@umijs/bundler-webpack 4.0.0-canary.20220425.1 → 4.0.0-canary.20220427.1

package/client/client/client.js

@@ -13,21 +13,29 @@ import * as ErrorOverlay from 'react-error-overlay';
 import { MESSAGE_TYPE } from '../constants';
 import { formatWebpackMessages } from '../utils/formatWebpackMessages';
 console.log('[webpack] connecting...');
-function getSocketHost() {
-    let l = location;
+function getHost() {
     if (process.env.SOCKET_SERVER) {
-        l = new URL(process.env.SOCKET_SERVER);
+        return new URL(process.env.SOCKET_SERVER);
     }
-    const host = l.host;
-    const isHttps = l.protocol === 'https:';
+    return location;
+}
+function getSocketUrl() {
+    let h = getHost();
+    const host = h.host;
+    const isHttps = h.protocol === 'https:';
     return `${isHttps ? 'wss' : 'ws'}://${host}`;
 }
+function getPingUrl() {
+    const h = getHost();
+    return `${h.protocol}//${h.host}/__umi_ping`;
+}
 let pingTimer = null;
 let isFirstCompilation = true;
 let mostRecentCompilationHash = null;
 let hasCompileErrors = false;
 let hadRuntimeError = false;
-const socket = new WebSocket(getSocketHost(), 'webpack-hmr');
+const pingUrl = getPingUrl();
+const socket = new WebSocket(getSocketUrl(), 'webpack-hmr');
 socket.addEventListener('message', ({ data }) => __awaiter(void 0, void 0, void 0, function* () {
     data = JSON.parse(data);
     if (data.type === 'connected') {
@@ -45,7 +53,7 @@ function waitForSuccessfulPing(ms = 1000) {
         // eslint-disable-next-line no-constant-condition
         while (true) {
             try {
-                yield fetch(`/__umi_ping`);
+                yield fetch(pingUrl);
                 break;
             }
             catch (e) {

package/dist/build.js

@@ -35,6 +35,7 @@ function build(opts) {
                 ...(opts.beforeBabelPresets || []),
                 ...(opts.extraBabelPresets || []),
             ],
+            extraBabelIncludes: opts.config.extraBabelIncludes,
             chainWebpack: opts.chainWebpack,
             modifyWebpackConfig: opts.modifyWebpackConfig,
             cache: opts.cache,

package/dist/client/client.js

@@ -41,21 +41,29 @@ const ErrorOverlay = __importStar(require("react-error-overlay"));
 const constants_1 = require("../constants");
 const formatWebpackMessages_1 = require("../utils/formatWebpackMessages");
 console.log('[webpack] connecting...');
-function getSocketHost() {
-    let l = location;
+function getHost() {
     if (process.env.SOCKET_SERVER) {
-        l = new URL(process.env.SOCKET_SERVER);
+        return new URL(process.env.SOCKET_SERVER);
     }
-    const host = l.host;
-    const isHttps = l.protocol === 'https:';
+    return location;
+}
+function getSocketUrl() {
+    let h = getHost();
+    const host = h.host;
+    const isHttps = h.protocol === 'https:';
     return `${isHttps ? 'wss' : 'ws'}://${host}`;
 }
+function getPingUrl() {
+    const h = getHost();
+    return `${h.protocol}//${h.host}/__umi_ping`;
+}
 let pingTimer = null;
 let isFirstCompilation = true;
 let mostRecentCompilationHash = null;
 let hasCompileErrors = false;
 let hadRuntimeError = false;
-const socket = new WebSocket(getSocketHost(), 'webpack-hmr');
+const pingUrl = getPingUrl();
+const socket = new WebSocket(getSocketUrl(), 'webpack-hmr');
 socket.addEventListener('message', ({ data }) => __awaiter(void 0, void 0, void 0, function* () {
     data = JSON.parse(data);
     if (data.type === 'connected') {
@@ -73,7 +81,7 @@ function waitForSuccessfulPing(ms = 1000) {
         // eslint-disable-next-line no-constant-condition
         while (true) {
             try {
-                yield fetch(`/__umi_ping`);
+                yield fetch(pingUrl);
                 break;
             }
             catch (e) {

package/dist/config/config.d.ts

@@ -7,6 +7,7 @@ export interface IOpts {
     entry: Record<string, string>;
     extraBabelPresets?: any[];
     extraBabelPlugins?: any[];
+    extraBabelIncludes?: string[];
     extraEsbuildLoaderHandler?: any[];
     babelPreset?: any;
     chainWebpack?: Function;

package/dist/config/config.js

@@ -55,6 +55,7 @@ function getConfig(opts) {
             babelPreset: opts.babelPreset,
             extraBabelPlugins: opts.extraBabelPlugins || [],
             extraBabelPresets: opts.extraBabelPresets || [],
+            extraBabelIncludes: opts.extraBabelIncludes || [],
             extraEsbuildLoaderHandler: opts.extraEsbuildLoaderHandler || [],
             browsers: (0, browsersList_1.getBrowsersList)({
                 targets: userConfig.targets,

package/dist/config/javaScriptRules.d.ts

@@ -7,6 +7,7 @@ interface IOpts {
     env: Env;
     extraBabelPlugins: any[];
     extraBabelPresets: any[];
+    extraBabelIncludes: string[];
     extraEsbuildLoaderHandler: any[];
     babelPreset: any;
     name?: string;

package/dist/config/javaScriptRules.js

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.addJavaScriptRules = void 0;
 const mfsu_1 = require("@umijs/mfsu");
 const utils_1 = require("@umijs/utils");
+const path_1 = require("path");
 const webpack_1 = require("../../compiled/webpack");
 const constants_1 = require("../constants");
 const types_1 = require("../types");
@@ -40,18 +41,41 @@ function addJavaScriptRules(opts) {
             config.module
                 .rule('extra-src')
                 .test(/\.(js|mjs)$/)
-                .include.add((path) => {
-                try {
-                    // do src transform for bundler-webpack/client/client/client.js
-                    if (path.includes('client/client/client'))
-                        return true;
-                    return (0, depMatch_1.isMatch)({ path, pkgs: depPkgs });
-                }
-                catch (e) {
-                    console.error(utils_1.chalk.red(e));
-                    throw e;
-                }
-            })
+                .include.add([
+                // support extraBabelIncludes
+                ...opts.extraBabelIncludes.map((p) => {
+                    // handle absolute path
+                    if ((0, path_1.isAbsolute)(p)) {
+                        return p;
+                    }
+                    // resolve npm package name
+                    try {
+                        if (p.startsWith('./')) {
+                            return require.resolve(p, { paths: [cwd] });
+                        }
+                        return (0, path_1.dirname)(require.resolve(`${p}/package.json`, { paths: [cwd] }));
+                    }
+                    catch (e) {
+                        if (e.code === 'MODULE_NOT_FOUND') {
+                            throw new Error('Cannot resolve extraBabelIncludes: ' + p);
+                        }
+                        throw e;
+                    }
+                }),
+                // support es5ImcompatibleVersions
+                (path) => {
+                    try {
+                        // do src transform for bundler-webpack/client/client/client.js
+                        if (path.includes('client/client/client'))
+                            return true;
+                        return (0, depMatch_1.isMatch)({ path, pkgs: depPkgs });
+                    }
+                    catch (e) {
+                        console.error(utils_1.chalk.red(e));
+                        throw e;
+                    }
+                },
+            ])
                 .end(),
         ];
         if (userConfig.mdx) {

package/dist/dev.js

@@ -81,6 +81,7 @@ function dev(opts) {
                 ...(opts.beforeBabelPresets || []),
                 ...(opts.extraBabelPresets || []),
             ],
+            extraBabelIncludes: opts.config.extraBabelIncludes,
             extraEsbuildLoaderHandler: (mfsu === null || mfsu === void 0 ? void 0 : mfsu.getEsbuildLoaderHandler()) || [],
             chainWebpack: opts.chainWebpack,
             modifyWebpackConfig: opts.modifyWebpackConfig,

package/dist/schema.js

@@ -40,6 +40,7 @@ function getSchemas() {
         devtool: (Joi) => Joi.alternatives().try(Joi.string().regex(DEVTOOL_REGEX), Joi.boolean()),
         esm: (Joi) => Joi.object(),
         externals: (Joi) => Joi.alternatives().try(Joi.object(), Joi.string(), Joi.func()),
+        extraBabelIncludes: (Joi) => Joi.array().items(Joi.string()),
         extraBabelPlugins: (Joi) => Joi.array().items(Joi.alternatives().try(Joi.string(), Joi.array())),
         extraBabelPresets: (Joi) => Joi.array().items(Joi.alternatives().try(Joi.string(), Joi.array())),
         extraPostCSSPlugins: (Joi) => Joi.array(),

package/dist/types.d.ts

@@ -75,6 +75,7 @@ export interface IConfig {
     };
     extraBabelPlugins?: IBabelPlugin[];
     extraBabelPresets?: IBabelPlugin[];
+    extraBabelIncludes?: string[];
     extraPostCSSPlugins?: any[];
     hash?: boolean;
     ignoreMomentLocale?: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/bundler-webpack",
-  "version": "4.0.0-canary.20220425.1",
+  "version": "4.0.0-canary.20220427.1",
   "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",
@@ -35,10 +35,10 @@
     "@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.20220425.1",
-    "@umijs/bundler-utils": "4.0.0-canary.20220425.1",
-    "@umijs/mfsu": "4.0.0-canary.20220425.1",
-    "@umijs/utils": "4.0.0-canary.20220425.1",
+    "@umijs/babel-preset-umi": "4.0.0-canary.20220427.1",
+    "@umijs/bundler-utils": "4.0.0-canary.20220427.1",
+    "@umijs/mfsu": "4.0.0-canary.20220427.1",
+    "@umijs/utils": "4.0.0-canary.20220427.1",
     "css-loader": "6.7.1",
     "es5-imcompatible-versions": "^0.1.73",
     "jest-worker": "27.5.1",