@modern-js/runtime 2.4.1-beta.0 → 2.5.0-alpha.0

package/dist/esm-node/ssr/serverRender/renderToString/index.worker.js

@@ -0,0 +1,29 @@
+import { PreRender } from "../../react/prerender";
+import { time } from "../time";
+import SSREntry from "./entry";
+const render = async ({
+  App,
+  context,
+  config
+}) => {
+  const ssrContext = context.ssrContext;
+  const entry = new SSREntry({
+    ctx: ssrContext,
+    App,
+    config
+  });
+  entry.metrics.emitCounter("app.visit.count", 1);
+  const end = time();
+  const html = await entry.renderToHtml(context);
+  const cost = end();
+  entry.logger.info("App Render Total cost = %d ms", cost);
+  entry.metrics.emitTimer("app.render.cost", cost);
+  const cacheConfig = PreRender.config();
+  if (cacheConfig) {
+    context.ssrContext.cacheConfig = cacheConfig;
+  }
+  return html;
+};
+export {
+  render
+};

package/dist/{js/modern → esm-node}/ssr/utils.js

@@ -1,19 +1,3 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
 const isReact18 = () => process.env.IS_REACT18 === "true";
 const formatServer = (request) => {
   const {
@@ -21,11 +5,12 @@ const formatServer = (request) => {
     "user-agent": userAgent = "",
     referer
   } = request.headers || {};
-  return __spreadValues({
+  return {
     cookie,
     userAgent,
-    referer
-  }, request);
+    referer,
+    ...request
+  };
 };
 const getQuery = () => window.location.search.substring(1).split("&").reduce((res, item) => {
   const [key, value] = item.split("=");

package/dist/{js/modern → esm-node}/state/runtime/plugin.js

@@ -1,22 +1,3 @@
-var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 import { jsx } from "react/jsx-runtime";
 import { useContext } from "react";
 import {
@@ -64,7 +45,9 @@ const state = (config) => ({
           return /* @__PURE__ */ jsx(Provider, {
             store: context.store,
             config: storeConfig,
-            children: /* @__PURE__ */ jsx(App, __spreadValues({}, props))
+            children: /* @__PURE__ */ jsx(App, {
+              ...props
+            })
           });
         };
         return next({
@@ -82,9 +65,10 @@ const state = (config) => ({
       pickContext({ context, pickedContext }, next) {
         return next({
           context,
-          pickedContext: __spreadProps(__spreadValues({}, pickedContext), {
+          pickedContext: {
+            ...pickedContext,
             store: context.store
-          })
+          }
         });
       }
     };

package/dist/types/common.d.ts

@@ -3,4 +3,6 @@ export declare const isBrowser: () => boolean;
 export interface AppConfig {
   state?: StateConfig | boolean;
   [key: string]: any;
-}
+}
+export declare const JSX_SHELL_STREAM_END_MARK = "<!--<?- SHELL_STREAM_END ?>-->";
+export declare const ESCAPED_SHELL_STREAM_END_MARK = "&lt;!--&lt;?- SHELL_STREAM_END ?&gt;--&gt;";

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

@@ -5,4 +5,5 @@ export * from './compatible';
 export type { TRuntimeContext, RuntimeContext } from '../runtime-context';
 export { RuntimeReactContext, ServerRouterContext } from '../runtime-context';
 export * from './loader';
+export type { SSRData, SSRContainer } from './types';
 export * from '@modern-js/plugin';

package/dist/types/core/loader/index.d.ts

@@ -1,2 +1 @@
-export { default as useLoader } from './useLoader';
-export type { SSRData, SSRContainer } from './useLoader';
+export { default as useLoader } from './useLoader';

package/dist/types/core/loader/useLoader.d.ts

@@ -1,17 +1,4 @@
-import { LoaderResult } from './loaderManager';
-export interface SSRData {
-  loadersData: Record<string, LoaderResult | undefined>;
-  initialData?: Record<string, unknown>;
-  storeState?: any;
-}
-export interface SSRContainer {
-  data?: SSRData;
-}
-declare global {
-  interface Window {
-    _SSR_DATA?: SSRContainer;
-  }
-}
+type LoaderFn<P = any, T = any> = (context: any, params: P) => Promise<T>;
 export interface LoaderOptions<Params = any, TData = any, TError extends Error = any> {
   /**
    * Revoke when loader excuted successfully.
@@ -44,7 +31,6 @@ export interface LoaderOptions<Params = any, TData = any, TError extends Error =
 
   static?: boolean;
 }
-type LoaderFn<P = any, T = any> = (context: any, params: P) => Promise<T>;
 declare const useLoader: <TData = any, Params = any, E = any>(loaderFn: LoaderFn<Params, TData>, options?: LoaderOptions<Params, any, any>) => {
   reload: (params?: Params | undefined) => Promise<any> | undefined;
   loading: boolean;

package/dist/types/core/types.d.ts

@@ -0,0 +1,21 @@
+import type { LoaderResult } from './loader/loaderManager';
+declare global {
+  interface Window {
+    _SSR_DATA?: SSRContainer;
+    _ROUTER_DATA?: RouterSSRData;
+  }
+}
+export interface SSRData {
+  loadersData: Record<string, LoaderResult | undefined>;
+  initialData?: Record<string, unknown>;
+  storeState?: any;
+}
+export interface RouteData {
+  [routeId: string]: any;
+}
+export interface RouterSSRData {
+  loaderData: RouteData;
+}
+export interface SSRContainer {
+  data?: SSRData;
+}

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

@@ -1,4 +1,6 @@
 import type { CliPlugin, AppTools } from '@modern-js/app-tools';
+import { Entrypoint } from '@modern-js/types/cli';
+export declare const getDocumenByEntryName: (entrypoints: Entrypoint[], entryName: string, fallbackDir?: string) => string | undefined;
 
 declare const _default: () => CliPlugin<AppTools>;
 

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

@@ -0,0 +1,3 @@
+export { routerPlugin as router } from './runtime/plugin.node';
+export { routerPlugin as default } from './runtime/plugin.node';
+export * from './runtime';

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

@@ -0,0 +1,8 @@
+/// <reference types="react" />
+
+/**
+ * DeferredDataScripts only renders in server side,
+ * it doesn't need to be hydrated in client side.
+ */
+declare const DeferredDataScripts: () => JSX.Element;
+export default DeferredDataScripts;

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

@@ -3,5 +3,7 @@ import type { SingleRouteConfig, RouterConfig } from './types';
 export type { SingleRouteConfig, RouterConfig };
 export default routerPlugin;
 export { modifyRoutes } from './plugin';
-export * from 'react-router-dom';
-export * from './withRouter';
+export * from './withRouter';
+export type { FormProps, Location, NavigateFunction, Params, Path, ShouldRevalidateFunction, SubmitFunction, SubmitOptions, unstable_Blocker, unstable_BlockerFunction } from 'react-router-dom';
+export { Form, Outlet, useAsyncError, useAsyncValue, isRouteErrorResponse, useBeforeUnload, useFormAction, useHref, useLocation, useNavigate, useNavigation, useNavigationType, useOutlet, useOutletContext, useParams, useResolvedPath, useRevalidator, useRouteError, useRouteLoaderData, useSearchParams, useSubmit, unstable_useBlocker, unstable_usePrompt } from 'react-router-dom';
+export { defer } from '@modern-js/utils/remix-router';

package/dist/types/runtime-context.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="react" />
 import { Store } from '@modern-js-reduck/store';
+import type { StaticHandlerContext } from '@modern-js/utils/remix-router';
 import { createLoaderManager } from './core/loader/loaderManager';
 import { runtime } from './core/plugin';
 import { SSRServerContext } from './ssr/serverRender/types';
@@ -9,6 +10,7 @@ export interface BaseRuntimeContext {
   runner: ReturnType<typeof runtime.init>;
   ssrContext?: SSRServerContext;
   store?: Store;
+  routerContext?: StaticHandlerContext;
 }
 export interface RuntimeContext extends BaseRuntimeContext {
   [key: string]: any;

package/dist/types/ssr/serverRender/renderToStream/buildTemplate.after.d.ts

@@ -1,6 +1,8 @@
+import type { StaticHandlerContext } from '@modern-js/utils/remix-router';
 import { RenderLevel, SSRServerContext } from '../types';
 type BuildShellAfterTemplateOptions = {
   ssrContext: SSRServerContext;
+  routerContext: StaticHandlerContext;
   renderLevel: RenderLevel;
 };
 export declare function buildShellAfterTemplate(afterAppTemplate: string, options: BuildShellAfterTemplateOptions): string;

package/package.json

@@ -11,68 +11,79 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.4.1-beta.0",
+  "version": "2.5.0-alpha.0",
   "engines": {
     "node": ">=14.17.6"
   },
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index",
-  "main": "./dist/js/node/index.js",
-  "module": "./dist/js/treeshaking/index.js",
-  "jsnext:modern": "./dist/js/modern/index.js",
+  "main": "./dist/cjs/index.js",
+  "module": "./dist/esm/index.js",
   "exports": {
     ".": {
       "jsnext:source": "./src/index.ts",
-      "default": "./dist/js/treeshaking/index.js"
+      "types": "./dist/types/index.d.ts",
+      "default": "./dist/esm/index.js"
     },
     "./loadable": {
       "jsnext:source": "./src/exports/loadable.ts",
-      "default": "./dist/js/treeshaking/exports/loadable.js"
+      "types": "./dist/types/exports/loadable.d.ts",
+      "default": "./dist/esm/exports/loadable.js"
     },
     "./head": {
       "jsnext:source": "./src/exports/head.ts",
-      "default": "./dist/js/treeshaking/exports/head.js"
+      "types": "./dist/types/exports/head.d.ts",
+      "default": "./dist/esm/exports/head.js"
     },
     "./styled": {
       "jsnext:source": "./src/exports/styled.ts",
-      "default": "./dist/js/treeshaking/exports/styled.js"
+      "types": "./dist/types/exports/styled.d.ts",
+      "default": "./dist/esm/exports/styled.js"
     },
     "./server": {
       "jsnext:source": "./src/exports/server.ts",
-      "node": "./dist/js/node/exports/server.js",
-      "default": "./dist/js/treeshaking/exports/server.js"
+      "node": "./dist/cjs/exports/server.js",
+      "types": "./dist/types/exports/server.d.ts",
+      "default": "./dist/esm/exports/server.js"
     },
     "./document": {
       "jsnext:source": "./src/document/index.ts",
-      "node": "./dist/js/node/document/index.js",
-      "default": "./dist/js/treeshaking/document/index.js"
+      "node": "./dist/cjs/document/index.js",
+      "types": "./dist/types/document/index.d.ts",
+      "default": "./dist/esm/document/index.js"
     },
     "./document/cli": {
       "jsnext:source": "./src/document/cli/index.ts",
-      "node": "./dist/js/node/document/cli/index.js",
-      "default": "./dist/js/treeshaking/document/cli/index.js"
+      "node": "./dist/cjs/document/cli/index.js",
+      "types": "./dist/types/document/index.d.ts",
+      "default": "./dist/esm/document/cli/index.js"
     },
     "./ssr": {
       "jsnext:source": "./src/ssr/index.ts",
-      "node": "./dist/js/treeshaking/ssr/index.node.js",
-      "worker": "./dist/js/treeshaking/ssr/index.node.js",
-      "default": "./dist/js/treeshaking/ssr/index.js"
+      "node": "./dist/esm/ssr/index.node.js",
+      "worker": "./dist/esm/ssr/index.node.js",
+      "types": "./dist/types/ssr/index.d.ts",
+      "default": "./dist/esm/ssr/index.js"
     },
     "./model": {
       "jsnext:source": "./src/state/index.ts",
-      "default": "./dist/js/treeshaking/state/index.js"
+      "types": "./dist/types/model.d.ts",
+      "default": "./dist/esm/state/index.js"
     },
     "./cli": {
       "jsnext:source": "./src/cli/index.ts",
-      "default": "./dist/js/node/cli/index.js"
+      "types": "./dist/types/cli/index.d.ts",
+      "default": "./dist/cjs/cli/index.js"
     },
     "./router": {
       "jsnext:source": "./src/router/index.ts",
-      "default": "./dist/js/treeshaking/router/index.js"
+      "types": "./dist/types/router/index.d.ts",
+      "default": "./dist/esm/router/index.js"
     },
     "./router/server": {
       "jsnext:source": "./src/router/runtime/server.ts",
-      "default": "./dist/js/treeshaking/router/runtime/server.js"
+      "types": "./dist/types/router/runtime/server.d.ts",
+      "default": "./dist/esm/router/runtime/server.js"
     }
   },
   "typesVersions": {
@@ -132,25 +143,23 @@
     "@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",
+    "@remix-run/node": "^1.12.0",
     "@types/loadable__component": "^5.13.4",
     "@types/react-helmet": "^6.1.2",
     "@types/redux-logger": "^3.0.9",
     "@types/styled-components": "^5.1.14",
+    "esbuild": "0.15.7",
     "hoist-non-react-statics": "^3.3.2",
     "invariant": "^2.2.4",
     "react-helmet": "^6.1.0",
     "react-is": "^18",
-    "react-router-dom": "^6.6.0",
+    "react-router-dom": "^6.8.1",
     "react-side-effect": "^2.1.1",
     "redux-logger": "^3.0.6",
-    "serialize-javascript": "^6.0.0",
     "styled-components": "^5.3.1",
-    "esbuild": "0.15.7",
-    "@modern-js/plugin": "2.4.0",
-    "@modern-js/types": "2.4.0",
-    "@modern-js/utils": "2.4.1-beta.0"
+    "@modern-js/plugin": "2.5.0",
+    "@modern-js/utils": "2.5.0-alpha.0",
+    "@modern-js/types": "2.5.0"
   },
   "peerDependencies": {
     "react": ">=17",
@@ -165,17 +174,16 @@
     "@types/loadable__webpack-plugin": "^5.7.3",
     "@types/node": "^14",
     "@types/react-side-effect": "^1.1.1",
-    "@types/serialize-javascript": "^5.0.1",
     "jest": "^27",
     "react": "^18",
     "react-dom": "^18",
     "ts-jest": "^27.0.4",
     "typescript": "^4",
-    "@modern-js/app-tools": "3.0.0-beta.0",
-    "@modern-js/core": "2.4.1-beta.0",
-    "@modern-js/server-core": "2.4.1-beta.0",
-    "@scripts/jest-config": "2.4.0",
-    "@scripts/build": "2.4.0"
+    "@modern-js/app-tools": "2.5.0",
+    "@modern-js/server-core": "2.5.0",
+    "@modern-js/core": "2.5.0",
+    "@scripts/build": "2.5.0",
+    "@scripts/jest-config": "2.5.0"
   },
   "sideEffects": false,
   "modernConfig": {},

package/dist/js/modern/common.js

@@ -1,4 +0,0 @@
-const isBrowser = () => typeof window !== "undefined" && window.name !== "nodejs";
-export {
-  isBrowser
-};

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

@@ -1,9 +0,0 @@
-import { routerPlugin } from "./plugin";
-var runtime_default = routerPlugin;
-import { modifyRoutes } from "./plugin";
-export * from "react-router-dom";
-export * from "./withRouter";
-export {
-  runtime_default as default,
-  modifyRoutes
-};

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

@@ -1,149 +0,0 @@
-var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
-var __async = (__this, __arguments, generator) => {
-  return new Promise((resolve, reject) => {
-    var fulfilled = (value) => {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var rejected = (value) => {
-      try {
-        step(generator.throw(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
-    step((generator = generator.apply(__this, __arguments)).next());
-  });
-};
-import { jsx } from "react/jsx-runtime";
-import { useContext } from "react";
-import { createStaticHandler } from "@remix-run/router";
-import {
-  createStaticRouter,
-  StaticRouterProvider
-} from "react-router-dom/server";
-import hoistNonReactStatics from "hoist-non-react-statics";
-import { createRoutesFromElements } from "react-router-dom";
-import { RuntimeReactContext } from "../../core";
-import { renderRoutes, urlJoin } from "./utils";
-import { installGlobals } from "./fetch";
-installGlobals();
-function createFetchRequest(req) {
-  const origin = `${req.protocol}://${req.host}`;
-  const url = new URL(req.originalUrl || req.url, origin);
-  const controller = new AbortController();
-  const init = {
-    method: req.method,
-    headers: createFetchHeaders(req.headers),
-    signal: controller.signal
-  };
-  return new Request(url.href, init);
-}
-function createFetchHeaders(requestHeaders) {
-  const headers = new Headers();
-  for (const [key, values] of Object.entries(requestHeaders || {})) {
-    if (values) {
-      if (Array.isArray(values)) {
-        for (const value of values) {
-          headers.append(key, value);
-        }
-      } else {
-        headers.set(key, values);
-      }
-    }
-  }
-  return headers;
-}
-const routerPlugin = ({
-  basename = "",
-  routesConfig,
-  createRoutes
-}) => {
-  return {
-    name: "@modern-js/plugin-router",
-    setup: () => {
-      return {
-        init(_0, _1) {
-          return __async(this, arguments, function* ({ context }, next) {
-            if (!routesConfig && !createRoutes) {
-              return next({ context });
-            }
-            const { request } = context.ssrContext;
-            const baseUrl = request.baseUrl;
-            const _basename = baseUrl === "/" ? urlJoin(baseUrl, basename) : baseUrl;
-            const routes = createRoutes ? createRoutes() : createRoutesFromElements(renderRoutes(routesConfig));
-            const { query } = createStaticHandler(routes, {
-              basename: _basename
-            });
-            const remixRequest = createFetchRequest(request);
-            const routerContext = yield query(remixRequest);
-            if (routerContext instanceof Response) {
-              return routerContext;
-            }
-            const router = createStaticRouter(routes, routerContext);
-            context.router = router;
-            context.routerContext = routerContext;
-            context.routes = routes;
-            context.routeManifest = context.ssrContext.routeManifest;
-            return next({ context });
-          });
-        },
-        hoc: ({ App }, next) => {
-          if (!routesConfig) {
-            return next({ App });
-          }
-          const getRouteApp = () => {
-            return (props) => {
-              const { router, routerContext } = useContext(RuntimeReactContext);
-              return /* @__PURE__ */ jsx(App, __spreadProps(__spreadValues({}, props), {
-                children: /* @__PURE__ */ jsx(StaticRouterProvider, {
-                  router,
-                  context: routerContext,
-                  nonce: "the-nonce"
-                })
-              }));
-            };
-          };
-          const RouteApp = getRouteApp();
-          if (routesConfig == null ? void 0 : routesConfig.globalApp) {
-            return next({
-              App: hoistNonReactStatics(RouteApp, routesConfig.globalApp)
-            });
-          }
-          return next({
-            App: RouteApp
-          });
-        }
-      };
-    }
-  };
-};
-const modifyRoutes = () => {
-};
-export {
-  createFetchHeaders,
-  modifyRoutes,
-  routerPlugin
-};