@modern-js/runtime 2.11.0 → 2.12.0

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @modern-js/runtime
 
+## 2.12.0
+
+### Patch Changes
+
+- 0b05ec3: fix: the SSR plugin will product some effects, disable the ssr plugin when user doesn't use ssr
+  fix: SSR 插件将会尝试一些副作用，如果用户没有使用它时禁用这个插件。
+- 1aa0cb7: fix: beforeCreateRouter should be false after render router
+  fix: 在渲染 router 后，beforeCreateRouter 应该为 false
+- Updated dependencies [c2ca6c8]
+- Updated dependencies [6d86e34]
+  - @modern-js/utils@2.12.0
+  - @modern-js/plugin@2.12.0
+  - @modern-js/types@2.12.0
+
 ## 2.11.0
 
 ### Patch Changes

package/dist/cjs/router/runtime/PrefetchLink.js

@@ -150,9 +150,10 @@ const PrefetchDataLinks = ({ matches, pathname, routeManifest }) => {
   const currentMatches = (0, import_react_router_dom.useMatches)();
   const basename = (0, import_react_router_dom.useHref)("/");
   const dataHrefs = (0, import_react.useMemo)(() => {
-    return matches == null ? void 0 : matches.filter(
-      (match) => match.route.loader && typeof match.route.loader === "function" && match.route.loader.length > 0
-    ).filter((match, index) => {
+    return matches == null ? void 0 : matches.filter((match, index) => {
+      if (!match.route.loader || typeof match.route.loader !== "function" || match.route.loader.length === 0) {
+        return false;
+      }
       const currentMatch = currentMatches[index];
       if (!currentMatch || currentMatch.id !== match.route.id) {
         return true;

package/dist/cjs/router/runtime/plugin.js

@@ -85,7 +85,7 @@ const routerPlugin = ({
           const getRouteApp = () => {
             return (props) => {
               var _a;
-              beforeCreateRouter = true;
+              beforeCreateRouter = false;
               routes = createRoutes ? createRoutes() : (0, import_react_router_dom.createRoutesFromElements)(
                 (0, import_utils.renderRoutes)({
                   routesConfig: finalRouteConfig,

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

@@ -61,6 +61,20 @@ var cli_default = () => ({
           appContext.internalDirectory,
           "plugins"
         );
+        const { builder } = api.useAppContext();
+        const bundlerType = (builder == null ? void 0 : builder.context.bundlerType) || "webpack";
+        const babelConfig = bundlerType === "webpack" ? (config) => {
+          var _a, _b;
+          (_a = config.plugins) == null ? void 0 : _a.push(
+            import_path.default.join(__dirname, "./babel-plugin-ssr-loader-id")
+          );
+          const userConfig = api.useResolvedConfigContext();
+          if ((0, import_utils.isUseSSRBundle)(userConfig) && hasStringSSREntry(userConfig)) {
+            (_b = config.plugins) == null ? void 0 : _b.push(
+              require.resolve("@loadable/babel-plugin")
+            );
+          }
+        } : void 0;
         return {
           source: {
             alias: {
@@ -94,15 +108,7 @@ var cli_default = () => ({
                 ];
               });
             },
-            babel: (config) => {
-              config.plugins.push(
-                import_path.default.join(__dirname, "./babel-plugin-ssr-loader-id")
-              );
-              const userConfig = api.useResolvedConfigContext();
-              if ((0, import_utils.isUseSSRBundle)(userConfig) && hasStringSSREntry(userConfig)) {
-                config.plugins.push(require.resolve("@loadable/babel-plugin"));
-              }
-            }
+            babel: babelConfig
           }
         };
       },

package/dist/esm/router/runtime/PrefetchLink.js

@@ -390,9 +390,10 @@ var PrefetchDataLinks = function(param) {
     var currentMatches = useMatches();
     var basename = useHref("/");
     var dataHrefs = useMemo(function() {
-        return matches === null || matches === void 0 ? void 0 : matches.filter(function(match) {
-            return match.route.loader && typeof match.route.loader === "function" && match.route.loader.length > 0;
-        }).filter(function(match, index) {
+        return matches === null || matches === void 0 ? void 0 : matches.filter(function(match, index) {
+            if (!match.route.loader || typeof match.route.loader !== "function" || match.route.loader.length === 0) {
+                return false;
+            }
             var currentMatch = currentMatches[index];
             if (!currentMatch || currentMatch.id !== match.route.id) {
                 return true;

package/dist/esm/router/runtime/plugin.js

@@ -105,7 +105,7 @@ var routerPlugin = function(param) {
                     var getRouteApp = function() {
                         return function(props) {
                             var _window__SERVER_DATA;
-                            beforeCreateRouter = true;
+                            beforeCreateRouter = false;
                             routes = createRoutes ? createRoutes() : createRoutesFromElements(renderRoutes({
                                 routesConfig: finalRouteConfig,
                                 props: props

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

@@ -110,6 +110,17 @@ var cli_default = function() {
                 config: function config() {
                     var appContext = api.useAppContext();
                     pluginsExportsUtils = createRuntimeExportsUtils(appContext.internalDirectory, "plugins");
+                    var builder = api.useAppContext().builder;
+                    var bundlerType = (builder === null || builder === void 0 ? void 0 : builder.context.bundlerType) || "webpack";
+                    var babelConfig = bundlerType === "webpack" ? function(config) {
+                        var _config_plugins;
+                        (_config_plugins = config.plugins) === null || _config_plugins === void 0 ? void 0 : _config_plugins.push(path.join(__dirname, "./babel-plugin-ssr-loader-id"));
+                        var userConfig = api.useResolvedConfigContext();
+                        if (isUseSSRBundle(userConfig) && hasStringSSREntry(userConfig)) {
+                            var _config_plugins1;
+                            (_config_plugins1 = config.plugins) === null || _config_plugins1 === void 0 ? void 0 : _config_plugins1.push(require.resolve("@loadable/babel-plugin"));
+                        }
+                    } : void 0;
                     return {
                         source: {
                             alias: {
@@ -138,13 +149,7 @@ var cli_default = function() {
                                     ].concat(_toConsumableArray(rest));
                                 });
                             },
-                            babel: function(config) {
-                                config.plugins.push(path.join(__dirname, "./babel-plugin-ssr-loader-id"));
-                                var userConfig = api.useResolvedConfigContext();
-                                if (isUseSSRBundle(userConfig) && hasStringSSREntry(userConfig)) {
-                                    config.plugins.push(require.resolve("@loadable/babel-plugin"));
-                                }
-                            }
+                            babel: babelConfig
                         }
                     };
                 },

package/dist/esm-node/router/runtime/PrefetchLink.js

@@ -123,9 +123,10 @@ const PrefetchDataLinks = ({ matches, pathname, routeManifest }) => {
   const currentMatches = useMatches();
   const basename = useHref("/");
   const dataHrefs = useMemo(() => {
-    return matches == null ? void 0 : matches.filter(
-      (match) => match.route.loader && typeof match.route.loader === "function" && match.route.loader.length > 0
-    ).filter((match, index) => {
+    return matches == null ? void 0 : matches.filter((match, index) => {
+      if (!match.route.loader || typeof match.route.loader !== "function" || match.route.loader.length === 0) {
+        return false;
+      }
       const currentMatch = currentMatches[index];
       if (!currentMatch || currentMatch.id !== match.route.id) {
         return true;

package/dist/esm-node/router/runtime/plugin.js

@@ -57,7 +57,7 @@ const routerPlugin = ({
           const getRouteApp = () => {
             return (props) => {
               var _a;
-              beforeCreateRouter = true;
+              beforeCreateRouter = false;
               routes = createRoutes ? createRoutes() : createRoutesFromElements(
                 renderRoutes({
                   routesConfig: finalRouteConfig,

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

@@ -36,6 +36,20 @@ var cli_default = () => ({
           appContext.internalDirectory,
           "plugins"
         );
+        const { builder } = api.useAppContext();
+        const bundlerType = (builder == null ? void 0 : builder.context.bundlerType) || "webpack";
+        const babelConfig = bundlerType === "webpack" ? (config) => {
+          var _a, _b;
+          (_a = config.plugins) == null ? void 0 : _a.push(
+            path.join(__dirname, "./babel-plugin-ssr-loader-id")
+          );
+          const userConfig = api.useResolvedConfigContext();
+          if (isUseSSRBundle(userConfig) && hasStringSSREntry(userConfig)) {
+            (_b = config.plugins) == null ? void 0 : _b.push(
+              require.resolve("@loadable/babel-plugin")
+            );
+          }
+        } : void 0;
         return {
           source: {
             alias: {
@@ -69,15 +83,7 @@ var cli_default = () => ({
                 ];
               });
             },
-            babel: (config) => {
-              config.plugins.push(
-                path.join(__dirname, "./babel-plugin-ssr-loader-id")
-              );
-              const userConfig = api.useResolvedConfigContext();
-              if (isUseSSRBundle(userConfig) && hasStringSSREntry(userConfig)) {
-                config.plugins.push(require.resolve("@loadable/babel-plugin"));
-              }
-            }
+            babel: babelConfig
           }
         };
       },

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.11.0",
+  "version": "2.12.0",
   "engines": {
     "node": ">=14.17.6"
   },
@@ -158,9 +158,9 @@
     "react-side-effect": "^2.1.1",
     "redux-logger": "^3.0.6",
     "styled-components": "^5.3.1",
-    "@modern-js/plugin": "2.11.0",
-    "@modern-js/types": "2.11.0",
-    "@modern-js/utils": "2.11.0"
+    "@modern-js/plugin": "2.12.0",
+    "@modern-js/types": "2.12.0",
+    "@modern-js/utils": "2.12.0"
   },
   "peerDependencies": {
     "react": ">=17",
@@ -181,11 +181,11 @@
     "react-dom": "^18",
     "ts-jest": "^29.0.5",
     "typescript": "^4",
-    "@modern-js/app-tools": "2.11.0",
-    "@modern-js/core": "2.11.0",
-    "@modern-js/server-core": "2.11.0",
-    "@scripts/build": "2.11.0",
-    "@scripts/jest-config": "2.11.0"
+    "@modern-js/app-tools": "2.12.0",
+    "@modern-js/core": "2.12.0",
+    "@modern-js/server-core": "2.12.0",
+    "@scripts/build": "2.12.0",
+    "@scripts/jest-config": "2.12.0"
   },
   "sideEffects": false,
   "modernConfig": {},