@modern-js/runtime 2.17.1 → 2.18.1

package/CHANGELOG.md

@@ -1,5 +1,28 @@
 # @modern-js/runtime
 
+## 2.18.1
+
+### Patch Changes
+
+- 8fb93d1: fix: replace route id correctly
+  fix: 正确地替换 route id
+  - @modern-js/plugin@2.18.1
+  - @modern-js/types@2.18.1
+  - @modern-js/utils@2.18.1
+
+## 2.18.0
+
+### Minor Changes
+
+- 7de6599: feat: rspack-provider support modern.js ssr mode
+  feat: rspack-provider 支持 modern.js ssr 模式
+
+### Patch Changes
+
+- @modern-js/plugin@2.18.0
+- @modern-js/types@2.18.0
+- @modern-js/utils@2.18.0
+
 ## 2.17.1
 
 ### Patch Changes

package/README.md

@@ -24,3 +24,9 @@ Please read the [Contributing Guide](https://github.com/web-infra-dev/modern.js/
 ## License
 
 Modern.js is [MIT licensed](https://github.com/web-infra-dev/modern.js/blob/main/LICENSE).
+
+## Credist
+
+Thanks to:
+
+- [@loadable/webpack-plugin](https://github.com/gregberge/loadable-components) to create a webpack plugin prepare for loadable usage in ssr.

package/dist/cjs/router/runtime/DeferredDataScripts.node.js

@@ -9,7 +9,7 @@ Object.defineProperty(exports, "default", {
 const _jsxruntime = require("react/jsx-runtime");
 const _react = require("react");
 const _reactrouterdom = require("react-router-dom");
-const _serialize = require("@modern-js/utils/universal/serialize");
+const _runtimenode = require("@modern-js/utils/runtime-node");
 const _common = require("../../common");
 const _utils = require("./utils");
 const setupFnStr = `function s(r,e){_ROUTER_DATA.r=_ROUTER_DATA.r||{},_ROUTER_DATA.r[r]=_ROUTER_DATA.r[r]||{};return new Promise((function(A,R){_ROUTER_DATA.r[r][e]={resolve:A,reject:R}}))};`;
@@ -32,7 +32,7 @@ const DeferredDataScripts = () => {
       errors: (0, _utils.serializeErrors)(staticContext.errors)
     };
     let initialScripts = [
-      `_ROUTER_DATA = ${(0, _serialize.serializeJson)(_ROUTER_DATA)};`,
+      `_ROUTER_DATA = ${(0, _runtimenode.serializeJson)(_ROUTER_DATA)};`,
       `_ROUTER_DATA.s = ${setupFnStr}`,
       `_ROUTER_DATA.r = ${resolveFnStr}`,
       `_ROUTER_DATA.p = ${preResolvedFnStr}`
@@ -56,12 +56,12 @@ const DeferredDataScripts = () => {
               message: trackedPromise._error.message,
               stack: process.env.NODE_ENV !== "production" ? trackedPromise._error.stack : void 0
             };
-            return `${JSON.stringify(key)}: _ROUTER_DATA.p(${void 0}, ${(0, _serialize.serializeJson)(error)})`;
+            return `${JSON.stringify(key)}: _ROUTER_DATA.p(${void 0}, ${(0, _runtimenode.serializeJson)(error)})`;
           } else {
             if (typeof trackedPromise._data === "undefined") {
               throw new Error(`The deferred data for ${key} was not resolved, did you forget to return data from a deferred promise`);
             }
-            return `${JSON.stringify(key)}: _ROUTER_DATA.p(${(0, _serialize.serializeJson)(trackedPromise._data)})`;
+            return `${JSON.stringify(key)}: _ROUTER_DATA.p(${(0, _runtimenode.serializeJson)(trackedPromise._data)})`;
           }
         }
       }).join(",\n");
@@ -101,7 +101,7 @@ const DeferredDataScript = ({ data, routeId, dataKey }) => {
         async: true,
         suppressHydrationWarning: true,
         dangerouslySetInnerHTML: {
-          __html: `_ROUTER_DATA.r(${JSON.stringify(routeId)}, ${JSON.stringify(dataKey)}, ${(0, _serialize.serializeJson)(data2)});`
+          __html: `_ROUTER_DATA.r(${JSON.stringify(routeId)}, ${JSON.stringify(dataKey)}, ${(0, _runtimenode.serializeJson)(data2)});`
         }
       })
     }) : null
