Remove before-load.js and Google Analytics (PR #4719)

firefox-devtools · Aug 16, 2023 · 3c92649 · 3c92649
1 parent cfb1a86
commit 3c92649
Show file tree

Hide file tree

Showing 9 changed files with 5 additions and 50 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -1,3 +1,2 @@
 src/types/libdef/npm
-res/before-load.js
 docs-user
diff --git a/.flowconfig b/.flowconfig
@@ -9,7 +9,6 @@ esproposal.optional_chaining=enable
 
 [ignore]
 <PROJECT_ROOT>/node_modules/.*
-<PROJECT_ROOT>/res/before-load\.js
 <PROJECT_ROOT>/dist/.*
 
 [libs]

diff --git a/docs-user/js/init.js b/docs-user/js/init.js
@@ -5,9 +5,7 @@ window.$docsify = {
   loadSidebar: true,
   loadNavbar: true,
   subMaxLevel: 2,
-  // If changing the Google Analytics ID, change it in res/before-load.js as well.
-  ga: 'UA-35433268-81',
   // Photon blue-50
   themeColor: '#0a84ff',
-  noCompileLinks: ['.*\\.svg']
+  noCompileLinks: ['.*\\.svg'],
 };
diff --git a/res/_headers b/res/_headers
@@ -15,7 +15,6 @@
 
   # 1. script-src
   #   a. 'wasm-unsafe-eval' allows to execute wasm scripts without compromising the javascript CSP.
-  #   b. We use Google Analytics to track the usage of the application.
   # 2. style-src
   #   a. `unsafe-inline` is necessary to support favicons.
   #   b. Google Fonts are used in the docs.
@@ -26,7 +25,7 @@
   # 7. `frame-ancestors` is the same purpose as `X-Frame-Options` above.
   # 8. `form-action`prevents forms, we don't need this.`
   # 9. `frame-src` allows the embedding of YouTube videos in the docs.
-  Content-Security-Policy: default-src 'self'; script-src 'self' 'wasm-unsafe-eval' https://www.google-analytics.com; style-src 'self' 'unsafe-inline' https://fonts.googleapis.com; font-src 'self' https://fonts.gstatic.com; img-src http: https: data:; object-src 'none'; connect-src *; frame-ancestors 'self'; form-action 'none'; frame-src www.youtube-nocookie.com
+  Content-Security-Policy: default-src 'self'; script-src 'self' 'wasm-unsafe-eval'; style-src 'self' 'unsafe-inline' https://fonts.googleapis.com; font-src 'self' https://fonts.gstatic.com; img-src http: https: data:; object-src 'none'; connect-src *; frame-ancestors 'self'; form-action 'none'; frame-src www.youtube-nocookie.com
 
 # Set the correct MIME type for WebAssembly modules.
 /*.wasm

diff --git a/res/before-load.js b/res/before-load.js
diff --git a/res/index.html b/res/index.html
@@ -7,7 +7,6 @@
 <meta charset="utf-8">
 <meta name="viewport" content="initial-scale=1" />
 <title>Firefox Profiler</title>
-<script src='/before-load.js'></script>
 </head>
 <body style='background-color: #363959; /* ink-70 */'>
 <div id="root"></div>

diff --git a/server.js b/server.js
@@ -53,8 +53,7 @@ const serverConfig = {
       default-src 'self';
       script-src
         'self'
-        'wasm-unsafe-eval'
-        https://www.google-analytics.com;
+        'wasm-unsafe-eval';
       style-src 'self' 'unsafe-inline' https://fonts.googleapis.com;
       font-src 'self' https://fonts.gstatic.com;
       img-src http: https: data:;

diff --git a/src/index.js b/src/index.js
@@ -29,6 +29,8 @@ import { ensureExists } from './utils/flow';
 
 // Mock out Google Analytics for anything that's not production so that we have run-time
 // code coverage in development and testing.
+// Note that ga isn't included nowadays. We still keep this code because we
+// intend to replace ga with Glean in the future, and this will still be useful.
 if (process.env.NODE_ENV === 'development') {
   window.ga = (event: string, ...payload: mixed[]) => {
     const style = 'color: #FF6D00; font-weight: bold';

diff --git a/webpack.config.js b/webpack.config.js
@@ -98,7 +98,6 @@ const config = {
         'res/_headers',
         'res/_redirects',
         'res/zee-worker.js',
-        'res/before-load.js',
         'res/contribute.json',
         'res/service-worker-compat.js',
         { from: 'docs-user', to: 'docs' },