@umijs/bundler-webpack 4.0.0-beta.9 → 4.0.0-canary.20220317.2

package/dist/swcPlugins/autoCSSModules.d.ts

@@ -1,8 +1,13 @@
-import { ImportDeclaration, TsType, VariableDeclaration } from '@swc/core';
+import type { ImportDeclaration, ModuleItem, TsType } from '@swc/core';
 import Visitor from '@swc/core/Visitor';
 declare class AutoCSSModule extends Visitor {
     visitTsType(expression: TsType): TsType;
+    /**
+     * call path:
+     *   visitProgram -> visitModule -> visitModuleItems -> visitModuleItem -> visitImportDeclaration
+     * @see https://github.com/swc-project/swc/blob/main/node-swc/src/Visitor.ts#L189
+     */
+    visitModuleItem(n: ModuleItem): ImportDeclaration | import("@swc/core").ExportDeclaration | import("@swc/core").ExportNamedDeclaration | import("@swc/core").ExportDefaultDeclaration | import("@swc/core").ExportDefaultExpression | import("@swc/core").ExportAllDeclaration | import("@swc/core").TsImportEqualsDeclaration | import("@swc/core").TsExportAssignment | import("@swc/core").TsNamespaceExportDeclaration | import("@swc/core").ExpressionStatement | import("@swc/core").BlockStatement | import("@swc/core").EmptyStatement | import("@swc/core").DebuggerStatement | import("@swc/core").WithStatement | import("@swc/core").ReturnStatement | import("@swc/core").LabeledStatement | import("@swc/core").BreakStatement | import("@swc/core").ContinueStatement | import("@swc/core").IfStatement | import("@swc/core").SwitchStatement | import("@swc/core").ThrowStatement | import("@swc/core").TryStatement | import("@swc/core").WhileStatement | import("@swc/core").DoWhileStatement | import("@swc/core").ForStatement | import("@swc/core").ForInStatement | import("@swc/core").ForOfStatement | import("@swc/core").ClassDeclaration | import("@swc/core").FunctionDeclaration | import("@swc/core").VariableDeclaration | import("@swc/core").TsInterfaceDeclaration | import("@swc/core").TsTypeAliasDeclaration | import("@swc/core").TsEnumDeclaration | import("@swc/core").TsModuleDeclaration;
     visitImportDeclaration(expression: ImportDeclaration): ImportDeclaration;
-    visitVariableDeclaration(expression: VariableDeclaration): VariableDeclaration;
 }
 export default AutoCSSModule;

package/dist/swcPlugins/autoCSSModules.js

