@rsbuild/core 0.0.9 → 0.0.10

package/dist/plugins/html.d.ts

@@ -1,3 +1,7 @@
-import type { DefaultRsbuildPlugin, SharedRsbuildPluginAPI } from '@rsbuild/shared';
+import type { SharedHtmlConfig, DefaultRsbuildPlugin, SharedRsbuildPluginAPI, NormalizedSharedOutputConfig } from '@rsbuild/shared';
+export declare function getMetaTags(entryName: string, config: {
+  html: SharedHtmlConfig;
+  output: NormalizedSharedOutputConfig;
+}): Promise<string>;
 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,
+  getMetaTags: () => getMetaTags,
   pluginHtml: () => pluginHtml
 });
 module.exports = __toCommonJS(html_exports);
@@ -36,9 +37,22 @@ 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) {
+  var _a;
+  const { meta, metaByEntries } = config.html;
+  const metaOptions = {
+    ...meta != null ? meta : {},
+    ...(_a = metaByEntries == null ? void 0 : metaByEntries[entryName]) != null ? _a : {}
+  };
+  if (config.output.charset === "utf8") {
+    metaOptions.charset = { charset: "utf-8" };
+  }
+  return (0, import_generateMetaTags.generateMetaTags)(metaOptions);
+}
 async function getTemplateParameters(entryName, config, assetPrefix) {
   const { mountId, templateParameters, templateParametersByEntries } = config.html;
-  const meta = await (0, import_shared.getMetaTags)(entryName, config);
+  const meta = await getMetaTags(entryName, config);
   const title = (0, import_shared.getTitle)(entryName, config);
   const templateParams = (templateParametersByEntries == null ? void 0 : templateParametersByEntries[entryName]) || templateParameters;
   const baseParameters = {
@@ -214,5 +228,6 @@ const pluginHtml = () => ({
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   applyInjectTags,
+  getMetaTags,
   pluginHtml
 });

package/dist/plugins/startUrl.d.ts

@@ -1,3 +1,12 @@
 import { type DefaultRsbuildPlugin } from '@rsbuild/shared';
+/**
+ * This method is modified based on source found in
+ * https://github.com/facebook/create-react-app
+ *
+ * MIT Licensed
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * https://github.com/facebook/create-react-app/blob/master/LICENSE
+ */
+export declare function openBrowser(url: string): Promise<boolean>;
 export declare const replacePlaceholder: (url: string, port: number) => string;
 export declare function pluginStartUrl(): DefaultRsbuildPlugin;

package/dist/plugins/startUrl.js

@@ -28,12 +28,68 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var startUrl_exports = {};
 __export(startUrl_exports, {
+  openBrowser: () => openBrowser,
   pluginStartUrl: () => pluginStartUrl,
   replacePlaceholder: () => replacePlaceholder
 });
 module.exports = __toCommonJS(startUrl_exports);
 var import_lodash = __toESM(require("lodash"));
+var import_path = require("path");
 var import_shared = require("@rsbuild/shared");
+var import_child_process = require("child_process");
+const supportedChromiumBrowsers = [
+  "Google Chrome Canary",
+  "Google Chrome Dev",
+  "Google Chrome Beta",
+  "Google Chrome",
+  "Microsoft Edge",
+  "Brave Browser",
+  "Vivaldi",
+  "Chromium"
+];
+const getTargetBrowser = () => {
+  let targetBrowser = process.env.BROWSER;
+  if (!targetBrowser || !supportedChromiumBrowsers.includes(targetBrowser)) {
+    const ps = (0, import_child_process.execSync)("ps cax").toString();
+    targetBrowser = supportedChromiumBrowsers.find((b) => ps.includes(b));
+  }
+  return targetBrowser;
+};
+async function openBrowser(url) {
+  const shouldTryOpenChromeWithAppleScript = process.platform === "darwin";
+  if (shouldTryOpenChromeWithAppleScript) {
+    try {
+      const targetBrowser = getTargetBrowser();
+      if (targetBrowser) {
+        (0, import_child_process.execSync)(
+          `osascript openChrome.applescript "${encodeURI(
+            url
+          )}" "${targetBrowser}"`,
+          {
+            stdio: "ignore",
+            cwd: (0, import_path.join)(__dirname, "../../static")
+          }
+        );
+        return true;
+      }
+      return false;
+    } catch (err) {
+      import_shared.logger.error(
+        "Failed to open start URL with apple script:",
+        JSON.stringify(err)
+      );
+      return false;
+    }
+  }
+  try {
+    const { default: open } = await Promise.resolve().then(() => __toESM(require("open")));
+    await open(url);
+    return true;
+  } catch (err) {
+    import_shared.logger.error("Failed to open start URL:", JSON.stringify(err));
+    return false;
+  }
+}
 const replacePlaceholder = (url, port) => url.replace(/<port>/g, String(port));
 const openedURLs = [];
 function pluginStartUrl() {
@@ -65,7 +121,6 @@ function pluginStartUrl() {
             )
           );
         }
-        const { openBrowser } = await Promise.resolve().then(() => __toESM(require("@rsbuild/shared")));
         const openUrls = () => {
           for (const url of urls) {
             if (!openedURLs.includes(url)) {
@@ -87,6 +142,7 @@ function pluginStartUrl() {
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  openBrowser,
   pluginStartUrl,
   replacePlaceholder
 });

package/dist/rspack-provider/shared/plugin.js

@@ -54,7 +54,6 @@ const applyDefaultPlugins = (plugins) => (0, import_shared.awaitableGetter)([
   plugins.nodeAddons(),
   // pug plugin should after html plugin
   Promise.resolve().then(() => __toESM(require("../plugins/pug"))).then((m) => m.pluginPug()),
-  Promise.resolve().then(() => __toESM(require("../plugins/babel"))).then((m) => m.pluginBabel()),
   plugins.define(),
   Promise.resolve().then(() => __toESM(require("../plugins/css"))).then((m) => m.pluginCss()),
   Promise.resolve().then(() => __toESM(require("../plugins/less"))).then((m) => m.pluginLess()),

package/dist/utils/generateMetaTags.d.ts

@@ -0,0 +1,11 @@
+/**
+ * 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';
+export declare const generateMetaTags: (metaOptions?: MetaOptions) => string;

package/dist/utils/generateMetaTags.js

@@ -0,0 +1,64 @@
+"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 tagObjectToString = (tagDefinition) => {
+  const attributes = Object.keys(tagDefinition.attributes || {}).filter(
+    (attributeName) => tagDefinition.attributes[attributeName] !== false
+  ).map((attributeName) => {
+    if (tagDefinition.attributes[attributeName] === true) {
+      return attributeName;
+    }
+    return `${attributeName}="${tagDefinition.attributes[attributeName]}"`;
+  });
+  return `<${[tagDefinition.tagName].concat(attributes).join(" ")}>${tagDefinition.innerHTML || ""}${tagDefinition.voidTag ? "" : `</${tagDefinition.tagName}>`}`;
+};
+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
+    };
+  }).reduce(
+    (memo, tagObject) => `${memo}
+${tagObjectToString(tagObject)}`,
+    ""
+  );
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  generateMetaTags
+});

package/package.json

@@ -17,7 +17,7 @@
     "node": ">=14.0.0"
   },
   "license": "MIT",
-  "version": "0.0.9",
+  "version": "0.0.10",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.js",
   "exports": {
@@ -68,7 +68,7 @@
     "provenance": true
   },
   "dependencies": {
-    "@modern-js/server": "^2.38.0",
+    "@modern-js/server": "^2.39.0",
     "@rspack/core": "0.3.8",
     "@rspack/dev-client": "0.3.8",
     "@rspack/plugin-html": "0.3.8",
@@ -77,13 +77,14 @@
     "gzip-size": "^6.0.0",
     "jiti": "^1.20.0",
     "lodash": "^4.17.21",
+    "open": "^8.4.0",
     "pkg-up": "^3.1.0",
     "postcss": "8.4.31",
     "rspack-manifest-plugin": "5.0.0-alpha0",
     "semver": "^7.5.4",
     "strip-ansi": "^6.0.1",
     "webpack": "^5.88.1",
-    "@rsbuild/shared": "0.0.9"
+    "@rsbuild/shared": "0.0.10"
   },
   "devDependencies": {
     "@types/lodash": "^4.14.200",

package/dist/rspack-provider/plugins/babel.d.ts

@@ -1,12 +0,0 @@
-import { RsbuildPlugin } from '../types';
-/**
- * The `@babel/preset-typescript` default options.
- */
-export declare const DEFAULT_BABEL_PRESET_TYPESCRIPT_OPTIONS: {
-  allowNamespaces: boolean;
-  allExtensions: boolean;
-  allowDeclareFields: boolean;
-  optimizeConstEnums: boolean;
-  isTSX: boolean;
-};
-export declare const pluginBabel: () => RsbuildPlugin;

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

@@ -1,130 +0,0 @@
-"use strict";
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-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 __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var babel_exports = {};
-__export(babel_exports, {
-  DEFAULT_BABEL_PRESET_TYPESCRIPT_OPTIONS: () => DEFAULT_BABEL_PRESET_TYPESCRIPT_OPTIONS,
-  pluginBabel: () => pluginBabel
-});
-module.exports = __toCommonJS(babel_exports);
-var import_shared = require("@rsbuild/shared");
-var import_lodash = require("lodash");
-const DEFAULT_BABEL_PRESET_TYPESCRIPT_OPTIONS = {
-  allowNamespaces: true,
-  allExtensions: true,
-  allowDeclareFields: true,
-  // aligns Babel's behavior with TypeScript's default behavior.
-  // https://babeljs.io/docs/en/babel-preset-typescript#optimizeconstenums
-  optimizeConstEnums: true,
-  isTSX: true
-};
-const pluginBabel = () => ({
-  name: "plugin-babel",
-  pre: ["plugin-swc"],
-  setup(api) {
-    api.modifyBundlerChain(
-      async (chain, { CHAIN_ID, isProd, getCompiledPath }) => {
-        const config = api.getNormalizedConfig();
-        if (!config.tools.babel) {
-          return;
-        }
-        const getBabelOptions = (config2) => {
-          const includes2 = [];
-          const excludes2 = [];
-          const babelUtils = {
-            addIncludes(items) {
-              if (Array.isArray(items)) {
-                includes2.push(...items);
-              } else {
-                includes2.push(items);
-              }
-            },
-            addExcludes(items) {
-              if (Array.isArray(items)) {
-                excludes2.push(...items);
-              } else {
-                excludes2.push(items);
-              }
-            }
-          };
-          const baseConfig = {
-            plugins: [],
-            presets: [
-              // TODO: only apply preset-typescript for ts file (isTSX & allExtensions false)
-              [
-                require.resolve("@babel/preset-typescript"),
-                DEFAULT_BABEL_PRESET_TYPESCRIPT_OPTIONS
-              ]
-            ]
-          };
-          const userBabelConfig = (0, import_shared.applyUserBabelConfig)(
-            (0, import_lodash.cloneDeep)(baseConfig),
-            config2.tools.babel,
-            babelUtils
-          );
-          const notModify = (0, import_lodash.isEqual)(baseConfig, userBabelConfig) && !(includes2 == null ? void 0 : includes2.length) && !(excludes2 == null ? void 0 : excludes2.length);
-          if (notModify) {
-            return {};
-          }
-          const babelOptions2 = {
-            babelrc: false,
-            configFile: false,
-            compact: isProd,
-            ...userBabelConfig
-          };
-          return {
-            babelOptions: babelOptions2,
-            includes: includes2,
-            excludes: excludes2
-          };
-        };
-        const {
-          babelOptions,
-          includes = [],
-          excludes = []
-        } = getBabelOptions(config);
-        if (!babelOptions) {
-          return;
-        }
-        const rule = chain.module.rule(CHAIN_ID.RULE.JS);
-        includes.forEach((condition) => {
-          rule.include.add(condition);
-        });
-        excludes.forEach((condition) => {
-          rule.exclude.add(condition);
-        });
-        rule.test((0, import_shared.mergeRegex)(import_shared.JS_REGEX, import_shared.TS_REGEX)).use(CHAIN_ID.USE.BABEL).after(CHAIN_ID.USE.SWC).loader(getCompiledPath("babel-loader")).options(babelOptions);
-      }
-    );
-  }
-});
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  DEFAULT_BABEL_PRESET_TYPESCRIPT_OPTIONS,
-  pluginBabel
-});