@modern-js/runtime 2.16.1-alpha.1 → 2.17.1

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @modern-js/runtime
 
+## 2.17.1
+
+### Patch Changes
+
+- @modern-js/plugin@2.17.1
+- @modern-js/types@2.17.1
+- @modern-js/utils@2.17.1
+
+## 2.17.0
+
+### Patch Changes
+
+- 3810930: fix: optimize alias for plugin-express & export useBlocker
+  fix: 优化 plugin-express 的 alias 的实现 & 导出 useBlocker
+  - @modern-js/plugin@2.17.0
+  - @modern-js/types@2.17.0
+  - @modern-js/utils@2.17.0
+
 ## 2.16.0
 
 ### Patch Changes

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

@@ -97,6 +97,6 @@ function _export_star(from, to) {
 }
 const _default = _plugin.routerPlugin;
 const useRouteLoaderData = (routeId) => {
-  const realRouteId = routeId.replace(/\[(.*?)\]/g, "($1)");
+  const realRouteId = routeId.replace(/\((.*?)\)/g, "[$1]");
   return (0, _reactrouterdom.useRouteLoaderData)(realRouteId);
 };

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

@@ -5,7 +5,7 @@ export { modifyRoutes } from "./plugin";
 export * from "./withRouter";
 export { Link, NavLink } from "./PrefetchLink";
 export var useRouteLoaderData = function(routeId) {
-  var realRouteId = routeId.replace(/\[(.*?)\]/g, "($1)");
+  var realRouteId = routeId.replace(/\((.*?)\)/g, "[$1]");
   return useRouteData(realRouteId);
 };
 export {

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

@@ -5,7 +5,7 @@ export { modifyRoutes } from "./plugin";
 export * from "./withRouter";
 export { Link, NavLink } from "./PrefetchLink";
 export const useRouteLoaderData = (routeId) => {
-  const realRouteId = routeId.replace(/\[(.*?)\]/g, "($1)");
+  const realRouteId = routeId.replace(/\((.*?)\)/g, "[$1]");
   return useRouteData(realRouteId);
 };
 export {

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.16.1-alpha.1",
+  "version": "2.17.1",
   "engines": {
     "node": ">=14.17.6"
   },
@@ -162,9 +162,9 @@
     "react-side-effect": "^2.1.1",
     "redux-logger": "^3.0.6",
     "styled-components": "^5.3.1",
-    "@modern-js/plugin": "2.16.0",
-    "@modern-js/types": "2.16.0",
-    "@modern-js/utils": "2.16.0"
+    "@modern-js/plugin": "2.17.1",
+    "@modern-js/types": "2.17.1",
+    "@modern-js/utils": "2.17.1"
   },
   "peerDependencies": {
     "react": ">=17",
@@ -184,11 +184,11 @@
     "react-dom": "^18",
     "ts-jest": "^29.0.5",
     "typescript": "^4",
-    "@scripts/build": "2.16.0",
-    "@modern-js/app-tools": "2.16.0",
-    "@modern-js/core": "2.16.0",
-    "@modern-js/server-core": "2.16.0",
-    "@scripts/jest-config": "2.16.0"
+    "@modern-js/app-tools": "2.17.1",
+    "@modern-js/core": "2.17.1",
+    "@modern-js/server-core": "2.17.1",
+    "@scripts/build": "2.17.1",
+    "@scripts/jest-config": "2.17.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
-};

package/dist/js/modern/core/compatible.js

@@ -1,285 +0,0 @@
-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;
-};
-var __objRest = (source, exclude) => {
-  var target = {};
-  for (var prop in source)
-    if (__hasOwnProp.call(source, prop) && exclude.indexOf(prop) < 0)
-      target[prop] = source[prop];
-  if (source != null && __getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(source)) {
-      if (exclude.indexOf(prop) < 0 && __propIsEnum.call(source, prop))
-        target[prop] = source[prop];
-    }
-  return target;
-};
-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 React, { useContext, useMemo } from "react";
-import hoistNonReactStatics from "hoist-non-react-statics";
-import { ROUTE_MANIFEST } from "@modern-js/utils/constants";
-import {
-  RuntimeReactContext
-} from "../runtime-context";
-import { runtime } from "./plugin";
-import { createLoaderManager } from "./loader/loaderManager";
-const IS_REACT18 = process.env.IS_REACT18 === "true";
-function isClientArgs(id) {
-  return typeof id === "string" || typeof HTMLElement !== "undefined" && id instanceof HTMLElement;
-}
-const runnerMap = /* @__PURE__ */ new WeakMap();
-const getInitialContext = (runner) => ({
-  loaderManager: createLoaderManager({}),
-  runner,
-  isBrowser: true,
-  routeManifest: typeof window !== "undefined" && window[ROUTE_MANIFEST]
-});
-const createApp = ({ plugins }) => {
-  const appRuntime = runtime.clone();
-  appRuntime.usePlugin(...plugins);
-  return (App) => {
-    const runner = appRuntime.init();
-    const WrapperComponent = (props) => {
-      const element = React.createElement(
-        App || React.Fragment,
-        __spreadValues({}, props),
-        props.children
-      );
-      const context = useContext(RuntimeReactContext);
-      return runner.provide(
-        { element, props: __spreadValues({}, props), context },
-        {
-          onLast: ({ element: element2 }) => element2
-        }
-      );
-    };
-    if (App) {
-      hoistNonReactStatics(WrapperComponent, App);
-    }
-    const HOCApp = runner.hoc(
-      { App: WrapperComponent },
-      {
-        onLast: ({ App: App2 }) => {
-          const WrapComponent = (_a) => {
-            var _b = _a, { context } = _b, props = __objRest(_b, ["context"]);
-            let contextValue = context;
-            if (!(contextValue == null ? void 0 : contextValue.runner)) {
-              contextValue = getInitialContext(runner);
-              runner.init(
-                { context: contextValue },
-                {
-                  onLast: ({ context: context1 }) => {
-                    var _a2;
-                    return (_a2 = App2 == null ? void 0 : App2.init) == null ? void 0 : _a2.call(App2, context1);
-                  }
-                }
-              );
-            }
-            return /* @__PURE__ */ jsx(RuntimeReactContext.Provider, {
-              value: contextValue,
-              children: /* @__PURE__ */ jsx(App2, __spreadValues({}, props))
-            });
-          };
-          return hoistNonReactStatics(WrapComponent, App2);
-        }
-      }
-    );
-    runnerMap.set(HOCApp, runner);
-    return HOCApp;
-  };
-};
-const bootstrap = (BootApp, id, root, ReactDOM) => __async(void 0, null, function* () {
-  var _a, _b;
-  let App = BootApp;
-  let runner = runnerMap.get(App);
-  if (!runner) {
-    App = createApp({ plugins: [] })(App);
-    runner = runnerMap.get(App);
-  }
-  const context = getInitialContext(runner);
-  const runInit = (_context) => runner.init(
-    { context: _context },
-    {
-      onLast: ({ context: context1 }) => {
-        var _a2;
-        return (_a2 = App == null ? void 0 : App.init) == null ? void 0 : _a2.call(App, context1);
-      }
-    }
-  );
-  if (!id) {
-    return React.createElement(App, {
-      context
-    });
-  }
-  const isBrowser = typeof window !== "undefined" && window.name !== "nodejs";
-  if (isBrowser) {
-    if (isClientArgs(id)) {
-      const ssrData = window._SSR_DATA;
-      const loadersData = ((_a = ssrData == null ? void 0 : ssrData.data) == null ? void 0 : _a.loadersData) || {};
-      const initialLoadersState = Object.keys(loadersData).reduce(
-        (res, key) => {
-          const loaderData = loadersData[key];
-          if (loaderData.loading !== false) {
-            return res;
-          }
-          res[key] = loaderData;
-          return res;
-        },
-        {}
-      );
-      Object.assign(context, __spreadValues({
-        loaderManager: createLoaderManager(initialLoadersState, {
-          skipStatic: true
-        })
-      }, ssrData ? { ssrContext: ssrData == null ? void 0 : ssrData.context } : {}));
-      context.initialData = (_b = ssrData == null ? void 0 : ssrData.data) == null ? void 0 : _b.initialData;
-      const initialData = yield runInit(context);
-      if (initialData) {
-        context.initialData = initialData;
-      }
-      const rootElement = typeof id !== "string" ? id : document.getElementById(id || "root");
-      if (!ReactDOM) {
-        throw Error("The `bootstrap` need provide `ReactDOM` parameter");
-      }
-      const ModernRender = (App2) => {
-        if (IS_REACT18) {
-          if (root) {
-            root.render(App2);
-          } else if (ReactDOM.createRoot) {
-            ReactDOM.createRoot(rootElement).render(App2);
-          } else {
-            throw Error(
-              "The `bootstrap` `ReactDOM` parameter needs to provide the `createRoot` method"
-            );
-          }
-        } else {
-          if (!ReactDOM.render) {
-            throw Error(
-              "The `bootstrap` `ReactDOM` parameter needs to provide the `render` method"
-            );
-          }
-          ReactDOM.render(App2, rootElement);
-        }
-      };
-      const ModernHydrate = (App2, callback) => {
-        if (IS_REACT18) {
-          if (!ReactDOM.hydrateRoot) {
-            throw Error(
-              "The `bootstrap` `ReactDOM` parameter needs to provide the `hydrateRoot` method"
-            );
-          }
-          ReactDOM.hydrateRoot(rootElement, App2);
-        } else {
-          if (!ReactDOM.hydrate) {
-            throw Error(
-              "The `bootstrap` `ReactDOM` parameter needs to provide the `hydrate` method"
-            );
-          }
-          ReactDOM.hydrate(App2, rootElement, callback);
-        }
-      };
-      return runner.client(
-        {
-          App,
-          context,
-          ModernRender,
-          ModernHydrate
-        },
-        {
-          onLast: ({ App: App2 }) => {
-            ModernRender(React.createElement(App2, { context }));
-          }
-        }
-      );
-    } else {
-      throw Error(
-        "`bootstrap` needs id in browser environment, it needs to be string or element"
-      );
-    }
-  } else {
-    Object.assign(context, {
-      ssrContext: id,
-      isBrowser: false,
-      loaderManager: createLoaderManager(
-        {},
-        {
-          skipNonStatic: id.staticGenerate,
-          skipStatic: process.env.NODE_ENV === "production" && !id.staticGenerate
-        }
-      )
-    });
-    const isRedirectResponse = (result) => {
-      if (typeof Response !== "undefined" && result instanceof Response && result.status >= 300 && result.status <= 399) {
-        const { status } = result;
-        const redirectUrl = result.headers.get("Location") || "/";
-        const { ssrContext } = context;
-        if (ssrContext) {
-          ssrContext.res.statusCode = status;
-          ssrContext.res.setHeader("Location", redirectUrl);
-          ssrContext.redirection.status = status;
-          ssrContext.redirection.url = redirectUrl;
-        }
-        return true;
-      }
-      return false;
-    };
-    const initialData = yield runInit(context);
-    if (!isRedirectResponse(initialData)) {
-      context.initialData = initialData;
-      return runner.server({
-        App,
-        context
-      });
-    }
-  }
-});
-const useRuntimeContext = () => {
-  const context = useContext(RuntimeReactContext);
-  const memoizedContext = useMemo(
-    () => context.runner.pickContext(
-      { context, pickedContext: {} },
-      {
-        onLast: ({ pickedContext }) => pickedContext
-      }
-    ),
-    [context]
-  );
-  return memoizedContext;
-};
-export {
-  bootstrap,
-  createApp,
-  useRuntimeContext
-};

