@modern-js/runtime 2.0.0-beta.4 → 2.0.0-beta.6

package/dist/js/treeshaking/document/index.js

@@ -4,6 +4,7 @@ export * from "./DocumentStructrueContext";
 export * from "./Head";
 export * from "./Body";
 export * from "./Root";
+export * from "./Links";
 export * from "./Scripts";
 export * from "./Script";
 export * from "./constants";

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

@@ -53,6 +53,10 @@ function _objectSpreadProps(target, source) {
 import { getEntryOptions, createRuntimeExportsUtils, PLUGIN_SCHEMAS } from "@modern-js/utils";
 var PLUGIN_IDENTIFIER = "router";
 var ROUTES_IDENTIFIER = "routes";
+var isV5 = function(config) {
+    var ref, ref1;
+    return (config === null || config === void 0 ? void 0 : (ref = config.runtime) === null || ref === void 0 ? void 0 : (ref1 = ref.router) === null || ref1 === void 0 ? void 0 : ref1.mode) === "react-router-5";
+};
 var cli_default = function() {
     return {
         name: "@modern-js/plugin-router",
@@ -79,15 +83,13 @@ var cli_default = function() {
                 },
                 modifyEntryImports: function modifyEntryImports(param) {
                     var entrypoint = param.entrypoint, imports = param.imports;
-                    var ref, ref1;
                     var entryName = entrypoint.entryName, fileSystemRoutes = entrypoint.fileSystemRoutes;
                     var userConfig = api.useResolvedConfigContext();
-                    var isLegacy = Boolean(userConfig === null || userConfig === void 0 ? void 0 : (ref = userConfig.runtime) === null || ref === void 0 ? void 0 : (ref1 = ref.router) === null || ref1 === void 0 ? void 0 : ref1.legacy);
                     var packageName = api.useAppContext().packageName;
                     var runtimeConfig = getEntryOptions(entryName, userConfig.runtime, userConfig.runtimeByEntries, packageName);
                     runtimeConfigMap.set(entryName, runtimeConfig);
                     if (runtimeConfig === null || runtimeConfig === void 0 ? void 0 : runtimeConfig.router) {
-                        if (!isLegacy) {
+                        if (!isV5(userConfig)) {
                             imports.push({
                                 value: "@modern-js/runtime/plugins",
                                 specifiers: [
@@ -107,13 +109,11 @@ var cli_default = function() {
                 },
                 modifyEntryRuntimePlugins: function modifyEntryRuntimePlugins(param) {
                     var entrypoint = param.entrypoint, plugins = param.plugins;
-                    var ref, ref1;
                     var entryName = entrypoint.entryName, fileSystemRoutes = entrypoint.fileSystemRoutes;
                     var serverRoutes = api.useAppContext().serverRoutes;
                     var userConfig = api.useResolvedConfigContext();
-                    var isLegacy = Boolean(userConfig === null || userConfig === void 0 ? void 0 : (ref = userConfig.runtime) === null || ref === void 0 ? void 0 : (ref1 = ref.router) === null || ref1 === void 0 ? void 0 : ref1.legacy);
                     var runtimeConfig = runtimeConfigMap.get(entryName);
-                    if (runtimeConfig.router && !isLegacy) {
+                    if (runtimeConfig.router && !isV5(userConfig)) {
                         var serverBase = serverRoutes.filter(function(route) {
                             return route.entryName === entryName;
                         }).map(function(route) {
@@ -136,10 +136,8 @@ var cli_default = function() {
                     };
                 },
                 addRuntimeExports: function addRuntimeExports() {
-                    var ref, ref1;
                     var userConfig = api.useResolvedConfigContext();
-                    var isLegacy = Boolean(userConfig === null || userConfig === void 0 ? void 0 : (ref = userConfig.runtime) === null || ref === void 0 ? void 0 : (ref1 = ref.router) === null || ref1 === void 0 ? void 0 : ref1.legacy);
-                    if (!isLegacy) {
+                    if (!isV5(userConfig)) {
                         pluginsExportsUtils.addExport("export { default as router } from '@modern-js/runtime/router'");
                     }
                 }

package/dist/js/treeshaking/router/runtime/index.js

@@ -2,5 +2,6 @@ import { routerPlugin } from "./plugin";
 var runtime_default = routerPlugin;
 import { modifyRoutes } from "./plugin";
 export * from "react-router-dom";
+export * from "react-router-dom/server";
 export * from "./withRouter";
 export { runtime_default as default, modifyRoutes };

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

@@ -229,8 +229,8 @@ var __generator = this && this.__generator || function(thisArg, body) {
 };
 import { jsx } from "react/jsx-runtime";
 import { useContext } from "react";
-import { unstable_createStaticHandler as createStaticHandler } from "@remix-run/router";
-import { unstable_createStaticRouter as createStaticRouter, unstable_StaticRouterProvider as StaticRouterProvider } from "react-router-dom/server";
+import { createStaticHandler } from "@remix-run/router";
+import { createStaticRouter, StaticRouterProvider } from "react-router-dom/server";
 import hoistNonReactStatics from "hoist-non-react-statics";
 import { installGlobals } from "@remix-run/node";
 import { createRoutesFromElements } from "react-router-dom";

package/dist/js/treeshaking/router/runtime/utils.js

@@ -84,9 +84,6 @@ import { DefaultNotFound } from "./DefaultNotFound";
 import { RootLayout } from "./root";
 var renderNestedRoute = function(nestedRoute, parent) {
     var children = nestedRoute.children, index = nestedRoute.index, id = nestedRoute.id, Component = nestedRoute.component;
-    var childElements = children === null || children === void 0 ? void 0 : children.map(function(childRoute) {
-        return renderNestedRoute(childRoute, nestedRoute);
-    });
     var routeProps = {
         caseSensitive: nestedRoute.caseSensitive,
         path: nestedRoute.path,
@@ -112,11 +109,15 @@ var renderNestedRoute = function(nestedRoute, parent) {
                 fallback: /* @__PURE__ */ jsx(Loading, {}),
                 children: /* @__PURE__ */ jsx(Component, {})
             });
-        } else {
+        } else if (!(parent === null || parent === void 0 ? void 0 : parent.index)) {
             element = /* @__PURE__ */ jsx(Suspense, {
                 children: /* @__PURE__ */ jsx(Component, {})
             });
+        } else {
+            element = /* @__PURE__ */ jsx(Component, {});
         }
+    } else {
+        nestedRoute.loading = parent === null || parent === void 0 ? void 0 : parent.loading;
     }
     if (!parent && element) {
         element = /* @__PURE__ */ jsx(RootLayout, {
@@ -129,6 +130,9 @@ var renderNestedRoute = function(nestedRoute, parent) {
     if (element) {
         routeProps.element = element;
     }
+    var childElements = children === null || children === void 0 ? void 0 : children.map(function(childRoute) {
+        return renderNestedRoute(childRoute, nestedRoute);
+    });
     var routeElement = index ? /* @__PURE__ */ jsx(Route, _objectSpreadProps(_objectSpread({}, routeProps), {
         index: true
     }), id) : /* @__PURE__ */ jsx(Route, _objectSpreadProps(_objectSpread({}, routeProps), {

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

@@ -157,8 +157,8 @@ var cli_default = function() {
                     if (typeof ssrConfig === "object" && ssrConfig.mode === "stream") {
                         var ref1;
                         var runtimeConfig = getEntryOptions(entryName, userConfig.runtime, userConfig.runtimeByEntries, packageName);
-                        if (runtimeConfig === null || runtimeConfig === void 0 ? void 0 : (ref1 = runtimeConfig.router) === null || ref1 === void 0 ? void 0 : ref1.legacy) {
-                            throw new Error("Legacy router plugin doesn't support streaming SSR, check your config 'runtime.router'");
+                        if ((runtimeConfig === null || runtimeConfig === void 0 ? void 0 : (ref1 = runtimeConfig.router) === null || ref1 === void 0 ? void 0 : ref1.mode) === "react-router-5") {
+                            throw new Error("router v5 plugin doesn't support streaming SSR, check your config 'runtime.router'");
                         }
                         if (fileSystemRoutes && !entrypoint.nestedRoutesEntry) {
                             throw new Error("You should switch to file-system based router to support streaming SSR.");

package/dist/types/document/DocumentStructrueContext.d.ts

@@ -2,6 +2,7 @@ import React, { ReactNode } from 'react';
 declare type DocumentStructrueContextProps = {
   hasSetHead?: boolean;
   hasSetScripts?: boolean;
+  hasSetLinks?: boolean;
   hasSetBody?: boolean;
   hasSetRoot?: boolean;
   docChild?: ReactNode;

package/dist/types/document/Links.d.ts

@@ -0,0 +1,2 @@
+/// <reference types="react" />
+export declare function Links(): JSX.Element;

package/dist/types/document/constants.d.ts

@@ -8,6 +8,7 @@ export declare const DOCUMENT_CHUNKSMAP_PLACEHOLDER: string;
 export declare const DOCUMENT_SSRDATASCRIPT_PLACEHOLDER: string;
 export declare const DOCUMENT_FILE_NAME = "Document";
 export declare const DOCUMENT_SCRIPTS_PLACEHOLDER: string;
+export declare const DOCUMENT_LINKS_PLACEHOLDER: string;
 export declare const DOCUMENT_NO_SCRIPTE_PLACEHOLDER: string;
 export declare const DOCUMENT_SCRIPT_PLACEHOLDER_START: string;
 export declare const DOCUMENT_SCRIPT_PLACEHOLDER_END: string;

package/dist/types/document/index.d.ts

@@ -4,6 +4,7 @@ export * from './DocumentStructrueContext';
 export * from './Head';
 export * from './Body';
 export * from './Root';
+export * from './Links';
 export * from './Scripts';
 export * from './Script';
 export * from './constants';

package/dist/types/router/runtime/index.d.ts

@@ -4,4 +4,5 @@ export type { SingleRouteConfig, RouterConfig };
 export default routerPlugin;
 export { modifyRoutes } from './plugin';
 export * from 'react-router-dom';
+export * from 'react-router-dom/server';
 export * from './withRouter';

package/dist/types/router/runtime/types.d.ts

@@ -27,7 +27,7 @@ export declare type SingleRouteConfig = RouteProps & {
   component?: React.ComponentType;
 };
 export declare type RouterConfig = {
-  legacy?: boolean;
+  mode?: 'react-router-5';
   routesConfig: {
     globalApp?: React.ComponentType<any>;
     routes: (NestedRoute | PageRoute)[];

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.0.0-beta.4",
+  "version": "2.0.0-beta.6",
   "engines": {
     "node": ">=14.17.6"
   },
@@ -94,6 +94,9 @@
       "loadable": [
         "./dist/types/exports/loadable.d.ts"
       ],
+      "cli": [
+        "./dist/types/cli/index.d.ts"
+      ],
       "head": [
         "./dist/types/exports/head.d.ts"
       ],
@@ -125,18 +128,20 @@
   },
   "dependencies": {
     "@babel/core": "^7.18.0",
-    "@babel/types": "^7.18.0",
     "@babel/runtime": "^7.18.0",
+    "@babel/types": "^7.18.0",
     "@loadable/babel-plugin": "^5.13.2",
-    "@loadable/webpack-plugin": "5.15.2",
     "@loadable/component": "^5.15.0",
     "@loadable/server": "^5.15.1",
+    "@loadable/webpack-plugin": "5.15.2",
     "@modern-js-reduck/plugin-auto-actions": "^1.1.4",
     "@modern-js-reduck/plugin-devtools": "^1.1.4",
     "@modern-js-reduck/plugin-effects": "^1.1.4",
     "@modern-js-reduck/plugin-immutable": "^1.1.4",
     "@modern-js-reduck/react": "^1.1.4",
     "@modern-js-reduck/store": "^1.1.4",
+    "@remix-run/node": "^1.9.0",
+    "@remix-run/router": "^1.2.0",
     "@types/loadable__component": "^5.13.4",
     "@types/react-helmet": "^6.1.2",
     "@types/redux-logger": "^3.0.9",
@@ -144,26 +149,24 @@
     "hoist-non-react-statics": "^3.3.2",
     "invariant": "^2.2.4",
     "react-helmet": "^6.1.0",
-    "@remix-run/node": "^1.7.0",
-    "@remix-run/router": "^1.0.4",
     "react-is": "^18",
-    "react-router-dom": "^6.4.4",
+    "react-router-dom": "^6.6.0",
     "react-side-effect": "^2.1.1",
     "redux-logger": "^3.0.6",
     "serialize-javascript": "^6.0.0",
     "styled-components": "^5.3.1",
-    "@modern-js/plugin": "2.0.0-beta.4",
-    "@modern-js/utils": "2.0.0-beta.4",
-    "@modern-js/types": "2.0.0-beta.4"
+    "@modern-js/plugin": "2.0.0-beta.6",
+    "@modern-js/types": "2.0.0-beta.6",
+    "@modern-js/utils": "2.0.0-beta.6"
   },
   "peerDependencies": {
     "react": ">=17",
     "react-dom": ">=17"
   },
   "devDependencies": {
+    "@remix-run/web-fetch": "^4.1.3",
     "@testing-library/react": "^13.4.0",
     "@testing-library/react-hooks": "^8.0.1",
-    "@remix-run/web-fetch": "^4.1.3",
     "@types/invariant": "^2.2.30",
     "@types/jest": "^27",
     "@types/loadable__webpack-plugin": "^5.7.3",
@@ -175,11 +178,11 @@
     "react-dom": "^18",
     "ts-jest": "^27.0.4",
     "typescript": "^4",
-    "@modern-js/core": "2.0.0-beta.4",
-    "@modern-js/server-core": "2.0.0-beta.4",
-    "@scripts/build": "2.0.0-beta.4",
-    "@modern-js/app-tools": "2.0.0-beta.4",
-    "@scripts/jest-config": "2.0.0-beta.4"
+    "@modern-js/app-tools": "2.0.0-beta.6",
+    "@modern-js/core": "2.0.0-beta.6",
+    "@modern-js/server-core": "2.0.0-beta.6",
+    "@scripts/build": "2.0.0-beta.6",
+    "@scripts/jest-config": "2.0.0-beta.6"
   },
   "sideEffects": false,
   "modernConfig": {},

package/types/index.d.ts

@@ -1,7 +1,7 @@
 import { StateConfig } from '../dist/types';
 
-declare module '@modern-js/core/config' {
-  interface RuntimeConfig {
+declare module '@modern-js/app-tools' {
+  interface RuntimeUserConfig {
     state?: StateConfig | boolean;
   }
 }

package/types/router.d.ts

@@ -1,8 +1,8 @@
 import { RouterConfig } from '../dist/types';
 import '../dist/types/router';
 
-declare module '@modern-js/core/config' {
-  interface RuntimeConfig {
+declare module '@modern-js/app-tools' {
+  interface RuntimeUserConfig {
     router?: RouterConfig | boolean;
   }
 }