Merge branch 'main' into plugin-uploader-fix

kintone · Oct 20, 2024 · 7a20495 · 7a20495
2 parents 6e6aa00 + a28d3d3
commit 7a20495
Show file tree

Hide file tree

Showing 6 changed files with 85 additions and 77 deletions.
diff --git a/package.json b/package.json
@@ -42,7 +42,7 @@
     "@cybozu/license-manager": "^1.2.1",
     "@octokit/rest": "^20.1.1",
     "@types/jest": "^29.5.13",
-    "@types/node": "^18.19.56",
+    "@types/node": "^18.19.57",
     "babel-jest": "^29.7.0",
     "comment-json": "^4.2.5",
     "eslint": "^8.57.1",

diff --git a/packages/create-plugin/package.json b/packages/create-plugin/package.json
@@ -33,7 +33,7 @@
   "devDependencies": {
     "@types/glob": "^8.1.0",
     "@types/inquirer": "^8.2.10",
-    "@types/lodash": "^4.17.10",
+    "@types/lodash": "^4.17.12",
     "@types/node-rsa": "^1.1.4",
     "@types/normalize-path": "^3.0.2",
     "cross-env": "^7.0.3",

diff --git a/packages/dts-gen/package.json b/packages/dts-gen/package.json
@@ -38,7 +38,7 @@
   },
   "devDependencies": {
     "@types/eslint": "^8.56.12",
-    "@types/lodash": "^4.17.10",
+    "@types/lodash": "^4.17.12",
     "ts-loader": "^9.5.1",
     "webpack": "^5.95.0",
     "webpack-cli": "^5.1.4",

diff --git a/packages/plugin-packer/docs/index-ja.html b/packages/plugin-packer/docs/index-ja.html
@@ -7,16 +7,20 @@
   <link rel="stylesheet" href="./dist/normalize.min.css">
   <link rel="stylesheet" href="./style.css">
   <script defer src="https://use.fontawesome.com/releases/v5.0.7/js/all.js"></script>
-  <script async src="https://www.googletagmanager.com/gtag/js?id=UA-378780-11"></script>
-  <script>
-window.dataLayer = window.dataLayer || [];
-function gtag(){dataLayer.push(arguments);}
-gtag('js', new Date());
-gtag('config', 'UA-378780-11');
-  </script>
+  <!-- Google Tag Manager -->
+  <script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
+            new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
+          j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
+          'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
+  })(window,document,'script','dataLayer','GTM-5N49D3');</script>
+  <!-- End Google Tag Manager -->
   <script src="./dist/bundle.js" defer></script>
 </head>
 <body>
+  <!-- Google Tag Manager (noscript) -->
+  <noscript><iframe src="https://www.googletagmanager.com/ns.html?id=GTM-5N49D3"
+                    height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
+  <!-- End Google Tag Manager (noscript) -->
   <header class="header">
     <h1 class="header__title">Package your kintone plug-in!</h1>
   </header>

diff --git a/packages/plugin-packer/docs/index.html b/packages/plugin-packer/docs/index.html
@@ -7,16 +7,20 @@
   <link rel="stylesheet" href="./dist/normalize.min.css">
   <link rel="stylesheet" href="./style.css">
   <script defer src="https://use.fontawesome.com/releases/v5.0.7/js/all.js"></script>
-  <script async src="https://www.googletagmanager.com/gtag/js?id=UA-378780-11"></script>
-  <script>
-window.dataLayer = window.dataLayer || [];
-function gtag(){dataLayer.push(arguments);}
-gtag('js', new Date());
-gtag('config', 'UA-378780-11');
-  </script>
+  <!-- Google Tag Manager -->
+  <script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
+            new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
+          j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
+          'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
+  })(window,document,'script','dataLayer','GTM-5N49D3');</script>
+  <!-- End Google Tag Manager -->
   <script src="./dist/bundle.js" defer></script>
 </head>
 <body>
+  <!-- Google Tag Manager (noscript) -->
+  <noscript><iframe src="https://www.googletagmanager.com/ns.html?id=GTM-5N49D3"
+                    height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
+  <!-- End Google Tag Manager (noscript) -->
   <header class="header">
     <h1 class="header__title">Package your kintone plug-in!</h1>
   </header>