@modern-js/uni-builder 0.0.0-nightly-20231231170611 → 0.0.0-nightly-20240102170625

package/dist/rspack/index.d.ts

@@ -1,16 +1,8 @@
 import type { RsbuildConfig, RsbuildPlugin, RsbuildInstance } from '@rsbuild/core';
-import type { UniBuilderConfig, CreateUniBuilderOptions, CreateBuilderCommonOptions } from '../types';
-import type { StartDevServerOptions, UniBuilderStartServerResult } from '../shared/devServer';
+import type { UniBuilderConfig, CreateUniBuilderOptions, CreateBuilderCommonOptions, OverridesUniBuilderInstance } from '../types';
 export declare function parseConfig(uniBuilderConfig: UniBuilderConfig, options: CreateBuilderCommonOptions): Promise<{
     rsbuildConfig: RsbuildConfig;
     rsbuildPlugins: RsbuildPlugin[];
 }>;
-export type UniBuilderInstance = Omit<RsbuildInstance, 'startDevServer'> & {
-    /**
-     * should be used in conjunction with the upper-layer framework:
-     *
-     * missing route.json (required in modern server)
-     */
-    startDevServer: (options: StartDevServerOptions) => Promise<UniBuilderStartServerResult>;
-};
+export type UniBuilderInstance = Omit<RsbuildInstance, keyof OverridesUniBuilderInstance> & OverridesUniBuilderInstance;
 export declare function createRspackBuilder(options: CreateUniBuilderOptions): Promise<UniBuilderInstance>;

package/dist/rspack/index.js

