@modern-js/uni-builder 0.0.0-nightly-20240201170631 → 0.0.0-nightly-20240202170715

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

@@ -1,3 +1,9 @@
 import { type RsbuildPlugin } from '@rsbuild/shared';
 import { type PluginBabelOptions } from '@rsbuild/plugin-babel';
+export declare const getPresetReact: (rootPath: string, isProd: boolean) => (string | {
+    development: boolean;
+    useBuiltIns: boolean;
+    useSpread: boolean;
+    runtime: string;
+})[];
 export declare const pluginBabel: (options?: PluginBabelOptions) => RsbuildPlugin;

package/dist/webpack/plugins/babel.js

@@ -28,22 +28,36 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var babel_exports = {};
 __export(babel_exports, {
+  getPresetReact: () => getPresetReact,
   pluginBabel: () => pluginBabel
 });
 module.exports = __toCommonJS(babel_exports);
 var import_cloneDeep = __toESM(require("lodash/cloneDeep"));
 var import_web = require("@rsbuild/babel-preset/web");
 var import_node = require("@rsbuild/babel-preset/node");
-var import_plugin_react = require("@rsbuild/plugin-react");
+var import_utils = require("@modern-js/utils");
 var import_shared = require("@rsbuild/shared");
 var import_plugin_babel = require("@rsbuild/plugin-babel");
+const getPresetReact = (rootPath, isProd) => {
+  const isNewJsx = (0, import_utils.isBeyondReact17)(rootPath);
+  const presetReactOptions = {
+    development: !isProd,
+    // Will use the native built-in instead of trying to polyfill
+    useBuiltIns: true,
+    useSpread: false,
+    runtime: isNewJsx ? "automatic" : "classic"
+  };
+  return [
+    require.resolve("@babel/preset-react"),
+    presetReactOptions
+  ];
+};
 const pluginBabel = (options) => ({
   name: "uni-builder:babel",
   setup(api) {
     api.modifyBundlerChain(async (chain, { CHAIN_ID, target, isProd, isServer, isServiceWorker }) => {
       const config = api.getNormalizedConfig();
       const browserslist = await (0, import_shared.getBrowserslistWithDefault)(api.context.rootPath, config, target);
-      const isNewJsx = await (0, import_plugin_react.isBeyondReact17)(api.context.rootPath);
       const getBabelOptions = (config2) => {
         var _baseBabelConfig_presets;
         const includes2 = [];
@@ -83,17 +97,7 @@ const pluginBabel = (options) => ({
         });
         applyPluginImport(baseBabelConfig, config2.source.transformImport);
         applyPluginLodash(baseBabelConfig, config2.performance.transformLodash);
-        const presetReactOptions = {
-          development: !isProd,
-          // Will use the native built-in instead of trying to polyfill
-          useBuiltIns: true,
-          useSpread: false,
-          runtime: isNewJsx ? "automatic" : "classic"
-        };
-        (_baseBabelConfig_presets = baseBabelConfig.presets) === null || _baseBabelConfig_presets === void 0 ? void 0 : _baseBabelConfig_presets.push([
-          require.resolve("@babel/preset-react"),
-          presetReactOptions
-        ]);
+        (_baseBabelConfig_presets = baseBabelConfig.presets) === null || _baseBabelConfig_presets === void 0 ? void 0 : _baseBabelConfig_presets.push(getPresetReact(api.context.rootPath, isProd));
         if (isProd) {
           var _baseBabelConfig_plugins;
           (_baseBabelConfig_plugins = baseBabelConfig.plugins) === null || _baseBabelConfig_plugins === void 0 ? void 0 : _baseBabelConfig_plugins.push([
@@ -181,5 +185,6 @@ function applyPluginImport(config, pluginImport) {
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  getPresetReact,
   pluginBabel
 });

package/dist/webpack/plugins/tsLoader.js

@@ -34,6 +34,7 @@ module.exports = __toCommonJS(tsLoader_exports);
 var import_shared = require("@rsbuild/shared");
 var import_plugin_babel = require("@rsbuild/plugin-babel");
 var import_web = require("@rsbuild/babel-preset/web");
+var import_babel = require("./babel");
 const pluginTsLoader = (options, babelOptions) => {
   return {
     name: "uni-builder:ts-loader",
@@ -44,7 +45,8 @@ const pluginTsLoader = (options, babelOptions) => {
       "uni-builder:react"
     ],
     setup(api) {
-      api.modifyBundlerChain(async (chain, { target, CHAIN_ID }) => {
+      api.modifyBundlerChain(async (chain, { isProd, target, CHAIN_ID }) => {
+        var _baseBabelConfig_presets;
         const config = api.getNormalizedConfig();
         const { rootPath } = api.context;
         const browserslist = await (0, import_shared.getBrowserslistWithDefault)(rootPath, config, target);
@@ -54,6 +56,7 @@ const pluginTsLoader = (options, babelOptions) => {
             useBuiltIns: (0, import_plugin_babel.getUseBuiltIns)(config)
           }
         });
+        (_baseBabelConfig_presets = baseBabelConfig.presets) === null || _baseBabelConfig_presets === void 0 ? void 0 : _baseBabelConfig_presets.push((0, import_babel.getPresetReact)(api.context.rootPath, isProd));
         const babelUtils = (0, import_plugin_babel.getBabelUtils)(baseBabelConfig);
         const babelLoaderOptions = (0, import_shared.mergeChainedOptions)({
           defaults: baseBabelConfig,

package/package.json

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