@@ -4,32 +4,29 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const Visitor_1 = __importDefault(require("@swc/core/Visitor"));
-const path_1 = require("path");
-const CSS_EXT_NAMES = ['.css', '.less', '.sass', '.scss', '.stylus', '.styl'];
+const utils_1 = require("@umijs/utils");
 class AutoCSSModule extends Visitor_1.default {
     visitTsType(expression) {
         return expression;
     }
+    /**
+     * call path:
+     *   visitProgram -> visitModule -> visitModuleItems -> visitModuleItem -> visitImportDeclaration
+     * @see https://github.com/swc-project/swc/blob/main/node-swc/src/Visitor.ts#L189
+     */
+    visitModuleItem(n) {
+        if (n.type === 'ImportDeclaration') {
+            return this.visitImportDeclaration(n);
+        }
+        return n;
+    }
     visitImportDeclaration(expression) {
         const { specifiers, source } = expression;
         const { value } = source;
-        if (specifiers.length && CSS_EXT_NAMES.includes((0, path_1.extname)(value))) {
+        if (specifiers.length && (0, utils_1.isStyleFile)({ filename: value })) {
             return Object.assign(Object.assign({}, expression), { source: Object.assign(Object.assign({}, source), { value: `${value}?modules` }) });
         }
         return expression;
     }
-    visitVariableDeclaration(expression) {
-        const { declarations } = expression;
-        if (declarations.length &&
-            declarations[0].init &&
-            declarations[0].init.type === 'AwaitExpression' &&
-            declarations[0].init.argument.type === 'CallExpression' &&
-            declarations[0].init.argument.arguments[0].expression.type ===
-                'StringLiteral' &&
-            CSS_EXT_NAMES.includes((0, path_1.extname)(declarations[0].init.argument.arguments[0].expression.value))) {
-            declarations[0].init.argument.arguments[0].expression.value = `${declarations[0].init.argument.arguments[0].expression.value}?modules`;
-        }
-        return expression;
-    }
 }
 exports.default = AutoCSSModule;

package/dist/swcPlugins/lockCoreJS.d.ts

@@ -0,0 +1,6 @@
+import type { ImportDeclaration } from '@swc/core';
+import Visitor from '@swc/core/Visitor';
+declare class LockCoreJS extends Visitor {
+    visitImportDeclaration(expression: ImportDeclaration): ImportDeclaration;
+}
+export default LockCoreJS;

package/dist/swcPlugins/lockCoreJS.js

@@ -0,0 +1,23 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const Visitor_1 = __importDefault(require("@swc/core/Visitor"));
+const utils_1 = require("@umijs/utils");
+const path_1 = require("path");
+function addLastSlash(path) {
+    return path.endsWith('/') ? path : `${path}/`;
+}
+class LockCoreJS extends Visitor_1.default {
+    visitImportDeclaration(expression) {
+        const { source } = expression;
+        let { value, type } = source;
+        if (type === 'StringLiteral' && value.startsWith('core-js/')) {
+            value = value.replace(/^core-js\//, addLastSlash((0, utils_1.winPath)((0, path_1.dirname)(require.resolve('core-js/package.json')))));
+            return Object.assign(Object.assign({}, expression), { source: Object.assign(Object.assign({}, source), { value }) });
+        }
+        return expression;
+    }
+}
+exports.default = LockCoreJS;

package/dist/types.d.ts

@@ -1,3 +1,4 @@
+import type { Config as SwcConfig } from '@swc/core';
 import type { Options as ProxyOptions } from '../compiled/http-proxy-middleware';
 import { Configuration } from '../compiled/webpack';
 import Config from '../compiled/webpack-5-chain';
@@ -21,6 +22,7 @@ export declare enum JSMinifier {
 export declare enum CSSMinifier {
     esbuild = "esbuild",
     cssnano = "cssnano",
+    parcelCSS = "parcelCSS",
     none = "none"
 }
 export interface ICopy {
@@ -31,9 +33,18 @@ declare type WebpackConfig = Required<Configuration>;
 declare type IBabelPlugin = Function | string | [string, {
     [key: string]: any;
 }];
+export interface DeadCodeParams {
+    patterns?: string[];
+    exclude?: string[];
+    failOnHint?: boolean;
+    detectUnusedFiles?: boolean;
+    detectUnusedExport?: boolean;
+    context?: string;
+}
 export interface IConfig {
     alias?: Record<string, string>;
     autoCSSModules?: boolean;
+    base?: string;
     chainWebpack?: Function;
     copy?: ICopy[] | string[];
     cssLoader?: {
@@ -51,6 +62,7 @@ export interface IConfig {
     };
     depTranspiler?: Transpiler;
     devtool?: Config.DevTool;
+    deadCode?: DeadCodeParams;
     externals?: WebpackConfig['externals'];
     esm?: {
         [key: string]: any;
@@ -97,4 +109,8 @@ export interface IConfig {
     writeToDisk?: boolean;
     [key: string]: any;
 }
+export interface SwcOptions extends SwcConfig {
+    sync?: boolean;
+    parseMap?: boolean;
+}
 export {};

package/dist/types.js

@@ -25,5 +25,6 @@ var CSSMinifier;
 (function (CSSMinifier) {
     CSSMinifier["esbuild"] = "esbuild";
     CSSMinifier["cssnano"] = "cssnano";
+    CSSMinifier["parcelCSS"] = "parcelCSS";
     CSSMinifier["none"] = "none";
 })(CSSMinifier = exports.CSSMinifier || (exports.CSSMinifier = {}));

package/dist/utils/depMatch.js

@@ -15,7 +15,7 @@ function isMatch(opts) {
         return !!cache.get(dir);
     }
     else {
-        const pkgPath = utils_1.pkgUp.sync({ cwd: opts.path });
+        const pkgPath = utils_1.pkgUp.pkgUpSync({ cwd: opts.path });
         let ret;
         if (!pkgPath) {
             ret = false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/bundler-webpack",
-  "version": "4.0.0-beta.9",
+  "version": "4.0.0-canary.20220317.2",
   "description": "@umijs/bundler-webpack",
   "homepage": "https://github.com/umijs/umi-next/tree/master/packages/bundler-webpack#readme",
   "bugs": "https://github.com/umijs/umi-next/issues",
@@ -25,60 +25,62 @@
     "build:client": "pnpm tsc --project ./tsconfig.client.json",
     "build:deps": "pnpm esno ../../scripts/bundleDeps.ts",
     "dev": "pnpm build -- --watch",
-    "generate:webpackPackages": "zx ./scripts/generateWebpackPackages.mjs"
+    "generate:webpackPackages": "zx ./scripts/generateWebpackPackages.mjs",
+    "test": "jest -c ../../jest.turbo.config.ts"
   },
   "dependencies": {
-    "@pmmmwh/react-refresh-webpack-plugin": "0.5.1",
-    "@swc/core": "1.2.105",
-    "@types/hapi__joi": "17.1.7",
-    "@umijs/babel-preset-umi": "4.0.0-beta.9",
-    "@umijs/mfsu": "4.0.0-beta.9",
-    "@umijs/utils": "4.0.0-beta.9",
-    "css-loader": "6.5.0",
+    "@parcel/css": "1.6.0",
+    "@pmmmwh/react-refresh-webpack-plugin": "0.5.4",
+    "@svgr/core": "6.2.1",
+    "@svgr/plugin-jsx": "^6.2.1",
+    "@svgr/plugin-svgo": "^6.2.0",
+    "@types/hapi__joi": "17.1.8",
+    "@umijs/babel-preset-umi": "4.0.0-canary.20220317.2",
+    "@umijs/mfsu": "4.0.0-canary.20220317.2",
+    "@umijs/utils": "4.0.0-canary.20220317.2",
+    "css-loader": "6.7.1",
     "es5-imcompatible-versions": "^0.1.73",
-    "jest-worker": "27.3.1",
+    "jest-worker": "27.5.1",
     "node-libs-browser": "2.2.1",
-    "postcss": "^8.3.11",
-    "postcss-preset-env": "6.7.0",
+    "postcss": "^8.4.12",
+    "postcss-preset-env": "7.4.2",
     "react-error-overlay": "6.0.9"
   },
   "devDependencies": {
-    "@svgr/webpack": "6.0.0",
-    "@types/express": "4.17.13",
+    "@swc/core": "1.2.156",
     "@types/webpack-sources": "3.2.0",
-    "@types/ws": "8.2.0",
-    "autoprefixer": "10.3.7",
-    "babel-loader": "8.2.2",
+    "@types/ws": "8.5.3",
+    "autoprefixer": "10.4.4",
+    "babel-loader": "8.2.3",
     "compression": "1.7.4",
     "connect-history-api-fallback": "1.6.0",
-    "copy-webpack-plugin": "9.0.1",
-    "css-minimizer-webpack-plugin": "3.1.1",
-    "cssnano": "5.0.8",
-    "express": "4.17.1",
-    "http-proxy-middleware": "2.0.1",
-    "less": "4.1.2",
+    "copy-webpack-plugin": "10.2.4",
+    "css-minimizer-webpack-plugin": "3.4.1",
+    "cssnano": "5.1.4",
+    "fork-ts-checker-webpack-plugin": "7.2.1",
+    "http-proxy-middleware": "2.0.4",
     "less-loader": "10.2.0",
-    "mini-css-extract-plugin": "2.4.2",
+    "mini-css-extract-plugin": "2.6.0",
     "postcss-flexbugs-fixes": "5.0.2",
-    "postcss-loader": "6.2.0",
-    "purgecss-webpack-plugin": "4.0.3",
-    "react-refresh": "0.10.0",
-    "sass-loader": "12.2.0",
-    "schema-utils": "3.1.1",
+    "postcss-loader": "6.2.1",
+    "purgecss-webpack-plugin": "4.1.3",
+    "react-refresh": "0.11.0",
+    "sass-loader": "12.6.0",
+    "schema-utils": "4.0.0",
     "speed-measure-webpack-plugin": "1.5.0",
-    "style-loader": "3.3.0",
+    "style-loader": "3.3.1",
     "svgo-loader": "3.0.0",
-    "swc-loader": "0.1.15",
     "tapable": "2.2.1",
-    "terser": "5.9.0",
-    "terser-webpack-plugin": "5.2.4",
+    "terser": "5.12.1",
+    "terser-webpack-plugin": "5.3.1",
     "url-loader": "4.1.1",
-    "webpack": "5.61.0",
+    "webpack": "5.70.0",
     "webpack-5-chain": "8.0.0",
     "webpack-bundle-analyzer": "4.5.0",
-    "webpack-dev-middleware": "5.2.1",
-    "webpack-sources": "3.2.1",
-    "ws": "8.2.3"
+    "webpack-dev-middleware": "5.3.1",
+    "webpack-manifest-plugin": "5.0.0",
+    "webpack-sources": "3.2.3",
+    "ws": "8.5.0"
   },
   "publishConfig": {
     "access": "public"
@@ -88,7 +90,6 @@
   ],
   "compiledConfig": {
     "deps": [
-      "@svgr/webpack",
       "autoprefixer",
       "babel-loader",
       "copy-webpack-plugin",
@@ -97,9 +98,8 @@
       "cssnano",
       "compression",
       "connect-history-api-fallback",
-      "express",
+      "fork-ts-checker-webpack-plugin",
       "http-proxy-middleware",
-      "less",
       "less-loader",
       "mini-css-extract-plugin",
       "postcss-flexbugs-fixes",
@@ -108,7 +108,6 @@
       "sass-loader",
       "schema-utils",
       "style-loader",
-      "swc-loader",
       "speed-measure-webpack-plugin",
       "svgo-loader",
       "tapable",
@@ -118,6 +117,7 @@
       "webpack-5-chain",
       "webpack-bundle-analyzer",
       "webpack-dev-middleware",
+      "webpack-manifest-plugin",
       "webpack-sources",
       "ws",
       "./bundles/webpack/bundle",
@@ -128,17 +128,19 @@
       "@babel/core": "@umijs/bundler-utils/compiled/babel/core",
       "es-module-lexer": "@umijs/bundler-utils/compiled/es-module-lexer",
       "esbuild": "@umijs/bundler-utils/compiled/esbuild",
-      "express": "$$LOCAL",
+      "express": "@umijs/bundler-utils/compiled/express",
       "jest-worker": "jest-worker",
-      "less": "$$LOCAL",
+      "less": "@umijs/bundler-utils/compiled/less",
       "cssnano": "$$LOCAL",
       "postcss": "postcss",
       "tapable": "$$LOCAL",
       "terser": "$$LOCAL",
       "terser-webpack-plugin": "$$LOCAL",
+      "typescript": "typescript",
       "uglify-js": "uglify-js",
       "url-loader": "$$LOCAL",
       "webpack": "$$LOCAL",
+      "webpack/lib/NormalModule": "../webpack/NormalModule",
       "webpack-5-chain": "$$LOCAL",
       "webpack-sources": "$$LOCAL",
       "ws": "$$LOCAL"
@@ -159,7 +161,6 @@
       "webpack"
     ],
     "excludeDtsDeps": [
-      "@svgr/webpack",
       "babel-loader",
       "copy-webpack-plugin",
       "css-loader",
@@ -167,7 +168,7 @@
       "cssnano",
       "compression",
       "connect-history-api-fallback",
-      "less",
+      "fork-ts-checker-webpack-plugin",
       "less-loader",
       "mini-css-extract-plugin",
       "postcss-flexbugs-fixes",
@@ -176,11 +177,11 @@
       "sass-loader",
       "speed-measure-webpack-plugin",
       "style-loader",
-      "swc-loader",
       "svgo-loader",
       "url-loader",
       "webpack-bundle-analyzer",
-      "webpack-dev-middleware"
+      "webpack-dev-middleware",
+      "webpack-manifest-plugin"
     ]
   }
 }

package/compiled/@svgr/webpack/LICENSE

@@ -1,7 +0,0 @@
-Copyright 2017 Smooth Code
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.