Nits:

Changed WASM to refer to local copy of mappings.wasm Warn only for Dev mode
MLH-Fellowship · Dec 8, 2020 · 5fae37c · 5fae37c
1 parent 9873685
commit 5fae37c
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 10 deletions.
diff --git a/packages/react-devtools-extensions/build.js b/packages/react-devtools-extensions/build.js
@@ -11,7 +11,7 @@ const {getGitCommit} = require('./utils');
 
 // These files are copied along with Webpack-bundled files
 // to produce the final web extension
-const STATIC_FILES = ['icons', 'popups', 'main.html', 'panel.html'];
+const STATIC_FILES = ['icons', 'popups', 'main.html', 'panel.html', 'mappings.wasm'];
 
 const preProcess = async (destinationPath, tempPath) => {
   await remove(destinationPath); // Clean up from previously completed builds

diff --git a/packages/react-devtools-extensions/chrome/manifest.json b/packages/react-devtools-extensions/chrome/manifest.json
@@ -32,7 +32,8 @@
     "main.html",
     "panel.html",
     "build/react_devtools_backend.js",
-    "build/renderer.js"
+    "build/renderer.js",
+    "mappings.wasm"
   ],
 
   "background": {

diff --git a/packages/react-devtools-extensions/mappings.wasm b/packages/react-devtools-extensions/mappings.wasm
diff --git a/packages/react-devtools-extensions/src/main.js b/packages/react-devtools-extensions/src/main.js
@@ -240,7 +240,9 @@ function createPanelIfReactLoaded() {
             return newHookLog
           })
           .catch(e => {
-            console.warn(e);
+            if (__DEV__) {
+              console.warn(e);
+            }
             return Promise.resolve(hookLog);
           });
         }

diff --git a/packages/react-devtools-extensions/webpack.backend.js b/packages/react-devtools-extensions/webpack.backend.js
@@ -29,6 +29,7 @@ module.exports = {
   node: {
     // Don't define a polyfill on window.setImmediate
     setImmediate: false,
+    fs: 'empty',
   },
   resolve: {
     alias: {

diff --git a/packages/react-devtools-extensions/webpack.config.js b/packages/react-devtools-extensions/webpack.config.js
@@ -35,6 +35,7 @@ module.exports = {
   node: {
     // Don't define a polyfill on window.setImmediate
     setImmediate: false,
+    fs: 'empty',
   },
   resolve: {
     alias: {

diff --git a/packages/react-devtools-shared/package.json b/packages/react-devtools-shared/package.json
@@ -18,7 +18,6 @@
     "react-virtualized-auto-sizer": "^1.0.2",
     "semver": "^6.3.0",
     "source-map": "^0.7.3",
-    "fs": "*",
     "@babel/traverse": "^7.12.5",
     "@babel/parser": "^7.12.5" 
   }

diff --git a/packages/react-devtools-shared/src/utils.js b/packages/react-devtools-shared/src/utils.js
@@ -905,7 +905,8 @@ export function getSourceMapURL(url: string, urlResponse: string): string {
  * TODO: Bundle WASM in extension static files and use those instead of versioned URLs
  */
 function initialiseSourceMaps() {
-  const wasmMappingsURL = 'https://unpkg.com/source-map@0.7.3/lib/mappings.wasm';
+  const wasmFileName = 'mappings.wasm'
+  const wasmMappingsURL = chrome.extension.getURL(wasmFileName);
   SourceMapConsumer.initialize({ 'lib/mappings.wasm': wasmMappingsURL });
 }
 

diff --git a/yarn.lock b/yarn.lock
@@ -6846,11 +6846,6 @@ fs.realpath@^1.0.0:
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
   integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
 
-fs@*:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/fs/-/fs-0.0.2.tgz#e1f244ef3933c1b2a64bd4799136060d0f5914f8"
-  integrity sha1-4fJE7zkzwbKmS9R5kTYGDQ9ZFPg=
-
 fsevents@2.1.3, fsevents@~2.1.2:
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.3.tgz#fb738703ae8d2f9fe900c33836ddebee8b97f23e"