@umijs/bundler-webpack 4.0.0-canary.20221221.1 → 4.0.0-canary.20230109.1

package/dist/dev.js

@@ -23,7 +23,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var dev_exports = {};
 __export(dev_exports, {
   dev: () => dev,
-  stripUndefined: () => stripUndefined
+  ensureSerializableValue: () => ensureSerializableValue
 });
 module.exports = __toCommonJS(dev_exports);
 var import_mfsu = require("@umijs/mfsu");
@@ -35,13 +35,13 @@ var import_config = require("./config/config");
 var import_constants = require("./constants");
 var import_server = require("./server/server");
 var import_types = require("./types");
-function stripUndefined(obj) {
-  Object.keys(obj).forEach((key) => {
-    if (obj[key] === void 0) {
-      delete obj[key];
+function ensureSerializableValue(obj) {
+  return JSON.parse(JSON.stringify(obj, (_key, value) => {
+    if (typeof value === "function") {
+      return value.toString();
     }
-  });
-  return obj;
+    return value;
+  }, 2));
 }
 async function dev(opts) {
   var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
@@ -49,9 +49,6 @@ async function dev(opts) {
   const enableMFSU = opts.config.mfsu !== false;
   let mfsu = null;
   if (enableMFSU) {
-    if (opts.config.srcTranspiler === import_types.Transpiler.swc) {
-      import_utils.logger.warn(`Swc currently not supported for use with mfsu, recommended you use srcTranspiler: 'esbuild' in dev.`);
-    }
     mfsu = new import_mfsu.MFSU({
       strategy: opts.mfsuStrategy,
       include: opts.mfsuInclude || [],
@@ -70,7 +67,7 @@ async function dev(opts) {
       remoteAliases: (_g = opts.config.mfsu) == null ? void 0 : _g.remoteAliases,
       remoteName: (_h = opts.config.mfsu) == null ? void 0 : _h.remoteName,
       getCacheDependency() {
-        return stripUndefined({
+        return ensureSerializableValue({
           version: require("../package.json").version,
           mfsu: opts.config.mfsu,
           alias: opts.config.alias,
@@ -168,5 +165,5 @@ async function dev(opts) {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   dev,
-  stripUndefined
+  ensureSerializableValue
 });

package/dist/loader/swc.d.ts

@@ -1,4 +1,4 @@
 import type { LoaderContext } from '../../compiled/webpack';
-import { SwcOptions } from '../types';
-declare function swcLoader(this: LoaderContext<SwcOptions>, contents: string): void;
+import { type SwcOptions } from '../types';
+declare function swcLoader(this: LoaderContext<SwcOptions>, contents: string, inputSourceMap: string | Record<string, any>): void;
 export default swcLoader;

package/dist/loader/swc.js

@@ -1,6 +1,8 @@
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -14,6 +16,7 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/loader/swc.ts
@@ -24,6 +27,7 @@ __export(swc_exports, {
 module.exports = __toCommonJS(swc_exports);
 var import_core = require("@swc/core");
 var import_types = require("../types");
+var import_utils = require("@umijs/utils");
 function getBaseOpts({ filename }) {
   const isTSFile = filename.endsWith(".ts");
   const isTypeScript = isTSFile || filename.endsWith(".tsx");
@@ -54,20 +58,54 @@ function getBaseOpts({ filename }) {
   };
   return swcOpts;
 }
-function swcLoader(contents) {
+function swcLoader(contents, inputSourceMap) {
   const callback = this.async();
   const loaderOpts = this.getOptions();
-  const { sync = false, parseMap = false, ...otherOpts } = loaderOpts;
+  if (inputSourceMap && typeof inputSourceMap === "object") {
+    inputSourceMap = JSON.stringify(inputSourceMap);
+  }
+  const {
+    sync = false,
+    parseMap = false,
+    excludeFiles = [],
+    enableAutoCssModulesPlugin = false,
+    mergeConfigs,
+    ...otherOpts
+  } = loaderOpts;
   const filename = this.resourcePath;
-  const swcOpts = {
+  const isSkip = excludeFiles.some((pattern) => {
+    if (typeof pattern === "string") {
+      return filename == pattern;
+    }
+    return pattern.test(filename);
+  });
+  if (isSkip) {
+    return callback(null, contents, parseMap ? JSON.parse(inputSourceMap) : inputSourceMap);
+  }
+  let swcOpts = {
     ...getBaseOpts({
       filename
     }),
     filename,
-    sourceMaps: this.sourceMap,
     sourceFileName: filename,
+    sourceMaps: this.sourceMap,
+    ...inputSourceMap ? {
+      inputSourceMap
+    } : {},
     ...otherOpts
   };
+  if (enableAutoCssModulesPlugin) {
+    swcOpts = (0, import_utils.deepmerge)(swcOpts, {
+      jsc: {
+        experimental: {
+          plugins: [[require.resolve("swc-plugin-auto-css-modules"), {}]]
+        }
+      }
+    });
+  }
+  if (mergeConfigs) {
+    swcOpts = (0, import_utils.deepmerge)(swcOpts, mergeConfigs);
+  }
   try {
     if (sync) {
       const output = (0, import_core.transformSync)(contents, swcOpts);

package/dist/schema.js

@@ -112,6 +112,10 @@ function getSchemas() {
     runtimePublicPath: (Joi) => Joi.object(),
     sassLoader: (Joi) => Joi.object(),
     srcTranspiler: (Joi) => Joi.string().valid(import_types.Transpiler.babel, import_types.Transpiler.esbuild, import_types.Transpiler.swc, import_types.Transpiler.none),
+    srcTranspilerOptions: (Joi) => Joi.object({
+      esbuild: Joi.object(),
+      swc: Joi.object()
+    }),
     styleLoader: (Joi) => Joi.object(),
     svgo: (Joi) => Joi.alternatives().try(Joi.object(), Joi.boolean()),
     svgr: (Joi) => Joi.object(),

package/dist/swcPlugins/autoCSSModules.d.ts

@@ -7,7 +7,11 @@ declare class AutoCSSModule extends Visitor {
      *   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;
+    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").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 | import("@swc/core").ExpressionStatement;
     visitImportDeclaration(expression: ImportDeclaration): ImportDeclaration;
 }
+/**
+ * @deprecated Swc will not support js plugin in the future.
+ * See https://github.com/swc-project/website/commit/fde42ad5371c1a16ca9729fe17bcfd3489841ac1
+ */
 export default AutoCSSModule;

package/dist/types.d.ts

@@ -1,7 +1,9 @@
-import type { Config as SwcConfig } from '@swc/core';
+import type { Options as SwcConfig } from '@swc/core';
 import type { HttpsServerOptions, ProxyOptions } from '@umijs/bundler-utils';
 import webpack, { Configuration } from '../compiled/webpack';
 import Config from '../compiled/webpack-5-chain';
+import type { TransformOptions as EsbuildOptions } from '@umijs/bundler-utils/compiled/esbuild';
+import type { BundleAnalyzerPlugin } from 'webpack-bundle-analyzer';
 export declare enum Env {
     development = "development",
     production = "production"
@@ -102,7 +104,8 @@ export interface IConfig {
     sassLoader?: {
         [key: string]: any;
     };
-    srcTranspiler?: Transpiler;
+    srcTranspiler?: `${Transpiler}`;
+    srcTranspilerOptions?: ISrcTranspilerOpts;
     styleLoader?: {
         [key: string]: any;
     };
@@ -117,11 +120,20 @@ export interface IConfig {
     };
     writeToDisk?: boolean;
     babelLoaderCustomize?: string;
-    analyze?: Record<string, any>;
+    analyze?: BundleAnalyzerPlugin.Options;
     [key: string]: any;
 }
-export interface SwcOptions extends SwcConfig {
+export interface ISrcTranspilerOpts {
+    swc?: Partial<SwcConfig>;
+    esbuild?: Partial<EsbuildOptions>;
+}
+export interface ISwcPluginOpts {
+    enableAutoCssModulesPlugin?: boolean;
+}
+export interface SwcOptions extends SwcConfig, ISwcPluginOpts {
     sync?: boolean;
     parseMap?: boolean;
+    excludeFiles?: Array<string | RegExp>;
+    mergeConfigs?: Partial<SwcConfig>;
 }
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/bundler-webpack",
-  "version": "4.0.0-canary.20221221.1",
+  "version": "4.0.0-canary.20230109.1",
   "description": "@umijs/bundler-webpack",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/bundler-webpack#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -34,11 +34,11 @@
     "@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.20221221.1",
-    "@umijs/bundler-utils": "4.0.0-canary.20221221.1",
+    "@umijs/babel-preset-umi": "4.0.0-canary.20230109.1",
+    "@umijs/bundler-utils": "4.0.0-canary.20230109.1",
     "@umijs/case-sensitive-paths-webpack-plugin": "^1.0.1",
-    "@umijs/mfsu": "4.0.0-canary.20221221.1",
-    "@umijs/utils": "4.0.0-canary.20221221.1",
+    "@umijs/mfsu": "4.0.0-canary.20230109.1",
+    "@umijs/utils": "4.0.0-canary.20230109.1",
     "cors": "^2.8.5",
     "css-loader": "6.7.1",
     "es5-imcompatible-versions": "^0.1.73",
@@ -51,11 +51,12 @@
     "react-refresh": "0.14.0"
   },
   "devDependencies": {
-    "@swc/core": "1.2.165",
+    "@swc/core": "1.3.24",
     "@types/cors": "^2.8.12",
+    "@types/webpack-bundle-analyzer": "^4.6.0",
     "@types/webpack-sources": "3.2.0",
     "@types/ws": "8.5.3",
-    "autoprefixer": "10.4.4",
+    "autoprefixer": "10.4.13",
     "babel-loader": "8.2.4",
     "compression": "1.7.4",
     "connect-history-api-fallback": "1.6.0",
@@ -72,6 +73,7 @@
     "speed-measure-webpack-plugin": "1.5.0",
     "style-loader": "3.3.1",
     "svgo-loader": "3.0.0",
+    "swc-plugin-auto-css-modules": "1.3.0",
     "terser": "5.12.1",
     "terser-webpack-plugin": "5.3.1",
     "url-loader": "4.1.1",
@@ -81,6 +83,7 @@
     "webpack-dev-middleware": "5.3.3",
     "webpack-manifest-plugin": "5.0.0",
     "webpack-sources": "3.2.3",
+    "webpackbar": "5.0.2",
     "ws": "8.5.0"
   },
   "publishConfig": {
@@ -117,6 +120,7 @@
       "webpack-dev-middleware",
       "webpack-manifest-plugin",
       "webpack-sources",
+      "webpackbar",
       "ws",
       "./bundles/webpack/bundle"
     ],