@rsbuild/core 0.0.16 → 0.0.17

package/dist/plugins/define.js

@@ -25,32 +25,30 @@ var import_lodash = require("lodash");
 var import_shared = require("@rsbuild/shared");
 const pluginDefine = () => ({
   name: "plugin-define",
-  async setup(api) {
-    api.modifyBundlerChain(
-      async (chain, { env, target, CHAIN_ID, bundler }) => {
-        const config = api.getNormalizedConfig();
-        const publicPath = chain.output.get("publicPath");
-        const assetPrefix = publicPath && typeof publicPath === "string" ? publicPath : config.output.assetPrefix;
-        const builtinVars = {
-          "process.env.NODE_ENV": process.env.NODE_ENV,
-          "process.env.ASSET_PREFIX": (0, import_shared.removeTailSlash)(assetPrefix)
-        };
-        const globalVars = (0, import_shared.mergeChainedOptions)({
-          defaults: builtinVars,
-          options: config.source.globalVars,
-          utils: { env, target }
-        });
-        const serializedVars = (0, import_lodash.mapValues)(
-          globalVars,
-          (value) => {
-            var _a;
-            return (_a = JSON.stringify(value)) != null ? _a : "undefined";
-          }
-        );
-        const defineExprs = config.source.define;
-        chain.plugin(CHAIN_ID.PLUGIN.DEFINE).use(bundler.DefinePlugin, [{ ...serializedVars, ...defineExprs }]);
-      }
-    );
+  setup(api) {
+    api.modifyBundlerChain((chain, { env, target, CHAIN_ID, bundler }) => {
+      const config = api.getNormalizedConfig();
+      const publicPath = chain.output.get("publicPath");
+      const assetPrefix = publicPath && typeof publicPath === "string" ? publicPath : config.output.assetPrefix;
+      const builtinVars = {
+        "process.env.NODE_ENV": process.env.NODE_ENV,
+        "process.env.ASSET_PREFIX": (0, import_shared.removeTailSlash)(assetPrefix)
+      };
+      const globalVars = (0, import_shared.mergeChainedOptions)({
+        defaults: builtinVars,
+        options: config.source.globalVars,
+        utils: { env, target }
+      });
+      const serializedVars = (0, import_lodash.mapValues)(
+        globalVars,
+        (value) => {
+          var _a;
+          return (_a = JSON.stringify(value)) != null ? _a : "undefined";
+        }
+      );
+      const defineExprs = config.source.define;
+      chain.plugin(CHAIN_ID.PLUGIN.DEFINE).use(bundler.DefinePlugin, [{ ...serializedVars, ...defineExprs }]);
+    });
   }
 });
 // Annotate the CommonJS export names for ESM import in node:

package/dist/plugins/html.d.ts

@@ -1,4 +1,10 @@
-import type { MetaAttrs, HtmlConfig, MetaOptions, DefaultRsbuildPlugin, SharedRsbuildPluginAPI, NormalizedOutputConfig } from '@rsbuild/shared';
+import type { MetaAttrs, HtmlConfig, MetaOptions, NormalizedConfig, DefaultRsbuildPlugin, SharedRsbuildPluginAPI, NormalizedOutputConfig } from '@rsbuild/shared';
+export declare function getTitle(entryName: string, config: NormalizedConfig): string;
+export declare function getInject(entryName: string, config: NormalizedConfig): import("@rsbuild/shared").ScriptInject;
+export declare function getTemplatePath(entryName: string, config: NormalizedConfig): string;
+export declare function getFavicon(entryName: string, config: {
+  html: HtmlConfig;
+}): string;
 export declare const generateMetaTags: (metaOptions?: MetaOptions) => MetaAttrs[];
 export declare function getMetaTags(entryName: string, config: {
   html: HtmlConfig;

package/dist/plugins/html.js

@@ -30,7 +30,11 @@ var html_exports = {};
 __export(html_exports, {
   applyInjectTags: () => applyInjectTags,
   generateMetaTags: () => generateMetaTags,
+  getFavicon: () => getFavicon,
+  getInject: () => getInject,
   getMetaTags: () => getMetaTags,
+  getTemplatePath: () => getTemplatePath,
+  getTitle: () => getTitle,
   pluginHtml: () => pluginHtml
 });
 module.exports = __toCommonJS(html_exports);
@@ -38,6 +42,43 @@ var import_path = __toESM(require("path"));
 var import_shared = require("@rsbuild/shared");
 var import_fs_extra = require("@rsbuild/shared/fs-extra");
 var import_lodash = __toESM(require("lodash"));
+var import_HtmlBasicPlugin = require("../rspack-plugins/HtmlBasicPlugin");
+function getTitle(entryName, config) {
+  return (0, import_shared.mergeChainedOptions)({
+    defaults: "",
+    options: config.html.title,
+    utils: { entryName },
+    useObjectParam: true
+  });
+}
+function getInject(entryName, config) {
+  return (0, import_shared.mergeChainedOptions)({
+    defaults: "head",
+    options: config.html.inject,
+    utils: { entryName },
+    useObjectParam: true
+  });
+}
+function getTemplatePath(entryName, config) {
+  const DEFAULT_TEMPLATE = import_path.default.resolve(
+    __dirname,
+    "../../static/template.html"
+  );
+  return (0, import_shared.mergeChainedOptions)({
+    defaults: DEFAULT_TEMPLATE,
+    options: config.html.template,
+    utils: { entryName },
+    useObjectParam: true
+  });
+}
+function getFavicon(entryName, config) {
+  return (0, import_shared.mergeChainedOptions)({
+    defaults: "",
+    options: config.html.favicon,
+    utils: { entryName },
+    useObjectParam: true
+  });
+}
 const generateMetaTags = (metaOptions) => {
   if (!metaOptions) {
     return [];
@@ -59,32 +100,29 @@ async function getMetaTags(entryName, config) {
   });
   return generateMetaTags(merged);
 }
-async function getTemplateParameters(entryName, config, assetPrefix) {
-  const { mountId, templateParameters, templateParametersByEntries } = config.html;
-  const templateParams = (templateParametersByEntries == null ? void 0 : templateParametersByEntries[entryName]) || templateParameters;
-  const baseParameters = {
-    mountId,
-    entryName,
-    assetPrefix
-  };
+function getTemplateParameters(entryName, config, assetPrefix) {
   return (compilation, assets, assetTags, pluginOptions) => {
+    const { mountId, templateParameters } = config.html;
     const defaultOptions = {
+      mountId,
+      entryName,
+      assetPrefix,
       compilation,
       webpackConfig: compilation.options,
       htmlWebpackPlugin: {
         tags: assetTags,
         files: assets,
         options: pluginOptions
-      },
-      ...baseParameters
+      }
     };
     return (0, import_shared.mergeChainedOptions)({
       defaults: defaultOptions,
-      options: templateParams
+      options: templateParameters,
+      utils: { entryName }
     });
   };
 }
-async function getChunks(entryName, entryValue) {
+function getChunks(entryName, entryValue) {
   const dependOn = [];
   if ((0, import_shared.isPlainObject)(entryValue)) {
     dependOn.push(...entryValue.dependOn);
@@ -139,36 +177,19 @@ const pluginHtml = () => ({
         const entries = chain.entryPoints.entries() || {};
         const entryNames = Object.keys(entries);
         const htmlPaths = api.getHTMLPaths();
-        const faviconUrls = [];
-        const metaPluginOptions = {
-          meta: {},
-          HtmlPlugin
-        };
-        const titlePluginOptions = {
-          titles: {},
-          HtmlPlugin
-        };
+        const htmlInfoMap = {};
         await Promise.all(
           entryNames.map(async (entryName, index) => {
             const entryValue = entries[entryName].values();
-            const chunks = await getChunks(entryName, entryValue);
-            const inject = (0, import_shared.getInject)(entryName, config);
-            const favicon = (0, import_shared.getFavicon)(entryName, config);
+            const chunks = getChunks(entryName, entryValue);
+            const inject = getInject(entryName, config);
             const filename = htmlPaths[entryName];
-            const template = (0, import_shared.getTemplatePath)(entryName, config);
-            const metaTags = await getMetaTags(entryName, config);
-            const title = await (0, import_shared.getTitle)(entryName, config);
-            const templateParameters = await getTemplateParameters(
+            const template = getTemplatePath(entryName, config);
+            const templateParameters = getTemplateParameters(
               entryName,
               config,
               assetPrefix
             );
-            if (metaTags.length) {
-              metaPluginOptions.meta[filename] = metaTags;
-            }
-            if (title) {
-              titlePluginOptions.titles[filename] = title;
-            }
             const pluginOptions = {
               chunks,
               inject,
@@ -178,12 +199,20 @@ const pluginHtml = () => ({
               templateParameters,
               scriptLoading: config.html.scriptLoading
             };
+            const htmlInfo = {};
+            htmlInfoMap[filename] = htmlInfo;
+            const title = getTitle(entryName, config);
+            if (title) {
+              htmlInfo.title = title;
+            }
+            const metaTags = await getMetaTags(entryName, config);
+            if (metaTags.length) {
+              htmlInfo.meta = metaTags;
+            }
+            const favicon = getFavicon(entryName, config);
             if (favicon) {
               if ((0, import_shared.isURL)(favicon)) {
-                faviconUrls.push({
-                  filename,
-                  url: favicon
-                });
+                htmlInfo.favicon = favicon;
               } else {
                 pluginOptions.favicon = favicon;
               }
@@ -205,12 +234,7 @@ const pluginHtml = () => ({
             chain.plugin(`${CHAIN_ID.PLUGIN.HTML}-${entryName}`).use(HtmlPlugin, [finalOptions]);
           })
         );
-        if (Object.keys(metaPluginOptions.meta).length) {
-          chain.plugin(CHAIN_ID.PLUGIN.HTML_META).use(import_shared.HtmlMetaPlugin, [metaPluginOptions]);
-        }
-        if (Object.keys(titlePluginOptions.titles).length) {
-          chain.plugin(CHAIN_ID.PLUGIN.HTML_TITLE).use(import_shared.HtmlTitlePlugin, [titlePluginOptions]);
-        }
+        chain.plugin(CHAIN_ID.PLUGIN.HTML_BASIC).use(import_HtmlBasicPlugin.HtmlBasicPlugin, [{ HtmlPlugin, info: htmlInfoMap }]);
         if (config.security) {
           const { nonce } = config.security;
           if (nonce) {
@@ -228,10 +252,6 @@ const pluginHtml = () => ({
             ]);
             chain.output.crossOriginLoading(formattedCrossorigin);
           }
-          if (faviconUrls.length) {
-            const { HtmlFaviconUrlPlugin } = await Promise.resolve().then(() => __toESM(require("@rsbuild/shared")));
-            chain.plugin(CHAIN_ID.PLUGIN.FAVICON_URL).use(HtmlFaviconUrlPlugin, [{ faviconUrls, HtmlPlugin }]);
-          }
           if (appIcon) {
             const { HtmlAppIconPlugin } = await Promise.resolve().then(() => __toESM(require("@rsbuild/shared")));
             const distDir = (0, import_shared.getDistPath)(config.output, "image");
@@ -259,6 +279,10 @@ const pluginHtml = () => ({
 0 && (module.exports = {
   applyInjectTags,
   generateMetaTags,
+  getFavicon,
+  getInject,
   getMetaTags,
+  getTemplatePath,
+  getTitle,
   pluginHtml
 });

package/dist/plugins/startUrl.js

@@ -93,7 +93,7 @@ const openedURLs = [];
 function pluginStartUrl() {
   return {
     name: "plugin-start-url",
-    async setup(api) {
+    setup(api) {
       let port;
       api.onAfterStartDevServer(async (params) => {
         ({ port } = params);

package/dist/rspack-plugins/HtmlBasicPlugin.d.ts

@@ -0,0 +1,19 @@
+import type HtmlWebpackPlugin from 'html-webpack-plugin';
+import type { Compiler } from '@rspack/core';
+import type { MetaAttrs } from '@rsbuild/shared';
+export type HtmlInfo = {
+  meta?: MetaAttrs[];
+  title?: string;
+  favicon?: string;
+};
+export type HtmlBasicPluginOptions = {
+  info: Record<string, HtmlInfo>;
+  HtmlPlugin: typeof HtmlWebpackPlugin;
+};
+export declare class HtmlBasicPlugin {
+  readonly name: string;
+  readonly options: HtmlBasicPluginOptions;
+  readonly HtmlPlugin: typeof HtmlWebpackPlugin;
+  constructor(options: HtmlBasicPluginOptions);
+  apply(compiler: Compiler): void;
+}

package/dist/rspack-plugins/HtmlBasicPlugin.js

@@ -0,0 +1,87 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var HtmlBasicPlugin_exports = {};
+__export(HtmlBasicPlugin_exports, {
+  HtmlBasicPlugin: () => HtmlBasicPlugin
+});
+module.exports = __toCommonJS(HtmlBasicPlugin_exports);
+class HtmlBasicPlugin {
+  constructor(options) {
+    this.name = "HtmlBasicPlugin";
+    this.options = options;
+    this.HtmlPlugin = options.HtmlPlugin;
+  }
+  apply(compiler) {
+    const addTitleTag = (headTags, outputName) => {
+      const { title } = this.options.info[outputName];
+      if (title) {
+        headTags.unshift({
+          tagName: "title",
+          innerHTML: title,
+          attributes: {},
+          voidTag: false,
+          meta: {}
+        });
+      }
+    };
+    const addMetaTag = (headTags, outputName) => {
+      const { meta } = this.options.info[outputName];
+      if (meta) {
+        headTags.unshift(
+          ...meta.map((attr) => ({
+            tagName: "meta",
+            attributes: attr,
+            meta: {},
+            voidTag: true
+          }))
+        );
+      }
+    };
+    const addFavicon = (headTags, outputName) => {
+      const { favicon } = this.options.info[outputName];
+      if (favicon) {
+        headTags.unshift({
+          tagName: "link",
+          voidTag: true,
+          attributes: {
+            rel: "icon",
+            href: favicon
+          },
+          meta: {}
+        });
+      }
+    };
+    compiler.hooks.compilation.tap(this.name, (compilation) => {
+      this.HtmlPlugin.getHooks(compilation).alterAssetTagGroups.tap(
+        this.name,
+        (data) => {
+          const { headTags, outputName } = data;
+          addTitleTag(headTags, outputName);
+          addMetaTag(headTags, outputName);
+          addFavicon(headTags, outputName);
+          return data;
+        }
+      );
+    });
+  }
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  HtmlBasicPlugin
+});

package/dist/rspack-provider/plugins/css.js

@@ -56,7 +56,7 @@ async function applyBaseCSSRule({
   const enableCssMinify = !enableExtractCSS && isProd;
   if (!enableNativeCss(config)) {
     const localIdentName = (0, import_shared.getCssModuleLocalIdentName)(config, isProd);
-    const cssLoaderOptions = await (0, import_shared.getCssLoaderOptions)({
+    const cssLoaderOptions = (0, import_shared.getCssLoaderOptions)({
       config,
       enableSourceMap,
       importLoaders,
@@ -110,7 +110,7 @@ async function applyBaseCSSRule({
     rule.type("css");
   }
   if (!isServer && !isWebWorker) {
-    const postcssLoaderOptions = await (0, import_shared.getPostcssConfig)({
+    const postcssLoaderOptions = (0, import_shared.getPostcssConfig)({
       enableSourceMap,
       browserslist,
       config,

package/dist/rspack-provider/plugins/less.js

@@ -47,7 +47,7 @@ function pluginLess() {
           context: api.context,
           importLoaders: 2
         });
-        const { excludes, options } = await (0, import_shared.getLessLoaderOptions)(
+        const { excludes, options } = (0, import_shared.getLessLoaderOptions)(
           config.tools.less,
           (0, import_shared.isUseCssSourceMap)(config)
         );

package/dist/rspack-provider/plugins/resolve.js

@@ -27,8 +27,7 @@ const pluginResolve = () => ({
   setup(api) {
     (0, import_shared.applyResolvePlugin)(api);
     api.modifyBundlerChain(async (chain, { CHAIN_ID }) => {
-      const config = api.getNormalizedConfig();
-      if (chain.module.rules.get(CHAIN_ID.RULE.JS_DATA_URI) && config.source.compileJsDataURI) {
+      if (chain.module.rules.get(CHAIN_ID.RULE.JS_DATA_URI)) {
         chain.module.rule(CHAIN_ID.RULE.JS_DATA_URI).resolve.set("fullySpecified", false);
       }
     });

package/dist/rspack-provider/plugins/sass.js

@@ -35,14 +35,14 @@ var import_shared = require("@rsbuild/shared");
 function pluginSass() {
   return {
     name: "plugin-sass",
-    async setup(api) {
+    setup(api) {
       api.onAfterCreateCompiler(({ compiler }) => {
         (0, import_shared.patchCompilerGlobalLocation)(compiler);
       });
       api.modifyBundlerChain(async (chain, utils) => {
         const config = api.getNormalizedConfig();
         const { applyBaseCSSRule } = await Promise.resolve().then(() => __toESM(require("./css")));
-        const { excludes, options } = await (0, import_shared.getSassLoaderOptions)(
+        const { excludes, options } = (0, import_shared.getSassLoaderOptions)(
           config.tools.sass,
           // source-maps required for loaders preceding resolve-url-loader
           true

package/dist/rspack-provider/plugins/swc.js

@@ -98,11 +98,9 @@ const pluginSwc = () => ({
           }
         }
         rule.use(CHAIN_ID.USE.SWC).loader(builtinSwcLoaderName).options(swcConfig);
-        if (config.source.compileJsDataURI) {
-          chain.module.rule(CHAIN_ID.RULE.JS_DATA_URI).mimetype({
-            or: ["text/javascript", "application/javascript"]
-          }).use(CHAIN_ID.USE.SWC).loader(builtinSwcLoaderName).options((0, import_lodash.cloneDeep)(swcConfig));
-        }
+        chain.module.rule(CHAIN_ID.RULE.JS_DATA_URI).mimetype({
+          or: ["text/javascript", "application/javascript"]
+        }).use(CHAIN_ID.USE.SWC).loader(builtinSwcLoaderName).options((0, import_lodash.cloneDeep)(swcConfig));
       }
     );
     api.modifyRspackConfig(async (config) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsbuild/core",
-  "version": "0.0.16",
+  "version": "0.0.17",
   "description": "Unleash the power of Rspack with the out-of-the-box build tool.",
   "homepage": "https://rsbuild.dev",
   "bugs": {
@@ -62,7 +62,7 @@
   ],
   "dependencies": {
     "@modern-js/server": "0.0.0-next-20231103131234",
-    "@rspack/core": "0.3.10",
+    "@rspack/core": "0.3.11",
     "commander": "^10.0.1",
     "core-js": "~3.32.2",
     "filesize": "^8.0.7",
@@ -74,7 +74,7 @@
     "pkg-up": "^3.1.0",
     "postcss": "8.4.31",
     "semver": "^7.5.4",
-    "@rsbuild/shared": "0.0.16"
+    "@rsbuild/shared": "0.0.17"
   },
   "devDependencies": {
     "@types/lodash": "^4.14.200",

package/static/template.html

@@ -0,0 +1,7 @@
+<!doctype html>
+<html>
+  <head></head>
+  <body>
+    <div id="<%= mountId %>"></div>
+  </body>
+</html>

package/dist/utils/generateMetaTags.js

@@ -1 +0,0 @@
-"use strict";