@rsbuild/core 2.2.7 → 2.2.9

package/compiled/html-rspack-plugin/htmlLoader.js

@@ -33,7 +33,7 @@ const stringEscapes = {
 const WITH_PLACEHOLDER = 'function __with_placeholder__';
 const escapeStringChar = (chr) => '\\' + stringEscapes[chr];
 
-function template(string) {
+function template(string, interpolate = reInterpolate) {
   let isEscaping;
   let isEvaluating;
   let index = 0;
@@ -41,24 +41,13 @@ function template(string) {
 
   // Compile the regexp to match each delimiter.
   const reDelimiters = RegExp(
-    reEscape.source +
-      '|' +
-      reInterpolate.source +
-      '|' +
-      reEvaluate.source +
-      '|$',
+    reEscape.source + '|' + interpolate.source + '|' + reEvaluate.source + '|$',
     'g',
   );
 
   string.replace(
     reDelimiters,
-    function (
-      match,
-      escapeValue,
-      interpolateValue,
-      evaluateValue,
-      offset,
-    ) {
+    function (match, escapeValue, interpolateValue, evaluateValue, offset) {
       // Escape characters that can't be included in string literals.
       source += string
         .slice(index, offset)
@@ -110,12 +99,14 @@ function template(string) {
 }
 
 module.exports = function (source) {
+  const options = this.getOptions();
+  const force = options.force || false;
   const allLoadersButThisOne = this.loaders.filter(
     (loader) => loader.normal !== module.exports,
   );
 
   // This loader shouldn't kick in if there is any other loader
-  if (allLoadersButThisOne.length > 0) {
+  if (allLoadersButThisOne.length > 0 && !force) {
     return source;
   }
 
@@ -129,7 +120,7 @@ module.exports = function (source) {
     return source;
   }
 
-  if (/\.(c|m)?js$/.test(this.resourcePath)) {
+  if (/\.(c|m)?js$/.test(this.resourcePath) && !force) {
     return source;
   }
 
@@ -156,7 +147,7 @@ function lodashEscape(input) {
   // The following part renders the template with lodash as a minimalistic loader
   // The WITH_PLACEHOLDER will be replaced with `with` in the next step
   // to make the code compatible with SWC strict mode
-  const { compiled, isEscaping } = template(source);
+  const { compiled, isEscaping } = template(source, options.interpolate);
   return `
 module.exports = function (templateParams) { ${WITH_PLACEHOLDER}(templateParams) {
   ${isEscaping ? escapeCode : ''}

package/compiled/html-rspack-plugin/index.d.ts

@@ -20,15 +20,16 @@ type AsArray<T> = T extends any[] ? T : [T];
 type Fn<T, R> = (...args: AsArray<T>) => R;
 type FnAsync<T, R> = (...args: Append<AsArray<T>, InnerCallback<Error, R>>) => void;
 type FnPromise<T, R> = (...args: AsArray<T>) => Promise<R>;
+type TapFunction = (...args: any[]) => any;
 type UnsetAdditionalOptions = {
     _UnsetAdditionalOptions: true;
 };
-type IfSet<X> = X extends UnsetAdditionalOptions ? {} : X;
+type IfSet<X> = X extends UnsetAdditionalOptions ? unknown : X;
 type Callback<E, T> = (error: E | null, result?: T) => void;
 type InnerCallback<E, T> = (error?: E | null | false, result?: T) => void;
 type FullTap = Tap & {
     type: 'sync' | 'async' | 'promise';
-    fn: Function;
+    fn: TapFunction;
 };
 type Tap = TapOptions & {
     name: string;
@@ -82,7 +83,7 @@ declare class HookBase<T, R, AdditionalOptions = UnsetAdditionalOptions> impleme
     tap(options: Options<AdditionalOptions>, fn: Fn<T, R>): void;
     tapAsync(options: Options<AdditionalOptions>, fn: FnAsync<T, R>): void;
     tapPromise(options: Options<AdditionalOptions>, fn: FnPromise<T, R>): void;
-    _tap(type: 'sync' | 'async' | 'promise', options: Options<AdditionalOptions>, fn: Function): void;
+    _tap(type: 'sync' | 'async' | 'promise', options: Options<AdditionalOptions>, fn: TapFunction): void;
     _insert(item: FullTap & IfSet<AdditionalOptions>): void;
     _prepareArgs(args: AsArray<T>): (T | undefined)[];
 }
@@ -270,7 +271,10 @@ declare namespace HtmlRspackPlugin {
   /**
    * The plugin options after adding default values
    */
-  interface ProcessedOptions extends Required<Options> {}
+  type ProcessedOptions = {
+    // Preserve named properties alongside the index signature in Options.
+    [K in keyof Options as Exclude<K, 'minify'>]-?: Options[K];
+  } & Pick<Options, 'minify'>;
 
   /**
    * The values which are available during template execution

package/compiled/html-rspack-plugin/index.js

@@ -1,8 +1,8 @@
 (() => {
   var __webpack_modules__ = {
-    25: (module, __unused_webpack_exports, __nccwpck_require__) => {
+    535: (module, __unused_webpack_exports, __nccwpck_require__) => {
       "use strict";
-      const { HtmlWebpackChildCompiler } = __nccwpck_require__(634);
+      const { HtmlWebpackChildCompiler } = __nccwpck_require__(284);
       const compilerMap = new WeakMap();
       class CachedChildCompilation {
         constructor(compiler) {
@@ -65,7 +65,7 @@
                     } else {
                       timestamps[file] = null;
                     }
-                    resolve();
+                    resolve(undefined);
                   });
                 }),
             ),
@@ -125,7 +125,6 @@
           });
           let mainCompilationHashOfLastChildRecompile = "";
           let previousFileSystemSnapshot;
-          let compilationStartTime = Date.now();
           compiler.hooks.make.tapAsync(
             "PersistentChildCompilerSingletonPlugin",
             (mainCompilation, callback) => {
@@ -137,7 +136,6 @@
                   new Error("Child compilation has already started"),
                 );
               }
-              compilationStartTime = Date.now();
               this.compilationState = {
                 isCompiling: false,
                 isVerifyingCache: true,
@@ -172,24 +170,6 @@
                   return compiledEntriesPromise;
                 },
               );
-              mainCompilation.hooks.optimizeTree.tapAsync(
-                "PersistentChildCompilerSingletonPlugin",
-                (chunks, modules, callback) => {
-                  const handleCompilationDonePromise =
-                    childCompilationResultPromise.then(
-                      (childCompilationResult) => {
-                        this.watchFiles(
-                          mainCompilation,
-                          childCompilationResult.dependencies,
-                        );
-                      },
-                    );
-                  handleCompilationDonePromise.then(
-                    () => callback(null, chunks, modules),
-                    callback,
-                  );
-                },
-              );
               mainCompilation.hooks.additionalAssets.tapAsync(
                 "PersistentChildCompilerSingletonPlugin",
                 (callback) => {
@@ -227,6 +207,22 @@
               callback(null);
             },
           );
+          compiler.hooks.finishMake.tapAsync(
+            "PersistentChildCompilerSingletonPlugin",
+            (mainCompilation, callback) => {
+              if (mainCompilation.compiler !== compiler) {
+                return callback(null);
+              }
+              const handleCompilationDonePromise =
+                childCompilationResultPromise.then((childCompilationResult) => {
+                  this.watchFiles(
+                    mainCompilation,
+                    childCompilationResult.dependencies,
+                  );
+                });
+              handleCompilationDonePromise.then(() => callback(null), callback);
+            },
+          );
         }
         addEntry(entry) {
           if (
@@ -311,12 +307,12 @@
       }
       module.exports = { CachedChildCompilation };
     },
-    634: (module) => {
+    284: (module) => {
       "use strict";
       class HtmlWebpackChildCompiler {
+        compilationPromise;
         constructor(templates) {
           this.templates = templates;
-          this.compilationPromise;
           this.compilationStartedTimestamp;
           this.compilationEndedTimestamp;
           this.fileDependencies = {
@@ -480,26 +476,23 @@
       }
       module.exports = { HtmlWebpackChildCompiler };
     },
-    914: (module) => {
+    876: (module) => {
       "use strict";
-      module.exports = {};
-      module.exports.none = (chunks) => chunks;
-      module.exports.manual = (
-        entryPointNames,
-        compilation,
-        htmlWebpackPluginOptions,
-      ) => {
-        const chunks = htmlWebpackPluginOptions.chunks;
+      function none(chunks) {
+        return chunks;
+      }
+      function manual(entryPointNames, compilation, htmlRspackPluginOptions) {
+        const chunks = htmlRspackPluginOptions.chunks;
         if (!Array.isArray(chunks)) {
           return entryPointNames;
         }
         return chunks.filter((entryPointName) =>
           compilation.entrypoints.has(entryPointName),
         );
-      };
-      module.exports.auto = module.exports.none;
+      }
+      module.exports = { auto: none, manual, none };
     },
-    253: (module) => {
+    123: (module) => {
       "use strict";
       module.exports = function (err) {
         return {
@@ -523,9 +516,9 @@
         };
       };
     },
-    604: (module, __unused_webpack_exports, __nccwpck_require__) => {
+    90: (module, __unused_webpack_exports, __nccwpck_require__) => {
       "use strict";
-      const { AsyncSeriesWaterfallHook } = __nccwpck_require__(84);
+      const { AsyncSeriesWaterfallHook } = __nccwpck_require__(176);
       const htmlWebpackPluginHooksMap = new WeakMap();
       function getHtmlRspackPluginHooks(compilation) {
         let hooks = htmlWebpackPluginHooksMap.get(compilation);
@@ -549,7 +542,7 @@
       }
       module.exports = { getHtmlRspackPluginHooks };
     },
-    1: (module) => {
+    527: (module) => {
       const voidTags = [
         "area",
         "base",
@@ -617,19 +610,19 @@
         htmlTagObjectToString,
       };
     },
-    28: (module, __unused_webpack_exports, __nccwpck_require__) => {
+    718: (module, __unused_webpack_exports, __nccwpck_require__) => {
       "use strict";
       const promisify = __nccwpck_require__(23).promisify;
       const vm = __nccwpck_require__(154);
       const fs = __nccwpck_require__(896);
       const path = __nccwpck_require__(928);
-      const { CachedChildCompilation } = __nccwpck_require__(25);
+      const { CachedChildCompilation } = __nccwpck_require__(535);
       const { createHtmlTagObject, htmlTagObjectToString, HtmlTagArray } =
-        __nccwpck_require__(1);
-      const prettyError = __nccwpck_require__(253);
-      const chunkSorter = __nccwpck_require__(914);
+        __nccwpck_require__(527);
+      const prettyError = __nccwpck_require__(123);
+      const chunkSorter = __nccwpck_require__(876);
       const getHtmlRspackPluginHooks =
-        __nccwpck_require__(604).getHtmlRspackPluginHooks;
+        __nccwpck_require__(90).getHtmlRspackPluginHooks;
       const WITH_PLACEHOLDER = "function __with_placeholder__";
       class HtmlRspackPlugin {
         constructor(userOptions = {}) {
@@ -818,6 +811,7 @@
             { hash: compilation.hash },
           );
           const isPublicPathDefined = webpackPublicPath !== "auto";
+          const outputPath = compilation.options.output.path;
           let publicPath =
             customPublicPath !== "auto"
               ? customPublicPath
@@ -825,11 +819,8 @@
                 ? webpackPublicPath
                 : path
                     .relative(
-                      path.resolve(
-                        compilation.options.output.path,
-                        path.dirname(filename),
-                      ),
-                      compilation.options.output.path,
+                      path.resolve(outputPath, path.dirname(filename)),
+                      outputPath,
                     )
                     .split(path.sep)
                     .join("/");
@@ -1097,12 +1088,13 @@
           }
           const isProductionLikeMode =
             compiler.options.mode === "production" || !compiler.options.mode;
+          const minify = this.options.minify;
           const needMinify =
-            typeof this.options.minify === "function" && isProductionLikeMode;
+            typeof minify === "function" && isProductionLikeMode;
           if (!needMinify) {
             return Promise.resolve(html);
           }
-          return Promise.resolve(this.options.minify(html));
+          return Promise.resolve(minify(html));
         }
         getAssetFiles(assets) {
           const uniq = (arr) => Array.from(new Set(arr));
@@ -1130,7 +1122,8 @@
             return Promise.resolve(undefined);
           }
           const filename = path.resolve(compilation.compiler.context, favicon);
-          return promisify(compilation.inputFileSystem.readFile)(filename)
+          const inputFileSystem = compilation.inputFileSystem;
+          return promisify(inputFileSystem.readFile)(filename)
             .then((buf) => {
               const source = new compiler.webpack.sources.RawSource(buf, false);
               const name = path.basename(filename);
@@ -1198,17 +1191,12 @@
                 : metaTagContent;
             })
             .filter((attribute) => attribute !== false);
-          return metaTagAttributeObjects.map((metaTagAttributes) => {
-            if (metaTagAttributes === false) {
-              throw new Error("Invalid meta tag");
-            }
-            return {
-              tagName: "meta",
-              voidTag: true,
-              meta: { plugin: "html-webpack-plugin" },
-              attributes: metaTagAttributes,
-            };
-          });
+          return metaTagAttributeObjects.map((metaTagAttributes) => ({
+            tagName: "meta",
+            voidTag: true,
+            meta: { plugin: "html-webpack-plugin" },
+            attributes: metaTagAttributes,
+          }));
         }
         generateFaviconTag(favicon) {
           return [
@@ -1248,9 +1236,13 @@
           const hash = compiler.webpack.util.createHash(
             compilation.outputOptions.hashFunction,
           );
-          hash.update(fileContent);
+          if (typeof fileContent === "string") {
+            hash.update(fileContent, "utf8");
+          } else {
+            hash.update(fileContent);
+          }
           if (compilation.outputOptions.hashSalt) {
-            hash.update(compilation.outputOptions.hashSalt);
+            hash.update(compilation.outputOptions.hashSalt, "utf8");
           }
           const contentHash = hash
             .digest(compilation.outputOptions.hashDigest)
@@ -1528,7 +1520,7 @@
       "use strict";
       module.exports = require("vm");
     },
-    84: (__unused_webpack_module, exports) => {
+    176: (__unused_webpack_module, exports) => {
       "use strict";
       var __nested_webpack_require_18__ = {};
       (() => {
@@ -2403,6 +2395,6 @@
   }
   if (typeof __nccwpck_require__ !== "undefined")
     __nccwpck_require__.ab = __dirname + "/";
-  var __webpack_exports__ = __nccwpck_require__(28);
+  var __webpack_exports__ = __nccwpck_require__(718);
   module.exports = __webpack_exports__;
 })();

package/compiled/html-rspack-plugin/package.json

@@ -1 +1 @@
-{"name":"html-rspack-plugin","author":"Jan Nicklas <j.nicklas@me.com> (https://github.com/jantimon)","version":"6.1.9","funding":{"type":"opencollective","url":"https://opencollective.com/html-webpack-plugin"},"license":"MIT","types":"index.d.ts","type":"commonjs"}
+{"name":"html-rspack-plugin","author":"Jan Nicklas <j.nicklas@me.com> (https://github.com/jantimon)","version":"6.1.11","funding":{"type":"opencollective","url":"https://opencollective.com/html-webpack-plugin"},"license":"MIT","types":"index.d.ts","type":"commonjs"}

package/compiled/postcss-loader/index.js

@@ -1,15 +1,15 @@
 (() => {
   "use strict";
   var __webpack_modules__ = {
-    54: (module, __unused_webpack_exports, __nccwpck_require__) => {
-      module.exports = __nccwpck_require__(388)["default"];
+    841: (module, __unused_webpack_exports, __nccwpck_require__) => {
+      module.exports = __nccwpck_require__(147)["default"];
     },
-    388: (__unused_webpack_module, exports, __nccwpck_require__) => {
+    147: (__unused_webpack_module, exports, __nccwpck_require__) => {
       var __webpack_unused_export__;
       __webpack_unused_export__ = { value: true };
       exports["default"] = loader;
       var _nodePath = _interopRequireDefault(__nccwpck_require__(760));
-      var _utils = __nccwpck_require__(637);
+      var _utils = __nccwpck_require__(870);
       function _interopRequireDefault(e) {
         return e && e.__esModule ? e : { default: e };
       }
@@ -179,7 +179,7 @@
         callback(null, result.css, map, { ast });
       }
     },
-    637: (module, exports, __nccwpck_require__) => {
+    870: (module, exports, __nccwpck_require__) => {
       module = __nccwpck_require__.nmd(module);
       Object.defineProperty(exports, "__esModule", { value: true });
       exports.exec = exec;
@@ -716,6 +716,6 @@
   })();
   if (typeof __nccwpck_require__ !== "undefined")
     __nccwpck_require__.ab = __dirname + "/";
-  var __webpack_exports__ = __nccwpck_require__(54);
+  var __webpack_exports__ = __nccwpck_require__(841);
   module.exports = __webpack_exports__;
 })();