@@ -112,7 +112,7 @@ const ErrorDeferredDataScript = ({ routeId, dataKey }) => {
   return /* @__PURE__ */ (0, _jsxruntime.jsx)("script", {
     suppressHydrationWarning: true,
     dangerouslySetInnerHTML: {
-      __html: `_ROUTER_DATA.r(${JSON.stringify(routeId)}, ${JSON.stringify(dataKey)}, ${void 0}, ${(0, _serialize.serializeJson)({
+      __html: `_ROUTER_DATA.r(${JSON.stringify(routeId)}, ${JSON.stringify(dataKey)}, ${void 0}, ${(0, _runtimenode.serializeJson)({
         message: error.message,
         stack: error.stack
       })});`

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

@@ -73,15 +73,15 @@ _export(exports, {
   createPath: () => _reactrouterdom.createPath,
   unstable_useBlocker: () => _reactrouterdom.unstable_useBlocker,
   unstable_usePrompt: () => _reactrouterdom.unstable_usePrompt,
-  defer: () => _remixrouter.defer,
-  json: () => _remixrouter.json,
-  redirect: () => _remixrouter.redirect
+  defer: () => _router.defer,
+  json: () => _router.json,
+  redirect: () => _router.redirect
 });
 const _reactrouterdom = require("react-router-dom");
 const _plugin = require("./plugin");
 _export_star(require("./withRouter"), exports);
 const _PrefetchLink = require("./PrefetchLink");
-const _remixrouter = require("@modern-js/utils/universal/remix-router");
+const _router = require("@modern-js/utils/runtime/router");
 function _export_star(from, to) {
   Object.keys(from).forEach(function(k) {
     if (k !== "default" && !Object.prototype.hasOwnProperty.call(to, k)) {
@@ -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/cjs/router/runtime/plugin.js

@@ -19,7 +19,7 @@ const _jsxruntime = require("react/jsx-runtime");
 const _react = /* @__PURE__ */ _interop_require_default(require("react"));
 const _reactrouterdom = require("react-router-dom");
 const _hoistnonreactstatics = /* @__PURE__ */ _interop_require_default(require("hoist-non-react-statics"));
-const _runtime = require("@modern-js/utils/runtime");
+const _runtimebrowser = require("@modern-js/utils/runtime-browser");
 const _hooks = require("./hooks");
 const _utils = require("./utils");
 function _interop_require_default(obj) {
@@ -44,7 +44,7 @@ const routerPlugin = ({ serverBase = [], supportHtml5History = true, basename =
   const select = (pathname) => serverBase.find((baseUrl) => pathname.search(baseUrl) === 0) || "/";
   let routes = [];
   finalRouteConfig = routesConfig;
-  window._SERVER_DATA = (0, _runtime.parsedJSONFromElement)("__MODERN_SERVER_DATA__");
+  window._SERVER_DATA = (0, _runtimebrowser.parsedJSONFromElement)("__MODERN_SERVER_DATA__");
   return {
     name: "@modern-js/plugin-router",
     registerHook: {

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

@@ -16,7 +16,7 @@ _export(exports, {
 });
 const _jsxruntime = require("react/jsx-runtime");
 const _react = /* @__PURE__ */ _interop_require_wildcard(require("react"));
-const _remixrouter = require("@modern-js/utils/universal/remix-router");
+const _router = require("@modern-js/utils/runtime/router");
 const _server = require("react-router-dom/server");
 const _hoistnonreactstatics = /* @__PURE__ */ _interop_require_default(require("hoist-non-react-statics"));
 const _reactrouterdom = require("react-router-dom");
@@ -117,7 +117,7 @@ const routerPlugin = ({ basename = "", routesConfig, createRoutes }) => {
             routesConfig,
             ssrMode
           }));
-          const { query } = (0, _remixrouter.createStaticHandler)(routes, {
+          const { query } = (0, _router.createStaticHandler)(routes, {
             basename: _basename
           });
           const remixRequest = createFetchRequest(request);

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

@@ -21,8 +21,7 @@ _export(exports, {
 const _jsxruntime = require("react/jsx-runtime");
 const _react = /* @__PURE__ */ _interop_require_default(require("react"));
 const _reactrouterdom = require("react-router-dom");
-const _remixrouter = require("@modern-js/utils/universal/remix-router");
-const _nestedRoutes = require("@modern-js/utils/universal/nestedRoutes");
+const _router = require("@modern-js/utils/runtime/router");
 const _DefaultNotFound = require("./DefaultNotFound");
 const _DeferredDataScripts = /* @__PURE__ */ _interop_require_default(require("./DeferredDataScripts"));
 function _interop_require_default(obj) {
@@ -46,7 +45,7 @@ function getRouteComponents(routes, { globalApp, ssrMode, props }) {
   const routeElements = [];
   for (const route of routes) {
     if (route.type === "nested") {
-      const routeElement = (0, _nestedRoutes.renderNestedRoute)(route, {
+      const routeElement = (0, _router.renderNestedRoute)(route, {
         DeferredDataComponent: ssrMode === "stream" ? _DeferredDataScripts.default : void 0,
         props
       });
@@ -120,7 +119,7 @@ function serializeErrors(errors) {
   const entries = Object.entries(errors);
   const serialized = {};
   for (const [key, val] of entries) {
-    if ((0, _remixrouter.isRouteErrorResponse)(val)) {
+    if ((0, _router.isRouteErrorResponse)(val)) {
       serialized[key] = {
         ...val,
         __type: "RouteErrorResponse"
@@ -145,7 +144,7 @@ function deserializeErrors(errors) {
   const serialized = {};
   for (const [key, val] of entries) {
     if (val && val.__type === "RouteErrorResponse") {
-      serialized[key] = new _remixrouter.ErrorResponse(val.status, val.statusText, val.data, val.internal === true);
+      serialized[key] = new _router.ErrorResponse(val.status, val.statusText, val.data, val.internal === true);
     } else if (val && val.__type === "Error") {
       const error = new Error(val.message);
       error.stack = val.stack;

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

@@ -42,21 +42,36 @@ const _default = () => {
         config() {
           const appContext = api.useAppContext();
           pluginsExportsUtils = (0, _utils.createRuntimeExportsUtils)(appContext.internalDirectory, "plugins");
+          const userConfig = api.useResolvedConfigContext();
           const { bundlerType = "webpack" } = api.useAppContext();
-          const babelConfig = bundlerType === "webpack" ? (config) => {
-            var _config_plugins;
-            (_config_plugins = config.plugins) === null || _config_plugins === void 0 ? void 0 : _config_plugins.push(_path.default.join(__dirname, "./babel-plugin-ssr-loader-id"));
-            const userConfig = api.useResolvedConfigContext();
-            if ((0, _utils.isUseSSRBundle)(userConfig) && hasStringSSREntry(userConfig)) {
-              var _config_plugins1;
-              (_config_plugins1 = config.plugins) === null || _config_plugins1 === void 0 ? void 0 : _config_plugins1.push(require.resolve("@loadable/babel-plugin"));
+          const babelConfig = (() => {
+            if (bundlerType === "webpack") {
+              return (config) => {
+                var _config_plugins;
+                (_config_plugins = config.plugins) === null || _config_plugins === void 0 ? void 0 : _config_plugins.push(_path.default.join(__dirname, "./babel-plugin-ssr-loader-id"));
+                if ((0, _utils.isUseSSRBundle)(userConfig) && hasStringSSREntry(userConfig)) {
+                  var _config_plugins1;
+                  (_config_plugins1 = config.plugins) === null || _config_plugins1 === void 0 ? void 0 : _config_plugins1.push(require.resolve("@loadable/babel-plugin"));
+                }
+              };
+            } else if (bundlerType === "rspack") {
+              if ((0, _utils.isUseSSRBundle)(userConfig)) {
+                return (config) => {
+                  var _config_plugins;
+                  (_config_plugins = config.plugins) === null || _config_plugins === void 0 ? void 0 : _config_plugins.push(_path.default.join(__dirname, "./babel-plugin-ssr-loader-id"));
+                  if (hasStringSSREntry(userConfig)) {
+                    var _config_plugins1;
+                    (_config_plugins1 = config.plugins) === null || _config_plugins1 === void 0 ? void 0 : _config_plugins1.push(require.resolve("@loadable/babel-plugin"));
+                  }
+                };
+              }
             }
-          } : void 0;
+          })();
           return {
             source: {
               alias: {
-                // ensure that all packages use the same storage in @modern-js/utils/ssr
-                "@modern-js/utils/ssr": require.resolve("@modern-js/utils/ssr"),
+                // ensure that all packages use the same storage in @modern-js/utils/runtime-node
+                "@modern-js/utils/runtime-node": require.resolve("@modern-js/utils/runtime-node"),
                 "@modern-js/runtime/plugins": pluginsExportsUtils.getPath()
               },
               globalVars: (values, { target }) => {
@@ -64,11 +79,11 @@ const _default = () => {
               }
             },
             tools: {
-              webpackChain: (chain, { isServer, isServiceWorker, CHAIN_ID }) => {
-                const userConfig = api.useResolvedConfigContext();
-                if ((0, _utils.isUseSSRBundle)(userConfig) && !isServer && !isServiceWorker && hasStringSSREntry(userConfig)) {
-                  const LoadableWebpackPlugin = require("@loadable/webpack-plugin");
-                  chain.plugin(CHAIN_ID.PLUGIN.LOADABLE).use(LoadableWebpackPlugin, [
+              bundlerChain(chain, { isServer, isServiceWorker, CHAIN_ID }) {
+                const userConfig2 = api.useResolvedConfigContext();
+                if ((0, _utils.isUseSSRBundle)(userConfig2) && !isServer && !isServiceWorker && hasStringSSREntry(userConfig2)) {
+                  const LoadableBundlerPlugin = require("./loadable-bundler-plugin.js");
+                  chain.plugin(CHAIN_ID.PLUGIN.LOADABLE).use(LoadableBundlerPlugin, [
                     {
                       filename: _utils.LOADABLE_STATS_FILE
                     }

package/dist/cjs/ssr/cli/loadable-bundler-plugin.js

@@ -0,0 +1,112 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+const _path = /* @__PURE__ */ _interop_require_default(require("path"));
+const _utils = require("@modern-js/utils");
+function _define_property(obj, key, value) {
+  if (key in obj) {
+    Object.defineProperty(obj, key, {
+      value,
+      enumerable: true,
+      configurable: true,
+      writable: true
+    });
+  } else {
+    obj[key] = value;
+  }
+  return obj;
+}
+function _interop_require_default(obj) {
+  return obj && obj.__esModule ? obj : {
+    default: obj
+  };
+}
+class LoadablePlugin {
+  apply(compiler) {
+    this.compiler = compiler;
+    compiler.options.output.chunkLoadingGlobal = this.opts.chunkLoadingGlobal;
+    if (this.opts.outputAsset || this.opts.writeToDisk) {
+      compiler.hooks.make.tap(LoadablePlugin.name, (compilation) => {
+        compilation.hooks.processAssets.tap({
+          name: LoadablePlugin.name,
+          stage: compiler.webpack.Compilation.PROCESS_ASSETS_STAGE_REPORT
+        }, () => {
+          const asset = this.handleEmit(compilation);
+          if (asset) {
+            compilation.emitAsset(this.opts.filename, asset);
+          }
+        });
+      });
+    }
+  }
+  handleEmit(compilation) {
+    const stats = compilation.getStats().toJson({
+      all: false,
+      assets: true,
+      // rspack not support cachedAssets,
+      cachedAssets: true,
+      chunks: true,
+      chunkGroups: true,
+      entrypoints: true,
+      // rspack not support chunkGroupChildren.
+      chunkGroupChildren: true,
+      hash: true,
+      ids: true,
+      outputPath: true,
+      publicPath: true
+    });
+    const output = {
+      ...stats,
+      generator: "loadable-components",
+      chunks: [
+        ...stats.chunks || []
+      ].map((chunk) => {
+        return {
+          id: chunk.id,
+          files: [
+            ...chunk.files || []
+          ]
+        };
+      })
+    };
+    const result = JSON.stringify(output, null, 2);
+    if (this.opts.writeToDisk) {
+      this.writeAssetsFile(result);
+    }
+    if (this.opts.outputAsset) {
+      return {
+        source() {
+          return result;
+        },
+        size() {
+          return result.length;
+        }
+      };
+    }
+    return null;
+  }
+  writeAssetsFile(manifest) {
+    var _this_compiler;
+    const outputFolder = (_this_compiler = this.compiler) === null || _this_compiler === void 0 ? void 0 : _this_compiler.options.output.path;
+    const outputFile = _path.default.resolve(outputFolder || "", this.opts.filename);
+    _utils.fs.outputFileSync(outputFile, manifest);
+  }
+  constructor({ filename = "loadable-stats.json", path, writeToDisk, outputAsset = true, chunkLoadingGlobal = "__LOADABLE_LOADED_CHUNKS__" } = {
+    filename: "loadable-stats.json",
+    outputAsset: true,
+    chunkLoadingGlobal: "__LOADABLE_LOADED_CHUNKS__"
+  }) {
+    _define_property(this, "opts", void 0);
+    _define_property(this, "compiler", void 0);
+    this.opts = {
+      filename,
+      path,
+      writeToDisk,
+      outputAsset,
+      chunkLoadingGlobal
+    };
+    this.compiler = null;
+  }
+}
+module.exports = LoadablePlugin;

package/dist/cjs/ssr/index.js

@@ -16,7 +16,7 @@ _export(exports, {
 const _jsxruntime = require("react/jsx-runtime");
 const _component = require("@loadable/component");
 const _hoistnonreactstatics = /* @__PURE__ */ _interop_require_default(require("hoist-non-react-statics"));
-const _runtime = require("@modern-js/utils/runtime");
+const _runtimebrowser = require("@modern-js/utils/runtime-browser");
 const _types = require("./serverRender/types");
 const _withCallback = require("./react/withCallback");
 const _utils = require("./utils");
@@ -46,8 +46,8 @@ const ssr = (config) => {
     setup: () => {
       const mockResp = (0, _utils.mockResponse)();
       if (config.inlineScript === false) {
-        window._SSR_DATA = (0, _runtime.parsedJSONFromElement)(_utils1.SSR_DATA_JSON_ID);
-        window._ROUTER_DATA = (0, _runtime.parsedJSONFromElement)(_utils1.ROUTER_DATA_JSON_ID);
+        window._SSR_DATA = (0, _runtimebrowser.parsedJSONFromElement)(_utils1.SSR_DATA_JSON_ID);
+        window._ROUTER_DATA = (0, _runtimebrowser.parsedJSONFromElement)(_utils1.ROUTER_DATA_JSON_ID);
       }
       return {
         client: async ({ App, context, ModernRender, ModernHydrate }) => {

package/dist/cjs/ssr/prefetch.js

@@ -8,10 +8,10 @@ Object.defineProperty(exports, "default", {
 });
 const _jsxruntime = require("react/jsx-runtime");
 const _server = require("react-dom/server");
-const _ssr = require("@modern-js/utils/ssr");
+const _runtimenode = require("@modern-js/utils/runtime-node");
 const _server1 = require("@loadable/server");
 const prefetch = async (App, context) => {
-  return (0, _ssr.run)(context.ssrContext.request.headers, async () => {
+  return (0, _runtimenode.run)(context.ssrContext.request.headers, async () => {
     var _context_store;
     const { ssrContext } = context;
     const { loadableStats } = ssrContext;

package/dist/cjs/ssr/serverRender/renderToStream/buildTemplate.after.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "buildShellAfterTemplate", {
   enumerable: true,
   get: () => buildShellAfterTemplate
 });
-const _serialize = require("@modern-js/utils/universal/serialize");
+const _runtimenode = require("@modern-js/utils/runtime-node");
 const _buildTemplateshare = require("./buildTemplate.share");
 function buildShellAfterTemplate(afterAppTemplate, options) {
   const callbacks = [
@@ -40,7 +40,7 @@ function buildShellAfterTemplate(afterAppTemplate, options) {
         renderLevel
       };
       return `
-      <script>window._SSR_DATA = ${(0, _serialize.serializeJson)(SSRData)}</script>
+      <script>window._SSR_DATA = ${(0, _runtimenode.serializeJson)(SSRData)}</script>
       `;
     }
   }

package/dist/cjs/ssr/serverRender/renderToStream/index.js

@@ -7,7 +7,7 @@ Object.defineProperty(exports, "render", {
   get: () => render
 });
 const _react = require("react");
-const _ssr = require("@modern-js/utils/ssr");
+const _runtimenode = require("@modern-js/utils/runtime-node");
 const _prerender = require("../../react/prerender");
 const _time = require("../time");
 const _renderToPipe = /* @__PURE__ */ _interop_require_default(require("./renderToPipe"));
@@ -21,7 +21,7 @@ const render = ({ App, context }) => {
   if (!ssrContext) {
     throw new Error('The "ssrContext" must not be undefined, but received undefined');
   }
-  return (0, _ssr.run)(ssrContext.request.headers, async () => {
+  return (0, _runtimenode.run)(ssrContext.request.headers, async () => {
     const end = (0, _time.time)();
     const rootElement = (0, _react.createElement)(App, {
       context: Object.assign(context || {}, {

package/dist/cjs/ssr/serverRender/renderToString/entry.js

@@ -8,7 +8,7 @@ Object.defineProperty(exports, "default", {
 });
 const _react = /* @__PURE__ */ _interop_require_default(require("react"));
 const _server = /* @__PURE__ */ _interop_require_default(require("react-dom/server"));
-const _serialize = require("@modern-js/utils/universal/serialize");
+const _runtimenode = require("@modern-js/utils/runtime-node");
 const _reacthelmet = /* @__PURE__ */ _interop_require_default(require("react-helmet"));
 const _utils = require("../../../router/runtime/utils");
 const _helmet = /* @__PURE__ */ _interop_require_default(require("../helmet"));
@@ -183,10 +183,10 @@ class Entry {
   }
   getSSRDataScript(templateData, routerData) {
     const useInlineScript = this.pluginConfig.inlineScript !== false;
-    const ssrData = (0, _serialize.serializeJson)(templateData);
+    const ssrData = (0, _runtimenode.serializeJson)(templateData);
     let ssrDataScripts = useInlineScript ? `<script>window._SSR_DATA = ${ssrData}</script>` : `<script type="application/json" id="${_utils1.SSR_DATA_JSON_ID}">${ssrData}</script>`;
     if (routerData) {
-      const serializedRouterData = (0, _serialize.serializeJson)(routerData);
+      const serializedRouterData = (0, _runtimenode.serializeJson)(routerData);
       ssrDataScripts += useInlineScript ? `
 <script>window._ROUTER_DATA = ${serializedRouterData}</script>` : `
 <script type="application/json" id="${_utils1.ROUTER_DATA_JSON_ID}">${serializedRouterData}</script>`;

package/dist/cjs/ssr/serverRender/renderToString/index.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "render", {
   enumerable: true,
   get: () => render
 });
-const _ssr = require("@modern-js/utils/ssr");
+const _runtimenode = require("@modern-js/utils/runtime-node");
 const _prerender = require("../../react/prerender");
 const _time = require("../time");
 const _entry = /* @__PURE__ */ _interop_require_default(require("./entry"));
@@ -17,7 +17,7 @@ function _interop_require_default(obj) {
 }
 const render = ({ App, context, config }) => {
   const ssrContext = context.ssrContext;
-  return (0, _ssr.run)(ssrContext.request.headers, async () => {
+  return (0, _runtimenode.run)(ssrContext.request.headers, async () => {
     const entry = new _entry.default({
       ctx: ssrContext,
       App,

package/dist/esm/core/compatible.js

@@ -41,7 +41,7 @@ function _async_to_generator(fn) {
 function _define_property(obj, key, value) {
   if (key in obj) {
     Object.defineProperty(obj, key, {
-      value,
+      value: value,
       enumerable: true,
       configurable: true,
       writable: true
@@ -245,7 +245,7 @@ var runnerMap = /* @__PURE__ */ new WeakMap();
 var getInitialContext = function(runner) {
   return {
     loaderManager: createLoaderManager({}),
-    runner,
+    runner: runner,
     isBrowser: true,
     routeManifest: typeof window !== "undefined" && window[ROUTE_MANIFEST]
   };
@@ -262,9 +262,9 @@ export var createApp = function(param) {
       var element = /* @__PURE__ */ React.createElement(App || React.Fragment, App ? _object_spread({}, props) : null, App ? props.children : /* @__PURE__ */ React.cloneElement(props.children, _object_spread({}, (_props_children = props.children) === null || _props_children === void 0 ? void 0 : _props_children.props, props)));
       var context = useContext(RuntimeReactContext);
       return runner.provide({
-        element,
+        element: element,
         props: _object_spread({}, props),
-        context
+        context: context
       }, {
         onLast: function(param2) {
           var element2 = param2.element;
@@ -340,7 +340,7 @@ export var bootstrap = function() {
             return [
               2,
               /* @__PURE__ */ React.createElement(App, {
-                context
+                context: context
               })
             ];
           }
@@ -418,15 +418,15 @@ export var bootstrap = function() {
           return [
             2,
             runner.client({
-              App,
-              context,
-              ModernRender,
-              ModernHydrate
+              App: App,
+              context: context,
+              ModernRender: ModernRender,
+              ModernHydrate: ModernHydrate
             }, {
               onLast: function(param) {
                 var App2 = param.App;
                 ModernRender(/* @__PURE__ */ React.createElement(App2, {
-                  context
+                  context: context
                 }));
               }
             })
@@ -476,8 +476,8 @@ export var bootstrap = function() {
             return [
               2,
               runner.server({
-                App,
-                context
+                App: App,
+                context: context
               })
             ];
           }
@@ -497,7 +497,7 @@ export var useRuntimeContext = function() {
   var context = useContext(RuntimeReactContext);
   var memoizedContext = useMemo(function() {
     return context.runner.pickContext({
-      context,
+      context: context,
       pickedContext: {}
     }, {
       onLast: function(param) {

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

@@ -285,7 +285,7 @@ var createLoader = function(id) {
     return {
       loading: !hasLoaded && status === LoaderStatus.loading,
       reloading: hasLoaded && status === LoaderStatus.loading,
-      data,
+      data: data,
       error: _instanceof(error, Error) ? "".concat(error.message) : error,
       // redundant fields for ssr log
       _error: error
@@ -309,8 +309,8 @@ var createLoader = function(id) {
     get promise() {
       return promise;
     },
-    onChange,
-    load
+    onChange: onChange,
+    load: load
   };
 };
 export var createLoaderManager = function(initialDataMap) {
@@ -425,9 +425,9 @@ export var createLoaderManager = function(initialDataMap) {
     };
   }();
   return {
-    hasPendingLoaders,
-    awaitPendingLoaders,
-    add,
-    get
+    hasPendingLoaders: hasPendingLoaders,
+    awaitPendingLoaders: awaitPendingLoaders,
+    add: add,
+    get: get
   };
 };

package/dist/esm/core/loader/useLoader.js

@@ -12,7 +12,7 @@ function _array_with_holes(arr) {
 function _define_property(obj, key, value) {
   if (key in obj) {
     Object.defineProperty(obj, key, {
-      value,
+      value: value,
       enumerable: true,
       configurable: true,
       writable: true
@@ -148,7 +148,7 @@ var useLoader = function(loaderFn) {
         return Promise.reject(e);
       }
     }, _object_spread_props(_object_spread({}, options), {
-      params
+      params: params
     }));
     loaderRef.current = loaderManager.get(id);
     (_unlistenLoaderChangeRef_current = unlistenLoaderChangeRef.current) === null || _unlistenLoaderChangeRef_current === void 0 ? void 0 : _unlistenLoaderChangeRef_current.call(unlistenLoaderChangeRef);

package/dist/esm/core/plugin.js

@@ -138,12 +138,12 @@ var server = createAsyncPipeline();
 var init = createAsyncPipeline();
 var pickContext = createPipeline();
 var runtimeHooks = {
-  hoc,
-  provide,
-  client,
-  server,
-  init,
-  pickContext
+  hoc: hoc,
+  provide: provide,
+  client: client,
+  server: server,
+  init: init,
+  pickContext: pickContext
 };
 export var createRuntime = function() {
   return createManager(runtimeHooks);

package/dist/esm/document/Html.js

@@ -81,11 +81,11 @@ export function Html(props) {
   return /* @__PURE__ */ _jsx("html", {
     children: /* @__PURE__ */ _jsxs(DocumentStructureContext.Provider, {
       value: {
-        hasSetHead,
-        hasSetScripts,
-        hasSetLinks,
-        hasSetRoot,
-        hasSetBody,
+        hasSetHead: hasSetHead,
+        hasSetScripts: hasSetScripts,
+        hasSetLinks: hasSetLinks,
+        hasSetRoot: hasSetRoot,
+        hasSetBody: hasSetBody,
         docChild: children
       },
       children: [