package/dist/js/modern/core/index.js

@@ -1,16 +0,0 @@
-import { createPlugin, createRuntime, runtime, registerInit } from "./plugin";
-import { defineConfig, getConfig } from "./app-config";
-export * from "./compatible";
-import { RuntimeReactContext, ServerRouterContext } from "../runtime-context";
-export * from "./loader";
-export * from "@modern-js/plugin";
-export {
-  RuntimeReactContext,
-  ServerRouterContext,
-  createPlugin,
-  createRuntime,
-  defineConfig,
-  getConfig,
-  registerInit,
-  runtime
-};

package/dist/js/modern/core/loader/index.js

@@ -1,4 +0,0 @@
-import { default as default2 } from "./useLoader";
-export {
-  default2 as useLoader
-};

package/dist/js/modern/core/loader/loaderManager.js

@@ -1,165 +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 invariant from "invariant";
-const createGetId = () => {
-  const idCache = /* @__PURE__ */ new Map();
-  return (objectId) => {
-    const cachedId = idCache.get(objectId);
-    if (cachedId) {
-      return cachedId;
-    }
-    const id = JSON.stringify(objectId);
-    invariant(id, "params should be not null value");
-    idCache.set(objectId, id);
-    return id;
-  };
-};
-var LoaderStatus = /* @__PURE__ */ ((LoaderStatus2) => {
-  LoaderStatus2[LoaderStatus2["idle"] = 0] = "idle";
-  LoaderStatus2[LoaderStatus2["loading"] = 1] = "loading";
-  LoaderStatus2[LoaderStatus2["fulfilled"] = 2] = "fulfilled";
-  LoaderStatus2[LoaderStatus2["rejected"] = 3] = "rejected";
-  return LoaderStatus2;
-})(LoaderStatus || {});
-const createLoader = (id, initialData = {
-  loading: false,
-  reloading: false,
-  data: void 0,
-  error: void 0
-}, loaderFn, skip = false) => {
-  let promise;
-  let status = 0 /* idle */;
-  let { data, error } = initialData;
-  let hasLoaded = false;
-  const handlers = /* @__PURE__ */ new Set();
-  const load = () => __async(void 0, null, function* () {
-    if (skip) {
-      return promise;
-    }
-    if (status === 1 /* loading */) {
-      return promise;
-    }
-    status = 1 /* loading */;
-    notify();
-    promise = loaderFn().then((value) => {
-      data = value;
-      error = null;
-      status = 2 /* fulfilled */;
-    }).catch((e) => {
-      error = e;
-      data = null;
-      status = 3 /* rejected */;
-    }).finally(() => {
-      promise = null;
-      hasLoaded = true;
-      notify();
-    });
-    return promise;
-  });
-  const getResult = () => ({
-    loading: !hasLoaded && status === 1 /* loading */,
-    reloading: hasLoaded && status === 1 /* loading */,
-    data,
-    error: error instanceof Error ? `${error.message}` : error,
-    _error: error
-  });
-  const notify = () => {
-    [...handlers].forEach((handler) => {
-      handler(status, getResult());
-    });
-  };
-  const onChange = (handler) => {
-    handlers.add(handler);
-    return () => {
-      handlers.delete(handler);
-    };
-  };
-  return {
-    get result() {
-      return getResult();
-    },
-    get promise() {
-      return promise;
-    },
-    onChange,
-    load
-  };
-};
-const createLoaderManager = (initialDataMap, managerOptions = {}) => {
-  const { skipStatic = false, skipNonStatic = false } = managerOptions;
-  const loadersMap = /* @__PURE__ */ new Map();
-  const getId = createGetId();
-  const add = (loaderFn, loaderOptions) => {
-    const id = getId(loaderOptions.params);
-    let loader = loadersMap.get(id);
-    const cache = loaderOptions._cache;
-    if (!loader || cache === false) {
-      const ignoreNonStatic = skipNonStatic && !loaderOptions.static;
-      const ignoreStatic = skipStatic && loaderOptions.static;
-      const skipExec = ignoreNonStatic || ignoreStatic;
-      loader = createLoader(
-        id,
-        typeof initialDataMap[id] !== "undefined" ? initialDataMap[id] : { data: loaderOptions.initialData },
-        loaderFn,
-        skipExec
-      );
-      loadersMap.set(id, loader);
-    }
-    return id;
-  };
-  const get = (id) => loadersMap.get(id);
-  const hasPendingLoaders = () => {
-    for (const loader of loadersMap.values()) {
-      const { promise } = loader;
-      if (promise instanceof Promise) {
-        return true;
-      }
-    }
-    return false;
-  };
-  const awaitPendingLoaders = () => __async(void 0, null, function* () {
-    const pendingLoaders = [];
-    for (const [id, loader] of loadersMap) {
-      const { promise } = loader;
-      if (promise instanceof Promise) {
-        pendingLoaders.push([id, loader]);
-      }
-    }
-    yield Promise.all(pendingLoaders.map((item) => item[1].promise));
-    return pendingLoaders.reduce(
-      (res, [id, loader]) => {
-        res[id] = loader.result;
-        return res;
-      },
-      {}
-    );
-  });
-  return {
-    hasPendingLoaders,
-    awaitPendingLoaders,
-    add,
-    get
-  };
-};
-export {
-  LoaderStatus,
-  createLoaderManager
-};