@modern-js/runtime 2.22.2-alpha.0 → 2.23.1

package/CHANGELOG.md

@@ -1,5 +1,38 @@
 # @modern-js/runtime
 
+## 2.23.1
+
+### Patch Changes
+
+- Updated dependencies [f08bbfc]
+- Updated dependencies [a6b313a]
+- Updated dependencies [8f2cab0]
+  - @modern-js/utils@2.23.1
+  - @modern-js/plugin@2.23.1
+  - @modern-js/types@2.23.1
+
+## 2.23.0
+
+### Patch Changes
+
+- 7e6fb5f: chore: publishConfig add provenance config
+
+  chore: publishConfig 增加 provenance 配置
+
+- a7a7ad7: chore: move some public code to the utils package
+  chore: 移动一些公共的代码到 utils 包
+- c3216b5: chore: split the scheme into the plugin
+
+  chore: 拆分 scheme 到插件内部
+
+- Updated dependencies [7e6fb5f]
+- Updated dependencies [a7a7ad7]
+- Updated dependencies [6dec7c2]
+- Updated dependencies [c3216b5]
+  - @modern-js/plugin@2.23.0
+  - @modern-js/types@2.23.0
+  - @modern-js/utils@2.23.0
+
 ## 2.22.1
 
 ### Patch Changes

package/dist/cjs/cli/index.js

