From 6660eaae18ec3faa7e74ee3b7f54c9886ec67e38 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 29 Aug 2021 04:09:37 +0000 Subject: [PATCH] chore(deps): update dependency webpack to v5 (#788) * chore(deps): update dependency webpack to v5 * Add path * changes * Add path to extension * Fix things * Fix that Co-authored-by: Renovate Bot Co-authored-by: Nathan Bierema --- extension/.babelrc | 2 +- extension/package.json | 4 +- extension/webpack/base.config.js | 10 ++--- package.json | 4 +- packages/redux-devtools-app/package.json | 1 + packages/redux-devtools-app/webpack.config.ts | 3 ++ .../redux-devtools-app/webpack.config.umd.ts | 4 +- .../containers/StackFrameCodeBlock.tsx | 39 ++++++++++--------- yarn.lock | 35 ++++++++++------- 9 files changed, 56 insertions(+), 46 deletions(-) diff --git a/extension/.babelrc b/extension/.babelrc index 72aeeb79..0d42ef44 100644 --- a/extension/.babelrc +++ b/extension/.babelrc @@ -4,5 +4,5 @@ "@babel/preset-react", "@babel/preset-typescript" ], - "plugins": [["@babel/plugin-proposal-class-properties"]] + "plugins": ["@babel/plugin-proposal-class-properties"] } diff --git a/extension/package.json b/extension/package.json index 646bcae9..adcfb30c 100644 --- a/extension/package.json +++ b/extension/package.json @@ -32,6 +32,7 @@ "type-check": "tsc --noEmit" }, "dependencies": { + "@babel/polyfill": "^7.12.1", "@redux-devtools/app": "^1.0.0-8", "@redux-devtools/core": "^3.9.0", "@redux-devtools/instrument": "^1.11.0", @@ -49,8 +50,6 @@ "redux": "^4.1.1" }, "devDependencies": { - "@babel/plugin-proposal-decorators": "^7.14.5", - "@babel/polyfill": "^7.12.1", "@babel/register": "^7.15.3", "bestzip": "^2.2.0", "chromedriver": "^91.0.1", @@ -64,6 +63,7 @@ "eslint-plugin-react": "^7.24.0", "eslint-plugin-react-hooks": "^4.2.0", "gitbook-cli": "^2.3.2", + "path-browserify": "^1.0.1", "react-transform-catch-errors": "^1.0.2", "react-transform-hmr": "^1.0.4", "selenium-webdriver": "^3.6.0", diff --git a/extension/webpack/base.config.js b/extension/webpack/base.config.js index 3c17f491..b7151873 100644 --- a/extension/webpack/base.config.js +++ b/extension/webpack/base.config.js @@ -31,12 +31,7 @@ const baseConfig = (params) => ({ }, plugins: [ new webpack.DefinePlugin(params.globals), - ...(params.plugins - ? params.plugins - : [ - new webpack.optimize.ModuleConcatenationPlugin(), - new webpack.optimize.OccurrenceOrderPlugin(), - ]), + ...(params.plugins ? params.plugins : []), ].concat( params.copy ? new CopyPlugin({ @@ -65,6 +60,9 @@ const baseConfig = (params) => ({ tmp: path.join(__dirname, '../build/tmp'), }, extensions: ['.js', '.jsx', '.ts', '.tsx'], + fallback: { + path: require.resolve('path-browserify'), + }, }, module: { rules: [ diff --git a/package.json b/package.json index d0deb8d1..8561d517 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "@babel/preset-typescript": "^7.15.0", "@types/jest": "^27.0.1", "@types/node": "^14.17.12", - "@types/webpack": "^4.41.30", + "@types/webpack": "^5.28.0", "@types/webpack-dev-server": "^4.0.3", "@types/webpack-env": "^1.16.2", "@typescript-eslint/eslint-plugin": "^4.29.3", @@ -46,7 +46,7 @@ "ts-node": "^10.2.1", "typescript": "^4.3.5", "url-loader": "^4.1.1", - "webpack": "^4.46.0", + "webpack": "^5.51.1", "webpack-cli": "^4.8.0", "webpack-dev-server": "^4.0.0" }, diff --git a/packages/redux-devtools-app/package.json b/packages/redux-devtools-app/package.json index 432bae40..320f6348 100644 --- a/packages/redux-devtools-app/package.json +++ b/packages/redux-devtools-app/package.json @@ -69,6 +69,7 @@ "enzyme": "^3.11.0", "enzyme-adapter-react-16": "^1.15.6", "enzyme-to-json": "^3.6.2", + "path-browserify": "^1.0.1", "react": "^16.14.0", "react-dom": "^16.14.0" }, diff --git a/packages/redux-devtools-app/webpack.config.ts b/packages/redux-devtools-app/webpack.config.ts index 7d9c9925..c419bcc5 100644 --- a/packages/redux-devtools-app/webpack.config.ts +++ b/packages/redux-devtools-app/webpack.config.ts @@ -47,6 +47,9 @@ module.exports = (env: { development?: boolean; platform?: string } = {}) => ({ }, 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 179bb77a..dc92eb4a 100644 --- a/packages/redux-devtools-app/webpack.config.umd.ts +++ b/packages/redux-devtools-app/webpack.config.umd.ts @@ -44,11 +44,13 @@ module.exports = (env: { production?: boolean } = {}) => ({ }, resolve: { extensions: ['.js', '.jsx', '.ts', '.tsx'], + fallback: { + path: require.resolve('path-browserify'), + }, }, plugins: [ new webpack.DefinePlugin({ 'process.env': { - NODE_ENV: JSON.stringify('production'), PLATFORM: JSON.stringify('web'), }, }), diff --git a/packages/redux-devtools-inspector-monitor-trace-tab/src/react-error-overlay/containers/StackFrameCodeBlock.tsx b/packages/redux-devtools-inspector-monitor-trace-tab/src/react-error-overlay/containers/StackFrameCodeBlock.tsx index 753c2e06..553d2d02 100644 --- a/packages/redux-devtools-inspector-monitor-trace-tab/src/react-error-overlay/containers/StackFrameCodeBlock.tsx +++ b/packages/redux-devtools-inspector-monitor-trace-tab/src/react-error-overlay/containers/StackFrameCodeBlock.tsx @@ -12,7 +12,7 @@ import { absolutifyCaret } from '../utils/dom/absolutifyCaret'; import { ScriptLine } from '../utils/stack-frame'; import generateAnsiHTML from '../utils/generateAnsiHTML'; -import { codeFrameColumns } from '@babel/code-frame'; +// import { codeFrameColumns } from '@babel/code-frame'; import { nicinabox as theme } from 'redux-devtools-themes'; interface StackFrameCodeBlockPropsType { @@ -48,24 +48,25 @@ function StackFrameCodeBlock(props: StackFrameCodeBlockPropsType) { } sourceCode[line - 1] = text; }); - const ansiHighlight = codeFrameColumns( - sourceCode.join('\n'), - { - start: { - line: lineNum, - column: - columnNum == null - ? 0 - : columnNum - (isFinite(whiteSpace) ? whiteSpace : 0), - }, - }, - { - forceColor: true, - linesAbove: contextSize, - linesBelow: contextSize, - } - ); - const htmlHighlight = generateAnsiHTML(ansiHighlight); + // const ansiHighlight = codeFrameColumns( + // sourceCode.join('\n'), + // { + // start: { + // line: lineNum, + // column: + // columnNum == null + // ? 0 + // : columnNum - (isFinite(whiteSpace) ? whiteSpace : 0), + // }, + // }, + // { + // forceColor: true, + // linesAbove: contextSize, + // linesBelow: contextSize, + // } + // ); + // const htmlHighlight = generateAnsiHTML(ansiHighlight); + const htmlHighlight = generateAnsiHTML(sourceCode.join('\n')); const code = document.createElement('code'); code.innerHTML = htmlHighlight; absolutifyCaret(code); diff --git a/yarn.lock b/yarn.lock index 5eb28f4c..029cc338 100644 --- a/yarn.lock +++ b/yarn.lock @@ -688,7 +688,7 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-proposal-decorators@npm:^7.12.12, @babel/plugin-proposal-decorators@npm:^7.14.5": +"@babel/plugin-proposal-decorators@npm:^7.12.12": version: 7.14.5 resolution: "@babel/plugin-proposal-decorators@npm:7.14.5" dependencies: @@ -4890,6 +4890,7 @@ __metadata: jsondiffpatch: ^0.4.1 localforage: ^1.10.0 lodash: ^4.17.21 + path-browserify: ^1.0.1 prop-types: ^15.7.2 react: ^16.14.0 react-dom: ^16.14.0 @@ -7892,17 +7893,14 @@ __metadata: languageName: node linkType: hard -"@types/webpack@npm:^4.41.30": - version: 4.41.30 - resolution: "@types/webpack@npm:4.41.30" +"@types/webpack@npm:^5.28.0": + version: 5.28.0 + resolution: "@types/webpack@npm:5.28.0" dependencies: "@types/node": "*" - "@types/tapable": ^1 - "@types/uglify-js": "*" - "@types/webpack-sources": "*" - anymatch: ^3.0.0 - source-map: ^0.6.0 - checksum: a247f48905777ac96fd43699cbef0aa053d25316f4242f3b1b9c5193850883fe42397e745a87b209c1da94f61dbbb9db2cef0a74b420bd3fe3af3be6a5ed039f + tapable: ^2.2.0 + webpack: ^5 + checksum: a038d7e12dd109c6a8d2eb744fd32070ef94f1655e730fb1443b370db98864c3a0e408638b02d12ba08269b9c012b3be8b801117ced2d1102e7676203fd663ed languageName: node linkType: hard @@ -23343,6 +23341,13 @@ fsevents@^1.2.7: languageName: node linkType: hard +"path-browserify@npm:^1.0.1": + version: 1.0.1 + resolution: "path-browserify@npm:1.0.1" + checksum: c6d7fa376423fe35b95b2d67990060c3ee304fc815ff0a2dc1c6c3cfaff2bd0d572ee67e18f19d0ea3bbe32e8add2a05021132ac40509416459fffee35200699 + languageName: node + linkType: hard + "path-dirname@npm:^1.0.0": version: 1.0.2 resolution: "path-dirname@npm:1.0.2" @@ -25877,7 +25882,6 @@ fsevents@^1.2.7: version: 0.0.0-use.local resolution: "remotedev-redux-devtools-extension@workspace:extension" dependencies: - "@babel/plugin-proposal-decorators": ^7.14.5 "@babel/polyfill": ^7.12.1 "@babel/register": ^7.15.3 "@redux-devtools/app": ^1.0.0-8 @@ -25901,6 +25905,7 @@ fsevents@^1.2.7: gitbook-cli: ^2.3.2 jsan: ^3.1.13 lodash: ^4.17.21 + path-browserify: ^1.0.1 react: ^16.14.0 react-dom: ^16.14.0 react-icons: ^3.11.0 @@ -26304,7 +26309,7 @@ resolve@^2.0.0-next.3: "@babel/preset-typescript": ^7.15.0 "@types/jest": ^27.0.1 "@types/node": ^14.17.12 - "@types/webpack": ^4.41.30 + "@types/webpack": ^5.28.0 "@types/webpack-dev-server": ^4.0.3 "@types/webpack-env": ^1.16.2 "@typescript-eslint/eslint-plugin": ^4.29.3 @@ -26340,7 +26345,7 @@ resolve@^2.0.0-next.3: ts-node: ^10.2.1 typescript: ^4.3.5 url-loader: ^4.1.1 - webpack: ^4.46.0 + webpack: ^5.51.1 webpack-cli: ^4.8.0 webpack-dev-server: ^4.0.0 languageName: unknown @@ -30401,7 +30406,7 @@ typescript@^4.3.5: languageName: node linkType: hard -"webpack@npm:4, webpack@npm:^4.46.0": +"webpack@npm:4": version: 4.46.0 resolution: "webpack@npm:4.46.0" dependencies: @@ -30439,7 +30444,7 @@ typescript@^4.3.5: languageName: node linkType: hard -"webpack@npm:^5.38.1": +"webpack@npm:^5, webpack@npm:^5.38.1, webpack@npm:^5.51.1": version: 5.51.1 resolution: "webpack@npm:5.51.1" dependencies: