@modern-js/runtime 2.52.0 → 2.54.0

package/dist/types/router/cli/constants.d.ts

@@ -0,0 +1,32 @@
+export declare const PAGES_DIR_NAME = "pages";
+export declare const NESTED_ROUTES_DIR = "routes";
+export declare const FILE_SYSTEM_ROUTES_FILE_NAME = "routes.js";
+export declare const LOADER_EXPORT_NAME = "loader";
+export declare const ACTION_EXPORT_NAME = "action";
+export declare const TEMP_LOADERS_DIR = "__loaders__";
+export declare const FILE_SYSTEM_ROUTES_LAYOUT = "_layout";
+export declare const FILE_SYSTEM_ROUTES_GLOBAL_LAYOUT = "_app";
+export declare const FILE_SYSTEM_ROUTES_INDEX = "index";
+export declare const FILE_SYSTEM_ROUTES_IGNORED_REGEX: RegExp;
+export declare const FILE_SYSTEM_ROUTES_DYNAMIC_REGEXP: RegExp;
+export declare const FILE_SYSTEM_ROUTES_COMPONENTS_DIR = "internal_components";
+export declare const NESTED_ROUTE: {
+    LAYOUT_FILE: string;
+    LAYOUT_CONFIG_FILE: string;
+    LAYOUT_LOADER_FILE: string;
+    LAYOUT_DATA_FILE: string;
+    LAYOUT_CLIENT_LOADER: string;
+    PAGE_FILE: string;
+    PAGE_CONFIG_FILE: string;
+    PAGE_LOADER_FILE: string;
+    PAGE_DATA_FILE: string;
+    PAGE_CLIENT_LOADER: string;
+    SPLATE_FILE: string;
+    SPLATE_CONFIG_FILE: string;
+    SPLATE_LOADER_FILE: string;
+    SPLATE_DATA_FILE: string;
+    SPLATE_CLIENT_DATA: string;
+    LOADING_FILE: string;
+    ERROR_FILE: string;
+    LOADER_FILE: string;
+};

package/dist/types/router/cli/entry.d.ts

@@ -0,0 +1,5 @@
+import { Entrypoint } from '@modern-js/types';
+export declare const hasPages: (dir: string) => boolean;
+export declare const hasNestedRoutes: (dir: string) => boolean;
+export declare const isRouteEntry: (dir: string) => string | false;
+export declare const modifyEntrypoints: (entrypoints: Entrypoint[], config?: Record<string, any>) => Entrypoint[];

package/dist/types/router/cli/handler.d.ts

@@ -0,0 +1,5 @@
+import { Entrypoint } from '@modern-js/types';
+import { PluginAPI } from '@modern-js/core';
+import { AppTools } from '@modern-js/app-tools';
+export declare function handleModifyEntrypoints(api: PluginAPI<AppTools<'shared'>>, entrypoints: Entrypoint[]): Promise<Entrypoint[]>;
+export declare function handleFileChange(api: PluginAPI<AppTools<'shared'>>, e: any): Promise<void>;

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

@@ -1,3 +1,5 @@
 import type { CliPlugin, AppTools } from '@modern-js/app-tools';
-export declare const routerPlugin: () => CliPlugin<AppTools>;
+export { isRouteEntry } from './entry';
+export { handleFileChange, handleModifyEntrypoints } from './handler';
+export declare const routerPlugin: () => CliPlugin<AppTools<'shared'>>;
 export default routerPlugin;

package/dist/types/ssr/serverRender/types.d.ts

@@ -19,6 +19,7 @@ export type RenderResult = {
         css: string;
     };
 };
