From 0353d68781547c6f93bca8ea346a945ceb66d9b5 Mon Sep 17 00:00:00 2001 From: Igor Randjelovic Date: Tue, 9 Mar 2021 18:45:28 +0100 Subject: [PATCH] chore: bump deps & drop clean-webpack-plugin in favor of clean:true --- .../__snapshots__/angular.spec.ts.snap | 24 ++-------- .../__snapshots__/base.spec.ts.snap | 24 ++-------- .../__snapshots__/javascript.spec.ts.snap | 24 ++-------- .../__snapshots__/react.spec.ts.snap | 48 ++++--------------- .../__snapshots__/svelte.spec.ts.snap | 24 ++-------- .../__snapshots__/typescript.spec.ts.snap | 24 ++-------- .../__snapshots__/vue.spec.ts.snap | 24 ++-------- packages/webpack5/package.json | 19 ++++---- packages/webpack5/src/configuration/base.ts | 12 +---- 9 files changed, 43 insertions(+), 180 deletions(-) diff --git a/packages/webpack5/__tests__/configuration/__snapshots__/angular.spec.ts.snap b/packages/webpack5/__tests__/configuration/__snapshots__/angular.spec.ts.snap index b20a4c51f..abe92c9f6 100644 --- a/packages/webpack5/__tests__/configuration/__snapshots__/angular.spec.ts.snap +++ b/packages/webpack5/__tests__/configuration/__snapshots__/angular.spec.ts.snap @@ -14,7 +14,8 @@ exports[`angular configuration for android 1`] = ` pathinfo: false, publicPath: '', libraryTarget: 'commonjs', - globalObject: 'global' + globalObject: 'global', + clean: true }, resolve: { symlinks: true, @@ -188,15 +189,6 @@ exports[`angular configuration for android 1`] = ` ] }, plugins: [ - /* config.plugin('CleanWebpackPlugin') */ - new CleanWebpackPlugin( - { - cleanOnceBeforeBuildPatterns: [ - '__jest__/platforms/android/app/src/main/assets/app/**/*' - ], - verbose: false - } - ), /* config.plugin('PlatformSuffixPlugin') */ new PlatformSuffixPlugin( { @@ -295,7 +287,8 @@ exports[`angular configuration for ios 1`] = ` pathinfo: false, publicPath: '', libraryTarget: 'commonjs', - globalObject: 'global' + globalObject: 'global', + clean: true }, resolve: { symlinks: true, @@ -469,15 +462,6 @@ exports[`angular configuration for ios 1`] = ` ] }, plugins: [ - /* config.plugin('CleanWebpackPlugin') */ - new CleanWebpackPlugin( - { - cleanOnceBeforeBuildPatterns: [ - '__jest__/platforms/ios/jest/app/**/*' - ], - verbose: false - } - ), /* config.plugin('PlatformSuffixPlugin') */ new PlatformSuffixPlugin( { diff --git a/packages/webpack5/__tests__/configuration/__snapshots__/base.spec.ts.snap b/packages/webpack5/__tests__/configuration/__snapshots__/base.spec.ts.snap index f060751ef..cd5cfa0ae 100644 --- a/packages/webpack5/__tests__/configuration/__snapshots__/base.spec.ts.snap +++ b/packages/webpack5/__tests__/configuration/__snapshots__/base.spec.ts.snap @@ -14,7 +14,8 @@ exports[`base configuration for android 1`] = ` pathinfo: false, publicPath: '', libraryTarget: 'commonjs', - globalObject: 'global' + globalObject: 'global', + clean: true }, resolve: { symlinks: true, @@ -186,15 +187,6 @@ exports[`base configuration for android 1`] = ` } } ), - /* config.plugin('CleanWebpackPlugin') */ - new CleanWebpackPlugin( - { - cleanOnceBeforeBuildPatterns: [ - '__jest__/platforms/android/app/src/main/assets/app/**/*' - ], - verbose: false - } - ), /* config.plugin('PlatformSuffixPlugin') */ new PlatformSuffixPlugin( { @@ -283,7 +275,8 @@ exports[`base configuration for ios 1`] = ` pathinfo: false, publicPath: '', libraryTarget: 'commonjs', - globalObject: 'global' + globalObject: 'global', + clean: true }, resolve: { symlinks: true, @@ -455,15 +448,6 @@ exports[`base configuration for ios 1`] = ` } } ), - /* config.plugin('CleanWebpackPlugin') */ - new CleanWebpackPlugin( - { - cleanOnceBeforeBuildPatterns: [ - '__jest__/platforms/ios/jest/app/**/*' - ], - verbose: false - } - ), /* config.plugin('PlatformSuffixPlugin') */ new PlatformSuffixPlugin( { diff --git a/packages/webpack5/__tests__/configuration/__snapshots__/javascript.spec.ts.snap b/packages/webpack5/__tests__/configuration/__snapshots__/javascript.spec.ts.snap index 3a467c52f..9fc956b69 100644 --- a/packages/webpack5/__tests__/configuration/__snapshots__/javascript.spec.ts.snap +++ b/packages/webpack5/__tests__/configuration/__snapshots__/javascript.spec.ts.snap @@ -14,7 +14,8 @@ exports[`javascript configuration for android 1`] = ` pathinfo: false, publicPath: '', libraryTarget: 'commonjs', - globalObject: 'global' + globalObject: 'global', + clean: true }, resolve: { symlinks: true, @@ -196,15 +197,6 @@ exports[`javascript configuration for android 1`] = ` } } ), - /* config.plugin('CleanWebpackPlugin') */ - new CleanWebpackPlugin( - { - cleanOnceBeforeBuildPatterns: [ - '__jest__/platforms/android/app/src/main/assets/app/**/*' - ], - verbose: false - } - ), /* config.plugin('PlatformSuffixPlugin') */ new PlatformSuffixPlugin( { @@ -304,7 +296,8 @@ exports[`javascript configuration for ios 1`] = ` pathinfo: false, publicPath: '', libraryTarget: 'commonjs', - globalObject: 'global' + globalObject: 'global', + clean: true }, resolve: { symlinks: true, @@ -486,15 +479,6 @@ exports[`javascript configuration for ios 1`] = ` } } ), - /* config.plugin('CleanWebpackPlugin') */ - new CleanWebpackPlugin( - { - cleanOnceBeforeBuildPatterns: [ - '__jest__/platforms/ios/jest/app/**/*' - ], - verbose: false - } - ), /* config.plugin('PlatformSuffixPlugin') */ new PlatformSuffixPlugin( { diff --git a/packages/webpack5/__tests__/configuration/__snapshots__/react.spec.ts.snap b/packages/webpack5/__tests__/configuration/__snapshots__/react.spec.ts.snap index 851b6c4ac..a162eec11 100644 --- a/packages/webpack5/__tests__/configuration/__snapshots__/react.spec.ts.snap +++ b/packages/webpack5/__tests__/configuration/__snapshots__/react.spec.ts.snap @@ -14,7 +14,8 @@ exports[`react configuration > android > adds ReactRefreshWebpackPlugin when HMR pathinfo: false, publicPath: '', libraryTarget: 'commonjs', - globalObject: 'global' + globalObject: 'global', + clean: true }, resolve: { symlinks: true, @@ -201,15 +202,6 @@ exports[`react configuration > android > adds ReactRefreshWebpackPlugin when HMR } } ), - /* config.plugin('CleanWebpackPlugin') */ - new CleanWebpackPlugin( - { - cleanOnceBeforeBuildPatterns: [ - '__jest__/platforms/android/app/src/main/assets/app/**/*' - ], - verbose: false - } - ), /* config.plugin('PlatformSuffixPlugin') */ new PlatformSuffixPlugin( { @@ -311,7 +303,8 @@ exports[`react configuration > android > base config 1`] = ` pathinfo: false, publicPath: '', libraryTarget: 'commonjs', - globalObject: 'global' + globalObject: 'global', + clean: true }, resolve: { symlinks: true, @@ -487,15 +480,6 @@ exports[`react configuration > android > base config 1`] = ` } } ), - /* config.plugin('CleanWebpackPlugin') */ - new CleanWebpackPlugin( - { - cleanOnceBeforeBuildPatterns: [ - '__jest__/platforms/android/app/src/main/assets/app/**/*' - ], - verbose: false - } - ), /* config.plugin('PlatformSuffixPlugin') */ new PlatformSuffixPlugin( { @@ -586,7 +570,8 @@ exports[`react configuration > ios > adds ReactRefreshWebpackPlugin when HMR ena pathinfo: false, publicPath: '', libraryTarget: 'commonjs', - globalObject: 'global' + globalObject: 'global', + clean: true }, resolve: { symlinks: true, @@ -773,15 +758,6 @@ exports[`react configuration > ios > adds ReactRefreshWebpackPlugin when HMR ena } } ), - /* config.plugin('CleanWebpackPlugin') */ - new CleanWebpackPlugin( - { - cleanOnceBeforeBuildPatterns: [ - '__jest__/platforms/ios/jest/app/**/*' - ], - verbose: false - } - ), /* config.plugin('PlatformSuffixPlugin') */ new PlatformSuffixPlugin( { @@ -884,7 +860,8 @@ exports[`react configuration > ios > base config 1`] = ` pathinfo: false, publicPath: '', libraryTarget: 'commonjs', - globalObject: 'global' + globalObject: 'global', + clean: true }, resolve: { symlinks: true, @@ -1060,15 +1037,6 @@ exports[`react configuration > ios > base config 1`] = ` } } ), - /* config.plugin('CleanWebpackPlugin') */ - new CleanWebpackPlugin( - { - cleanOnceBeforeBuildPatterns: [ - '__jest__/platforms/ios/jest/app/**/*' - ], - verbose: false - } - ), /* config.plugin('PlatformSuffixPlugin') */ new PlatformSuffixPlugin( { diff --git a/packages/webpack5/__tests__/configuration/__snapshots__/svelte.spec.ts.snap b/packages/webpack5/__tests__/configuration/__snapshots__/svelte.spec.ts.snap index 504d587e8..e899bd504 100644 --- a/packages/webpack5/__tests__/configuration/__snapshots__/svelte.spec.ts.snap +++ b/packages/webpack5/__tests__/configuration/__snapshots__/svelte.spec.ts.snap @@ -14,7 +14,8 @@ exports[`svelte configuration for android 1`] = ` pathinfo: false, publicPath: '', libraryTarget: 'commonjs', - globalObject: 'global' + globalObject: 'global', + clean: true }, resolve: { symlinks: true, @@ -211,15 +212,6 @@ exports[`svelte configuration for android 1`] = ` } } ), - /* config.plugin('CleanWebpackPlugin') */ - new CleanWebpackPlugin( - { - cleanOnceBeforeBuildPatterns: [ - '__jest__/platforms/android/app/src/main/assets/app/**/*' - ], - verbose: false - } - ), /* config.plugin('PlatformSuffixPlugin') */ new PlatformSuffixPlugin( { @@ -308,7 +300,8 @@ exports[`svelte configuration for ios 1`] = ` pathinfo: false, publicPath: '', libraryTarget: 'commonjs', - globalObject: 'global' + globalObject: 'global', + clean: true }, resolve: { symlinks: true, @@ -505,15 +498,6 @@ exports[`svelte configuration for ios 1`] = ` } } ), - /* config.plugin('CleanWebpackPlugin') */ - new CleanWebpackPlugin( - { - cleanOnceBeforeBuildPatterns: [ - '__jest__/platforms/ios/jest/app/**/*' - ], - verbose: false - } - ), /* config.plugin('PlatformSuffixPlugin') */ new PlatformSuffixPlugin( { diff --git a/packages/webpack5/__tests__/configuration/__snapshots__/typescript.spec.ts.snap b/packages/webpack5/__tests__/configuration/__snapshots__/typescript.spec.ts.snap index 0958bd031..fe876098e 100644 --- a/packages/webpack5/__tests__/configuration/__snapshots__/typescript.spec.ts.snap +++ b/packages/webpack5/__tests__/configuration/__snapshots__/typescript.spec.ts.snap @@ -14,7 +14,8 @@ exports[`typescript configuration for android 1`] = ` pathinfo: false, publicPath: '', libraryTarget: 'commonjs', - globalObject: 'global' + globalObject: 'global', + clean: true }, resolve: { symlinks: true, @@ -196,15 +197,6 @@ exports[`typescript configuration for android 1`] = ` } } ), - /* config.plugin('CleanWebpackPlugin') */ - new CleanWebpackPlugin( - { - cleanOnceBeforeBuildPatterns: [ - '__jest__/platforms/android/app/src/main/assets/app/**/*' - ], - verbose: false - } - ), /* config.plugin('PlatformSuffixPlugin') */ new PlatformSuffixPlugin( { @@ -304,7 +296,8 @@ exports[`typescript configuration for ios 1`] = ` pathinfo: false, publicPath: '', libraryTarget: 'commonjs', - globalObject: 'global' + globalObject: 'global', + clean: true }, resolve: { symlinks: true, @@ -486,15 +479,6 @@ exports[`typescript configuration for ios 1`] = ` } } ), - /* config.plugin('CleanWebpackPlugin') */ - new CleanWebpackPlugin( - { - cleanOnceBeforeBuildPatterns: [ - '__jest__/platforms/ios/jest/app/**/*' - ], - verbose: false - } - ), /* config.plugin('PlatformSuffixPlugin') */ new PlatformSuffixPlugin( { diff --git a/packages/webpack5/__tests__/configuration/__snapshots__/vue.spec.ts.snap b/packages/webpack5/__tests__/configuration/__snapshots__/vue.spec.ts.snap index 54c36f04f..5f4ae6b00 100644 --- a/packages/webpack5/__tests__/configuration/__snapshots__/vue.spec.ts.snap +++ b/packages/webpack5/__tests__/configuration/__snapshots__/vue.spec.ts.snap @@ -14,7 +14,8 @@ exports[`vue configuration for android 1`] = ` pathinfo: false, publicPath: '', libraryTarget: 'commonjs', - globalObject: 'global' + globalObject: 'global', + clean: true }, resolve: { symlinks: true, @@ -218,15 +219,6 @@ exports[`vue configuration for android 1`] = ` } } ), - /* config.plugin('CleanWebpackPlugin') */ - new CleanWebpackPlugin( - { - cleanOnceBeforeBuildPatterns: [ - '__jest__/platforms/android/app/src/main/assets/app/**/*' - ], - verbose: false - } - ), /* config.plugin('PlatformSuffixPlugin') */ new PlatformSuffixPlugin( { @@ -315,7 +307,8 @@ exports[`vue configuration for ios 1`] = ` pathinfo: false, publicPath: '', libraryTarget: 'commonjs', - globalObject: 'global' + globalObject: 'global', + clean: true }, resolve: { symlinks: true, @@ -519,15 +512,6 @@ exports[`vue configuration for ios 1`] = ` } } ), - /* config.plugin('CleanWebpackPlugin') */ - new CleanWebpackPlugin( - { - cleanOnceBeforeBuildPatterns: [ - '__jest__/platforms/ios/jest/app/**/*' - ], - verbose: false - } - ), /* config.plugin('PlatformSuffixPlugin') */ new PlatformSuffixPlugin( { diff --git a/packages/webpack5/package.json b/packages/webpack5/package.json index 1c211d8cb..cb3f59651 100644 --- a/packages/webpack5/package.json +++ b/packages/webpack5/package.json @@ -16,24 +16,23 @@ "prepack": "npm run build && cp -R src/stubs dist/stubs && chmod +x dist/bin/index.js" }, "dependencies": { - "@babel/core": "^7.13.8", + "@babel/core": "^7.13.10", "@pmmmwh/react-refresh-webpack-plugin": "^0.4.3", "@types/sax": "^1.2.1", "babel-loader": "^8.2.1", "chalk": "^4.1.0", - "clean-webpack-plugin": "^3.0.0", "cli-highlight": "^2.1.10", "commander": "^7.1.0", - "copy-webpack-plugin": "^7.0.0", + "copy-webpack-plugin": "^8.0.0", "css": "^3.0.0", "css-loader": "^5.1.1", - "dotenv-webpack": "^6.0.2", - "fork-ts-checker-webpack-plugin": "^6.1.0", + "dotenv-webpack": "^7.0.1", + "fork-ts-checker-webpack-plugin": "^6.1.1", "loader-utils": "^2.0.0", "micromatch": "^4.0.2", - "postcss": "^8.2.6", + "postcss": "^8.2.7", "postcss-import": "^14.0.0", - "postcss-loader": "^5.0.0", + "postcss-loader": "^5.1.0", "raw-loader": "^4.0.2", "react-refresh": "^0.9.0", "sass": "^1.32.8", @@ -44,7 +43,7 @@ "ts-dedent": "^2.0.0", "ts-loader": "^8.0.17", "vue-loader": "^15.9.5", - "webpack": "^5.24.2", + "webpack": "^5.24.4", "webpack-bundle-analyzer": "^4.4.0", "webpack-chain": "^6.5.1", "webpack-cli": "^4.5.0", @@ -64,8 +63,8 @@ "jest-matcher-utils": "^26.6.2", "memfs": "^3.2.0", "nativescript-vue-template-compiler": "^2.8.2", - "ts-jest": "^26.5.2", - "typescript": "^4.2.2", + "ts-jest": "^26.5.3", + "typescript": "^4.2.3", "unionfs": "^4.4.0" }, "peerDependencies": { diff --git a/packages/webpack5/src/configuration/base.ts b/packages/webpack5/src/configuration/base.ts index 02f67de29..2936afe4f 100644 --- a/packages/webpack5/src/configuration/base.ts +++ b/packages/webpack5/src/configuration/base.ts @@ -5,7 +5,6 @@ import { resolve } from 'path'; import ForkTsCheckerWebpackPlugin from 'fork-ts-checker-webpack-plugin'; import FilterWarningsPlugin from 'webpack-filter-warnings-plugin'; import { BundleAnalyzerPlugin } from 'webpack-bundle-analyzer'; -import { CleanWebpackPlugin } from 'clean-webpack-plugin'; import TerserPlugin from 'terser-webpack-plugin'; // import { WatchStateLoggerPlugin } from '../plugins/WatchStateLoggerPlugin'; @@ -78,7 +77,8 @@ export default function (config: Config, env: IWebpackEnv = _env): Config { .pathinfo(false) .publicPath('') .libraryTarget('commonjs') - .globalObject('global'); + .globalObject('global') + .set('clean', true); // Set up Terser options config.optimization.minimizer('TerserPlugin').use(TerserPlugin, [ @@ -233,14 +233,6 @@ export default function (config: Config, env: IWebpackEnv = _env): Config { .use('sass-loader') .loader('sass-loader'); - // items to clean - config.plugin('CleanWebpackPlugin').use(CleanWebpackPlugin, [ - { - cleanOnceBeforeBuildPatterns: [`${getAbsoluteDistPath()}/**/*`], - verbose: !!env.verbose, - }, - ]); - // config.plugin('NormalModuleReplacementPlugin').use(NormalModuleReplacementPlugin, [ // /.*/, // request => {