From b3a9889a71e56682f6f7f5ae09d444f756987f40 Mon Sep 17 00:00:00 2001
From: Nathan Bierema <nbierema@gmail.com>
Date: Sun, 6 Nov 2022 17:58:43 -0500
Subject: [PATCH] Update

---
 extension/package.json                            | 2 +-
 extension/webpack.config.js                       | 8 +++++---
 extension/wrap.webpack.config.js                  | 2 +-
 packages/redux-devtools-app/package.json          | 1 -
 packages/redux-devtools-app/webpack.config.ts     | 3 ---
 packages/redux-devtools-app/webpack.config.umd.ts | 3 ---
 pnpm-lock.yaml                                    | 2 --
 7 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/extension/package.json b/extension/package.json
index d41b8df1..6d9a6d2a 100644
--- a/extension/package.json
+++ b/extension/package.json
@@ -22,7 +22,7 @@
     "test:app": "cross-env BABEL_ENV=test jest test/app",
     "test:chrome": "jest test/chrome",
     "test:electron": "pnpm run build:test:electron:fixture && jest test/electron",
-    "test": "pnpm run test:app && pnpm run build:extension && pnpm run build:chrome && pnpm run test:chrome && pnpm run test:electron",
+    "test": "pnpm run test:app && pnpm run build:extension && pnpm run test:chrome && pnpm run test:electron",
     "build:test:electron:fixture": "webpack --config test/electron/fixture/webpack.config.js",
     "type-check": "tsc --noEmit"
   },
diff --git a/extension/webpack.config.js b/extension/webpack.config.js
index a4f09dc3..e9ab0942 100644
--- a/extension/webpack.config.js
+++ b/extension/webpack.config.js
@@ -4,8 +4,8 @@ const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin');
 
 module.exports = function (env) {
   return {
-    // devtool: 'source-map',
     mode: env.production ? 'production' : 'development',
+    devtool: env.production ? 'source-map' : 'eval-source-map',
     entry: {
       background: [
         path.resolve(__dirname, 'src/chromeApiMock'),
@@ -27,10 +27,12 @@ module.exports = function (env) {
         path.resolve(__dirname, 'src/contentScript/index'),
       ],
       page: path.join(__dirname, 'src/pageScript'),
+      ...(env.production
+        ? {}
+        : { pagewrap: path.resolve(__dirname, 'src/pageScriptWrap') }),
     },
     output: {
       filename: '[name].bundle.js',
-      chunkFilename: '[id].chunk.js',
     },
     plugins: [
       new ForkTsCheckerWebpackPlugin({
@@ -45,7 +47,7 @@ module.exports = function (env) {
             to: path.join(__dirname, 'dist/manifest.json'),
           },
           {
-            from: path.join(__dirname, 'src/assets/'),
+            from: path.join(__dirname, 'src/assets'),
             to: path.join(__dirname, 'dist'),
           },
         ],
diff --git a/extension/wrap.webpack.config.js b/extension/wrap.webpack.config.js
index dd336c62..c3c69c3b 100644
--- a/extension/wrap.webpack.config.js
+++ b/extension/wrap.webpack.config.js
@@ -3,12 +3,12 @@ const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin');
 
 module.exports = {
   mode: 'production',
+  devtool: 'source-map',
   entry: {
     pagewrap: path.resolve(__dirname, 'src/pageScriptWrap'),
   },
   output: {
     filename: '[name].bundle.js',
-    chunkFilename: '[id].chunk.js',
   },
   plugins: [
     new ForkTsCheckerWebpackPlugin({
diff --git a/packages/redux-devtools-app/package.json b/packages/redux-devtools-app/package.json
index 145f722f..c3b4bfb3 100644
--- a/packages/redux-devtools-app/package.json
+++ b/packages/redux-devtools-app/package.json
@@ -103,7 +103,6 @@
     "html-webpack-plugin": "^5.5.0",
     "jest": "^29.2.2",
     "jest-environment-jsdom": "^29.2.2",
-    "path-browserify": "^1.0.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "rimraf": "^3.0.2",
diff --git a/packages/redux-devtools-app/webpack.config.ts b/packages/redux-devtools-app/webpack.config.ts
index c20747b6..d48dc365 100644
--- a/packages/redux-devtools-app/webpack.config.ts
+++ b/packages/redux-devtools-app/webpack.config.ts
@@ -39,9 +39,6 @@ export default (
   },
   resolve: {
     extensions: ['.js', '.jsx', '.ts', '.tsx'],
-    fallback: {
-      path: require.resolve('path-browserify'),
-    },
   },
   plugins: [
     new webpack.DefinePlugin({
diff --git a/packages/redux-devtools-app/webpack.config.umd.ts b/packages/redux-devtools-app/webpack.config.umd.ts
index 58ae1c22..d3f4e829 100644
--- a/packages/redux-devtools-app/webpack.config.umd.ts
+++ b/packages/redux-devtools-app/webpack.config.umd.ts
@@ -39,9 +39,6 @@ export default (env: { production?: boolean } = {}): webpack.Configuration => ({
   },
   resolve: {
     extensions: ['.js', '.jsx', '.ts', '.tsx'],
-    fallback: {
-      path: require.resolve('path-browserify'),
-    },
   },
   plugins: [
     new webpack.DefinePlugin({
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 4a2a4c41..d74cac9c 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -838,7 +838,6 @@ importers:
       jsondiffpatch: ^0.4.1
       localforage: ^1.10.0
       lodash: ^4.17.21
-      path-browserify: ^1.0.1
       prop-types: ^15.8.1
       react: ^18.2.0
       react-dom: ^18.2.0
@@ -920,7 +919,6 @@ importers:
       html-webpack-plugin: 5.5.0_webpack@5.74.0
       jest: 29.2.2_4pb6an67rakrle6rtido6z2a34
       jest-environment-jsdom: 29.2.2
-      path-browserify: 1.0.1
       react: 18.2.0
       react-dom: 18.2.0_react@18.2.0
       rimraf: 3.0.2