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

package/compiled/webpack/lazy-compilation-node.js

@@ -9,7 +9,9 @@ exports.keepAlive = function (options) {
 	var active = options.active;
 	var module = options.module;
 	var response;
-	var request = require("http").request(
+	var request = (
+		urlBase.startsWith("https") ? require("https") : require("http")
+	).request(
 		urlBase + data,
 		{
 			agent: false,

package/compiled/webpack/package.json

@@ -1 +1,5 @@
-{"name":"webpack","author":"Tobias Koppers @sokra","license":"MIT","types":"types.d.ts"}
+{
+  "name": "webpack",
+  "author": "Tobias Koppers @sokra",
+  "types": "types.d.ts"
+}

package/compiled/webpack/types.d.ts

@@ -80,6 +80,8 @@ import {
 	WithStatement,
 	YieldExpression
 } from "estree";
+import { ServerOptions as ServerOptionsImport } from 'http';
+import { ListenOptions, Server } from 'net';
 import { validate as validateFunction } from './schema-utils';
 import { default as ValidationError } from './schema-utils/declarations/ValidationError';
 import { ValidationErrorConfiguration } from './schema-utils/declarations/validate';
@@ -95,6 +97,7 @@ import {
 	SyncHook,
 	SyncWaterfallHook
 } from "tapable";
+import { SecureContextOptions, TlsOptions } from 'tls';
 
 declare class AbstractLibraryPlugin<T> {
 	constructor(__0: {
@@ -383,6 +386,10 @@ declare class AutomaticPrefetchPlugin {
 	apply(compiler: Compiler): void;
 }
 type AuxiliaryComment = string | LibraryCustomUmdCommentObject;
+declare interface BackendApi {
+	dispose: (arg0?: Error) => void;
+	module: (arg0: Module) => { client: string; data: string; active: boolean };
+}
 declare class BannerPlugin {
 	constructor(options: BannerPluginArgument);
 	options: BannerPluginOptions;
@@ -5794,25 +5801,45 @@ declare interface KnownStatsProfile {
 	dependencies: number;
 }
 
+/**
+ * Options for the default backend.
+ */
+declare interface LazyCompilationDefaultBackendOptions {
+	/**
+	 * A custom client.
+	 */
+	client?: string;
+
+	/**
+	 * Specifies where to listen to from the server.
+	 */
+	listen?: number | ListenOptions | ((server: typeof Server) => void);
+
+	/**
+	 * Specifies the protocol the client should use to connect to the server.
+	 */
+	protocol?: "http" | "https";
+
+	/**
+	 * Specifies how to create the server handling the EventSource requests.
+	 */
+	server?: ServerOptionsImport | ServerOptionsHttps | (() => typeof Server);
+}
+
 /**
  * Options for compiling entrypoints and import()s only when they are accessed.
  */
 declare interface LazyCompilationOptions {
 	/**
-	 * A custom backend.
+	 * Specifies the backend that should be used for handling client keep alive.
 	 */
 	backend?:
 		| ((
 				compiler: Compiler,
-				client: string,
-				callback: (err?: Error, api?: any) => void
+				callback: (err?: Error, api?: BackendApi) => void
 		  ) => void)
-		| ((compiler: Compiler, client: string) => Promise<any>);
-
-	/**
-	 * A custom client.
-	 */
-	client?: string;
+		| ((compiler: Compiler) => Promise<BackendApi>)
+		| LazyCompilationDefaultBackendOptions;
 
 	/**
 	 * Enable/disable lazy compilation for entries.
@@ -7485,6 +7512,7 @@ declare interface NormalModuleLoaderContext<OptionsType> {
 	utils: {
 		absolutify: (context: string, request: string) => string;
 		contextify: (context: string, request: string) => string;
+		createHash: (algorithm?: string) => Hash;
 	};
 	rootContext: string;
 	fs: InputFileSystem;
@@ -10369,6 +10397,9 @@ declare abstract class Serializer {
 	serialize(obj?: any, context?: any): any;
 	deserialize(value?: any, context?: any): any;
 }
+type ServerOptionsHttps = SecureContextOptions &
+	TlsOptions &
+	ServerOptionsImport;
 declare class SharePlugin {
 	constructor(options: SharePluginOptions);
 

package/dist/build.d.ts

@@ -4,6 +4,12 @@ interface IOpts {
     entry: Record<string, string>;
     config: IConfig;
     onBuildComplete?: Function;
+    babelPreset?: any;
+    chainWebpack?: Function;
+    beforeBabelPlugins?: any[];
+    beforeBabelPresets?: any[];
+    extraBabelPlugins?: any[];
+    extraBabelPresets?: any[];
     clean?: boolean;
 }
 export declare function build(opts: IOpts): Promise<void>;

package/dist/build.js

@@ -25,6 +25,16 @@ function build(opts) {
             entry: opts.entry,
             userConfig: opts.config,
             analyze: process.env.ANALYZE,
+            babelPreset: opts.babelPreset,
+            extraBabelPlugins: [
+                ...(opts.beforeBabelPlugins || []),
+                ...(opts.extraBabelPlugins || []),
+            ],
+            extraBabelPresets: [
+                ...(opts.beforeBabelPresets || []),
+                ...(opts.extraBabelPresets || []),
+            ],
+            chainWebpack: opts.chainWebpack,
         });
         let isFirstCompile = true;
         return new Promise((resolve, reject) => {

package/dist/config/assetRules.js

@@ -42,7 +42,8 @@ function addAssetRules(opts) {
         });
         rule
             .oneOf('fallback')
-            .exclude.add(/\.(js|mjs|jsx|ts|tsx)$/)
+            .exclude.add(/^$/) /* handle data: resources */
+            .add(/\.(js|mjs|jsx|ts|tsx)$/)
             .add(/\.(css|less|sass|scss|stylus)$/)
             .add(/\.html$/)
             .add(/\.json$/)

package/dist/config/config.d.ts

@@ -4,7 +4,10 @@ interface IOpts {
     cwd: string;
     env: Env;
     entry: Record<string, string>;
+    extraBabelPresets?: any[];
     extraBabelPlugins?: any[];
+    babelPreset?: any;
+    chainWebpack?: Function;
     hash?: boolean;
     hmr?: boolean;
     staticPathPrefix?: string;

package/dist/config/config.js

@@ -47,7 +47,9 @@ function getConfig(opts) {
             userConfig,
             cwd: opts.cwd,
             env: opts.env,
+            babelPreset: opts.babelPreset,
             extraBabelPlugins: opts.extraBabelPlugins || [],
+            extraBabelPresets: opts.extraBabelPresets || [],
             browsers: (0, browsersList_1.getBrowsersList)({
                 targets: userConfig.targets,
             }),
@@ -145,6 +147,12 @@ function getConfig(opts) {
             yield (0, bundleAnalyzerPlugin_1.addBundleAnalyzerPlugin)(applyOpts);
         }
         // chain webpack
+        if (opts.chainWebpack) {
+            yield opts.chainWebpack(config, {
+                env: opts.env,
+                webpack: webpack_1.default,
+            });
+        }
         if (userConfig.chainWebpack) {
             yield userConfig.chainWebpack(config, {
                 env: opts.env,

package/dist/config/cssRules.js

@@ -14,10 +14,10 @@ function addCSSRules(opts) {
     return __awaiter(this, void 0, void 0, function* () {
         const { config, userConfig } = opts;
         const rulesConfig = [
-            { name: 'css', test: /\.css(\?.*)?/ },
+            { name: 'css', test: /\.css(\?.*)?$/ },
             {
                 name: 'less',
-                test: /\.less(\?.*)?/,
+                test: /\.less(\?.*)?$/,
                 loader: require.resolve('@umijs/bundler-webpack/compiled/less-loader'),
                 loaderOptions: {
                     implementation: require.resolve('@umijs/bundler-webpack/compiled/less'),
@@ -26,7 +26,7 @@ function addCSSRules(opts) {
             },
             {
                 name: 'sass',
-                test: /\.(sass|scss)(\?.*)?/,
+                test: /\.(sass|scss)(\?.*)?$/,
                 loader: require.resolve('@umijs/bundler-webpack/compiled/sass-loader'),
                 loaderOptions: userConfig.sassLoader || {},
             },

package/dist/config/javaScriptRules.d.ts

@@ -6,6 +6,8 @@ interface IOpts {
     cwd: string;
     env: Env;
     extraBabelPlugins: any[];
+    extraBabelPresets: any[];
+    babelPreset: any;
     name?: string;
 }
 export declare function addJavaScriptRules(opts: IOpts): Promise<void>;

package/dist/config/javaScriptRules.js

@@ -85,10 +85,9 @@ function addJavaScriptRules(opts) {
                     //   : false,
                     targets: userConfig.targets,
                     presets: [
-                        [
+                        opts.babelPreset || [
                             require.resolve('@umijs/babel-preset-umi'),
                             {
-                                env,
                                 presetEnv: {},
                                 presetReact: {},
                                 presetTypeScript: {},
@@ -98,6 +97,7 @@ function addJavaScriptRules(opts) {
                                 pluginAutoCSSModules: userConfig.autoCSSModules,
                             },
                         ],
+                        ...opts.extraBabelPresets,
                         ...(userConfig.extraBabelPresets || []).filter(Boolean),
                     ],
                     plugins: [

package/dist/dev.d.ts

@@ -5,6 +5,11 @@ interface IOpts {
     onDevCompileDone?: Function;
     port?: number;
     host?: string;
+    chainWebpack?: Function;
+    beforeBabelPlugins?: any[];
+    beforeBabelPresets?: any[];
+    extraBabelPlugins?: any[];
+    extraBabelPresets?: any[];
     cwd: string;
     config: IConfig;
     entry: Record<string, string>;

package/dist/dev.js

@@ -30,7 +30,16 @@ function dev(opts) {
             env: types_1.Env.development,
             entry: opts.entry,
             userConfig: opts.config,
-            extraBabelPlugins: mfsu.getBabelPlugins(),
+            extraBabelPlugins: [
+                ...(opts.beforeBabelPlugins || []),
+                ...mfsu.getBabelPlugins(),
+                ...(opts.extraBabelPlugins || []),
+            ],
+            extraBabelPresets: [
+                ...(opts.beforeBabelPresets || []),
+                ...(opts.extraBabelPresets || []),
+            ],
+            chainWebpack: opts.chainWebpack,
             hmr: true,
             analyze: process.env.ANALYZE,
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/bundler-webpack",
-  "version": "4.0.0-beta.1",
+  "version": "4.0.0-beta.5",
   "description": "@umijs/bundler-webpack",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -37,10 +37,10 @@
     "@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.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.5",
+    "@umijs/mfsu": "4.0.0-beta.5",
+    "@umijs/utils": "4.0.0-beta.5",
+    "css-loader": "6.5.0",
     "es5-imcompatible-versions": "^0.1.73",
     "jest-worker": "27.3.1",
     "node-libs-browser": "2.2.1",
@@ -79,7 +79,7 @@
     "terser": "5.9.0",
     "terser-webpack-plugin": "5.2.4",
     "url-loader": "4.1.1",
-    "webpack": "5.59.0",
+    "webpack": "5.61.0",
     "webpack-5-chain": "8.0.0",
     "webpack-bundle-analyzer": "4.5.0",
     "webpack-dev-middleware": "5.2.1",