+type LoaderFailureMode = 'clientRender' | 'errorBoundary';
 export type SSRServerContext = BaseSSRServerContext & {
     request: BaseSSRServerContext['request'] & {
         userAgent: string;
@@ -27,6 +28,7 @@ export type SSRServerContext = BaseSSRServerContext & {
     };
     htmlModifiers: BuildHtmlCb[];
     tracker: SSRTracker;
+    loaderFailureMode?: 'clientRender' | 'errorBoundary';
 };
 export type ModernSSRReactComponent = React.ComponentType<any>;
 export { RuntimeContext };
@@ -36,6 +38,7 @@ export type SSRPluginConfig = {
     enableInlineStyles?: boolean | RegExp;
     enableInlineScripts?: boolean | RegExp;
     disablePrerender?: boolean;
+    loaderFailureMode?: LoaderFailureMode;
     chunkLoadingGlobal?: string;
     unsafeHeaders?: string[];
 } & Exclude<ServerUserConfig['ssr'], boolean>;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.52.0",
+  "version": "2.54.0",
   "engines": {
     "node": ">=14.17.6"
   },
@@ -33,6 +33,16 @@
     "./types/index": "./types/index.d.ts",
     "./types/router": "./types/router.d.ts",
     "./types/model": "./types/model.d.ts",
+    "./context": {
+      "types": "./dist/types/core/context/index.d.ts",
+      "jsnext:source": "./src/core/context/index.ts",
+      "default": "./dist/cjs/core/context/index.js"
+    },
+    "./plugin": {
+      "types": "./dist/types/core/plugin/index.d.ts",
+      "jsnext:source": "./src/core/plugin/index.ts",
+      "default": "./dist/cjs/core/plugin/index.js"
+    },
     "./loadable": {
       "types": "./dist/types/exports/loadable.d.ts",
       "jsnext:source": "./src/exports/loadable.ts",
@@ -93,6 +103,11 @@
       "jsnext:source": "./src/router/runtime/server.ts",
       "default": "./dist/esm/router/runtime/server.js"
     },
+    "./router/cli": {
+      "types": "./dist/types/router/cli/index.d.ts",
+      "jsnext:source": "./src/router/cli/index.ts",
+      "default": "./dist/cjs/router/cli/index.js"
+    },
     "./loadable-bundler-plugin": {
       "types": "./dist/types/ssr/cli/loadable-bundler-plugin.d.ts",
       "jsnext:source": "./src/ssr/cli/loadable-bundler-plugin.ts",
@@ -113,6 +128,12 @@
       "cli": [
         "./dist/types/cli/index.d.ts"
       ],
+      "context": [
+        "./dist/types/core/context/index.d.ts"
+      ],
+      "plugin": [
+        "./dist/types/core/plugin/index.d.ts"
+      ],
       "head": [
         "./dist/types/exports/head.d.ts"
       ],
@@ -140,6 +161,9 @@
       "router/server": [
         "./dist/types/router/runtime/server.d.ts"
       ],
+      "router/cli": [
+        "./dist/types/router/cli/index.d.ts"
+      ],
       "loadable-bundler-plugin": [
         "./dist/types/ssr/cli/loadable-bundler-plugin.d.ts"
       ]
@@ -163,6 +187,7 @@
     "@types/react-helmet": "^6.1.2",
     "@types/styled-components": "^5.1.14",
     "esbuild": "0.17.19",
+    "es-module-lexer": "^1.1.0",
     "hoist-non-react-statics": "^3.3.2",
     "invariant": "^2.2.4",
     "react-helmet": "^6.1.0",
@@ -170,10 +195,11 @@
     "react-side-effect": "^2.1.1",
     "styled-components": "^5.3.1",
     "@swc/helpers": "0.5.3",
-    "@modern-js/plugin": "2.52.0",
-    "@modern-js/types": "2.52.0",
-    "@modern-js/runtime-utils": "2.52.0",
-    "@modern-js/utils": "2.52.0"
+    "@modern-js/plugin": "2.54.0",
+    "@modern-js/types": "2.54.0",
+    "@modern-js/runtime-utils": "2.54.0",
+    "@modern-js/plugin-data-loader": "2.54.0",
+    "@modern-js/utils": "2.54.0"
   },
   "peerDependencies": {
     "react": ">=17",
@@ -193,12 +219,12 @@
     "react-dom": "^18",
     "ts-jest": "^29.1.0",
     "typescript": "^5",
-    "webpack": "^5.91.0",
-    "@scripts/build": "2.52.0",
-    "@modern-js/core": "2.52.0",
-    "@modern-js/app-tools": "2.52.0",
-    "@modern-js/server-core": "2.52.0",
-    "@scripts/jest-config": "2.52.0"
+    "webpack": "^5.92.0",
+    "@modern-js/app-tools": "2.54.0",
+    "@modern-js/core": "2.54.0",
+    "@modern-js/server-core": "2.54.0",
+    "@scripts/build": "2.54.0",
+    "@scripts/jest-config": "2.54.0"
   },
   "sideEffects": false,
   "publishConfig": {

package/dist/esm/core/plugin.js

@@ -1,59 +0,0 @@
-import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
-import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
-import { createManager, createPipeline, createAsyncPipeline } from "@modern-js/plugin";
-import { createLoaderManager } from "./loader/loaderManager";
-var hoc = createPipeline();
-var provide = createPipeline();
-var client = createAsyncPipeline();
-var server = createAsyncPipeline();
-var init = createAsyncPipeline();
-var pickContext = createPipeline();
-var runtimeHooks = {
-  hoc,
-  provide,
-  client,
-  server,
-  init,
-  pickContext
-};
-var createRuntime = function() {
-  return createManager(runtimeHooks);
-};
-var registerInit = function(App, _init) {
-  var originalInit = App.init;
-  App.init = function() {
-    var _ref = _async_to_generator(function(context) {
-      return _ts_generator(this, function(_state) {
-        switch (_state.label) {
-          case 0:
-            if (!context.loaderManager) {
-              context.loaderManager = createLoaderManager({});
-            }
-            return [
-              4,
-              Promise.all([
-                originalInit === null || originalInit === void 0 ? void 0 : originalInit(context),
-                _init === null || _init === void 0 ? void 0 : _init(context)
-              ])
-            ];
-          case 1:
-            _state.sent();
-            return [
-              2
-            ];
-        }
-      });
-    });
-    return function(context) {
-      return _ref.apply(this, arguments);
-    };
-  }();
-};
-var runtime = createRuntime();
-var createPlugin = runtime.createPlugin;
-export {
-  createPlugin,
-  createRuntime,
-  registerInit,
-  runtime
-};

package/dist/esm/runtimeContext.js

@@ -1,7 +0,0 @@
-import { createContext } from "react";
-var RuntimeReactContext = createContext({});
-var ServerRouterContext = createContext({});
-export {
-  RuntimeReactContext,
-  ServerRouterContext
-};

package/dist/esm-node/core/plugin.js

@@ -1,37 +0,0 @@
-import { createManager, createPipeline, createAsyncPipeline } from "@modern-js/plugin";
-import { createLoaderManager } from "./loader/loaderManager";
-const hoc = createPipeline();
-const provide = createPipeline();
-const client = createAsyncPipeline();
-const server = createAsyncPipeline();
-const init = createAsyncPipeline();
-const pickContext = createPipeline();
-const runtimeHooks = {
-  hoc,
-  provide,
-  client,
-  server,
-  init,
-  pickContext
-};
-const createRuntime = () => createManager(runtimeHooks);
-const registerInit = (App, _init) => {
-  const originalInit = App.init;
-  App.init = async (context) => {
-    if (!context.loaderManager) {
-      context.loaderManager = createLoaderManager({});
-    }
-    await Promise.all([
-      originalInit === null || originalInit === void 0 ? void 0 : originalInit(context),
-      _init === null || _init === void 0 ? void 0 : _init(context)
-    ]);
-  };
-};
-const runtime = createRuntime();
-const { createPlugin } = runtime;
-export {
-  createPlugin,
-  createRuntime,
-  registerInit,
-  runtime
-};

package/dist/esm-node/runtimeContext.js

@@ -1,7 +0,0 @@
-import { createContext } from "react";
-const RuntimeReactContext = createContext({});
-const ServerRouterContext = createContext({});
-export {
-  RuntimeReactContext,
-  ServerRouterContext
-};

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

@@ -1,4 +0,0 @@
-import type React from 'react';
-import { AppConfig } from '../common';
-export declare const getConfig: (Component: React.ComponentType<any>) => AppConfig | undefined;
-export declare const defineConfig: (Component: React.ComponentType<any>, config: AppConfig) => React.ComponentType<any>;

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

@@ -1,204 +0,0 @@
-import type React from 'react';
-import { Setup, ToThreads, CommonAPI, PluginOptions } from '@modern-js/plugin';
-import type { RuntimeContext, TRuntimeContext } from '../runtimeContext';
-export interface AppProps {
-}
-declare const runtimeHooks: {
-    hoc: import("@modern-js/plugin").Pipeline<{
-        App: React.ComponentType<any>;
-    }, React.ComponentType<any>>;
-    provide: import("@modern-js/plugin").Pipeline<{
-        element: JSX.Element;
-        readonly props: AppProps;
-        readonly context: RuntimeContext;
-    }, JSX.Element>;
-    client: import("@modern-js/plugin").AsyncPipeline<{
-        App: React.ComponentType<any>;
-        readonly context: RuntimeContext;
-        ModernRender: (App: React.ReactElement) => void;
-        ModernHydrate: (App: React.ReactElement, callback?: () => void) => void;
-    }, void>;
-    server: import("@modern-js/plugin").AsyncPipeline<{
-        App: React.ComponentType<any>;
-        readonly context: RuntimeContext;
-    }, string>;
-    init: import("@modern-js/plugin").AsyncPipeline<{
-        context: RuntimeContext;
-    }, unknown>;
-    pickContext: import("@modern-js/plugin").Pipeline<{
-        context: RuntimeContext;
-        pickedContext: TRuntimeContext;
-    }, TRuntimeContext>;
-};
-/** All hooks of runtime plugin. */
-export type RuntimeHooks = typeof runtimeHooks;
-/** All hook callbacks of runtime plugin. */
-export type RuntimeHookCallbacks = ToThreads<RuntimeHooks>;
-/** All apis for runtime plugin. */
-export type PluginAPI = CommonAPI<RuntimeHooks>;
-/** Plugin options of a runtime plugin. */
-export type Plugin = PluginOptions<RuntimeHooks, Setup<RuntimeHooks>>;
-export declare const createRuntime: () => import("@modern-js/plugin").Manager<{
-    hoc: import("@modern-js/plugin").Pipeline<{
-        App: React.ComponentType<any>;
-    }, React.ComponentType<any>>;
-    provide: import("@modern-js/plugin").Pipeline<{
-        element: JSX.Element;
-        readonly props: AppProps;
-        readonly context: RuntimeContext;
-    }, JSX.Element>;
-    client: import("@modern-js/plugin").AsyncPipeline<{
-        App: React.ComponentType<any>;
-        readonly context: RuntimeContext;
-        ModernRender: (App: React.ReactElement) => void;
-        ModernHydrate: (App: React.ReactElement, callback?: () => void) => void;
-    }, void>;
-    server: import("@modern-js/plugin").AsyncPipeline<{
-        App: React.ComponentType<any>;
-        readonly context: RuntimeContext;
-    }, string>;
-    init: import("@modern-js/plugin").AsyncPipeline<{
-        context: RuntimeContext;
-    }, unknown>;
-    pickContext: import("@modern-js/plugin").Pipeline<{
-        context: RuntimeContext;
-        pickedContext: TRuntimeContext;
-    }, TRuntimeContext>;
-}, Record<string, never>>;
-/**
- * register init hook. It would be revoked both ssr and csr.
- */
-declare const registerInit: (App: React.ComponentType, _init: (context: RuntimeContext) => any | Promise<any>) => void;
-export declare const runtime: import("@modern-js/plugin").Manager<{
-    hoc: import("@modern-js/plugin").Pipeline<{
-        App: React.ComponentType<any>;
-    }, React.ComponentType<any>>;
-    provide: import("@modern-js/plugin").Pipeline<{
-        element: JSX.Element;
-        readonly props: AppProps;
-        readonly context: RuntimeContext;
-    }, JSX.Element>;
-    client: import("@modern-js/plugin").AsyncPipeline<{
-        App: React.ComponentType<any>;
-        readonly context: RuntimeContext;
-        ModernRender: (App: React.ReactElement) => void;
-        ModernHydrate: (App: React.ReactElement, callback?: () => void) => void;
-    }, void>;
-    server: import("@modern-js/plugin").AsyncPipeline<{
-        App: React.ComponentType<any>;
-        readonly context: RuntimeContext;
-    }, string>;
-    init: import("@modern-js/plugin").AsyncPipeline<{
-        context: RuntimeContext;
-    }, unknown>;
-    pickContext: import("@modern-js/plugin").Pipeline<{
-        context: RuntimeContext;
-        pickedContext: TRuntimeContext;
-    }, TRuntimeContext>;
-}, Record<string, never>>;
-export declare const createPlugin: (setup?: Setup<{
-    hoc: import("@modern-js/plugin").Pipeline<{
-        App: React.ComponentType<any>;
-    }, React.ComponentType<any>>;
-    provide: import("@modern-js/plugin").Pipeline<{
-        element: JSX.Element;
-        readonly props: AppProps;
-        readonly context: RuntimeContext;
-    }, JSX.Element>;
-    client: import("@modern-js/plugin").AsyncPipeline<{
-        App: React.ComponentType<any>;
-        readonly context: RuntimeContext;
-        ModernRender: (App: React.ReactElement) => void;
-        ModernHydrate: (App: React.ReactElement, callback?: () => void) => void;
-    }, void>;
-    server: import("@modern-js/plugin").AsyncPipeline<{
-        App: React.ComponentType<any>;
-        readonly context: RuntimeContext;
-    }, string>;
-    init: import("@modern-js/plugin").AsyncPipeline<{
-        context: RuntimeContext;
-    }, unknown>;
-    pickContext: import("@modern-js/plugin").Pipeline<{
-        context: RuntimeContext;
-        pickedContext: TRuntimeContext;
-    }, TRuntimeContext>;
-}, Record<string, never>> | undefined, options?: PluginOptions<{
-    hoc: import("@modern-js/plugin").Pipeline<{
-        App: React.ComponentType<any>;
-    }, React.ComponentType<any>>;
-    provide: import("@modern-js/plugin").Pipeline<{
-        element: JSX.Element;
-        readonly props: AppProps;
-        readonly context: RuntimeContext;
-    }, JSX.Element>;
-    client: import("@modern-js/plugin").AsyncPipeline<{
-        App: React.ComponentType<any>;
-        readonly context: RuntimeContext;
-        ModernRender: (App: React.ReactElement) => void;
-        ModernHydrate: (App: React.ReactElement, callback?: () => void) => void;
-    }, void>;
-    server: import("@modern-js/plugin").AsyncPipeline<{
-        App: React.ComponentType<any>;
-        readonly context: RuntimeContext;
-    }, string>;
-    init: import("@modern-js/plugin").AsyncPipeline<{
-        context: RuntimeContext;
-    }, unknown>;
-    pickContext: import("@modern-js/plugin").Pipeline<{
-        context: RuntimeContext;
-        pickedContext: TRuntimeContext;
-    }, TRuntimeContext>;
-}, Setup<{
-    hoc: import("@modern-js/plugin").Pipeline<{
-        App: React.ComponentType<any>;
-    }, React.ComponentType<any>>;
-    provide: import("@modern-js/plugin").Pipeline<{
-        element: JSX.Element;
-        readonly props: AppProps;
-        readonly context: RuntimeContext;
-    }, JSX.Element>;
-    client: import("@modern-js/plugin").AsyncPipeline<{
-        App: React.ComponentType<any>;
-        readonly context: RuntimeContext;
-        ModernRender: (App: React.ReactElement) => void;
-        ModernHydrate: (App: React.ReactElement, callback?: () => void) => void;
-    }, void>;
-    server: import("@modern-js/plugin").AsyncPipeline<{
-        App: React.ComponentType<any>;
-        readonly context: RuntimeContext;
-    }, string>;
-    init: import("@modern-js/plugin").AsyncPipeline<{
-        context: RuntimeContext;
-    }, unknown>;
-    pickContext: import("@modern-js/plugin").Pipeline<{
-        context: RuntimeContext;
-        pickedContext: TRuntimeContext;
-    }, TRuntimeContext>;
-}, Record<string, never>>> | undefined) => import("@modern-js/plugin").Plugin<{
-    hoc: import("@modern-js/plugin").Pipeline<{
-        App: React.ComponentType<any>;
-    }, React.ComponentType<any>>;
-    provide: import("@modern-js/plugin").Pipeline<{
-        element: JSX.Element;
-        readonly props: AppProps;
-        readonly context: RuntimeContext;
-    }, JSX.Element>;
-    client: import("@modern-js/plugin").AsyncPipeline<{
-        App: React.ComponentType<any>;
-        readonly context: RuntimeContext;
-        ModernRender: (App: React.ReactElement) => void;
-        ModernHydrate: (App: React.ReactElement, callback?: () => void) => void;
-    }, void>;
-    server: import("@modern-js/plugin").AsyncPipeline<{
-        App: React.ComponentType<any>;
-        readonly context: RuntimeContext;
-    }, string>;
-    init: import("@modern-js/plugin").AsyncPipeline<{
-        context: RuntimeContext;
-    }, unknown>;
-    pickContext: import("@modern-js/plugin").Pipeline<{
-        context: RuntimeContext;
-        pickedContext: TRuntimeContext;
-    }, TRuntimeContext>;
-}, Record<string, never>>;
-export { registerInit };