@umijs/bundler-webpack 4.2.6-alpha.4 → 4.2.6-alpha.5

package/compiled/webpack-5-chain/package.json

@@ -1 +1 @@
-{"name":"webpack-5-chain","version":"8.0.1","author":"Eli Perelman <eli@eliperelman.com>","license":"MPL-2.0","typings":"types/index.d.ts"}
+{"name":"webpack-5-chain","version":"8.0.2","author":"Eli Perelman <eli@eliperelman.com>","license":"MPL-2.0","typings":"types/index.d.ts"}

package/compiled/webpack-5-chain/types/index.d.ts

@@ -200,7 +200,7 @@ declare namespace Config {
     ): this;
     devtoolNamespace(value: WebpackOutput['devtoolNamespace']): this;
     filename(value: WebpackOutput['filename']): this;
-    assetModuleFilenamet(value: WebpackOutput['assetModuleFilename']): this;
+    assetModuleFilename(value: WebpackOutput['assetModuleFilename']): this;
     globalObject(value: WebpackOutput['globalObject']): this;
     uniqueName(value: WebpackOutput['uniqueName']): this;
     hashDigest(value: WebpackOutput['hashDigest']): this;

package/dist/config/config.d.ts

@@ -25,5 +25,7 @@ export interface IOpts {
     };
     pkg?: Record<string, any>;
     disableCopy?: boolean;
+    host?: string;
+    port?: number;
 }
 export declare function getConfig(opts: IOpts): Promise<Configuration>;

package/dist/config/config.js

@@ -84,7 +84,9 @@ async function getConfig(opts) {
       targets: userConfig.targets
     }),
     useHash,
-    staticPathPrefix: opts.staticPathPrefix !== void 0 ? opts.staticPathPrefix : "static/"
+    staticPathPrefix: opts.staticPathPrefix !== void 0 ? opts.staticPathPrefix : "static/",
+    port: opts.port,
+    host: opts.host
   };
   config.name(opts.name);
   config.mode(opts.env);

package/dist/config/definePlugin.d.ts

@@ -1,15 +1,14 @@
 import Config from '@umijs/bundler-webpack/compiled/webpack-5-chain';
-import { Env, IConfig } from '../types';
+import type { Env, IConfig } from '../types';
 interface IOpts {
     config: Config;
     userConfig: IConfig;
     cwd: string;
     env: Env;
+    host?: string;
+    port?: number;
 }
