@modern-js/runtime 2.60.1-alpha.1 → 2.60.1-alpha.2

package/dist/cjs/cli/index.js

@@ -125,10 +125,10 @@ const runtimePlugin = (params) => ({
               * Compatible with the reference path of the old version of the plugin.
               */
               [`@${metaName}/runtime/plugins`]: pluginsExportsUtils.getPath(),
-              "@meta/runtime/browser": "@modern-js/runtime/browser",
-              "@meta/runtime/react": "@modern-js/runtime/react",
-              "@meta/runtime/context": "@modern-js/runtime/context",
-              "@meta/runtime": "@modern-js/runtime"
+              "@meta/runtime/browser": require.resolve("@modern-js/runtime/browser"),
+              "@meta/runtime/react": require.resolve("@modern-js/runtime/react"),
+              "@meta/runtime/context": require.resolve("@modern-js/runtime/context"),
+              "@meta/runtime": require.resolve("@modern-js/runtime")
             },
             globalVars: {
               "process.env.IS_REACT18": process.env.IS_REACT18

package/dist/cjs/core/server/react/nossr/index.js

@@ -32,14 +32,13 @@ __export(nossr_exports, {
 });
 module.exports = __toCommonJS(nossr_exports);
 var import_react = __toESM(require("react"));
-let csr = false;
+var import_react2 = require("react");
 const NoSSR = (props) => {
-  const [isMounted, setMounted] = (0, import_react.useState)(csr);
-  (0, import_react.useEffect)(() => {
-    csr = true;
+  const [isMounted, setMounted] = (0, import_react2.useState)(false);
+  (0, import_react2.useEffect)(() => {
     setMounted(true);
-  });
-  const { children, fallback = null } = props;
+  }, []);
+  const { children, fallback = null } = props || {};
   return import_react.default.createElement(import_react.default.Fragment, null, isMounted ? children : fallback);
 };
 // Annotate the CommonJS export names for ESM import in node:

package/dist/cjs/router/cli/code/index.js

@@ -35,6 +35,7 @@ module.exports = __toCommonJS(code_exports);
 var import_path = __toESM(require("path"));
 var import_utils = require("@modern-js/utils");
 var import_lodash = require("@modern-js/utils/lodash");
+var import_route = require("@modern-js/utils/universal/route");
 var import_constants = require("../../../cli/constants");
 var import_constants2 = require("../constants");
 var import_getClientRoutes = require("./getClientRoutes");
@@ -84,7 +85,7 @@ const generateCode = async (appContext, config, entrypoints, api) => {
         const config2 = api.useResolvedConfigContext();
         const ssrByRouteIds = config2.server.ssrByRouteIds || [];
         const clonedRoutes = (0, import_lodash.cloneDeep)(initialRoutes);
-        const markedRoutes = ssrByRouteIds.length > 0 ? markRoutes(clonedRoutes, ssrByRouteIds) : initialRoutes;
+        const markedRoutes = ssrByRouteIds.length > 0 ? (0, import_route.markRoutes)(clonedRoutes, ssrByRouteIds) : initialRoutes;
         const { routes } = await hookRunners.modifyFileSystemRoutes({
           entrypoint,
           routes: markedRoutes
@@ -117,8 +118,8 @@ const generateCode = async (appContext, config, entrypoints, api) => {
         if (entrypoint.nestedRoutesEntry && (0, import_utils.isUseSSRBundle)(config2)) {
           var _config_output1;
           const routesServerFile = (0, import_utils2.getServerLoadersFile)(internalDirectory, entryName);
-          const filtedRoutesForServer = (0, import_utils.filterRoutesForServer)(routes);
-          const routesForServerLoaderMatches = (0, import_utils.filterRoutesLoader)(routes);
+          const filtedRoutesForServer = (0, import_route.filterRoutesForServer)(routes);
+          const routesForServerLoaderMatches = (0, import_route.filterRoutesLoader)(routes);
           const code2 = templates.routesForServer({
             routesForServerLoaderMatches
           });
@@ -145,25 +146,6 @@ const generateCode = async (appContext, config, entrypoints, api) => {
     }
   }
 };
-function markRoutes(routes, routeIds) {
-  return routes.map((route) => {
-    if (route.type !== "nested") {
-      return route;
-    }
-    if (route.children && route.children.length > 0) {
-      route.children = markRoutes(route.children, routeIds);
-    }
-    if (route.children && route.children.length > 0) {
-      route.inValidSSRRoute = route.children.every((child) => {
-        var _child_inValidSSRRoute;
-        return (_child_inValidSSRRoute = child.inValidSSRRoute) !== null && _child_inValidSSRRoute !== void 0 ? _child_inValidSSRRoute : false;
-      });
-    } else if (route.id) {
-      route.inValidSSRRoute = !routeIds.includes(route.id);
-    }
-    return route;
-  });
-}
 function generatorRegisterCode(internalDirectory, entryName, code) {
   import_utils.fs.outputFileSync(import_path.default.resolve(internalDirectory, `./${entryName}/${import_constants.ENTRY_POINT_RUNTIME_GLOBAL_CONTEXT_FILE_NAME}`), code, "utf8");
 }

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

@@ -37,6 +37,7 @@ __export(cli_exports, {
 module.exports = __toCommonJS(cli_exports);
 var import_node_path = __toESM(require("node:path"));
 var import_utils = require("@modern-js/utils");
+var import_route = require("@modern-js/utils/universal/route");
 var import_entry = require("./entry");
 var import_handler = require("./handler");
 var import_entry2 = require("./entry");
@@ -115,7 +116,7 @@ const routerPlugin = () => ({
       },
       async modifyFileSystemRoutes({ entrypoint, routes }) {
         nestedRoutes[entrypoint.entryName] = routes;
-        nestedRoutesForServer[entrypoint.entryName] = (0, import_utils.filterRoutesForServer)(routes);
+        nestedRoutesForServer[entrypoint.entryName] = (0, import_route.filterRoutesForServer)(routes);
         return {
           entrypoint,
           routes

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

@@ -139,7 +139,7 @@ const routerPlugin = (userConfig = {}) => {
             return (props) => {
               beforeCreateRouter = false;
               const router = useCreateRouter(props);
-              return (
+              const routerWrapper = (
                 // To match the node tree about https://github.com/web-infra-dev/modern.js/blob/v2.59.0/packages/runtime/plugin-runtime/src/router/runtime/plugin.node.tsx#L150-L168
                 // According to react [useId generation algorithm](https://github.com/facebook/react/pull/22644), `useId` will generate id with the react node react struct.
                 // To void hydration failed, we must guarantee that the node tree when browser hydrate must have same struct with node tree when ssr render.
@@ -153,6 +153,9 @@ const routerPlugin = (userConfig = {}) => {
                   ]
                 })
               );
+              return App ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(App, {
+                children: routerWrapper
+              }) : routerWrapper;
             };
           };
           return getRouteApp();

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

@@ -125,7 +125,7 @@ const routerPlugin = (userConfig = {}) => {
               const context = (0, import_react.useContext)(import_core.RuntimeReactContext);
               const { remixRouter, routerContext, ssrContext } = context;
               const { nonce, mode } = ssrContext;
-              return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, {
+              const routerWrapper = /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, {
                 children: [
                   /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_router.StaticRouterProvider, {
                     router: remixRouter,
@@ -141,6 +141,9 @@ const routerPlugin = (userConfig = {}) => {
                   mode === "stream" && import_common.JSX_SHELL_STREAM_END_MARK
                 ]
               });
+              return App ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(App, {
+                children: routerWrapper
+              }) : routerWrapper;
             };
           };
           return getRouteApp();

package/dist/esm/cli/index.js

@@ -109,7 +109,7 @@ var runtimePlugin = function(params) {
               }, /**
               * Compatible with the reference path of the old version of the plugin.
               */
-              _define_property(_obj, "@".concat(metaName, "/runtime/plugins"), pluginsExportsUtils.getPath()), _define_property(_obj, "@meta/runtime/browser", "@modern-js/runtime/browser"), _define_property(_obj, "@meta/runtime/react", "@modern-js/runtime/react"), _define_property(_obj, "@meta/runtime/context", "@modern-js/runtime/context"), _define_property(_obj, "@meta/runtime", "@modern-js/runtime"), _obj),
+              _define_property(_obj, "@".concat(metaName, "/runtime/plugins"), pluginsExportsUtils.getPath()), _define_property(_obj, "@meta/runtime/browser", require.resolve("@modern-js/runtime/browser")), _define_property(_obj, "@meta/runtime/react", require.resolve("@modern-js/runtime/react")), _define_property(_obj, "@meta/runtime/context", require.resolve("@modern-js/runtime/context")), _define_property(_obj, "@meta/runtime", require.resolve("@modern-js/runtime")), _obj),
               globalVars: {
                 "process.env.IS_REACT18": process.env.IS_REACT18
               }

package/dist/esm/core/server/react/nossr/index.js

@@ -1,13 +1,12 @@
 import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
-import React, { useEffect, useState } from "react";
-var csr = false;
+import React from "react";
+import { useEffect, useState } from "react";
 var NoSSR = function(props) {
-  var _useState = _sliced_to_array(useState(csr), 2), isMounted = _useState[0], setMounted = _useState[1];
+  var _useState = _sliced_to_array(useState(false), 2), isMounted = _useState[0], setMounted = _useState[1];
   useEffect(function() {
-    csr = true;
     setMounted(true);
-  });
-  var children = props.children, _props_fallback = props.fallback, fallback = _props_fallback === void 0 ? null : _props_fallback;
+  }, []);
+  var _ref = props || {}, children = _ref.children, _ref_fallback = _ref.fallback, fallback = _ref_fallback === void 0 ? null : _ref_fallback;
   return React.createElement(React.Fragment, null, isMounted ? children : fallback);
 };
 export {

package/dist/esm/router/cli/code/index.js

@@ -2,8 +2,9 @@ import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _type_of } from "@swc/helpers/_/_type_of";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import path from "path";
-import { fs, filterRoutesForServer, filterRoutesLoader, getEntryOptions, isRouterV5, isSSGEntry, isUseSSRBundle, logger } from "@modern-js/utils";
+import { fs, getEntryOptions, isRouterV5, isSSGEntry, isUseSSRBundle, logger } from "@modern-js/utils";
 import { cloneDeep } from "@modern-js/utils/lodash";
+import { filterRoutesForServer, filterRoutesLoader, markRoutes } from "@modern-js/utils/universal/route";
 import { ENTRY_POINT_RUNTIME_GLOBAL_CONTEXT_FILE_NAME } from "../../../cli/constants";
 import { FILE_SYSTEM_ROUTES_FILE_NAME } from "../constants";
 import { getClientRoutes, getClientRoutesLegacy } from "./getClientRoutes";
@@ -240,25 +241,6 @@ var generateCode = function() {
     return _ref.apply(this, arguments);
   };
 }();
-function markRoutes(routes, routeIds) {
-  return routes.map(function(route) {
-    if (route.type !== "nested") {
-      return route;
-    }
-    if (route.children && route.children.length > 0) {
-      route.children = markRoutes(route.children, routeIds);
-    }
-    if (route.children && route.children.length > 0) {
-      route.inValidSSRRoute = route.children.every(function(child) {
-        var _child_inValidSSRRoute;
-        return (_child_inValidSSRRoute = child.inValidSSRRoute) !== null && _child_inValidSSRRoute !== void 0 ? _child_inValidSSRRoute : false;
-      });
-    } else if (route.id) {
-      route.inValidSSRRoute = !routeIds.includes(route.id);
-    }
-    return route;
-  });
-}
 function generatorRegisterCode(internalDirectory, entryName, code) {
   fs.outputFileSync(path.resolve(internalDirectory, "./".concat(entryName, "/").concat(ENTRY_POINT_RUNTIME_GLOBAL_CONTEXT_FILE_NAME)), code, "utf8");
 }

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

@@ -3,7 +3,8 @@ import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import path from "node:path";
-import { fs, NESTED_ROUTE_SPEC_FILE, createRuntimeExportsUtils, filterRoutesForServer, getEntryOptions, isRouterV5 as isV5 } from "@modern-js/utils";
+import { fs, NESTED_ROUTE_SPEC_FILE, createRuntimeExportsUtils, getEntryOptions, isRouterV5 as isV5 } from "@modern-js/utils";
+import { filterRoutesForServer } from "@modern-js/utils/universal/route";
 import { isRouteEntry } from "./entry";
 import { handleFileChange, handleGeneratorEntryCode, handleModifyEntrypoints } from "./handler";
 import { isRouteEntry as isRouteEntry2 } from "./entry";

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

@@ -124,7 +124,7 @@ var routerPlugin = function() {
             return function(props) {
               beforeCreateRouter = false;
               var router = useCreateRouter(props);
-              return (
+              var routerWrapper = (
                 // To match the node tree about https://github.com/web-infra-dev/modern.js/blob/v2.59.0/packages/runtime/plugin-runtime/src/router/runtime/plugin.node.tsx#L150-L168
                 // According to react [useId generation algorithm](https://github.com/facebook/react/pull/22644), `useId` will generate id with the react node react struct.
                 // To void hydration failed, we must guarantee that the node tree when browser hydrate must have same struct with node tree when ssr render.
@@ -138,6 +138,9 @@ var routerPlugin = function() {
                   ]
                 })
               );
+              return App ? /* @__PURE__ */ _jsx(App, {
+                children: routerWrapper
+              }) : routerWrapper;
             };
           };
           return getRouteApp();

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

@@ -116,7 +116,7 @@ var routerPlugin = function() {
               var context = useContext(RuntimeReactContext);
               var remixRouter = context.remixRouter, routerContext = context.routerContext, ssrContext = context.ssrContext;
               var nonce = ssrContext.nonce, mode = ssrContext.mode;
-              return /* @__PURE__ */ _jsxs(_Fragment, {
+              var routerWrapper = /* @__PURE__ */ _jsxs(_Fragment, {
                 children: [
                   /* @__PURE__ */ _jsx(StaticRouterProvider, {
                     router: remixRouter,
@@ -132,6 +132,9 @@ var routerPlugin = function() {
                   mode === "stream" && JSX_SHELL_STREAM_END_MARK
                 ]
               });
+              return App ? /* @__PURE__ */ _jsx(App, {
+                children: routerWrapper
+              }) : routerWrapper;
             };
           };
           return getRouteApp();

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

@@ -86,10 +86,10 @@ const runtimePlugin = (params) => ({
               * Compatible with the reference path of the old version of the plugin.
               */
               [`@${metaName}/runtime/plugins`]: pluginsExportsUtils.getPath(),
-              "@meta/runtime/browser": "@modern-js/runtime/browser",
-              "@meta/runtime/react": "@modern-js/runtime/react",
-              "@meta/runtime/context": "@modern-js/runtime/context",
-              "@meta/runtime": "@modern-js/runtime"
+              "@meta/runtime/browser": require.resolve("@modern-js/runtime/browser"),
+              "@meta/runtime/react": require.resolve("@modern-js/runtime/react"),
+              "@meta/runtime/context": require.resolve("@modern-js/runtime/context"),
+              "@meta/runtime": require.resolve("@modern-js/runtime")
             },
             globalVars: {
               "process.env.IS_REACT18": process.env.IS_REACT18

package/dist/esm-node/core/server/react/nossr/index.js

@@ -1,12 +1,11 @@
-import React, { useEffect, useState } from "react";
-let csr = false;
+import React from "react";
+import { useEffect, useState } from "react";
 const NoSSR = (props) => {
-  const [isMounted, setMounted] = useState(csr);
+  const [isMounted, setMounted] = useState(false);
   useEffect(() => {
-    csr = true;
     setMounted(true);
-  });
-  const { children, fallback = null } = props;
+  }, []);
+  const { children, fallback = null } = props || {};
   return React.createElement(React.Fragment, null, isMounted ? children : fallback);
 };
 export {

package/dist/esm-node/router/cli/code/index.js

@@ -1,6 +1,7 @@
 import path from "path";
-import { fs, filterRoutesForServer, filterRoutesLoader, getEntryOptions, isRouterV5, isSSGEntry, isUseSSRBundle, logger } from "@modern-js/utils";
+import { fs, getEntryOptions, isRouterV5, isSSGEntry, isUseSSRBundle, logger } from "@modern-js/utils";
 import { cloneDeep } from "@modern-js/utils/lodash";
+import { filterRoutesForServer, filterRoutesLoader, markRoutes } from "@modern-js/utils/universal/route";
 import { ENTRY_POINT_RUNTIME_GLOBAL_CONTEXT_FILE_NAME } from "../../../cli/constants";
 import { FILE_SYSTEM_ROUTES_FILE_NAME } from "../constants";
 import { getClientRoutes, getClientRoutesLegacy } from "./getClientRoutes";
@@ -111,25 +112,6 @@ const generateCode = async (appContext, config, entrypoints, api) => {
     }
   }
 };
-function markRoutes(routes, routeIds) {
-  return routes.map((route) => {
-    if (route.type !== "nested") {
-      return route;
-    }
-    if (route.children && route.children.length > 0) {
-      route.children = markRoutes(route.children, routeIds);
-    }
-    if (route.children && route.children.length > 0) {
-      route.inValidSSRRoute = route.children.every((child) => {
-        var _child_inValidSSRRoute;
-        return (_child_inValidSSRRoute = child.inValidSSRRoute) !== null && _child_inValidSSRRoute !== void 0 ? _child_inValidSSRRoute : false;
-      });
-    } else if (route.id) {
-      route.inValidSSRRoute = !routeIds.includes(route.id);
-    }
-    return route;
-  });
-}
 function generatorRegisterCode(internalDirectory, entryName, code) {
   fs.outputFileSync(path.resolve(internalDirectory, `./${entryName}/${ENTRY_POINT_RUNTIME_GLOBAL_CONTEXT_FILE_NAME}`), code, "utf8");
 }

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

@@ -1,5 +1,6 @@
 import path from "node:path";
-import { fs, NESTED_ROUTE_SPEC_FILE, createRuntimeExportsUtils, filterRoutesForServer, getEntryOptions, isRouterV5 as isV5 } from "@modern-js/utils";
+import { fs, NESTED_ROUTE_SPEC_FILE, createRuntimeExportsUtils, getEntryOptions, isRouterV5 as isV5 } from "@modern-js/utils";
+import { filterRoutesForServer } from "@modern-js/utils/universal/route";
 import { isRouteEntry } from "./entry";
 import { handleFileChange, handleGeneratorEntryCode, handleModifyEntrypoints } from "./handler";
 import { isRouteEntry as isRouteEntry2 } from "./entry";

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

@@ -113,7 +113,7 @@ const routerPlugin = (userConfig = {}) => {
             return (props) => {
               beforeCreateRouter = false;
               const router = useCreateRouter(props);
-              return (
+              const routerWrapper = (
                 // To match the node tree about https://github.com/web-infra-dev/modern.js/blob/v2.59.0/packages/runtime/plugin-runtime/src/router/runtime/plugin.node.tsx#L150-L168
                 // According to react [useId generation algorithm](https://github.com/facebook/react/pull/22644), `useId` will generate id with the react node react struct.
                 // To void hydration failed, we must guarantee that the node tree when browser hydrate must have same struct with node tree when ssr render.
@@ -127,6 +127,9 @@ const routerPlugin = (userConfig = {}) => {
                   ]
                 })
               );
+              return App ? /* @__PURE__ */ _jsx(App, {
+                children: routerWrapper
+              }) : routerWrapper;
             };
           };
           return getRouteApp();

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

@@ -91,7 +91,7 @@ const routerPlugin = (userConfig = {}) => {
               const context = useContext(RuntimeReactContext);
               const { remixRouter, routerContext, ssrContext } = context;
               const { nonce, mode } = ssrContext;
-              return /* @__PURE__ */ _jsxs(_Fragment, {
+              const routerWrapper = /* @__PURE__ */ _jsxs(_Fragment, {
                 children: [
                   /* @__PURE__ */ _jsx(StaticRouterProvider, {
                     router: remixRouter,
@@ -107,6 +107,9 @@ const routerPlugin = (userConfig = {}) => {
                   mode === "stream" && JSX_SHELL_STREAM_END_MARK
                 ]
               });
+              return App ? /* @__PURE__ */ _jsx(App, {
+                children: routerWrapper
+              }) : routerWrapper;
             };
           };
           return getRouteApp();

package/dist/types/core/server/react/nossr/index.d.ts

@@ -1,6 +1,5 @@
-import React, { type ReactElement } from 'react';
-export declare const NoSSR: (props: React.PropsWithChildren<{
+import React from 'react';
+import { type ReactElement } from 'react';
+export declare const NoSSR: (props?: React.PropsWithChildren<{
     fallback?: ReactElement | string;
-}>) => React.FunctionComponentElement<{
-    children?: React.ReactNode;
-}>;
+}>) => ReactElement | null;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.60.1-alpha.1",
+  "version": "2.60.1-alpha.2",
   "engines": {
     "node": ">=14.17.6"
   },
@@ -199,11 +199,11 @@
     "react-is": "^18",
     "react-side-effect": "^2.1.1",
     "styled-components": "^5.3.1",
+    "@modern-js/plugin": "2.60.0",
     "@modern-js/runtime-utils": "2.60.0",
     "@modern-js/types": "2.60.0",
-    "@modern-js/utils": "2.60.0",
     "@modern-js/plugin-data-loader": "2.60.0",
-    "@modern-js/plugin": "2.60.0"
+    "@modern-js/utils": "2.60.0"
   },
   "peerDependencies": {
     "react": ">=17",
@@ -226,15 +226,16 @@
     "ts-jest": "^29.1.0",
     "typescript": "^5",
     "webpack": "^5.94.0",
-    "@scripts/build": "2.60.0",
     "@modern-js/app-tools": "2.60.0",
     "@scripts/jest-config": "2.60.0",
-    "@modern-js/core": "2.60.0"
+    "@modern-js/core": "2.60.0",
+    "@scripts/build": "2.60.0"
   },
   "sideEffects": false,
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
-    "access": "public"
+    "access": "public",
+    "provenance": true
   },
   "scripts": {
     "dev": "modern-lib build --watch",