@umijs/bundler-webpack 4.0.0-beta.1 → 4.0.0-beta.13

package/dist/server/server.js

@@ -32,6 +32,16 @@ function createServer(opts) {
         // TODO: headers
         // before middlewares
         (opts.beforeMiddlewares || []).forEach((m) => app.use(m));
+        // TODO: add to before middleware
+        app.use((req, res, next) => {
+            if (req.path === '/umi.js' && (0, fs_1.existsSync)((0, path_1.join)(opts.cwd, 'umi.js'))) {
+                res.setHeader('Content-Type', 'application/javascript');
+                res.send((0, fs_1.readFileSync)((0, path_1.join)(opts.cwd, 'umi.js'), 'utf-8'));
+            }
+            else {
+                next();
+            }
+        });
         // webpack dev middleware
         const compiler = (0, webpack_1.default)(Array.isArray(webpackConfig) ? webpackConfig : [webpackConfig]);
         const webpackDevMiddleware = require('@umijs/bundler-webpack/compiled/webpack-dev-middleware');
@@ -117,15 +127,6 @@ function createServer(opts) {
         app.use('/__umi_ping', (_, res) => {
             res.end('pong');
         });
-        // TODO: remove me
-        app.use((req, res, next) => {
-            if (req.path === '/umi.js' && (0, fs_1.existsSync)((0, path_1.join)(opts.cwd, 'umi.js'))) {
-                res.send((0, fs_1.readFileSync)((0, path_1.join)(opts.cwd, 'umi.js'), 'utf-8'));
-            }
-            else {
-                next();
-            }
-        });
         // index.html
         // TODO: remove me
         app.get('/', (_req, res, next) => {
@@ -149,7 +150,7 @@ function createServer(opts) {
         const port = opts.port || 8000;
         server.listen(port, () => {
             const host = opts.host && opts.host !== '0.0.0.0' ? opts.host : '127.0.0.1';
-            utils_1.logger.ready(`App listening at http://${host}:${port}`);
+            utils_1.logger.ready(`App listening at ${utils_1.chalk.green.bold(`http://${host}:${port}`)}`);
         });
         return server;
     });

package/dist/server/ws.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import { Server } from 'http';
-import WebSocket from 'ws';
+import WebSocket from '../../compiled/ws';
 export declare function createWebSocketServer(server: Server): {
     send(message: string): void;
     wss: WebSocket.Server;

package/dist/server/ws.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createWebSocketServer = void 0;
 const utils_1 = require("@umijs/utils");
-const ws_1 = __importDefault(require("ws"));
+const ws_1 = __importDefault(require("../../compiled/ws"));
 function createWebSocketServer(server) {
     const wss = new ws_1.default.Server({
         noServer: true,

package/dist/swcPlugins/autoCSSModules.d.ts

@@ -0,0 +1,8 @@
+import { ImportDeclaration, TsType, VariableDeclaration } from '@swc/core';
+import Visitor from '@swc/core/Visitor';
+declare class AutoCSSModule extends Visitor {
+    visitTsType(expression: TsType): TsType;
+    visitImportDeclaration(expression: ImportDeclaration): ImportDeclaration;
+    visitVariableDeclaration(expression: VariableDeclaration): VariableDeclaration;
+}
+export default AutoCSSModule;

package/dist/swcPlugins/autoCSSModules.js

@@ -0,0 +1,35 @@
+"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 path_1 = require("path");
+const CSS_EXT_NAMES = ['.css', '.less', '.sass', '.scss', '.stylus', '.styl'];
+class AutoCSSModule extends Visitor_1.default {
+    visitTsType(expression) {
+        return expression;
+    }
+    visitImportDeclaration(expression) {
+        const { specifiers, source } = expression;
+        const { value } = source;
+        if (specifiers.length && CSS_EXT_NAMES.includes((0, path_1.extname)(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 { 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

@@ -52,6 +52,9 @@ export interface IConfig {
     depTranspiler?: Transpiler;
     devtool?: Config.DevTool;
     externals?: WebpackConfig['externals'];
+    esm?: {
+        [key: string]: any;
+    };
     extraBabelPlugins?: IBabelPlugin[];
     extraBabelPresets?: IBabelPlugin[];
     extraPostCSSPlugins?: any[];

package/package.json

@@ -1,9 +1,19 @@
 {
   "name": "@umijs/bundler-webpack",
-  "version": "4.0.0-beta.1",
+  "version": "4.0.0-beta.13",
   "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",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/umijs/umi-next"
+  },
+  "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
+  "bin": {
+    "bundler-webpack": "bin/bundler-webpack.js"
+  },
   "files": [
     "bin",
     "client",
@@ -17,44 +27,30 @@
     "dev": "pnpm build -- --watch",
     "generate:webpackPackages": "zx ./scripts/generateWebpackPackages.mjs"
   },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/umijs/umi-next"
-  },
-  "authors": [
-    "chencheng <sorrycc@gmail.com> (https://github.com/sorrycc)"
-  ],
-  "license": "MIT",
-  "bugs": "https://github.com/umijs/umi-next/issues",
-  "homepage": "https://github.com/umijs/umi-next/tree/master/packages/bundler-webpack#readme",
-  "publishConfig": {
-    "access": "public"
-  },
-  "bin": {
-    "bundler-webpack": "bin/bundler-webpack.js"
-  },
   "dependencies": {
-    "@pmmmwh/react-refresh-webpack-plugin": "0.5.1",
-    "@swc/core": "1.2.105",
+    "@pmmmwh/react-refresh-webpack-plugin": "0.5.3",
+    "@svgr/core": "6.0.0",
+    "@svgr/plugin-jsx": "^6.1.0",
+    "@svgr/plugin-svgo": "^6.1.0",
+    "@swc/core": "1.2.117",
     "@types/hapi__joi": "17.1.7",
-    "@umijs/babel-preset-umi": "4.0.0-beta.1",
-    "@umijs/mfsu": "4.0.0-beta.1",
-    "@umijs/utils": "4.0.0-beta.1",
-    "css-loader": "6.4.0",
+    "@umijs/babel-preset-umi": "4.0.0-beta.13",
+    "@umijs/mfsu": "4.0.0-beta.13",
+    "@umijs/utils": "4.0.0-beta.13",
+    "css-loader": "6.5.1",
     "es5-imcompatible-versions": "^0.1.73",
-    "jest-worker": "27.3.1",
+    "jest-worker": "27.4.2",
     "node-libs-browser": "2.2.1",
-    "postcss": "^8.3.11",
-    "postcss-preset-env": "6.7.0",
+    "postcss": "^8.4.4",
+    "postcss-preset-env": "7.0.1",
     "react-error-overlay": "6.0.9"
   },
   "devDependencies": {
-    "@svgr/webpack": "5.5.0",
     "@types/express": "4.17.13",
     "@types/webpack-sources": "3.2.0",
-    "@types/ws": "8.2.0",
-    "autoprefixer": "10.3.7",
-    "babel-loader": "8.2.2",
+    "@types/ws": "8.2.1",
+    "autoprefixer": "10.4.0",
+    "babel-loader": "8.2.3",
     "compression": "1.7.4",
     "connect-history-api-fallback": "1.6.0",
     "copy-webpack-plugin": "9.0.1",
@@ -64,31 +60,36 @@
     "http-proxy-middleware": "2.0.1",
     "less": "4.1.2",
     "less-loader": "10.2.0",
-    "mini-css-extract-plugin": "2.4.2",
+    "mini-css-extract-plugin": "2.4.5",
     "postcss-flexbugs-fixes": "5.0.2",
-    "postcss-loader": "6.2.0",
+    "postcss-loader": "6.2.1",
     "purgecss-webpack-plugin": "4.0.3",
-    "react-refresh": "0.10.0",
-    "sass-loader": "12.2.0",
-    "schema-utils": "3.1.1",
+    "react-refresh": "0.11.0",
+    "sass-loader": "12.3.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.10.0",
+    "terser-webpack-plugin": "5.2.5",
     "url-loader": "4.1.1",
-    "webpack": "5.59.0",
+    "webpack": "5.64.4",
     "webpack-5-chain": "8.0.0",
     "webpack-bundle-analyzer": "4.5.0",
-    "webpack-dev-middleware": "5.2.1",
-    "webpack-sources": "3.2.1",
+    "webpack-dev-middleware": "5.2.2",
+    "webpack-sources": "3.2.2",
     "ws": "8.2.3"
   },
+  "publishConfig": {
+    "access": "public"
+  },
+  "authors": [
+    "chencheng <sorrycc@gmail.com> (https://github.com/sorrycc)"
+  ],
   "compiledConfig": {
     "deps": [
-      "@svgr/webpack",
       "autoprefixer",
       "babel-loader",
       "copy-webpack-plugin",
@@ -159,7 +160,6 @@
       "webpack"
     ],
     "excludeDtsDeps": [
-      "@svgr/webpack",
       "babel-loader",
       "copy-webpack-plugin",
       "css-loader",

package/compiled/@svgr/webpack/.svgo.yml

@@ -1,75 +0,0 @@
-# replace default config
-
-# multipass: true
-# full: true
-
-plugins:
-
-  # - name
-  #
-  # or:
-  # - name: false
-  # - name: true
-  #
-  # or:
-  # - name:
-  #     param1: 1
-  #     param2: 2
-
-  - removeDoctype
-  - removeXMLProcInst
-  - removeComments
-  - removeMetadata
-  - removeXMLNS
-  - removeEditorsNSData
-  - cleanupAttrs
-  - inlineStyles
-  - minifyStyles
-  - convertStyleToAttrs
-  - cleanupIDs
-  - prefixIds
-  - removeRasterImages
-  - removeUselessDefs
-  - cleanupNumericValues
-  - cleanupListOfValues
-  - convertColors
-  - removeUnknownsAndDefaults
-  - removeNonInheritableGroupAttrs
-  - removeUselessStrokeAndFill
-  - removeViewBox
-  - cleanupEnableBackground
-  - removeHiddenElems
-  - removeEmptyText
-  - convertShapeToPath
-  - convertEllipseToCircle
-  - moveElemsAttrsToGroup
-  - moveGroupAttrsToElems
-  - collapseGroups
-  - convertPathData
-  - convertTransform
-  - removeEmptyAttrs
-  - removeEmptyContainers
-  - mergePaths
-  - removeUnusedNS
-  - sortAttrs
-  - sortDefsChildren
-  - removeTitle
-  - removeDesc
-  - removeDimensions
-  - removeAttrs
-  - removeAttributesBySelector
-  - removeElementsByAttr
-  - addClassesToSVGElement
-  - removeStyleElement
-  - removeScriptElement
-  - addAttributesToSVGElement
-  - removeOffCanvasPaths
-  - reusePaths
-
-# configure the indent (default 4 spaces) used by `--pretty` here:
-#
-# @see https://github.com/svg/svgo/blob/master/lib/svgo/js2svg.js#L6 for more config options
-#
-# js2svg:
-#  pretty: true
-#  indent: '  '

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.