@@ -63,7 +63,27 @@ const _default = () => ({
         };
       },
       validateSchema() {
-        return _utils.PLUGIN_SCHEMAS["@modern-js/runtime"];
+        return [
+          {
+            target: "runtime",
+            schema: {
+              type: "object",
+              additionalProperties: false
+            }
+          },
+          {
+            target: "runtimeByEntries",
+            schema: {
+              type: "object",
+              patternProperties: {
+                [_utils.ENTRY_NAME_PATTERN]: {
+                  type: "object"
+                }
+              },
+              additionalProperties: false
+            }
+          }
+        ];
       },
       async beforeRestart() {
         (0, _utils.cleanRequireCache)([

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

@@ -41,7 +41,17 @@ const _default = () => {
           };
         },
         validateSchema() {
-          return _utils.PLUGIN_SCHEMAS["@modern-js/plugin-router"];
+          return [
+            {
+              target: "runtime.router",
+              schema: {
+                type: [
+                  "boolean",
+                  "object"
+                ]
+              }
+            }
+          ];
         },
         modifyEntryImports({ entrypoint, imports }) {
           const { entryName, fileSystemRoutes } = entrypoint;

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

@@ -105,22 +105,7 @@ const routerPlugin = ({ serverBase = [], supportHtml5History = true, basename =
                 hydrationData
               });
               const runtimeContext = (0, _react.useContext)(_core.RuntimeReactContext);
-              Object.defineProperty(runtimeContext, "remixRouter", {
-                get() {
-                  return router;
-                }
-              });
-              const originSubscribe = router.subscribe;
-              router.subscribe = (listener) => {
-                const wrapedListener = (...args) => {
-                  const blockRoute = runtimeContext.unstable_blockRoute;
-                  if (blockRoute) {
-                    return;
-                  }
-                  return listener(...args);
-                };
-                return originSubscribe(wrapedListener);
-              };
+              runtimeContext.remixRouter = router;
               return /* @__PURE__ */ (0, _jsxruntime.jsx)(App, {
                 ...props,
                 children: /* @__PURE__ */ (0, _jsxruntime.jsx)(_router.RouterProvider, {

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

@@ -67,7 +67,17 @@ const _default = () => {
           };
         },
         validateSchema() {
-          return _utils.PLUGIN_SCHEMAS["@modern-js/plugin-state"];
+          return [
+            {
+              target: "runtime.state",
+              schema: {
+                type: [
+                  "boolean",
+                  "object"
+                ]
+              }
+            }
+          ];
         },
         addRuntimeExports() {
           pluginsExportsUtils.addExport(`export { default as state } from '@modern-js/runtime/model'`);

package/dist/esm/cli/index.js

@@ -1,7 +1,8 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
+import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import path from "path";
-import { PLUGIN_SCHEMAS, cleanRequireCache, isReact18 } from "@modern-js/utils";
+import { isReact18, cleanRequireCache, ENTRY_NAME_PATTERN } from "@modern-js/utils";
 import PluginState from "../state/cli";
 import PluginSSR from "../ssr/cli";
 import PluginRouter from "../router/cli";
@@ -55,7 +56,25 @@ export default function() {
           };
         },
         validateSchema: function validateSchema() {
-          return PLUGIN_SCHEMAS["@modern-js/runtime"];
+          return [
+            {
+              target: "runtime",
+              schema: {
+                type: "object",
+                additionalProperties: false
+              }
+            },
+            {
+              target: "runtimeByEntries",
+              schema: {
+                type: "object",
+                patternProperties: _define_property({}, ENTRY_NAME_PATTERN, {
+                  type: "object"
+                }),
+                additionalProperties: false
+              }
+            }
+          ];
         },
         beforeRestart: function beforeRestart() {
           return _async_to_generator(function() {

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

@@ -1,6 +1,6 @@
 import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
-import { getEntryOptions, createRuntimeExportsUtils, PLUGIN_SCHEMAS, isRouterV5 as isV5 } from "@modern-js/utils";
+import { getEntryOptions, createRuntimeExportsUtils, isRouterV5 as isV5 } from "@modern-js/utils";
 var PLUGIN_IDENTIFIER = "router";
 var ROUTES_IDENTIFIER = "routes";
 export default function() {
@@ -33,7 +33,17 @@ export default function() {
           };
         },
         validateSchema: function validateSchema() {
-          return PLUGIN_SCHEMAS["@modern-js/plugin-router"];
+          return [
+            {
+              target: "runtime.router",
+              schema: {
+                type: [
+                  "boolean",
+                  "object"
+                ]
+              }
+            }
+          ];
         },
         modifyEntryImports: function modifyEntryImports(param) {
           var entrypoint = param.entrypoint, imports = param.imports;

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

@@ -1,6 +1,5 @@
 import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
-import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { useContext } from "react";
 import { createBrowserRouter, createHashRouter, RouterProvider, createRoutesFromElements, useMatches, useLocation } from "@modern-js/utils/runtime/router";
@@ -87,25 +86,7 @@ export var routerPlugin = function(param) {
                 hydrationData: hydrationData
               });
               var runtimeContext = useContext(RuntimeReactContext);
-              Object.defineProperty(runtimeContext, "remixRouter", {
-                get: function get() {
-                  return router;
-                }
-              });
-              var originSubscribe = router.subscribe;
-              router.subscribe = function(listener) {
-                var wrapedListener = function() {
-                  for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-                    args[_key] = arguments[_key];
-                  }
-                  var blockRoute = runtimeContext.unstable_blockRoute;
-                  if (blockRoute) {
-                    return;
-                  }
-                  return listener.apply(void 0, _to_consumable_array(args));
-                };
-                return originSubscribe(wrapedListener);
-              };
+              runtimeContext.remixRouter = router;
               return /* @__PURE__ */ _jsx(App, _object_spread_props(_object_spread({}, props), {
                 children: /* @__PURE__ */ _jsx(RouterProvider, {
                   router: router

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

@@ -1,4 +1,4 @@
-import { getEntryOptions, createRuntimeExportsUtils, PLUGIN_SCHEMAS } from "@modern-js/utils";
+import { getEntryOptions, createRuntimeExportsUtils } from "@modern-js/utils";
 var PLUGIN_IDENTIFIER = "state";
 export default function() {
   return {
@@ -59,7 +59,17 @@ export default function() {
           };
         },
         validateSchema: function validateSchema() {
-          return PLUGIN_SCHEMAS["@modern-js/plugin-state"];
+          return [
+            {
+              target: "runtime.state",
+              schema: {
+                type: [
+                  "boolean",
+                  "object"
+                ]
+              }
+            }
+          ];
         },
         addRuntimeExports: function addRuntimeExports() {
           pluginsExportsUtils.addExport("export { default as state } from '@modern-js/runtime/model'");

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

@@ -1,5 +1,5 @@
 import path from "path";
-import { PLUGIN_SCHEMAS, cleanRequireCache, isReact18 } from "@modern-js/utils";
+import { isReact18, cleanRequireCache, ENTRY_NAME_PATTERN } from "@modern-js/utils";
 import PluginState from "../state/cli";
 import PluginSSR from "../ssr/cli";
 import PluginRouter from "../router/cli";
@@ -52,7 +52,27 @@ export default () => ({
         };
       },
       validateSchema() {
-        return PLUGIN_SCHEMAS["@modern-js/runtime"];
+        return [
+          {
+            target: "runtime",
+            schema: {
+              type: "object",
+              additionalProperties: false
+            }
+          },
+          {
+            target: "runtimeByEntries",
+            schema: {
+              type: "object",
+              patternProperties: {
+                [ENTRY_NAME_PATTERN]: {
+                  type: "object"
+                }
+              },
+              additionalProperties: false
+            }
+          }
+        ];
       },
       async beforeRestart() {
         cleanRequireCache([

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

@@ -1,4 +1,4 @@
-import { getEntryOptions, createRuntimeExportsUtils, PLUGIN_SCHEMAS, isRouterV5 as isV5 } from "@modern-js/utils";
+import { getEntryOptions, createRuntimeExportsUtils, isRouterV5 as isV5 } from "@modern-js/utils";
 const PLUGIN_IDENTIFIER = "router";
 const ROUTES_IDENTIFIER = "routes";
 export default () => {
@@ -31,7 +31,17 @@ export default () => {
           };
         },
         validateSchema() {
-          return PLUGIN_SCHEMAS["@modern-js/plugin-router"];
+          return [
+            {
+              target: "runtime.router",
+              schema: {
+                type: [
+                  "boolean",
+                  "object"
+                ]
+              }
+            }
+          ];
         },
         modifyEntryImports({ entrypoint, imports }) {
           const { entryName, fileSystemRoutes } = entrypoint;

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

@@ -78,22 +78,7 @@ export const routerPlugin = ({ serverBase = [], supportHtml5History = true, base
                 hydrationData
               });
               const runtimeContext = useContext(RuntimeReactContext);
-              Object.defineProperty(runtimeContext, "remixRouter", {
-                get() {
-                  return router;
-                }
-              });
-              const originSubscribe = router.subscribe;
-              router.subscribe = (listener) => {
-                const wrapedListener = (...args) => {
-                  const blockRoute = runtimeContext.unstable_blockRoute;
-                  if (blockRoute) {
-                    return;
-                  }
-                  return listener(...args);
-                };
-                return originSubscribe(wrapedListener);
-              };
+              runtimeContext.remixRouter = router;
               return /* @__PURE__ */ _jsx(App, {
                 ...props,
                 children: /* @__PURE__ */ _jsx(RouterProvider, {

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

@@ -1,4 +1,4 @@
-import { getEntryOptions, createRuntimeExportsUtils, PLUGIN_SCHEMAS } from "@modern-js/utils";
+import { getEntryOptions, createRuntimeExportsUtils } from "@modern-js/utils";
 const PLUGIN_IDENTIFIER = "state";
 export default () => {
   return {
@@ -57,7 +57,17 @@ export default () => {
           };
         },
         validateSchema() {
-          return PLUGIN_SCHEMAS["@modern-js/plugin-state"];
+          return [
+            {
+              target: "runtime.state",
+              schema: {
+                type: [
+                  "boolean",
+                  "object"
+                ]
+              }
+            }
+          ];
         },
         addRuntimeExports() {
           pluginsExportsUtils.addExport(`export { default as state } from '@modern-js/runtime/model'`);

package/dist/types/runtimeContext.d.ts

@@ -13,14 +13,6 @@ export interface BaseRuntimeContext {
   store?: Store;
   routeManifest: RouteManifest;
   routerContext?: StaticHandlerContext;
-  /**
-   * private method
-   */
-  remixRouter?: Router;
-  /**
-   * private
-   */
-  unstable_blockRoute?: boolean;
 }
 export interface RuntimeContext extends BaseRuntimeContext {
   [key: string]: any;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.22.2-alpha.0",
+  "version": "2.23.1",
   "engines": {
     "node": ">=14.17.6"
   },
@@ -169,9 +169,9 @@
     "redux-logger": "^3.0.6",
     "styled-components": "^5.3.1",
     "@swc/helpers": "0.5.1",
-    "@modern-js/types": "2.22.1",
-    "@modern-js/utils": "2.22.1",
-    "@modern-js/plugin": "2.22.1"
+    "@modern-js/plugin": "2.23.1",
+    "@modern-js/types": "2.23.1",
+    "@modern-js/utils": "2.23.1"
   },
   "peerDependencies": {
     "react": ">=17",
@@ -192,11 +192,11 @@
     "ts-jest": "^29.1.0",
     "typescript": "^5",
     "webpack": "^5.82.1",
-    "@modern-js/core": "2.22.1",
-    "@modern-js/server-core": "2.22.1",
-    "@modern-js/app-tools": "2.22.1",
-    "@scripts/build": "2.22.1",
-    "@scripts/jest-config": "2.22.1"
+    "@modern-js/app-tools": "2.23.1",
+    "@modern-js/core": "2.23.1",
+    "@modern-js/server-core": "2.23.1",
+    "@scripts/build": "2.23.1",
+    "@scripts/jest-config": "2.23.1"
   },
   "sideEffects": false,
   "modernConfig": {},

package/dist/js/modern/cli/index.js

@@ -1,72 +0,0 @@
-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 path from "path";
-import { PLUGIN_SCHEMAS, cleanRequireCache, isReact18 } from "@modern-js/utils";
-import PluginState from "../state/cli";
-import PluginSSR from "../ssr/cli";
-import PluginRouter from "../router/cli";
-import Document from "../document/cli";
-var cli_default = () => ({
-  name: "@modern-js/runtime",
-  post: [
-    "@modern-js/plugin-router",
-    "@modern-js/plugin-ssr",
-    "@modern-js/plugin-document",
-    "@modern-js/plugin-state",
-    "@modern-js/plugin-design-token"
-  ],
-  usePlugins: [PluginState(), PluginSSR(), PluginRouter(), Document()],
-  setup: (api) => {
-    return {
-      config() {
-        const dir = api.useAppContext().internalDirectory || "";
-        process.env.IS_REACT18 = isReact18(path.join(dir, "../../")).toString();
-        return {
-          runtime: {},
-          runtimeByEntries: {},
-          source: {
-            alias: {
-              "styled-components": require.resolve("styled-components")
-            },
-            globalVars: {
-              "process.env.IS_REACT18": process.env.IS_REACT18
-            }
-          }
-        };
-      },
-      validateSchema() {
-        return PLUGIN_SCHEMAS["@modern-js/runtime"];
-      },
-      beforeRestart() {
-        return __async(this, null, function* () {
-          cleanRequireCache([
-            require.resolve("../state/cli"),
-            require.resolve("../router/cli"),
-            require.resolve("../ssr/cli")
-          ]);
-        });
-      }
-    };
-  }
-});
-export {
-  cli_default as default
-};

package/dist/js/modern/common.js

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

package/dist/js/modern/core/app-config.js

@@ -1,10 +0,0 @@
-const APP_CONFIG_SYMBOL = "config";
-const getConfig = (Component) => Component[APP_CONFIG_SYMBOL];
-const defineConfig = (Component, config) => {
-  Component[APP_CONFIG_SYMBOL] = config;
-  return Component;
-};
-export {
-  defineConfig,
-  getConfig
-};