-export declare function resolveDefine(opts: {
-    define: any;
-    publicPath?: string;
-}): {
+export declare function resolveDefine(opts: IOpts): {
     'process.env': Record<string, any>;
     'process.env.SSR_MANIFEST': string;
 };

package/dist/config/definePlugin.js

@@ -26,21 +26,41 @@ module.exports = __toCommonJS(definePlugin_exports);
 var import_webpack = require("@umijs/bundler-webpack/compiled/webpack");
 var prefixRE = /^UMI_APP_/;
 var ENV_SHOULD_PASS = ["NODE_ENV", "HMR", "SOCKET_SERVER", "ERROR_OVERLAY"];
+var SOCKET_IGNORE_HOSTS = ["0.0.0.0", "127.0.0.1", "localhost"];
+var CUSTOM_ENV_GETTER = {
+  SOCKET_SERVER: (opts) => {
+    const { userConfig, host, port } = opts;
+    const socketServer = process.env.SOCKET_SERVER;
+    if (socketServer) {
+      return socketServer;
+    }
+    if (host && !SOCKET_IGNORE_HOSTS.includes(host)) {
+      const protocol = userConfig.https ? "https:" : "http:";
+      return `${protocol}//${host}:${port || 8e3}`;
+    }
+    return;
+  }
+};
 function resolveDefine(opts) {
+  const { userConfig } = opts;
   const env = {};
-  Object.keys(process.env).forEach((key) => {
-    if (prefixRE.test(key) || ENV_SHOULD_PASS.includes(key)) {
-      env[key] = process.env[key];
+  ENV_SHOULD_PASS.concat(
+    Object.keys(process.env).filter((k) => prefixRE.test(k))
+  ).forEach((key) => {
+    const envValue = CUSTOM_ENV_GETTER[key] ? CUSTOM_ENV_GETTER[key](opts) : process.env[key];
+    if (typeof envValue === "undefined") {
+      return;
     }
+    env[key] = envValue;
   });
-  env.PUBLIC_PATH = opts.publicPath || "/";
+  env.PUBLIC_PATH = userConfig.publicPath || "/";
   for (const key in env) {
     env[key] = JSON.stringify(env[key]);
   }
   const define = {};
-  if (opts.define) {
-    for (const key in opts.define) {
-      define[key] = JSON.stringify(opts.define[key]);
+  if (userConfig.define) {
+    for (const key in userConfig.define) {
+      define[key] = JSON.stringify(userConfig.define[key]);
     }
   }
   return {
@@ -50,13 +70,8 @@ function resolveDefine(opts) {
   };
 }
 async function addDefinePlugin(opts) {
-  const { config, userConfig } = opts;
-  config.plugin("define").use(import_webpack.DefinePlugin, [
-    resolveDefine({
-      define: userConfig.define || {},
-      publicPath: userConfig.publicPath
-    })
-  ]);
+  const { config } = opts;
+  config.plugin("define").use(import_webpack.DefinePlugin, [resolveDefine(opts)]);
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/dev.js

@@ -150,7 +150,9 @@ async function setup(opts) {
       )
     } : void 0,
     pkg: opts.pkg,
-    disableCopy: opts.disableCopy
+    disableCopy: opts.disableCopy,
+    port: opts.port,
+    host: opts.host
   });
   const depConfig = await configModule.getConfig({
     cwd: opts.cwd,
@@ -168,7 +170,9 @@ async function setup(opts) {
       buildDependencies: (_j = opts.cache) == null ? void 0 : _j.buildDependencies,
       cacheDirectory: (0, import_path.join)(cacheDirectoryPath, "mfsu-deps")
     },
-    pkg: opts.pkg
+    pkg: opts.pkg,
+    port: opts.port,
+    host: opts.host
   });
   (_k = webpackConfig.resolve).alias || (_k.alias = {});
   ["@umijs/utils/compiled/strip-ansi", "react-error-overlay"].forEach((dep) => {

package/dist/requireHook.js

@@ -31,7 +31,8 @@ var hookPropertyMap = /* @__PURE__ */ new Map([
   ["webpack/package", resolve("compiled/webpack/package")],
   ["webpack/package.json", resolve("compiled/webpack/package")],
   ["webpack/lib/webpack", resolve("compiled/webpack")],
-  ["webpack/lib/webpack.js", resolve("compiled/webpack")]
+  ["webpack/lib/webpack.js", resolve("compiled/webpack")],
+  ["tapable", require.resolve("@umijs/bundler-utils/compiled/tapable")]
 ]);
 import_deepImports.default.forEach((item) => {
   const name = item.split("/").pop();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/bundler-webpack",
-  "version": "4.2.6-alpha.4",
+  "version": "4.2.6-alpha.5",
   "description": "@umijs/bundler-webpack",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/bundler-webpack#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -38,10 +38,10 @@
     "postcss-preset-env": "7.5.0",
     "react-error-overlay": "6.0.9",
     "react-refresh": "0.14.0",
-    "@umijs/mfsu": "4.2.6-alpha.4",
-    "@umijs/babel-preset-umi": "4.2.6-alpha.4",
-    "@umijs/bundler-utils": "4.2.6-alpha.4",
-    "@umijs/utils": "4.2.6-alpha.4"
+    "@umijs/babel-preset-umi": "4.2.6-alpha.5",
+    "@umijs/mfsu": "4.2.6-alpha.5",
+    "@umijs/utils": "4.2.6-alpha.5",
+    "@umijs/bundler-utils": "4.2.6-alpha.5"
   },
   "devDependencies": {
     "@swc/core": "1.3.67",
@@ -73,7 +73,7 @@
     "terser-webpack-plugin": "5.3.6",
     "url-loader": "4.1.1",
     "webpack": "5.88.2",
-    "webpack-5-chain": "8.0.1",
+    "webpack-5-chain": "8.0.2",
     "webpack-bundle-analyzer": "4.7.0",
     "webpack-dev-middleware": "6.0.1",
     "webpack-manifest-plugin": "5.0.0",