@modern-js/runtime 3.0.2 → 3.0.4

package/dist/cjs/cli/index.js

@@ -103,7 +103,10 @@ const runtimePlugin = (params)=>({
                     source: {
                         globalVars: {
                             'process.env.IS_REACT18': process.env.IS_REACT18
-                        }
+                        },
+                        include: [
+                            new RegExp(`[\\\\/]node_modules[\\\\/]@${metaName}[\\\\/]runtime[\\\\/].*[\\\\/]head\\.`)
+                        ]
                     },
                     tools: {
                         bundlerChain: (chain)=>{

package/dist/cjs/cli/ssr/index.js

@@ -57,7 +57,7 @@ const checkUseStringSSR = (config, appDirectory, entrypoints)=>{
     }
     return true;
 };
-const ssrBuilderPlugin = (modernAPI, outputModule)=>({
+const ssrBuilderPlugin = (modernAPI, outputModule, exportLoadablePath)=>({
         name: '@modern-js/builder-plugin-ssr',
         setup (api) {
             api.modifyEnvironmentConfig((config, { name, mergeEnvironmentConfig })=>{
@@ -67,6 +67,7 @@ const ssrBuilderPlugin = (modernAPI, outputModule)=>({
                 const appContext = modernAPI.getAppContext();
                 const { appDirectory, entrypoints } = appContext;
                 const useLoadablePlugin = (0, utils_namespaceObject.isUseSSRBundle)(userConfig) && !isServerEnvironment && checkUseStringSSR(userConfig, appDirectory, entrypoints);
+                const useLoadableComponents = (0, utils_namespaceObject.isUseSSRBundle)(userConfig) && checkUseStringSSR(userConfig, appDirectory, entrypoints);
                 return mergeEnvironmentConfig(config, {
                     source: {
                         define: {
@@ -84,33 +85,8 @@ const ssrBuilderPlugin = (modernAPI, outputModule)=>({
                                     filename: utils_namespaceObject.LOADABLE_STATS_FILE
                                 }
                             ]);
-                        } : void 0
-                    }
-                });
-            });
-        }
-    });
-const ssrPlugin = ()=>({
-        name: '@modern-js/plugin-ssr',
-        required: [
-            '@modern-js/runtime'
-        ],
-        setup: (api)=>{
-            const appContext = api.getAppContext();
-            const exportLoadablePath = `@${appContext.metaName}/runtime/loadable`;
-            const runtimeUtilsPath = require.resolve('@modern-js/runtime-utils/node');
-            const aliasPath = runtimeUtilsPath.replace(`${external_path_default().sep}cjs${external_path_default().sep}`, `${external_path_default().sep}esm${external_path_default().sep}`).replace(/\.js$/, '.mjs');
-            api.config(()=>({
-                    builderPlugins: [
-                        ssrBuilderPlugin(api, 'module' === appContext.moduleType)
-                    ],
-                    resolve: {
-                        alias: {
-                            '@modern-js/runtime-utils/node$': aliasPath
-                        }
-                    },
-                    tools: {
-                        swc: {
+                        } : void 0,
+                        swc: useLoadableComponents ? {
                             jsc: {
                                 experimental: {
                                     plugins: [
@@ -140,6 +116,29 @@ const ssrPlugin = ()=>({
                                     ]
                                 }
                             }
+                        } : void 0
+                    }
+                });
+            });
+        }
+    });
+const ssrPlugin = ()=>({
+        name: '@modern-js/plugin-ssr',
+        required: [
+            '@modern-js/runtime'
+        ],
+        setup: (api)=>{
+            const appContext = api.getAppContext();
+            const exportLoadablePath = `@${appContext.metaName}/runtime/loadable`;
+            const runtimeUtilsPath = require.resolve('@modern-js/runtime-utils/node');
+            const aliasPath = runtimeUtilsPath.replace(`${external_path_default().sep}cjs${external_path_default().sep}`, `${external_path_default().sep}esm${external_path_default().sep}`).replace(/\.js$/, '.mjs');
+            api.config(()=>({
+                    builderPlugins: [
+                        ssrBuilderPlugin(api, 'module' === appContext.moduleType, exportLoadablePath)
+                    ],
+                    resolve: {
+                        alias: {
+                            '@modern-js/runtime-utils/node$': aliasPath
                         }
                     }
                 }));

package/dist/cjs/document/cli/index.js

@@ -129,6 +129,10 @@ const configureChildCompiler = (child, compiler, appDirectory)=>{
         node: true
     };
     child.options.devtool = false;
+    if (child.options.optimization && 'object' == typeof child.options.optimization) child.options.optimization.minimize = false;
+    else child.options.optimization = {
+        minimize: false
+    };
 };
 const applyExternalsPlugin = (child, compiler)=>{
     const ExternalsPlugin = compiler.rspack?.ExternalsPlugin;

package/dist/cjs/exports/head.js

@@ -1,19 +1,6 @@
 "use strict";
-var __webpack_modules__ = {
-    "react-helmet" (module) {
-        module.exports = require("react-helmet");
-    }
-};
-var __webpack_module_cache__ = {};
-function __webpack_require__(moduleId) {
-    var cachedModule = __webpack_module_cache__[moduleId];
-    if (void 0 !== cachedModule) return cachedModule.exports;
-    var module = __webpack_module_cache__[moduleId] = {
-        exports: {}
-    };
-    __webpack_modules__[moduleId](module, module.exports, __webpack_require__);
-    return module.exports;
-}
+"use client";
+var __webpack_require__ = {};
 (()=>{
     __webpack_require__.n = (module)=>{
         var getter = module && module.__esModule ? ()=>module['default'] : ()=>module;
@@ -45,20 +32,18 @@ function __webpack_require__(moduleId) {
     };
 })();
 var __webpack_exports__ = {};
-(()=>{
-    __webpack_require__.r(__webpack_exports__);
-    __webpack_require__.d(__webpack_exports__, {
-        default: ()=>__rspack_default_export
-    });
-    var react_helmet__rspack_import_0 = __webpack_require__("react-helmet");
-    var react_helmet__rspack_import_0_default = /*#__PURE__*/ __webpack_require__.n(react_helmet__rspack_import_0);
-    var __rspack_reexport = {};
-    for(const __rspack_import_key in react_helmet__rspack_import_0)if ("default" !== __rspack_import_key) __rspack_reexport[__rspack_import_key] = ()=>react_helmet__rspack_import_0[__rspack_import_key];
-    __webpack_require__.d(__webpack_exports__, __rspack_reexport);
-    const __rspack_default_export = react_helmet__rspack_import_0_default();
-})();
+__webpack_require__.r(__webpack_exports__);
+__webpack_require__.d(__webpack_exports__, {
+    Helmet: ()=>external_react_helmet_namespaceObject.Helmet,
+    default: ()=>head
+});
+const external_react_helmet_namespaceObject = require("react-helmet");
+var external_react_helmet_default = /*#__PURE__*/ __webpack_require__.n(external_react_helmet_namespaceObject);
+const head = external_react_helmet_default();
+exports.Helmet = __webpack_exports__.Helmet;
 exports["default"] = __webpack_exports__["default"];
 for(var __rspack_i in __webpack_exports__)if (-1 === [
+    "Helmet",
     "default"
 ].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
 Object.defineProperty(exports, '__esModule', {

package/dist/esm/cli/index.mjs

@@ -60,7 +60,10 @@ const runtimePlugin = (params)=>({
                     source: {
                         globalVars: {
                             'process.env.IS_REACT18': process.env.IS_REACT18
-                        }
+                        },
+                        include: [
+                            new RegExp(`[\\\\/]node_modules[\\\\/]@${metaName}[\\\\/]runtime[\\\\/].*[\\\\/]head\\.`)
+                        ]
                     },
                     tools: {
                         bundlerChain: (chain)=>{

package/dist/esm/cli/ssr/index.mjs

@@ -17,7 +17,7 @@ const checkUseStringSSR = (config, appDirectory, entrypoints)=>{
     }
     return true;
 };
-const ssrBuilderPlugin = (modernAPI, outputModule)=>({
+const ssrBuilderPlugin = (modernAPI, outputModule, exportLoadablePath)=>({
         name: '@modern-js/builder-plugin-ssr',
         setup (api) {
             api.modifyEnvironmentConfig((config, { name, mergeEnvironmentConfig })=>{
@@ -27,6 +27,7 @@ const ssrBuilderPlugin = (modernAPI, outputModule)=>({
                 const appContext = modernAPI.getAppContext();
                 const { appDirectory, entrypoints } = appContext;
                 const useLoadablePlugin = isUseSSRBundle(userConfig) && !isServerEnvironment && checkUseStringSSR(userConfig, appDirectory, entrypoints);
+                const useLoadableComponents = isUseSSRBundle(userConfig) && checkUseStringSSR(userConfig, appDirectory, entrypoints);
                 return mergeEnvironmentConfig(config, {
                     source: {
                         define: {
@@ -44,33 +45,8 @@ const ssrBuilderPlugin = (modernAPI, outputModule)=>({
                                     filename: LOADABLE_STATS_FILE
                                 }
                             ]);
-                        } : void 0
-                    }
-                });
-            });
-        }
-    });
-const ssrPlugin = ()=>({
-        name: '@modern-js/plugin-ssr',
-        required: [
-            '@modern-js/runtime'
-        ],
-        setup: (api)=>{
-            const appContext = api.getAppContext();
-            const exportLoadablePath = `@${appContext.metaName}/runtime/loadable`;
-            const runtimeUtilsPath = require.resolve('@modern-js/runtime-utils/node');
-            const aliasPath = runtimeUtilsPath.replace(`${path.sep}cjs${path.sep}`, `${path.sep}esm${path.sep}`).replace(/\.js$/, '.mjs');
-            api.config(()=>({
-                    builderPlugins: [
-                        ssrBuilderPlugin(api, 'module' === appContext.moduleType)
-                    ],
-                    resolve: {
-                        alias: {
-                            '@modern-js/runtime-utils/node$': aliasPath
-                        }
-                    },
-                    tools: {
-                        swc: {
+                        } : void 0,
+                        swc: useLoadableComponents ? {
                             jsc: {
                                 experimental: {
                                     plugins: [
@@ -100,6 +76,29 @@ const ssrPlugin = ()=>({
                                     ]
                                 }
                             }
+                        } : void 0
+                    }
+                });
+            });
+        }
+    });
+const ssrPlugin = ()=>({
+        name: '@modern-js/plugin-ssr',
+        required: [
+            '@modern-js/runtime'
+        ],
+        setup: (api)=>{
+            const appContext = api.getAppContext();
+            const exportLoadablePath = `@${appContext.metaName}/runtime/loadable`;
+            const runtimeUtilsPath = require.resolve('@modern-js/runtime-utils/node');
+            const aliasPath = runtimeUtilsPath.replace(`${path.sep}cjs${path.sep}`, `${path.sep}esm${path.sep}`).replace(/\.js$/, '.mjs');
+            api.config(()=>({
+                    builderPlugins: [
+                        ssrBuilderPlugin(api, 'module' === appContext.moduleType, exportLoadablePath)
+                    ],
+                    resolve: {
+                        alias: {
+                            '@modern-js/runtime-utils/node$': aliasPath
                         }
                     }
                 }));

package/dist/esm/document/cli/index.mjs

@@ -88,6 +88,10 @@ const configureChildCompiler = (child, compiler, appDirectory)=>{
         node: true
     };
     child.options.devtool = false;
+    if (child.options.optimization && 'object' == typeof child.options.optimization) child.options.optimization.minimize = false;
+    else child.options.optimization = {
+        minimize: false
+    };
 };
 const applyExternalsPlugin = (child, compiler)=>{
     const ExternalsPlugin = compiler.rspack?.ExternalsPlugin;

package/dist/esm/exports/head.mjs

@@ -1,4 +1,4 @@
-import react_helmet from "react-helmet";
-export * from "react-helmet";
+"use client";
+import react_helmet, { Helmet } from "react-helmet";
 const head = react_helmet;
-export { head as default };
+export { Helmet, head as default };

package/dist/esm-node/cli/index.mjs

@@ -62,7 +62,10 @@ const runtimePlugin = (params)=>({
                     source: {
                         globalVars: {
                             'process.env.IS_REACT18': process.env.IS_REACT18
-                        }
+                        },
+                        include: [
+                            new RegExp(`[\\\\/]node_modules[\\\\/]@${metaName}[\\\\/]runtime[\\\\/].*[\\\\/]head\\.`)
+                        ]
                     },
                     tools: {
                         bundlerChain: (chain)=>{

package/dist/esm-node/cli/ssr/index.mjs

@@ -19,7 +19,7 @@ const checkUseStringSSR = (config, appDirectory, entrypoints)=>{
     }
     return true;
 };
-const ssrBuilderPlugin = (modernAPI, outputModule)=>({
+const ssrBuilderPlugin = (modernAPI, outputModule, exportLoadablePath)=>({
         name: '@modern-js/builder-plugin-ssr',
         setup (api) {
             api.modifyEnvironmentConfig((config, { name, mergeEnvironmentConfig })=>{
@@ -29,6 +29,7 @@ const ssrBuilderPlugin = (modernAPI, outputModule)=>({
                 const appContext = modernAPI.getAppContext();
                 const { appDirectory, entrypoints } = appContext;
                 const useLoadablePlugin = isUseSSRBundle(userConfig) && !isServerEnvironment && checkUseStringSSR(userConfig, appDirectory, entrypoints);
+                const useLoadableComponents = isUseSSRBundle(userConfig) && checkUseStringSSR(userConfig, appDirectory, entrypoints);
                 return mergeEnvironmentConfig(config, {
                     source: {
                         define: {
@@ -46,33 +47,8 @@ const ssrBuilderPlugin = (modernAPI, outputModule)=>({
                                     filename: LOADABLE_STATS_FILE
                                 }
                             ]);
-                        } : void 0
-                    }
-                });
-            });
-        }
-    });
-const ssrPlugin = ()=>({
-        name: '@modern-js/plugin-ssr',
-        required: [
-            '@modern-js/runtime'
-        ],
-        setup: (api)=>{
-            const appContext = api.getAppContext();
-            const exportLoadablePath = `@${appContext.metaName}/runtime/loadable`;
-            const runtimeUtilsPath = require.resolve('@modern-js/runtime-utils/node');
-            const aliasPath = runtimeUtilsPath.replace(`${path.sep}cjs${path.sep}`, `${path.sep}esm${path.sep}`).replace(/\.js$/, '.mjs');
-            api.config(()=>({
-                    builderPlugins: [
-                        ssrBuilderPlugin(api, 'module' === appContext.moduleType)
-                    ],
-                    resolve: {
-                        alias: {
-                            '@modern-js/runtime-utils/node$': aliasPath
-                        }
-                    },
-                    tools: {
-                        swc: {
+                        } : void 0,
+                        swc: useLoadableComponents ? {
                             jsc: {
                                 experimental: {
                                     plugins: [
@@ -102,6 +78,29 @@ const ssrPlugin = ()=>({
                                     ]
                                 }
                             }
+                        } : void 0
+                    }
+                });
+            });
+        }
+    });
+const ssrPlugin = ()=>({
+        name: '@modern-js/plugin-ssr',
+        required: [
+            '@modern-js/runtime'
+        ],
+        setup: (api)=>{
+            const appContext = api.getAppContext();
+            const exportLoadablePath = `@${appContext.metaName}/runtime/loadable`;
+            const runtimeUtilsPath = require.resolve('@modern-js/runtime-utils/node');
+            const aliasPath = runtimeUtilsPath.replace(`${path.sep}cjs${path.sep}`, `${path.sep}esm${path.sep}`).replace(/\.js$/, '.mjs');
+            api.config(()=>({
+                    builderPlugins: [
+                        ssrBuilderPlugin(api, 'module' === appContext.moduleType, exportLoadablePath)
+                    ],
+                    resolve: {
+                        alias: {
+                            '@modern-js/runtime-utils/node$': aliasPath
                         }
                     }
                 }));

package/dist/esm-node/document/cli/index.mjs

@@ -90,6 +90,10 @@ const configureChildCompiler = (child, compiler, appDirectory)=>{
         node: true
     };
     child.options.devtool = false;
+    if (child.options.optimization && 'object' == typeof child.options.optimization) child.options.optimization.minimize = false;
+    else child.options.optimization = {
+        minimize: false
+    };
 };
 const applyExternalsPlugin = (child, compiler)=>{
     const ExternalsPlugin = compiler.rspack?.ExternalsPlugin;

package/dist/esm-node/exports/head.mjs

@@ -1,5 +1,5 @@
 import "node:module";
-import react_helmet from "react-helmet";
-export * from "react-helmet";
+"use client";
+import react_helmet, { Helmet } from "react-helmet";
 const head = react_helmet;
-export { head as default };
+export { Helmet, head as default };

package/dist/types/exports/head.d.ts

@@ -1,3 +1,4 @@
 import head from 'react-helmet';
 export default head;
-export * from 'react-helmet';
+export { Helmet } from 'react-helmet';
+export type { HelmetTags, HelmetProps, HelmetPropsToState, HelmetData, HelmetDatum, HelmetHTMLBodyDatum, HelmetHTMLElementDatum, } from 'react-helmet';

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "3.0.2",
+  "version": "3.0.4",
   "engines": {
     "node": ">=20"
   },
@@ -215,12 +215,12 @@
     "isbot": "3.8.0",
     "react-helmet": "^6.1.0",
     "react-is": "^18.3.1",
-    "@modern-js/plugin": "3.0.2",
-    "@modern-js/render": "3.0.2",
-    "@modern-js/runtime-utils": "3.0.2",
-    "@modern-js/plugin-data-loader": "3.0.2",
-    "@modern-js/types": "3.0.2",
-    "@modern-js/utils": "3.0.2"
+    "@modern-js/plugin": "3.0.4",
+    "@modern-js/plugin-data-loader": "3.0.4",
+    "@modern-js/render": "3.0.4",
+    "@modern-js/runtime-utils": "3.0.4",
+    "@modern-js/types": "3.0.4",
+    "@modern-js/utils": "3.0.4"
   },
   "peerDependencies": {
     "react": ">=17.0.2",
@@ -229,7 +229,7 @@
   "devDependencies": {
     "@remix-run/web-fetch": "^4.1.3",
     "@rsbuild/core": "2.0.0-beta.4",
-    "@rslib/core": "0.19.5",
+    "@rslib/core": "0.19.6",
     "@testing-library/dom": "^10.4.1",
     "@testing-library/react": "^16.3.2",
     "@types/cookie": "0.6.0",
@@ -240,7 +240,7 @@
     "react-dom": "^19.2.4",
     "ts-node": "^10.9.2",
     "typescript": "^5",
-    "@modern-js/app-tools": "3.0.2",
+    "@modern-js/app-tools": "3.0.4",
     "@modern-js/rslib": "2.68.10",
     "@scripts/rstest-config": "2.66.0"
   },