From cec6eccc04a922869b18b78b0a5d66d94f4e5146 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 6 Jun 2023 04:06:29 +0000
Subject: [PATCH 01/24] fix(deps): update dependency scratch-l10n to
v3.15.20230606032220
---
package-lock.json | 46 +++++++++++++++++++++++++++++++++++++++-------
package.json | 2 +-
2 files changed, 40 insertions(+), 8 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 07212da0e..a6e41c864 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -102,7 +102,7 @@
"sass": "1.49.7",
"sass-loader": "10.2.1",
"scratch-gui": "1.8.107",
- "scratch-l10n": "3.15.20230605032207",
+ "scratch-l10n": "3.15.20230606032220",
"selenium-webdriver": "4.1.0",
"slick-carousel": "1.6.0",
"style-loader": "0.12.3",
@@ -23880,6 +23880,24 @@
"symbol-observable": "^1.0.3"
}
},
+ "node_modules/scratch-gui/node_modules/scratch-l10n": {
+ "version": "3.15.20230605032207",
+ "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230605032207.tgz",
+ "integrity": "sha512-/rfJpI0csg2a3F6Brnd7QIZxGAlLB165nsm0TwYBNwHFCg0BjjcehzPkumXKOeyc7U2e7GldGcMDb+8C8cPICQ==",
+ "dev": true,
+ "dependencies": {
+ "@babel/cli": "^7.1.2",
+ "@babel/core": "^7.1.2",
+ "@transifex/api": "4.2.5",
+ "babel-plugin-react-intl": "^3.0.1",
+ "download": "^8.0.0",
+ "transifex": "1.6.6"
+ },
+ "bin": {
+ "build-i18n-src": "scripts/build-i18n-src.js",
+ "tx-push-src": "scripts/tx-push-src.js"
+ }
+ },
"node_modules/scratch-gui/node_modules/scratch-paint": {
"version": "1.1.68",
"resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-1.1.68.tgz",
@@ -23962,9 +23980,9 @@
}
},
"node_modules/scratch-l10n": {
- "version": "3.15.20230605032207",
- "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230605032207.tgz",
- "integrity": "sha512-/rfJpI0csg2a3F6Brnd7QIZxGAlLB165nsm0TwYBNwHFCg0BjjcehzPkumXKOeyc7U2e7GldGcMDb+8C8cPICQ==",
+ "version": "3.15.20230606032220",
+ "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230606032220.tgz",
+ "integrity": "sha512-usnZmTRy0/MQGOpohJpvsPa/AzaoRtuIN+vUICYgCVefJbp0xMlEzkQcbk+pT/8aE+WueMj+pFErgi/bLZAE1w==",
"dev": true,
"dependencies": {
"@babel/cli": "^7.1.2",
@@ -52298,6 +52316,20 @@
"symbol-observable": "^1.0.3"
}
},
+ "scratch-l10n": {
+ "version": "3.15.20230605032207",
+ "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230605032207.tgz",
+ "integrity": "sha512-/rfJpI0csg2a3F6Brnd7QIZxGAlLB165nsm0TwYBNwHFCg0BjjcehzPkumXKOeyc7U2e7GldGcMDb+8C8cPICQ==",
+ "dev": true,
+ "requires": {
+ "@babel/cli": "^7.1.2",
+ "@babel/core": "^7.1.2",
+ "@transifex/api": "4.2.5",
+ "babel-plugin-react-intl": "^3.0.1",
+ "download": "^8.0.0",
+ "transifex": "1.6.6"
+ }
+ },
"scratch-paint": {
"version": "1.1.68",
"resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-1.1.68.tgz",
@@ -52362,9 +52394,9 @@
}
},
"scratch-l10n": {
- "version": "3.15.20230605032207",
- "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230605032207.tgz",
- "integrity": "sha512-/rfJpI0csg2a3F6Brnd7QIZxGAlLB165nsm0TwYBNwHFCg0BjjcehzPkumXKOeyc7U2e7GldGcMDb+8C8cPICQ==",
+ "version": "3.15.20230606032220",
+ "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230606032220.tgz",
+ "integrity": "sha512-usnZmTRy0/MQGOpohJpvsPa/AzaoRtuIN+vUICYgCVefJbp0xMlEzkQcbk+pT/8aE+WueMj+pFErgi/bLZAE1w==",
"dev": true,
"requires": {
"@babel/cli": "^7.1.2",
diff --git a/package.json b/package.json
index f38775030..72ea55207 100644
--- a/package.json
+++ b/package.json
@@ -137,7 +137,7 @@
"sass": "1.49.7",
"sass-loader": "10.2.1",
"scratch-gui": "1.8.107",
- "scratch-l10n": "3.15.20230605032207",
+ "scratch-l10n": "3.15.20230606032220",
"selenium-webdriver": "4.1.0",
"slick-carousel": "1.6.0",
"style-loader": "0.12.3",
From b0fdd5fa13234100ba1bc4c12cb7ebf5dec8b515 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 6 Jun 2023 11:03:31 +0000
Subject: [PATCH 02/24] fix(deps): update dependency scratch-gui to v1.8.108
---
package-lock.json | 50 +++++++++--------------------------------------
package.json | 2 +-
2 files changed, 10 insertions(+), 42 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index a6e41c864..ef88c87e0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -101,7 +101,7 @@
"regenerator-runtime": "0.13.9",
"sass": "1.49.7",
"sass-loader": "10.2.1",
- "scratch-gui": "1.8.107",
+ "scratch-gui": "1.8.108",
"scratch-l10n": "3.15.20230606032220",
"selenium-webdriver": "4.1.0",
"slick-carousel": "1.6.0",
@@ -23493,9 +23493,9 @@
}
},
"node_modules/scratch-gui": {
- "version": "1.8.107",
- "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-1.8.107.tgz",
- "integrity": "sha512-0cL52bALjfj2Wl4kSvw4zQRnrL3rilIAgzX9Py1z+29RG7KPm3w5eDwMJFofUKs8/Z+YoCVBzzJyIwT2WACoyQ==",
+ "version": "1.8.108",
+ "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-1.8.108.tgz",
+ "integrity": "sha512-u6T04nW4cqjDn4Q7DSdm7QM+nYusxlLHNOLHL1EVjDMYE17Lz0m+v76/Uk302aDqkuSSxzaePOr6KZriN0TnMQ==",
"dev": true,
"dependencies": {
"arraybuffer-loader": "^1.0.6",
@@ -23548,7 +23548,7 @@
"redux-throttle": "0.1.1",
"scratch-audio": "0.1.0-prerelease.20221123180128",
"scratch-blocks": "0.1.0-prerelease.20230527085947",
- "scratch-l10n": "3.15.20230605032207",
+ "scratch-l10n": "3.15.20230606032220",
"scratch-paint": "1.1.68",
"scratch-render": "0.1.0-prerelease.20230318150639",
"scratch-render-fonts": "1.0.0-prerelease.20221102164332",
@@ -23880,24 +23880,6 @@
"symbol-observable": "^1.0.3"
}
},
- "node_modules/scratch-gui/node_modules/scratch-l10n": {
- "version": "3.15.20230605032207",
- "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230605032207.tgz",
- "integrity": "sha512-/rfJpI0csg2a3F6Brnd7QIZxGAlLB165nsm0TwYBNwHFCg0BjjcehzPkumXKOeyc7U2e7GldGcMDb+8C8cPICQ==",
- "dev": true,
- "dependencies": {
- "@babel/cli": "^7.1.2",
- "@babel/core": "^7.1.2",
- "@transifex/api": "4.2.5",
- "babel-plugin-react-intl": "^3.0.1",
- "download": "^8.0.0",
- "transifex": "1.6.6"
- },
- "bin": {
- "build-i18n-src": "scripts/build-i18n-src.js",
- "tx-push-src": "scripts/tx-push-src.js"
- }
- },
"node_modules/scratch-gui/node_modules/scratch-paint": {
"version": "1.1.68",
"resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-1.1.68.tgz",
@@ -51991,9 +51973,9 @@
}
},
"scratch-gui": {
- "version": "1.8.107",
- "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-1.8.107.tgz",
- "integrity": "sha512-0cL52bALjfj2Wl4kSvw4zQRnrL3rilIAgzX9Py1z+29RG7KPm3w5eDwMJFofUKs8/Z+YoCVBzzJyIwT2WACoyQ==",
+ "version": "1.8.108",
+ "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-1.8.108.tgz",
+ "integrity": "sha512-u6T04nW4cqjDn4Q7DSdm7QM+nYusxlLHNOLHL1EVjDMYE17Lz0m+v76/Uk302aDqkuSSxzaePOr6KZriN0TnMQ==",
"dev": true,
"requires": {
"arraybuffer-loader": "^1.0.6",
@@ -52046,7 +52028,7 @@
"redux-throttle": "0.1.1",
"scratch-audio": "0.1.0-prerelease.20221123180128",
"scratch-blocks": "0.1.0-prerelease.20230527085947",
- "scratch-l10n": "3.15.20230605032207",
+ "scratch-l10n": "3.15.20230606032220",
"scratch-paint": "1.1.68",
"scratch-render": "0.1.0-prerelease.20230318150639",
"scratch-render-fonts": "1.0.0-prerelease.20221102164332",
@@ -52316,20 +52298,6 @@
"symbol-observable": "^1.0.3"
}
},
- "scratch-l10n": {
- "version": "3.15.20230605032207",
- "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230605032207.tgz",
- "integrity": "sha512-/rfJpI0csg2a3F6Brnd7QIZxGAlLB165nsm0TwYBNwHFCg0BjjcehzPkumXKOeyc7U2e7GldGcMDb+8C8cPICQ==",
- "dev": true,
- "requires": {
- "@babel/cli": "^7.1.2",
- "@babel/core": "^7.1.2",
- "@transifex/api": "4.2.5",
- "babel-plugin-react-intl": "^3.0.1",
- "download": "^8.0.0",
- "transifex": "1.6.6"
- }
- },
"scratch-paint": {
"version": "1.1.68",
"resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-1.1.68.tgz",
diff --git a/package.json b/package.json
index 72ea55207..88d7ce03b 100644
--- a/package.json
+++ b/package.json
@@ -136,7 +136,7 @@
"regenerator-runtime": "0.13.9",
"sass": "1.49.7",
"sass-loader": "10.2.1",
- "scratch-gui": "1.8.107",
+ "scratch-gui": "1.8.108",
"scratch-l10n": "3.15.20230606032220",
"selenium-webdriver": "4.1.0",
"slick-carousel": "1.6.0",
From 7d358a67af172c6526a4e53f4200068d543da8a6 Mon Sep 17 00:00:00 2001
From: Christopher Willis-Ford <7019101+cwillisf@users.noreply.github.com>
Date: Tue, 6 Jun 2023 14:31:14 -0700
Subject: [PATCH 03/24] build: enable GTM environments feature
- Document all GA/GTM-related variables in `template-config.js`
- Add `gtm_env_auth` variable (from `GTM_ENV_AUTH` environment variable)
to enable alternative GTM environments
This will let us test new GTM configurations in staging without sending
the data to our production data stream.
---
src/template-config.js | 19 ++++++++++++++++++-
src/template.ejs | 7 ++++---
2 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/src/template-config.js b/src/template-config.js
index 13cf2ed0e..c74763530 100644
--- a/src/template-config.js
+++ b/src/template-config.js
@@ -28,6 +28,23 @@ module.exports = {
og_image_height: 860,
// Analytics & Monitoring
+ // ----------------------
+
+ // GA4 Measurement ID
+ // Looks like 'G-XXXXXXXX'
+ ga4_id: process.env.GA4_ID || '',
+
+ // Universal Analytics Property ID
+ // Looks like 'UA-99999999-9'
ga_tracker: process.env.GA_TRACKER || '',
- gtm_id: process.env.GTM_ID || ''
+
+ // Google Tag Manager ID
+ // Looks like 'GTM-XXXXXXX'
+ gtm_id: process.env.GTM_ID || '',
+
+ // Google Tag Manager env & auth info for alterative GTM environments
+ // Looks like '>m_auth=0123456789abcdefghijklm>m_preview=env-00>m_cookies_win=x'
+ // Taken from the middle of: GTM -> Admin -> Environments -> (environment) -> Get Snippet
+ // Blank for production
+ gtm_env_auth: process.env.GTM_ENV_AUTH || ''
};
diff --git a/src/template.ejs b/src/template.ejs
index cfafbc05f..f2302c91f 100644
--- a/src/template.ejs
+++ b/src/template.ejs
@@ -8,8 +8,9 @@
+ 'https://www.googletagmanager.com/gtm.js?id='+i+dl+'<%- htmlWebpackPlugin.options.gtm_env_auth %>';
+ f.parentNode.insertBefore(j,f);})(window,document,'script','dataLayer','<%- htmlWebpackPlugin.options.gtm_id %>');
+
<% } %>
@@ -67,7 +68,7 @@
<% if (htmlWebpackPlugin.options.gtm_id) { %>
-
+
<% } %>