@rsbuild/core 0.0.15 → 0.0.16

package/dist/plugins/define.js

@@ -35,11 +35,11 @@ const pluginDefine = () => ({
           "process.env.NODE_ENV": process.env.NODE_ENV,
           "process.env.ASSET_PREFIX": (0, import_shared.removeTailSlash)(assetPrefix)
         };
-        const globalVars = (0, import_shared.mergeChainedOptions)(
-          builtinVars,
-          config.source.globalVars,
-          { env, target }
-        );
+        const globalVars = (0, import_shared.mergeChainedOptions)({
+          defaults: builtinVars,
+          options: config.source.globalVars,
+          utils: { env, target }
+        });
         const serializedVars = (0, import_lodash.mapValues)(
           globalVars,
           (value) => {

package/dist/plugins/html.d.ts

@@ -1,7 +1,8 @@
-import type { HtmlConfig, DefaultRsbuildPlugin, SharedRsbuildPluginAPI, NormalizedOutputConfig } from '@rsbuild/shared';
+import type { MetaAttrs, HtmlConfig, MetaOptions, DefaultRsbuildPlugin, SharedRsbuildPluginAPI, NormalizedOutputConfig } from '@rsbuild/shared';
+export declare const generateMetaTags: (metaOptions?: MetaOptions) => MetaAttrs[];
 export declare function getMetaTags(entryName: string, config: {
   html: HtmlConfig;
   output: NormalizedOutputConfig;
-}): Promise<import("html-webpack-plugin").HtmlTagObject[]>;
+}): Promise<MetaAttrs[]>;
 export declare const applyInjectTags: (api: SharedRsbuildPluginAPI) => void;
 export declare const pluginHtml: () => DefaultRsbuildPlugin;

package/dist/plugins/html.js

@@ -29,6 +29,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var html_exports = {};
 __export(html_exports, {
   applyInjectTags: () => applyInjectTags,
+  generateMetaTags: () => generateMetaTags,
   getMetaTags: () => getMetaTags,
   pluginHtml: () => pluginHtml
 });
@@ -37,15 +38,26 @@ 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_generateMetaTags = require("../utils/generateMetaTags");
-async function getMetaTags(entryName, config) {
-  const { meta, metaByEntries } = config.html;
-  const metaOptions = {};
-  if (config.output.charset === "utf8") {
-    metaOptions.charset = { charset: "utf-8" };
+const generateMetaTags = (metaOptions) => {
+  if (!metaOptions) {
+    return [];
   }
-  Object.assign(metaOptions, meta, metaByEntries == null ? void 0 : metaByEntries[entryName]);
-  return (0, import_generateMetaTags.generateMetaTags)(metaOptions);
+  return Object.keys(metaOptions).map((metaName) => {
+    const metaTagContent = metaOptions[metaName];
+    return typeof metaTagContent === "string" ? {
+      name: metaName,
+      content: metaTagContent
+    } : metaTagContent;
+  }).filter(Boolean);
+};
+async function getMetaTags(entryName, config) {
+  const merged = (0, import_shared.mergeChainedOptions)({
+    defaults: {},
+    options: config.html.meta,
+    utils: { entryName },
+    useObjectParam: true
+  });
+  return generateMetaTags(merged);
 }
 async function getTemplateParameters(entryName, config, assetPrefix) {
   const { mountId, templateParameters, templateParametersByEntries } = config.html;
@@ -66,7 +78,10 @@ async function getTemplateParameters(entryName, config, assetPrefix) {
       },
       ...baseParameters
     };
-    return (0, import_shared.mergeChainedOptions)(defaultOptions, templateParams);
+    return (0, import_shared.mergeChainedOptions)({
+      defaults: defaultOptions,
+      options: templateParams
+    });
   };
 }
 async function getChunks(entryName, entryValue) {
@@ -126,11 +141,11 @@ const pluginHtml = () => ({
         const htmlPaths = api.getHTMLPaths();
         const faviconUrls = [];
         const metaPluginOptions = {
-          meta: [],
+          meta: {},
           HtmlPlugin
         };
         const titlePluginOptions = {
-          titles: [],
+          titles: {},
           HtmlPlugin
         };
         await Promise.all(
@@ -149,16 +164,10 @@ const pluginHtml = () => ({
               assetPrefix
             );
             if (metaTags.length) {
-              metaPluginOptions.meta.push({
-                tags: metaTags,
-                filename
-              });
+              metaPluginOptions.meta[filename] = metaTags;
             }
             if (title) {
-              titlePluginOptions.titles.push({
-                title,
-                filename
-              });
+              titlePluginOptions.titles[filename] = title;
             }
             const pluginOptions = {
               chunks,
@@ -179,14 +188,14 @@ const pluginHtml = () => ({
                 pluginOptions.favicon = favicon;
               }
             }
-            const finalOptions = (0, import_shared.mergeChainedOptions)(
-              pluginOptions,
-              config.tools.htmlPlugin,
-              {
+            const finalOptions = (0, import_shared.mergeChainedOptions)({
+              defaults: pluginOptions,
+              options: config.tools.htmlPlugin,
+              utils: {
                 entryName,
                 entryValue
               }
-            );
+            });
             routesInfo.push({
               urlPath: index === 0 ? "/" : `/${entryName}`,
               entryName,
@@ -196,10 +205,10 @@ const pluginHtml = () => ({
             chain.plugin(`${CHAIN_ID.PLUGIN.HTML}-${entryName}`).use(HtmlPlugin, [finalOptions]);
           })
         );
-        if (metaPluginOptions.meta.length) {
+        if (Object.keys(metaPluginOptions.meta).length) {
           chain.plugin(CHAIN_ID.PLUGIN.HTML_META).use(import_shared.HtmlMetaPlugin, [metaPluginOptions]);
         }
-        if (titlePluginOptions.titles.length) {
+        if (Object.keys(titlePluginOptions.titles).length) {
           chain.plugin(CHAIN_ID.PLUGIN.HTML_TITLE).use(import_shared.HtmlTitlePlugin, [titlePluginOptions]);
         }
         if (config.security) {
@@ -249,6 +258,7 @@ const pluginHtml = () => ({
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   applyInjectTags,
+  generateMetaTags,
   getMetaTags,
   pluginHtml
 });

package/dist/rspack-provider/core/rspackConfig.js

@@ -41,12 +41,12 @@ async function modifyRspackConfig(context, rspackConfig, utils) {
     utils
   );
   if ((_a = context.config.tools) == null ? void 0 : _a.rspack) {
-    modifiedConfig = (0, import_shared.mergeChainedOptions)(
-      modifiedConfig,
-      context.config.tools.rspack,
+    modifiedConfig = (0, import_shared.mergeChainedOptions)({
+      defaults: modifiedConfig,
+      options: context.config.tools.rspack,
       utils,
-      utils.mergeConfig
-    );
+      mergeFn: utils.mergeConfig
+    });
   }
   (0, import_shared.debug)("modify Rspack config done");
   return modifiedConfig;

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

@@ -65,14 +65,14 @@ async function applyBaseCSSRule({
       localIdentName
     });
     if (!isServer && !isWebWorker) {
-      const styleLoaderOptions = (0, import_shared.mergeChainedOptions)(
-        {
+      const styleLoaderOptions = (0, import_shared.mergeChainedOptions)({
+        defaults: {
           // todo: hmr does not work while esModule is true
           // @ts-expect-error
           esModule: false
         },
-        config.tools.styleLoader
-      );
+        options: config.tools.styleLoader
+      });
       rule.use(CHAIN_ID.USE.STYLE).loader(require.resolve("style-loader")).options(styleLoaderOptions).end();
       if (enableCSSModuleTS && cssLoaderOptions.modules) {
         rule.use(CHAIN_ID.USE.CSS_MODULES_TS).loader(

package/dist/utils/generateMetaTags.d.ts

@@ -1,12 +0,0 @@
-/**
- * Copyright JS Foundation and other contributors.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file at
- * https://github.com/jantimon/html-webpack-plugin/blob/main/LICENSE
- *
- * Modified from https://github.com/jantimon/html-webpack-plugin/blob/2f5de7ab9e8bca60e9e200f2e4b4cfab90db28d4/index.js#L800
- */
-import type { MetaOptions } from '@rsbuild/shared';
-import type { HtmlTagObject } from 'html-webpack-plugin';
-export declare const generateMetaTags: (metaOptions?: MetaOptions) => HtmlTagObject[];

package/dist/utils/generateMetaTags.js

@@ -1,50 +1 @@
 "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 generateMetaTags_exports = {};
-__export(generateMetaTags_exports, {
-  generateMetaTags: () => generateMetaTags
-});
-module.exports = __toCommonJS(generateMetaTags_exports);
-const generateMetaTags = (metaOptions) => {
-  if (!metaOptions) {
-    return [];
-  }
-  const metaTagAttributeObjects = Object.keys(metaOptions).map((metaName) => {
-    const metaTagContent = metaOptions[metaName];
-    return typeof metaTagContent === "string" ? {
-      name: metaName,
-      content: metaTagContent
-    } : metaTagContent;
-  }).filter((attribute) => attribute !== false);
-  return metaTagAttributeObjects.map((metaTagAttributes) => {
-    if (metaTagAttributes === false) {
-      throw new Error("Invalid meta tag");
-    }
-    return {
-      tagName: "meta",
-      voidTag: true,
-      attributes: metaTagAttributes,
-      meta: {}
-    };
-  });
-};
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  generateMetaTags
-});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsbuild/core",
-  "version": "0.0.15",
+  "version": "0.0.16",
   "description": "Unleash the power of Rspack with the out-of-the-box build tool.",
   "homepage": "https://rsbuild.dev",
   "bugs": {
@@ -74,7 +74,7 @@
     "pkg-up": "^3.1.0",
     "postcss": "8.4.31",
     "semver": "^7.5.4",
-    "@rsbuild/shared": "0.0.15"
+    "@rsbuild/shared": "0.0.16"
   },
   "devDependencies": {
     "@types/lodash": "^4.14.200",