@@ -34,6 +34,7 @@ __export(rspack_exports, {
 module.exports = __toCommonJS(rspack_exports);
 var import_core = require("@rsbuild/core");
 var import_parseCommonConfig = require("../shared/parseCommonConfig");
+var import_compatLegacyPlugin = require("../shared/compatLegacyPlugin");
 async function parseConfig(uniBuilderConfig, options) {
   var _uniBuilderConfig_output, _uniBuilderConfig_tools, _uniBuilderConfig_tools1;
   const { rsbuildConfig, rsbuildPlugins } = await (0, import_parseCommonConfig.parseCommonConfig)(uniBuilderConfig, options);
@@ -71,6 +72,14 @@ async function createRspackBuilder(options) {
   rsbuild.addPlugins(rsbuildPlugins);
   return {
     ...rsbuild,
+    addPlugins: (plugins, options2) => {
+      const warpedPlugins = plugins.map((plugin) => {
+        return (0, import_compatLegacyPlugin.compatLegacyPlugin)(plugin, {
+          cwd
+        });
+      });
+      rsbuild.addPlugins(warpedPlugins, options2);
+    },
     startDevServer: async (options2 = {}) => {
       const { startDevServer } = await Promise.resolve().then(() => __toESM(require("../shared/devServer")));
       return startDevServer(rsbuild, options2, config);

package/dist/shared/compatLegacyPlugin.d.ts

@@ -0,0 +1,5 @@
+import type { UniBuilderPlugin } from '../types';
+import type { RsbuildPlugin } from '@rsbuild/core';
+export declare function compatLegacyPlugin(plugin: UniBuilderPlugin, extraInfo: {
+    cwd: string;
+}): RsbuildPlugin;

package/dist/shared/compatLegacyPlugin.js

@@ -0,0 +1,82 @@
+"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 compatLegacyPlugin_exports = {};
+__export(compatLegacyPlugin_exports, {
+  compatLegacyPlugin: () => compatLegacyPlugin
+});
+module.exports = __toCommonJS(compatLegacyPlugin_exports);
+var import_shared = require("@rsbuild/shared");
+var import_path = require("path");
+function addDeprecatedWarning(pluginName, name, newName) {
+  import_shared.logger.warn(`Plugin(${pluginName})'s api '${name}' is deprecated${newName ? `, please use '${newName}' instead.` : "."}`);
+}
+function compatLegacyPlugin(plugin, extraInfo) {
+  return {
+    ...plugin,
+    setup: (api) => {
+      const builderContext = new Proxy(api.context, {
+        get(target, prop) {
+          switch (prop) {
+            case "target":
+              addDeprecatedWarning(plugin.name, "context.target", "context.targets");
+              return target.targets;
+            case "srcPath":
+              addDeprecatedWarning(plugin.name, "context.srcPath");
+              return (0, import_path.join)(extraInfo.cwd, "src");
+            case "framework":
+              addDeprecatedWarning(plugin.name, "context.framework");
+              return "";
+            default: {
+              if (prop in target) {
+                return target[prop];
+              } else {
+                return void 0;
+              }
+            }
+          }
+        },
+        set(_target, prop) {
+          import_shared.logger.error(`Context is readonly, you can not assign to the "context.${prop}" prop.`);
+          return true;
+        }
+      });
+      const legacyAPI = {
+        ...api,
+        context: builderContext,
+        getBuilderConfig: () => {
+          addDeprecatedWarning(plugin.name, "getBuilderConfig", "getRsbuildConfig");
+          return api.getRsbuildConfig();
+        },
+        modifyBuilderConfig: (fn) => {
+          api.modifyRsbuildConfig((config, { mergeRsbuildConfig }) => {
+            addDeprecatedWarning(plugin.name, "modifyBuilderConfig", "modifyRsbuildConfig");
+            return fn(config, {
+              mergeBuilderConfig: mergeRsbuildConfig
+            });
+          });
+        }
+      };
+      return plugin.setup(legacyAPI);
+    }
+  };
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  compatLegacyPlugin
+});

package/dist/types.d.ts

@@ -1,4 +1,4 @@
-import type { NodeEnv, MetaOptions, ServerConfig, ScriptInject, RsbuildTarget, ChainedConfig, ChainedConfigWithUtils, InlineChunkTest, DevConfig, RequestHandler, RsbuildEntry } from '@rsbuild/shared';
+import type { NodeEnv, MetaOptions, ServerConfig, ScriptInject, RsbuildTarget, ChainedConfig, ChainedConfigWithUtils, InlineChunkTest, DevConfig, RequestHandler, RsbuildEntry, PromiseOrNot, RsbuildPluginAPI } from '@rsbuild/shared';
 import type { RsbuildConfig } from '@rsbuild/core';
 import type { PluginAssetsRetryOptions } from '@rsbuild/plugin-assets-retry';
 import type { PluginStyledComponentsOptions } from '@rsbuild/plugin-styled-components';
@@ -12,6 +12,7 @@ import type { PluginCheckSyntaxOptions } from '@rsbuild/plugin-check-syntax';
 import type { PluginPugOptions } from '@rsbuild/plugin-pug';
 import type { PluginBabelOptions } from '@rsbuild/plugin-babel';
 import type { AliasOption } from '@modern-js/utils';
+import type { StartDevServerOptions, UniBuilderStartServerResult } from './shared/devServer';
 export type CreateBuilderCommonOptions = {
     entry?: RsbuildEntry;
     frameworkConfigPath?: string;
@@ -238,6 +239,49 @@ export type SriOptions = {
     enabled?: 'auto' | true | false;
     hashLoading?: 'eager' | 'lazy';
 };
+export type OverridesUniBuilderInstance = {
+    addPlugins: (plugins: UniBuilderPlugin[], options?: {
+        before?: string;
+    }) => void;
+    /**
+     * should be used in conjunction with the upper-layer framework:
+     *
+     * missing route.json (required in modern server)
+     */
+    startDevServer: (options: StartDevServerOptions) => Promise<UniBuilderStartServerResult>;
+};
+export type UniBuilderContext = RsbuildPluginAPI['context'] & {
+    target: RsbuildPluginAPI['context']['targets'];
+    framework: string;
+    srcPath: string;
+    entry: Record<string, string | string[]>;
+};
+export type UniBuilderPluginAPI = {
+    [key in keyof RsbuildPluginAPI]: RsbuildPluginAPI[key];
+} & {
+    /** The following APIs only type incompatibility */
+    onBeforeCreateCompiler: (fn: any) => void;
+    onAfterCreateCompiler: (fn: any) => void;
+    onBeforeBuild: (fn: any) => void;
+    modifyBundlerChain: (fn: any) => void;
+    getNormalizedConfig: () => any;
+    /** The following APIs need to be compatible */
+    context: UniBuilderContext;
+    getBuilderConfig: () => Readonly<any>;
+    modifyBuilderConfig: (fn: (config: any, utils: {
+        mergeBuilderConfig: <T>(...configs: T[]) => T;
+    }) => PromiseOrNot<any | void>) => void;
+};
+/**
+ * compat legacy modern.js builder plugin
+ */
+export type UniBuilderPlugin = {
+    name: string;
+    setup: (api: UniBuilderPluginAPI) => PromiseOrNot<void>;
+    pre?: string[];
+    post?: string[];
+    remove?: string[];
+};
 export type UniBuilderConfig = {
     dev?: RsbuildConfig['dev'];
     html?: RsbuildConfig['html'];
@@ -246,4 +290,5 @@ export type UniBuilderConfig = {
     security?: RsbuildConfig['security'];
     tools?: RsbuildConfig['tools'];
     source?: Omit<NonNullable<RsbuildConfig['source']>, 'alias'>;
+    plugins?: RsbuildConfig['plugins'];
 } & UniBuilderExtraConfig;

package/dist/webpack/index.d.ts

@@ -1,12 +1,9 @@
 import { type RsbuildConfig, type RsbuildPlugin, type RsbuildInstance } from '@rsbuild/core';
 import type { RsbuildProvider } from '@rsbuild/shared';
-import type { UniBuilderConfig, CreateUniBuilderOptions, CreateBuilderCommonOptions } from '../types';
-import type { StartDevServerOptions, UniBuilderStartServerResult } from '../shared/devServer';
+import type { UniBuilderConfig, CreateUniBuilderOptions, CreateBuilderCommonOptions, OverridesUniBuilderInstance } from '../types';
 export declare function parseConfig(uniBuilderConfig: UniBuilderConfig, options: CreateBuilderCommonOptions): Promise<{
     rsbuildConfig: RsbuildConfig;
     rsbuildPlugins: RsbuildPlugin[];
 }>;
-export type UniBuilderWebpackInstance = Omit<RsbuildInstance<RsbuildProvider<'webpack'>>, 'startDevServer'> & {
-    startDevServer: (options: StartDevServerOptions) => Promise<UniBuilderStartServerResult>;
-};
+export type UniBuilderWebpackInstance = Omit<RsbuildInstance<RsbuildProvider<'webpack'>>, keyof OverridesUniBuilderInstance> & OverridesUniBuilderInstance;
 export declare function createWebpackBuilder(options: CreateUniBuilderOptions): Promise<UniBuilderWebpackInstance>;

package/dist/webpack/index.js

@@ -34,6 +34,7 @@ __export(webpack_exports, {
 module.exports = __toCommonJS(webpack_exports);
 var import_core = require("@rsbuild/core");
 var import_parseCommonConfig = require("../shared/parseCommonConfig");
+var import_compatLegacyPlugin = require("../shared/compatLegacyPlugin");
 var import_moduleScopes = require("./plugins/moduleScopes");
 var import_babel = require("./plugins/babel");
 var import_react = require("./plugins/react");
@@ -94,6 +95,14 @@ async function createWebpackBuilder(options) {
   ]);
   return {
     ...rsbuild,
+    addPlugins: (plugins, options2) => {
+      const warpedPlugins = plugins.map((plugin) => {
+        return (0, import_compatLegacyPlugin.compatLegacyPlugin)(plugin, {
+          cwd
+        });
+      });
+      rsbuild.addPlugins(warpedPlugins, options2);
+    },
     startDevServer: async (options2 = {}) => {
       const { startDevServer } = await Promise.resolve().then(() => __toESM(require("../shared/devServer")));
       return startDevServer(rsbuild, options2, config);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modern-js/uni-builder",
-  "version": "0.0.0-nightly-20231231170611",
+  "version": "0.0.0-nightly-20240102170625",
   "description": "Unified builder for Modern.js",
   "repository": {
     "type": "git",
@@ -62,9 +62,9 @@
     "webpack": "^5.89.0",
     "webpack-manifest-plugin": "5.0.0",
     "webpack-subresource-integrity": "5.1.0",
-    "@modern-js/utils": "0.0.0-nightly-20231231170611",
-    "@modern-js/server": "0.0.0-nightly-20231231170611",
-    "@modern-js/prod-server": "0.0.0-nightly-20231231170611"
+    "@modern-js/utils": "0.0.0-nightly-20240102170625",
+    "@modern-js/server": "0.0.0-nightly-20240102170625",
+    "@modern-js/prod-server": "0.0.0-nightly-20240102170625"
   },
   "devDependencies": {
     "@rsbuild/plugin-swc": "0.2.13",
@@ -72,8 +72,9 @@
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "typescript": "^5.3.0",
-    "@scripts/build": "0.0.0-nightly-20231231170611",
-    "@scripts/vitest-config": "0.0.0-nightly-20231231170611"
+    "@modern-js/builder-plugin-node-polyfill": "0.0.0-nightly-20240102170625",
+    "@scripts/vitest-config": "0.0.0-nightly-20240102170625",
+    "@scripts/build": "0.0.0-nightly-20240102170625"
   },
   "publishConfig": {
     "access": "public",