@bleedingdev/modern-js-runtime 3.9.0-ultramodern.9 → 3.9.3-ultramodern.1

package/dist/cjs/cli/code.js

@@ -85,7 +85,7 @@ const generateCode = async (entrypoints, appContext, config, hooks)=>{
                 entryName,
                 customEntry,
                 mountId,
-                enableRsc: config.server.rsc,
+                enableRsc: Boolean(config.server.rsc),
                 isNestedRouter: !!entrypoint.nestedRoutesEntry
             }) : external_template_js_namespaceObject.entryForCSRWithRSC({
                 metaName,
@@ -128,7 +128,7 @@ requestHandler.catch(() => {});`, 'utf8');
                     mode: ssrMode,
                     customServerEntry,
                     srcDirectory,
-                    enableRsc: config.server.rsc
+                    enableRsc: Boolean(config.server.rsc)
                 });
                 const indexServerFile = external_path_default().resolve(internalDirectory, `./${entryName}/${external_constants_js_namespaceObject.SERVER_ENTRY_POINT_FILE_NAME}`);
                 await utils_namespaceObject.fs.outputFile(indexServerFile, indexServerCode, 'utf8');

package/dist/cjs/cli/index.js

@@ -53,7 +53,6 @@ __webpack_require__.d(__webpack_exports__, {
     ssrPlugin: ()=>external_ssr_index_js_namespaceObject.ssrPlugin,
     updateNestedRoutesSpec: ()=>external_router_cli_index_js_namespaceObject.updateNestedRoutesSpec
 });
-const utils_namespaceObject = require("@modern-js/utils");
 const external_path_namespaceObject = require("path");
 var external_path_default = /*#__PURE__*/ __webpack_require__.n(external_path_namespaceObject);
 const index_js_namespaceObject = require("../document/cli/index.js");
@@ -128,12 +127,6 @@ const runtimePlugin = (params)=>({
                     }
                 };
             });
-            api.onBeforeRestart(()=>{
-                (0, utils_namespaceObject.cleanRequireCache)([
-                    require.resolve('../router/cli'),
-                    require.resolve('./ssr')
-                ]);
-            });
         }
     });
 const cli = runtimePlugin;

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

@@ -44,6 +44,7 @@ const external_path_namespaceObject = require("path");
 var external_path_default = /*#__PURE__*/ __webpack_require__.n(external_path_namespaceObject);
 const normalizeChunkId = (id)=>'string' == typeof id && /^\d+$/.test(id) ? Number(id) : id;
 const DEFAULT_CHUNK_LOADING_GLOBAL = '__LOADABLE_LOADED_CHUNKS__';
+const normalizeStatsPublicPath = (publicPath)=>'auto' === publicPath || 'auto/' === publicPath ? '/' : publicPath;
 const normalizeChunkGroup = (group)=>({
         ...group,
         chunks: (group.chunks || []).map(normalizeChunkId)
@@ -86,6 +87,7 @@ class LoadablePlugin {
         for (const [name, ep] of Object.entries(stats.entrypoints || {}))entrypoints[name] = normalizeChunkGroup(ep);
         const output = {
             ...stats,
+            publicPath: normalizeStatsPublicPath(stats.publicPath),
             namedChunkGroups,
             entrypoints,
             generator: 'loadable-components',

package/dist/cjs/cli/template.server.js

@@ -153,8 +153,7 @@ function genHandlerCode({ mode, metaName, customServerEntry, srcDirectory, inter
         return `
       export * from '${realEntryPath}';
       export { default as requestHandler } from '${realEntryPath}'`;
-    }
-    {
+    } else {
         const entrySource = enableRsc ? SERVER_ENTRY_RSC : SERVER_ENTRY;
         const serverEntry = transformServerEntry(entrySource, {
             metaName: metaName || 'modern-js',

package/dist/cjs/core/browser/hydrate.js

@@ -62,7 +62,7 @@ function hydrateRoot(App, context, ModernRender, ModernHydrate) {
     if ('stream' === renderMode) return streamSSRHydrate();
     function streamSSRHydrate() {
         if (renderLevel !== external_constants_js_namespaceObject.RenderLevel.SERVER_RENDER) return ModernRender((0, wrapper_js_namespaceObject.wrapRuntimeContextProvider)(App, context));
-        {
+        else {
             const SSRApp = ()=>/*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(external_withCallback_js_namespaceObject.WithCallback, {
                     callback: callback,
                     children: App
@@ -78,7 +78,7 @@ function hydrateRoot(App, context, ModernRender, ModernHydrate) {
     return stringSSRHydrate();
     function stringSSRHydrate() {
         if (renderLevel === external_constants_js_namespaceObject.RenderLevel.CLIENT_RENDER) return ModernRender((0, wrapper_js_namespaceObject.wrapRuntimeContextProvider)(App, context));
-        {
+        else {
             if (renderLevel === external_constants_js_namespaceObject.RenderLevel.SERVER_RENDER) return (0, component_namespaceObject.loadableReady)(()=>void 0, loadableReadyOptions).then(()=>{
                 const SSRApp = ()=>/*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(external_withCallback_js_namespaceObject.WithCallback, {
                         callback: callback,
@@ -86,13 +86,7 @@ function hydrateRoot(App, context, ModernRender, ModernHydrate) {
                     });
                 return ModernHydrate((0, wrapper_js_namespaceObject.wrapRuntimeContextProvider)(/*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(SSRApp, {}), hydrateContext));
             });
-            const runtimeConsole = Reflect.get(globalThis, 'console');
-            if (null !== runtimeConsole && 'object' == typeof runtimeConsole) {
-                const warn = Reflect.get(runtimeConsole, 'warn');
-                if ('function' == typeof warn) Reflect.apply(warn, runtimeConsole, [
-                    `unknow render level: ${renderLevel}, execute render()`
-                ]);
-            }
+            console.warn(`unknow render level: ${renderLevel}, execute render()`);
             return ModernRender((0, wrapper_js_namespaceObject.wrapRuntimeContextProvider)(App, context));
         }
     }

package/dist/cjs/core/browser/index.js

@@ -35,10 +35,9 @@ __webpack_require__.d(__webpack_exports__, {
     renderWithReact17: ()=>renderWithReact17,
     renderWithReact18: ()=>renderWithReact18
 });
+const context_namespaceObject = require("@modern-js/runtime/context");
 const external_cookie_namespaceObject = require("cookie");
 const client_namespaceObject = require("react-dom/client");
-const index_js_namespaceObject = require("../context/index.js");
-const runtime_js_namespaceObject = require("../context/runtime.js");
 const wrapper_js_namespaceObject = require("../react/wrapper.js");
 const external_hydrate_js_namespaceObject = require("./hydrate.js");
 const IS_REACT18 = 'true' === process.env.IS_REACT18;
@@ -85,7 +84,7 @@ function isClientArgs(id) {
     return void 0 === id || 'string' == typeof id || "u" > typeof HTMLElement && id instanceof HTMLElement;
 }
 async function renderApp(App, id, hydrateFromSsrData, internalRuntimeContext) {
-    const context = (0, runtime_js_namespaceObject.getInitialContext)();
+    const context = (0, context_namespaceObject.getInitialContext)();
     const runBeforeRender = async (context)=>{
         const api = internalRuntimeContext.pluginAPI;
         api.updateRuntimeContext(context);
@@ -115,10 +114,10 @@ async function renderApp(App, id, hydrateFromSsrData, internalRuntimeContext) {
     throw Error('`render` function needs id in browser environment, it needs to be string or element');
 }
 async function render(App, id) {
-    return renderApp(App, id, true, (0, index_js_namespaceObject.getGlobalInternalRuntimeContext)());
+    return renderApp(App, id, true, (0, context_namespaceObject.getGlobalInternalRuntimeContext)());
 }
 function createNestedAppRenderer() {
-    const internalRuntimeContext = (0, index_js_namespaceObject.getGlobalInternalRuntimeContext)();
+    const internalRuntimeContext = (0, context_namespaceObject.getGlobalInternalRuntimeContext)();
     return (App, id)=>renderApp(App, id, false, internalRuntimeContext);
 }
 async function renderWithReact18(App, rootElement) {

package/dist/cjs/core/context/index.js

@@ -30,6 +30,7 @@ __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
     DefaultNotFound: ()=>DefaultNotFound_js_namespaceObject.DefaultNotFound,
     InternalRuntimeContext: ()=>external_runtime_js_namespaceObject.InternalRuntimeContext,
+    ReactRuntimeContext: ()=>external_runtime_js_namespaceObject.ReactRuntimeContext,
     RuntimeComponentResolverContext: ()=>external_runtime_js_namespaceObject.RuntimeComponentResolverContext,
     RuntimeContext: ()=>external_runtime_js_namespaceObject.RuntimeContext,
     getCurrentEntryName: ()=>getCurrentEntryName,
@@ -52,7 +53,8 @@ __webpack_require__.d(__webpack_exports__, {
     routerProviderRegistryHooks: ()=>hooks_js_namespaceObject.routerProviderRegistryHooks,
     setGlobalContext: ()=>setGlobalContext,
     setGlobalInternalRuntimeContext: ()=>setGlobalInternalRuntimeContext,
-    setServerPayload: ()=>index_js_namespaceObject.setServerPayload
+    setServerPayload: ()=>index_js_namespaceObject.setServerPayload,
+    useRuntimeContext: ()=>external_runtime_js_namespaceObject.useRuntimeContext
 });
 const DefaultNotFound_js_namespaceObject = require("../../router/runtime/DefaultNotFound.js");
 const hooks_js_namespaceObject = require("../../router/runtime/hooks.js");
@@ -102,6 +104,7 @@ function getGlobalBasename() {
 }
 exports.DefaultNotFound = __webpack_exports__.DefaultNotFound;
 exports.InternalRuntimeContext = __webpack_exports__.InternalRuntimeContext;
+exports.ReactRuntimeContext = __webpack_exports__.ReactRuntimeContext;
 exports.RuntimeComponentResolverContext = __webpack_exports__.RuntimeComponentResolverContext;
 exports.RuntimeContext = __webpack_exports__.RuntimeContext;
 exports.getCurrentEntryName = __webpack_exports__.getCurrentEntryName;
@@ -125,9 +128,11 @@ exports.routerProviderRegistryHooks = __webpack_exports__.routerProviderRegistry
 exports.setGlobalContext = __webpack_exports__.setGlobalContext;
 exports.setGlobalInternalRuntimeContext = __webpack_exports__.setGlobalInternalRuntimeContext;
 exports.setServerPayload = __webpack_exports__.setServerPayload;
+exports.useRuntimeContext = __webpack_exports__.useRuntimeContext;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
     "DefaultNotFound",
     "InternalRuntimeContext",
+    "ReactRuntimeContext",
     "RuntimeComponentResolverContext",
     "RuntimeContext",
     "getCurrentEntryName",
@@ -150,7 +155,8 @@ for(var __rspack_i in __webpack_exports__)if (-1 === [
     "routerProviderRegistryHooks",
     "setGlobalContext",
     "setGlobalInternalRuntimeContext",
-    "setServerPayload"
+    "setServerPayload",
+    "useRuntimeContext"
 ].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
 Object.defineProperty(exports, '__esModule', {
     value: true

package/dist/cjs/core/context/public.js

@@ -28,11 +28,11 @@ var __webpack_require__ = {};
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
-    ReactRuntimeContext: ()=>external_runtime_js_namespaceObject.ReactRuntimeContext,
-    RuntimeContext: ()=>external_runtime_js_namespaceObject.RuntimeContext,
-    useRuntimeContext: ()=>external_runtime_js_namespaceObject.useRuntimeContext
+    ReactRuntimeContext: ()=>context_namespaceObject.ReactRuntimeContext,
+    RuntimeContext: ()=>context_namespaceObject.RuntimeContext,
+    useRuntimeContext: ()=>context_namespaceObject.useRuntimeContext
 });
-const external_runtime_js_namespaceObject = require("./runtime.js");
+const context_namespaceObject = require("@modern-js/runtime/context");
 exports.ReactRuntimeContext = __webpack_exports__.ReactRuntimeContext;
 exports.RuntimeContext = __webpack_exports__.RuntimeContext;
 exports.useRuntimeContext = __webpack_exports__.useRuntimeContext;

package/dist/cjs/core/context/runtime.js

@@ -37,15 +37,9 @@ __webpack_require__.d(__webpack_exports__, {
 });
 const external_react_namespaceObject = require("react");
 const ROUTE_MANIFEST = '_MODERNJS_ROUTE_MANIFEST';
-function getRuntimeReactContext(kind, create) {
-    const key = Symbol.for(`@modern-js/runtime:react-context:v1:${kind}`);
-    const contexts = globalThis;
-    contexts[key] ??= create();
-    return contexts[key];
-}
-const InternalRuntimeContext = getRuntimeReactContext('internal', ()=>(0, external_react_namespaceObject.createContext)({}));
-const RuntimeContext = getRuntimeReactContext('public', ()=>(0, external_react_namespaceObject.createContext)({}));
-const RuntimeComponentResolverContext = getRuntimeReactContext('component-resolver', ()=>(0, external_react_namespaceObject.createContext)(void 0));
+const InternalRuntimeContext = (0, external_react_namespaceObject.createContext)({});
+const RuntimeContext = (0, external_react_namespaceObject.createContext)({});
+const RuntimeComponentResolverContext = (0, external_react_namespaceObject.createContext)(void 0);
 const ReactRuntimeContext = RuntimeContext;
 const useRuntimeContext = ()=>(0, external_react_namespaceObject.useContext)(RuntimeContext);
 const getInitialContext = (isBrowser = true, routeManifest)=>{

package/dist/cjs/core/index.js

@@ -28,12 +28,12 @@ var __webpack_require__ = {};
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
-    RuntimeContext: ()=>runtime_js_namespaceObject.RuntimeContext,
+    RuntimeContext: ()=>context_namespaceObject.RuntimeContext,
     defineRuntimeConfig: ()=>external_config_js_namespaceObject.defineRuntimeConfig,
-    useRuntimeContext: ()=>runtime_js_namespaceObject.useRuntimeContext
+    useRuntimeContext: ()=>context_namespaceObject.useRuntimeContext
 });
+const context_namespaceObject = require("@modern-js/runtime/context");
 const external_config_js_namespaceObject = require("./config.js");
-const runtime_js_namespaceObject = require("./context/runtime.js");
 exports.RuntimeContext = __webpack_exports__.RuntimeContext;
 exports.defineRuntimeConfig = __webpack_exports__.defineRuntimeConfig;
 exports.useRuntimeContext = __webpack_exports__.useRuntimeContext;

package/dist/cjs/core/plugin/index.js

@@ -32,11 +32,11 @@ __webpack_require__.d(__webpack_exports__, {
     registerPlugin: ()=>registerPlugin
 });
 const runtime_namespaceObject = require("@modern-js/plugin/runtime");
+const context_namespaceObject = require("@modern-js/runtime/context");
 const merge_namespaceObject = require("@modern-js/runtime-utils/merge");
 const index_js_namespaceObject = require("../compat/index.js");
 const hooks_js_namespaceObject = require("../compat/hooks.js");
 const requestContext_js_namespaceObject = require("../compat/requestContext.js");
-const external_context_index_js_namespaceObject = require("../context/index.js");
 function registerPlugin(internalPlugins, runtimeConfig) {
     const { plugins = [] } = runtimeConfig || {};
     const { runtimeContext } = runtime_namespaceObject.runtime.run({
@@ -50,7 +50,7 @@ function registerPlugin(internalPlugins, runtimeConfig) {
         handleSetupResult: hooks_js_namespaceObject.handleSetupResult
     });
     const internalRuntimeContext = runtimeContext;
-    (0, external_context_index_js_namespaceObject.setGlobalInternalRuntimeContext)(internalRuntimeContext);
+    (0, context_namespaceObject.setGlobalInternalRuntimeContext)(internalRuntimeContext);
     return internalRuntimeContext;
 }
 function mergeConfig(config, ...otherConfig) {

package/dist/cjs/core/react/index.js

@@ -30,17 +30,17 @@ __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
     createRoot: ()=>createRoot
 });
+const context_namespaceObject = require("@modern-js/runtime/context");
 const parsed_namespaceObject = require("@modern-js/runtime-utils/parsed");
 const external_common_js_namespaceObject = require("../../common.js");
 const external_constants_js_namespaceObject = require("../constants.js");
-const index_js_namespaceObject = require("../context/index.js");
 function createRoot(UserApp) {
-    const App = UserApp || (0, index_js_namespaceObject.getGlobalApp)();
+    const App = UserApp || (0, context_namespaceObject.getGlobalApp)();
     if ((0, external_common_js_namespaceObject.isBrowser)()) {
         window._SSR_DATA = window._SSR_DATA || (0, parsed_namespaceObject.parsedJSONFromElement)(external_constants_js_namespaceObject.SSR_DATA_JSON_ID);
         window._ROUTER_DATA = window._ROUTER_DATA || (0, parsed_namespaceObject.parsedJSONFromElement)(external_constants_js_namespaceObject.ROUTER_DATA_JSON_ID);
     }
-    const internalRuntimeContext = (0, index_js_namespaceObject.getGlobalInternalRuntimeContext)();
+    const internalRuntimeContext = (0, context_namespaceObject.getGlobalInternalRuntimeContext)();
     const hooks = internalRuntimeContext.hooks;
     const WrapperApp = hooks.wrapRoot.call(App);
     return WrapperApp;

package/dist/cjs/core/react/wrapper.js

@@ -32,10 +32,9 @@ __webpack_require__.d(__webpack_exports__, {
     wrapRuntimeContextProvider: ()=>wrapRuntimeContextProvider
 });
 const jsx_runtime_namespaceObject = require("react/jsx-runtime");
-const index_js_namespaceObject = require("../context/index.js");
-const runtime_js_namespaceObject = require("../context/runtime.js");
-function wrapRuntimeComponentResolver(root, hooks = (0, index_js_namespaceObject.getGlobalInternalRuntimeContext)()?.hooks) {
-    return /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(runtime_js_namespaceObject.RuntimeComponentResolverContext.Provider, {
+const context_namespaceObject = require("@modern-js/runtime/context");
+function wrapRuntimeComponentResolver(root, hooks = (0, context_namespaceObject.getGlobalInternalRuntimeContext)()?.hooks) {
+    return /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(context_namespaceObject.RuntimeComponentResolverContext.Provider, {
         value: hooks?.resolveComponent?.call,
         children: root
     });
@@ -49,18 +48,18 @@ function wrapRuntimeContextProvider(App, contextValue) {
         context,
         ...rest
     };
-    const isRsc = true === (0, index_js_namespaceObject.getGlobalEnableRsc)();
+    const isRsc = true === (0, context_namespaceObject.getGlobalEnableRsc)();
     const projection = {
         internalContext: contextValue,
         publicContext: runtimeContextValue
     };
-    const values = (0, index_js_namespaceObject.getGlobalInternalRuntimeContext)()?.hooks.transformRuntimeContext?.call(projection, {
+    const values = (0, context_namespaceObject.getGlobalInternalRuntimeContext)()?.hooks.transformRuntimeContext?.call(projection, {
         context: contextValue,
         isRsc
     }) ?? projection;
-    const root = /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(index_js_namespaceObject.InternalRuntimeContext.Provider, {
+    const root = /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(context_namespaceObject.InternalRuntimeContext.Provider, {
         value: values.internalContext,
-        children: /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(index_js_namespaceObject.RuntimeContext.Provider, {
+        children: /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(context_namespaceObject.RuntimeContext.Provider, {
             value: values.publicContext,
             children: App
         })