Bump loader-utils and react-scripts

Bumps [loader-utils](https://github.com/webpack/loader-utils) to 2.0.4 and updates ancestor dependency [react-scripts](https://github.com/facebook/create-react-app/tree/HEAD/packages/react-scripts). These dependencies need to be updated together. Updates `loader-utils` from 1.2.3 to 2.0.4 - [Release notes](https://github.com/webpack/loader-utils/releases) - [Changelog](https://github.com/webpack/loader-utils/blob/v2.0.4/CHANGELOG.md) - [Commits](https://github.com/webpack/loader-utils/compare/v1.2.3...v2.0.4) Updates `react-scripts` from 3.4.1 to 5.0.1 - [Release notes](https://github.com/facebook/create-react-app/releases) - [Changelog](https://github.com/facebook/create-react-app/blob/main/CHANGELOG-3.x.md) - [Commits](https://github.com/facebook/create-react-app/commits/react-scripts@5.0.1/packages/react-scripts) --- updated-dependencies: - dependency-name: loader-utils dependency-type: indirect - dependency-name: react-scripts dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>
2022-11-22 14:37:28 +00:00
8 changed files with 15835 additions and 18654 deletions
--- a/.github/workflows/nodejs-master.yml
+++ b/.github/workflows/nodejs-master.yml
@ -34,4 +34,4 @@ jobs:
          secret_id: ${{ secrets.SECRET_ID }}
          secret_key: ${{ secrets.SECRET_KEY }}
          bucket: ${{ secrets.BUCKET }}
-          region: ap-shanghai
+          region: ap-shanghai
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -17,7 +17,7 @@
    "react-indiana-drag-scroll": "^1.6.1",
    "react-lazy-load": "^3.0.13",
    "react-redux": "^7.2.0",
-    "react-scripts": "3.4.1",
+    "react-scripts": "5.0.1",
    "redux": "^4.0.5",
    "serialize-javascript": "^3.1.0"
  },
--- a/public/index.html
+++ b/public/index.html
@ -2,15 +2,15 @@
 <html lang="zh">
  <head>
    <!-- Global site tag (gtag.js) - Google Analytics -->
-    <!-- Google tag (gtag.js) -->
-    <script async src="https://www.googletagmanager.com/gtag/js?id=G-XKEWNQ1T0E"></script>
+    <script async src="https://www.googletagmanager.com/gtag/js?id=UA-165845289-1"></script>
+    <script data-ad-client="ca-pub-3611009408282658" async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
    <script>
-      window.dataLayer = window.dataLayer || [];
-      function gtag(){dataLayer.push(arguments);}
-      gtag('js', new Date());
-    
-      gtag('config', 'UA-165845289-1');
-      gtag('config', 'G-XKEWNQ1T0E');
+        window.dataLayer = window.dataLayer || [];
+        function gtag(){dataLayer.push(arguments);}
+        gtag('js', new Date());
+
+        gtag('config', 'UA-165845289-1');
+        gtag('config', 'G-3NKS6ZG27V');
    </script>
    <script>
        (function(){
@ -53,7 +53,7 @@
      work correctly both with client-side routing and a non-root public URL.
      Learn how to configure a non-root public URL by running `npm run build`.
    -->
-    <title>QRBTF Classic</title>
+    <title>个人技术分享</title>
  </head>
  <body>
    <noscript>You need to enable JavaScript to run this app.</noscript>
--- a/src/components/Qrcode.css
+++ b/src/components/Qrcode.css
@ -349,17 +349,8 @@ td {
    transition-duration: 0.3s;
 }

-.Qr-new-discord {
-    font-size: 12px;
-    position: absolute;
-    left: 0;
-    bottom: -54px;
-    font-weight: bold;
-    text-decoration: underline;
-}
-
@media (min-width: 500px) {
-    .Qr-input-hint, .Qr-new-discord {
+    .Qr-input-hint {
        margin-top: 14px;
        font-size: 14px;
    }
--- a/src/components/app/App.js
+++ b/src/components/app/App.js
@ -24,7 +24,7 @@ ReactGA.addTrackers(
            }
        },
        {
-            trackingId: 'G-XKEWNQ1T0E',
+            trackingId: 'G-3NKS6ZG27V',
            gaOptions: { name: 'trackerG' }
        }
    ],
--- a/src/containers/app/InputText.js
+++ b/src/containers/app/InputText.js
@ -69,9 +69,6 @@ const InputText = ({dispatch}) => {
                <div className="Qr-input-hint">
                    上传普通二维码或输入网址
                </div>
-                <a className="Qr-new-discord" href="https://discord.gg/V9CNuqYfte" target='_blank'>
-                    New! Click to join our Discord，AI QR code coming soon!
-                </a>
            </div>
        </React.Fragment>);
 }
--- a/yarn.lock
+++ b/yarn.lock