@modern-js/uni-builder 0.0.0-nightly-20240707170654 → 0.0.0-nightly-20240708170628

package/dist/index.d.ts

@@ -4,10 +4,10 @@ import type { CreateUniBuilderOptions } from './types';
 import HtmlWebpackPlugin from 'html-webpack-plugin';
 export { HtmlWebpackPlugin };
 export type { CreateUniBuilderOptions, UniBuilderInstance, UniBuilderWebpackInstance, };
-export type { RspackChain, RsbuildPlugin, ConfigChain, CopyPluginOptions, ChainIdentifier, NormalizedConfig, RspackConfig, CacheGroup, } from '@rsbuild/shared';
+export type { CopyPluginOptions, NormalizedConfig, RspackConfig, CacheGroup, } from '@rsbuild/shared';
 export type { UniBuilderConfig, UniBuilderPlugin } from './types';
 export type { StartDevServerOptions } from './shared/devServer';
 export declare function createUniBuilder(options: CreateUniBuilderOptions): Promise<UniBuilderInstance>;
-export { logger, type Rspack, type RsbuildContext, type RsbuildConfig, } from '@rsbuild/core';
+export { logger, type ConfigChain, type RsbuildPlugin, type ChainIdentifier, type RspackChain, type Rspack, type RsbuildContext, type RsbuildConfig, } from '@rsbuild/core';
 export type { webpack, WebpackConfig } from '@rsbuild/webpack';
 export { RUNTIME_CHUNK_NAME } from './shared/utils';

package/dist/shared/parseCommonConfig.js

@@ -50,6 +50,7 @@ var import_arco = require("./plugins/arco");
 var import_plugin_sass = require("@rsbuild/plugin-sass");
 var import_plugin_less = require("@rsbuild/plugin-less");
 var import_devServer = require("./devServer");
+var import_utils = require("./utils");
 const CSS_MODULES_REGEX = /\.modules?\.\w+$/i;
 const GLOBAL_CSS_REGEX = /\.global\.\w+$/;
 const isLooseCssModules = (path) => {
@@ -215,7 +216,7 @@ async function parseCommonConfig(uniBuilderConfig, options) {
   if (tagsByEntries) {
     extraConfig.html.tags = [
       (tags2, utils) => {
-        const entryTags = (0, import_shared.castArray)(tagsByEntries[utils.entryName]);
+        const entryTags = (0, import_utils.castArray)(tagsByEntries[utils.entryName]);
         const handlers = [];
         for (const tag of entryTags) {
           if ((0, import_shared.isFunction)(tag)) {

package/dist/shared/plugins/fallback.js

@@ -22,7 +22,6 @@ __export(fallback_exports, {
 });
 module.exports = __toCommonJS(fallback_exports);
 var import_path = require("path");
-var import_shared = require("@rsbuild/shared");
 var import_utils = require("../../shared/utils");
 const HTML_REGEX = /\.html$/;
 const resourceRuleFallback = (rules = []) => {
@@ -50,7 +49,7 @@ const resourceRuleFallback = (rules = []) => {
   }
   const fileLoader = {
     exclude: [
-      import_shared.JS_REGEX,
+      import_utils.JS_REGEX,
       import_utils.TS_REGEX,
       // exclude `html` and `json`, they get processed by webpack internal loaders.
       HTML_REGEX,
@@ -71,17 +70,17 @@ const resourceRuleFallback = (rules = []) => {
 const pluginFallback = () => ({
   name: "uni-builder:fallback",
   setup(api) {
-    if (api.context.bundlerType === "webpack") {
-      api.modifyBundlerChain((chain) => {
-        const rsbuildConfig = api.getNormalizedConfig();
-        const { distPath, filename } = rsbuildConfig.output;
-        const distDir = distPath.media;
-        var _filename_media;
-        const mediaFilename = (_filename_media = filename.media) !== null && _filename_media !== void 0 ? _filename_media : `[name]${(0, import_utils.getHash)(rsbuildConfig)}[ext]`;
-        chain.output.merge({
-          assetModuleFilename: (0, import_path.join)(distDir, mediaFilename)
-        });
+    api.modifyBundlerChain((chain) => {
+      const rsbuildConfig = api.getNormalizedConfig();
+      const { distPath, filename } = rsbuildConfig.output;
+      const distDir = distPath.media;
+      var _filename_media;
+      const mediaFilename = (_filename_media = filename.media) !== null && _filename_media !== void 0 ? _filename_media : `[name]${(0, import_utils.getHash)(rsbuildConfig)}[ext]`;
+      chain.output.merge({
+        assetModuleFilename: (0, import_path.join)(distDir, mediaFilename)
       });
+    });
+    if (api.context.bundlerType === "webpack") {
       api.modifyWebpackConfig((config) => {
         if (!config.module) {
           return;
@@ -91,17 +90,11 @@ const pluginFallback = () => ({
     } else {
       api.modifyRspackConfig((config) => {
         var _config_module;
-        var _config, _config1;
-        const rsbuildConfig = api.getNormalizedConfig();
-        const distDir = rsbuildConfig.output.distPath.media;
-        var _rsbuildConfig_output_filename_media;
-        const filename = (_rsbuildConfig_output_filename_media = rsbuildConfig.output.filename.media) !== null && _rsbuildConfig_output_filename_media !== void 0 ? _rsbuildConfig_output_filename_media : `[name]${(0, import_utils.getHash)(rsbuildConfig)}[ext]`;
-        (_config = config).output || (_config.output = {});
-        config.output.assetModuleFilename = (0, import_path.join)(distDir, filename);
+        var _config;
         if (!config.module) {
           return;
         }
-        (_config1 = config).module || (_config1.module = {});
+        (_config = config).module || (_config.module = {});
         config.module.rules = resourceRuleFallback((_config_module = config.module) === null || _config_module === void 0 ? void 0 : _config_module.rules);
       });
     }

package/dist/shared/utils.d.ts

@@ -1,5 +1,7 @@
 import type { RsbuildTarget, NormalizedConfig } from '@rsbuild/core';
 export declare const RUNTIME_CHUNK_NAME = "builder-runtime";
+export declare const JS_REGEX: RegExp;
 export declare const TS_REGEX: RegExp;
 export declare function isServerTarget(target: RsbuildTarget[]): boolean;
+export declare const castArray: <T>(arr?: T | T[] | undefined) => T[];
 export declare const getHash: (config: NormalizedConfig) => string;

package/dist/shared/utils.js

@@ -18,13 +18,16 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var utils_exports = {};
 __export(utils_exports, {
+  JS_REGEX: () => JS_REGEX,
   RUNTIME_CHUNK_NAME: () => RUNTIME_CHUNK_NAME,
   TS_REGEX: () => TS_REGEX,
+  castArray: () => castArray,
   getHash: () => getHash,
   isServerTarget: () => isServerTarget
 });
 module.exports = __toCommonJS(utils_exports);
 const RUNTIME_CHUNK_NAME = "builder-runtime";
+const JS_REGEX = /\.(?:js|mjs|cjs|jsx)$/;
 const TS_REGEX = /\.(?:ts|mts|cts|tsx)$/;
 function isServerTarget(target) {
   return (Array.isArray(target) ? target : [
@@ -34,6 +37,14 @@ function isServerTarget(target) {
     "service-worker"
   ].includes(item));
 }
+const castArray = (arr) => {
+  if (arr === void 0) {
+    return [];
+  }
+  return Array.isArray(arr) ? arr : [
+    arr
+  ];
+};
 const getHash = (config) => {
   const { filenameHash } = config.output;
   if (typeof filenameHash === "string") {
@@ -43,8 +54,10 @@ const getHash = (config) => {
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  JS_REGEX,
   RUNTIME_CHUNK_NAME,
   TS_REGEX,
+  castArray,
   getHash,
   isServerTarget
 });

package/dist/types.d.ts

@@ -1,5 +1,5 @@
-import type { NodeEnv, MetaOptions, ConfigChain, ConfigChainWithContext, InlineChunkTest, RequestHandler, MaybePromise, HtmlTagDescriptor } from '@rsbuild/shared';
-import type { DevConfig, RsbuildConfig, RsbuildTarget, Polyfill, ScriptInject, ServerConfig, RsbuildPluginAPI, SourceConfig } from '@rsbuild/core';
+import type { NodeEnv, MetaOptions, RequestHandler, HtmlTagDescriptor } from '@rsbuild/shared';
+import type { ConfigChainWithContext, ConfigChain, DevConfig, RsbuildConfig, RsbuildTarget, Polyfill, ScriptInject, ServerConfig, RsbuildPluginAPI, SourceConfig, OutputConfig } from '@rsbuild/core';
 import type { PluginAssetsRetryOptions } from '@rsbuild/plugin-assets-retry';
 import type { PluginStyledComponentsOptions } from '@rsbuild/plugin-styled-components';
 import type { PluginRemOptions } from '@rsbuild/plugin-rem';
@@ -193,11 +193,11 @@ export type UniBuilderExtraConfig = {
         /**
          * @deprecated use `output.inlineScripts` instead
          */
-        enableInlineScripts?: boolean | InlineChunkTest;
+        enableInlineScripts?: OutputConfig['inlineScripts'];
         /**
          * @deprecated use `output.inlineStyles` instead
          */
-        enableInlineStyles?: boolean | InlineChunkTest;
+        enableInlineStyles?: OutputConfig['injectStyles'];
         /**
          * Configure the default export type of SVG files.
          */
@@ -320,14 +320,14 @@ export type UniBuilderPluginAPI = {
     getBuilderConfig: () => Readonly<any>;
     modifyBuilderConfig: (fn: (config: any, utils: {
         mergeBuilderConfig: <T>(...configs: T[]) => T;
-    }) => MaybePromise<any | void>) => void;
+    }) => any | Promise<any>) => void;
 };
 /**
  * compat legacy modern.js builder plugin
  */
 export type UniBuilderPlugin = {
     name: string;
-    setup: (api: UniBuilderPluginAPI) => MaybePromise<void>;
+    setup: (api: UniBuilderPluginAPI) => void | Promise<void>;
     pre?: string[];
     post?: string[];
     remove?: string[];

package/dist/webpack/plugins/babel.d.ts

@@ -1,4 +1,4 @@
-import { type RsbuildPlugin } from '@rsbuild/shared';
+import { type RsbuildPlugin } from '@rsbuild/core';
 import { type PluginBabelOptions } from '@rsbuild/plugin-babel';
 /**
  * Plugin order:

package/dist/webpack/plugins/lazyCompilation.d.ts

@@ -1,5 +1,4 @@
-import type { RsbuildPlugin } from '@rsbuild/core';
-import type { DevConfig } from '@rsbuild/shared';
+import type { RsbuildPlugin, DevConfig } from '@rsbuild/core';
 type LazyCompilationOptions = DevConfig['lazyCompilation'];
 export declare const pluginLazyCompilation: (options: LazyCompilationOptions) => RsbuildPlugin;
 export {};

package/dist/webpack/plugins/minimize.d.ts

@@ -1,3 +1,3 @@
-import { type RsbuildPlugin } from '@rsbuild/shared';
+import { type RsbuildPlugin } from '@rsbuild/core';
 import { ToolsTerserConfig } from '../../types';
 export declare const pluginMinimize: (userTerserConfig?: ToolsTerserConfig) => RsbuildPlugin;

package/dist/webpack/plugins/minimize.js

@@ -31,7 +31,6 @@ __export(minimize_exports, {
   pluginMinimize: () => pluginMinimize
 });
 module.exports = __toCommonJS(minimize_exports);
-var import_shared = require("@rsbuild/shared");
 var import_utils = require("@modern-js/utils");
 function applyRemoveConsole(options, config) {
   const { removeConsole } = config.performance;
@@ -50,7 +49,7 @@ function applyRemoveConsole(options, config) {
   }
   return options;
 }
-async function applyJSMinimizer(chain, config, userTerserConfig) {
+async function applyJSMinimizer(chain, config, CHAIN_ID, userTerserConfig) {
   const { default: TerserPlugin } = await Promise.resolve().then(() => __toESM(require("terser-webpack-plugin")));
   const DEFAULT_OPTIONS = {
     terserOptions: {
@@ -78,7 +77,7 @@ async function applyJSMinimizer(chain, config, userTerserConfig) {
       break;
   }
   const mergedOptions = (0, import_utils.applyOptionsChain)(DEFAULT_OPTIONS, userTerserConfig);
-  chain.optimization.minimizer(import_shared.CHAIN_ID.MINIMIZER.JS).use(TerserPlugin, [
+  chain.optimization.minimizer(CHAIN_ID.MINIMIZER.JS).use(TerserPlugin, [
     // Due to terser-webpack-plugin has changed the type of class, which using a generic type in
     // constructor, leading auto inference of parameters of plugin constructor is not possible, using any instead
     mergedOptions
@@ -87,14 +86,14 @@ async function applyJSMinimizer(chain, config, userTerserConfig) {
 const pluginMinimize = (userTerserConfig) => ({
   name: "uni-builder:minimize",
   setup(api) {
-    api.modifyBundlerChain(async (chain, { isProd }) => {
+    api.modifyBundlerChain(async (chain, { isProd, CHAIN_ID }) => {
       const config = api.getNormalizedConfig();
       const { minify } = config.output;
       if (minify === false || !isProd) {
         return;
       }
       if (minify === true || (minify === null || minify === void 0 ? void 0 : minify.js) !== false) {
-        await applyJSMinimizer(chain, config, userTerserConfig);
+        await applyJSMinimizer(chain, config, CHAIN_ID, userTerserConfig);
       }
     });
   }

package/dist/webpack/plugins/moduleScopes.d.ts

@@ -1,5 +1,4 @@
-import type { RsbuildPlugin } from '@rsbuild/core';
-import { type ConfigChain } from '@rsbuild/shared';
+import type { RsbuildPlugin, ConfigChain } from '@rsbuild/core';
 import type { ModuleScopes } from '../../types';
 export declare const isPrimitiveScope: (items: unknown[]) => items is (string | RegExp)[];
 export declare const applyScopeChain: (defaults: ModuleScopes, options: ConfigChain<ModuleScopes>) => ModuleScopes;

package/dist/webpack/plugins/react.js

@@ -31,7 +31,6 @@ __export(react_exports, {
   pluginReact: () => pluginReact
 });
 module.exports = __toCommonJS(react_exports);
-var import_shared = require("@rsbuild/shared");
 const pluginReact = () => ({
   name: "uni-builder:react",
   pre: [
@@ -40,7 +39,8 @@ const pluginReact = () => ({
   setup(api) {
     api.modifyBundlerChain(async (chain, utils) => {
       const config = api.getNormalizedConfig();
-      if (!(0, import_shared.isUsingHMR)(config, utils)) {
+      const usingHMR = !utils.isProd && config.dev.hmr && utils.target === "web";
+      if (!usingHMR) {
         return;
       }
       const { CHAIN_ID } = utils;

package/dist/webpack/plugins/styledComponents.d.ts

@@ -1,4 +1,3 @@
-import type { RsbuildPlugin } from '@rsbuild/core';
-import { type ConfigChain } from '@rsbuild/shared';
+import type { RsbuildPlugin, ConfigChain } from '@rsbuild/core';
 import type { PluginStyledComponentsOptions } from '@rsbuild/plugin-styled-components';
 export declare const pluginStyledComponents: (userConfig?: ConfigChain<PluginStyledComponentsOptions>) => RsbuildPlugin;

package/dist/webpack/plugins/tsLoader.d.ts

@@ -1,4 +1,5 @@
-import { type FileFilterUtil, type ConfigChainWithContext } from '@rsbuild/shared';
+import { type FileFilterUtil } from '@rsbuild/shared';
+import { type ConfigChainWithContext } from '@rsbuild/core';
 import { PluginBabelOptions } from '@rsbuild/plugin-babel';
 import type { RsbuildPlugin } from '@rsbuild/core';
 import type { Options as RawTSLoaderOptions } from 'ts-loader';

package/dist/webpack/plugins/tsLoader.js

@@ -64,10 +64,10 @@ const pluginTsLoader = (options, babelOptions) => {
           const excludes = [];
           const tsLoaderUtils = {
             addIncludes(items) {
-              includes.push(...(0, import_shared.castArray)(items));
+              includes.push(...(0, import_utils2.castArray)(items));
             },
             addExcludes(items) {
-              excludes.push(...(0, import_shared.castArray)(items));
+              excludes.push(...(0, import_utils2.castArray)(items));
             }
           };
           const tsLoaderDefaultOptions = {
@@ -93,7 +93,7 @@ const pluginTsLoader = (options, babelOptions) => {
             includes,
             excludes
           });
-          chain.module.rule(CHAIN_ID.RULE.JS).test(import_shared.JS_REGEX);
+          chain.module.rule(CHAIN_ID.RULE.JS).test(import_utils2.JS_REGEX);
           rule.test(import_utils2.TS_REGEX).use(CHAIN_ID.USE.BABEL).loader(require.resolve("babel-loader")).options({
             ...babelLoaderOptions,
             // fix repeatedly insert babel plugin in some boundary cases

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modern-js/uni-builder",
-  "version": "0.0.0-nightly-20240707170654",
+  "version": "0.0.0-nightly-20240708170628",
   "description": "Unified builder for Modern.js",
   "repository": {
     "type": "git",
@@ -69,9 +69,9 @@
     "ts-loader": "9.4.4",
     "webpack": "^5.92.0",
     "webpack-subresource-integrity": "5.1.0",
-    "@modern-js/utils": "0.0.0-nightly-20240707170654",
-    "@modern-js/server": "0.0.0-nightly-20240707170654",
-    "@modern-js/prod-server": "0.0.0-nightly-20240707170654"
+    "@modern-js/utils": "0.0.0-nightly-20240708170628",
+    "@modern-js/server": "0.0.0-nightly-20240708170628",
+    "@modern-js/prod-server": "0.0.0-nightly-20240708170628"
   },
   "devDependencies": {
     "@rsbuild/plugin-swc": "0.7.10",
@@ -79,8 +79,8 @@
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "typescript": "^5.3.0",
-    "@scripts/build": "0.0.0-nightly-20240707170654",
-    "@scripts/vitest-config": "0.0.0-nightly-20240707170654"
+    "@scripts/build": "0.0.0-nightly-20240708170628",
+    "@scripts/vitest-config": "0.0.0-nightly-20240708170628"
   },
   "publishConfig": {
     "access": "public",