@modern-js/runtime 2.26.0 → 2.28.0

package/dist/esm-node/ssr/prefetch.js

@@ -2,48 +2,46 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import { renderToStaticMarkup } from "react-dom/server";
 import { run } from "@modern-js/utils/runtime-node";
 import { ChunkExtractor } from "@loadable/server";
-const prefetch = async (App, context) => {
-  return run(context.ssrContext.request.headers, async () => {
-    var _context_store;
-    const { ssrContext } = context;
-    const { loadableStats } = ssrContext;
-    if (loadableStats) {
-      const extractor = new ChunkExtractor({
-        stats: loadableStats,
-        entrypoints: [
-          ssrContext.entryName
-        ].filter(Boolean)
-      });
-      renderToStaticMarkup(extractor.collectChunks(/* @__PURE__ */ _jsx(App, {
-        context
-      })));
-    } else {
-      renderToStaticMarkup(/* @__PURE__ */ _jsx(App, {
-        context
-      }));
-    }
-    if (!context.loaderManager.hasPendingLoaders()) {
-      return {
-        initialData: context.initialData,
-        i18nData: context.__i18nData__
-      };
-    }
-    const loadersData = await context.loaderManager.awaitPendingLoaders();
-    Object.keys(loadersData).forEach((id) => {
-      const data = loadersData[id];
-      if (data._error) {
-        ssrContext.logger.error("App Prefetch Loader", data._error);
-        ssrContext.metrics.emitCounter("app.prefetch.loader.error", 1);
-        delete data._error;
-      }
+const prefetch = async (App, context) => run(context.ssrContext.request.headers, async () => {
+  var _context_store, _context;
+  const { ssrContext } = context;
+  const { loadableStats } = ssrContext;
+  if (loadableStats) {
+    const extractor = new ChunkExtractor({
+      stats: loadableStats,
+      entrypoints: [
+        ssrContext.entryName
+      ].filter(Boolean)
     });
+    renderToStaticMarkup(extractor.collectChunks(/* @__PURE__ */ _jsx(App, {
+      context
+    })));
+  } else {
+    renderToStaticMarkup(/* @__PURE__ */ _jsx(App, {
+      context
+    }));
+  }
+  if (!context.loaderManager.hasPendingLoaders()) {
     return {
-      loadersData,
       initialData: context.initialData,
-      i18nData: context.__i18nData__,
-      // todo: move to plugin state
-      storeState: context === null || context === void 0 ? void 0 : (_context_store = context.store) === null || _context_store === void 0 ? void 0 : _context_store.getState()
+      i18nData: context.__i18nData__
     };
+  }
+  const loadersData = await context.loaderManager.awaitPendingLoaders();
+  Object.keys(loadersData).forEach((id) => {
+    const data = loadersData[id];
+    if (data._error) {
+      ssrContext.logger.error("App Prefetch Loader", data._error);
+      ssrContext.metrics.emitCounter("app.prefetch.loader.error", 1);
+      delete data._error;
+    }
   });
-};
+  return {
+    loadersData,
+    initialData: context.initialData,
+    i18nData: context.__i18nData__,
+    // todo: move to plugin state
+    storeState: (_context = context) === null || _context === void 0 ? void 0 : (_context_store = _context.store) === null || _context_store === void 0 ? void 0 : _context_store.getState()
+  };
+});
 export default prefetch;

package/dist/esm-node/ssr/react/prerender/util.js

@@ -27,8 +27,9 @@ export const aggKeysFromPropsList = function aggKeysFromPropsList2(propsList, pr
   }, {});
   const res = propsList.filter((props) => usefulObject(props[propName])).reduce((result, next) => {
     REQUEST_META.forEach((key) => {
+      var _prop;
       const prop = next[propName];
-      if ((prop === null || prop === void 0 ? void 0 : prop.hasOwnProperty(key)) && usefulArray(prop[key])) {
+      if (((_prop = prop) === null || _prop === void 0 ? void 0 : _prop.hasOwnProperty(key)) && usefulArray(prop[key])) {
         result[key] = unique(result[key].concat(prop[key]));
       }
     });
@@ -51,8 +52,9 @@ export const aggMatchesFromPropsList = function aggMatchesFromPropsList2(propsLi
   }, {});
   const res = propsList.filter((props) => usefulObject(props[propName])).reduce((result, next) => {
     REQUEST_META.forEach((key) => {
+      var _prop;
       const prop = next[propName];
-      if ((prop === null || prop === void 0 ? void 0 : prop.hasOwnProperty(key)) && usefulObject(prop[key])) {
+      if (((_prop = prop) === null || _prop === void 0 ? void 0 : _prop.hasOwnProperty(key)) && usefulObject(prop[key])) {
         result[key] = Object.assign(result[key], prop[key]);
       }
     });

package/dist/esm-node/ssr/serverRender/renderToStream/bulidTemplate.before.js

@@ -20,6 +20,7 @@ function getHeadTemplate(beforeEntryTemplate, context) {
   function injectCss(headTemplate2) {
     return headTemplate2.replace(CSS_CHUNKS_PLACEHOLDER, getCssChunks());
     function getCssChunks() {
+      var _matches;
       const { routeManifest, routerContext, routes } = context;
       if (!routeManifest || !routerContext || !routes) {
         return "";
@@ -27,7 +28,7 @@ function getHeadTemplate(beforeEntryTemplate, context) {
       const { routeAssets } = routeManifest;
       const cssChunks = [];
       const matches = matchRoutes(routes, routerContext.location, routerContext.basename);
-      matches === null || matches === void 0 ? void 0 : matches.forEach((match, index) => {
+      (_matches = matches) === null || _matches === void 0 ? void 0 : _matches.forEach((match, index) => {
         if (!index) {
           return;
         }
@@ -37,7 +38,8 @@ function getHeadTemplate(beforeEntryTemplate, context) {
           if (routeManifest2) {
             const { referenceCssAssets = [] } = routeManifest2;
             const _cssChunks = referenceCssAssets.filter((asset) => {
-              return (asset === null || asset === void 0 ? void 0 : asset.endsWith(".css")) && !headTemplate2.includes(asset);
+              var _asset;
+              return ((_asset = asset) === null || _asset === void 0 ? void 0 : _asset.endsWith(".css")) && !headTemplate2.includes(asset);
             });
             cssChunks.push(..._cssChunks);
           }

package/dist/esm-node/ssr/serverRender/renderToStream/renderToPipe.js

@@ -13,6 +13,7 @@ function renderToPipe(rootElement, context, options) {
   const chunkVec = [];
   const forUserPipe = (stream) => {
     return new Promise((resolve) => {
+      var _ssrContext;
       let renderToPipeableStream;
       try {
         ({ renderToPipeableStream } = require("react-dom/server"));
@@ -20,11 +21,11 @@ function renderToPipe(rootElement, context, options) {
       }
       const { pipe } = renderToPipeableStream(rootElement, {
         ...options,
-        nonce: ssrContext === null || ssrContext === void 0 ? void 0 : ssrContext.nonce,
+        nonce: (_ssrContext = ssrContext) === null || _ssrContext === void 0 ? void 0 : _ssrContext.nonce,
         onShellReady() {
-          var _options_onShellReady;
+          var _options_onShellReady, _options;
           const { shellAfter, shellBefore } = getTemplates(context, RenderLevel.SERVER_RENDER);
-          options === null || options === void 0 ? void 0 : (_options_onShellReady = options.onShellReady) === null || _options_onShellReady === void 0 ? void 0 : _options_onShellReady.call(options);
+          (_options = options) === null || _options === void 0 ? void 0 : (_options_onShellReady = _options.onShellReady) === null || _options_onShellReady === void 0 ? void 0 : _options_onShellReady.call(_options);
           const injectableTransform = new Transform({
             transform(chunk, _encoding, callback) {
               try {
@@ -52,18 +53,18 @@ function renderToPipe(rootElement, context, options) {
           resolve(pipe(injectableTransform).pipe(stream));
         },
         onShellError(error) {
-          var _options_onShellError;
+          var _options_onShellError, _options;
           ssrContext.metrics.emitCounter("app.render.streaming.shell.error", 1);
           const { shellAfter, shellBefore } = getTemplates(context, RenderLevel.CLIENT_RENDER);
           const fallbackHtml = `${shellBefore}${shellAfter}`;
           resolve(fallbackHtml);
-          options === null || options === void 0 ? void 0 : (_options_onShellError = options.onShellError) === null || _options_onShellError === void 0 ? void 0 : _options_onShellError.call(options, error);
+          (_options = options) === null || _options === void 0 ? void 0 : (_options_onShellError = _options.onShellError) === null || _options_onShellError === void 0 ? void 0 : _options_onShellError.call(_options, error);
         },
         onError(error) {
-          var _options_onError;
+          var _options_onError, _options;
           ssrContext.logger.error("An error occurs during streaming SSR", error);
           ssrContext.metrics.emitCounter("app.render.streaming.error", 1);
-          options === null || options === void 0 ? void 0 : (_options_onError = options.onError) === null || _options_onError === void 0 ? void 0 : _options_onError.call(options, error);
+          (_options = options) === null || _options === void 0 ? void 0 : (_options_onError = _options.onError) === null || _options_onError === void 0 ? void 0 : _options_onError.call(_options, error);
         }
       });
     });

package/dist/esm-node/ssr/serverRender/renderToStream/renderToPipe.worker.js

@@ -18,14 +18,15 @@ function renderToPipe(rootElement, context, options) {
     }
     const { shellAfter, shellBefore } = getTemplates(context, RenderLevel.SERVER_RENDER);
     try {
+      var _ssrContext;
       const readableOriginal = await renderToReadableStream(rootElement, {
         ...options,
-        nonce: ssrContext === null || ssrContext === void 0 ? void 0 : ssrContext.nonce,
+        nonce: (_ssrContext = ssrContext) === null || _ssrContext === void 0 ? void 0 : _ssrContext.nonce,
         onError(error) {
-          var _options_onError;
-          ssrContext === null || ssrContext === void 0 ? void 0 : ssrContext.logger.error("An error occurs during streaming SSR", error);
-          ssrContext === null || ssrContext === void 0 ? void 0 : ssrContext.metrics.emitCounter("app.render.streaming.error", 1);
-          options === null || options === void 0 ? void 0 : (_options_onError = options.onError) === null || _options_onError === void 0 ? void 0 : _options_onError.call(options, error);
+          var _ssrContext2, _ssrContext12, _options_onError, _options;
+          (_ssrContext2 = ssrContext) === null || _ssrContext2 === void 0 ? void 0 : _ssrContext2.logger.error("An error occurs during streaming SSR", error);
+          (_ssrContext12 = ssrContext) === null || _ssrContext12 === void 0 ? void 0 : _ssrContext12.metrics.emitCounter("app.render.streaming.error", 1);
+          (_options = options) === null || _options === void 0 ? void 0 : (_options_onError = _options.onError) === null || _options_onError === void 0 ? void 0 : _options_onError.call(_options, error);
         }
       });
       const reader = readableOriginal.getReader();
@@ -56,7 +57,8 @@ function renderToPipe(rootElement, context, options) {
       });
       return injectableStream;
     } catch (err) {
-      ssrContext === null || ssrContext === void 0 ? void 0 : ssrContext.metrics.emitCounter("app.render.streaming.shell.error", 1);
+      var _ssrContext1;
+      (_ssrContext1 = ssrContext) === null || _ssrContext1 === void 0 ? void 0 : _ssrContext1.metrics.emitCounter("app.render.streaming.shell.error", 1);
       const { shellAfter: shellAfter2, shellBefore: shellBefore2 } = getTemplates(context, RenderLevel.CLIENT_RENDER);
       const fallbackHtml = `${shellBefore2}${shellAfter2}`;
       return fallbackHtml;

package/dist/esm-node/ssr/serverRender/renderToString/loadable.js

@@ -1,10 +1,11 @@
 import { ChunkExtractor } from "@loadable/server";
 import { attributesToString, getLoadableScripts } from "../utils";
 const extname = (uri) => {
+  var _uri;
   if (typeof uri !== "string" || !uri.includes(".")) {
     return "";
   }
-  return `.${uri === null || uri === void 0 ? void 0 : uri.split(".").pop()}` || "";
+  return `.${(_uri = uri) === null || _uri === void 0 ? void 0 : _uri.split(".").pop()}` || "";
 };
 export const toHtml = (jsx, renderer, next) => {
   const { stats, result: { chunksMap }, config = {}, nonce } = renderer;

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

@@ -1,79 +1,77 @@
 import { getEntryOptions, createRuntimeExportsUtils } from "@modern-js/utils";
 const PLUGIN_IDENTIFIER = "state";
-export const statePlugin = () => {
-  return {
-    name: "@modern-js/plugin-state",
-    required: [
-      "@modern-js/runtime"
-    ],
-    setup: (api) => {
-      const stateConfigMap = /* @__PURE__ */ new Map();
-      let pluginsExportsUtils;
-      return {
-        config() {
-          const appContext = api.useAppContext();
-          pluginsExportsUtils = createRuntimeExportsUtils(appContext.internalDirectory, "plugins");
-          return {
-            source: {
-              alias: {
-                "@modern-js/runtime/plugins": pluginsExportsUtils.getPath()
-              }
+export const statePlugin = () => ({
+  name: "@modern-js/plugin-state",
+  required: [
+    "@modern-js/runtime"
+  ],
+  setup: (api) => {
+    const stateConfigMap = /* @__PURE__ */ new Map();
+    let pluginsExportsUtils;
+    return {
+      config() {
+        const appContext = api.useAppContext();
+        pluginsExportsUtils = createRuntimeExportsUtils(appContext.internalDirectory, "plugins");
+        return {
+          source: {
+            alias: {
+              "@modern-js/runtime/plugins": pluginsExportsUtils.getPath()
             }
-          };
-        },
-        modifyEntryImports({ entrypoint, imports }) {
-          var _getEntryOptions;
-          const { entryName, isMainEntry } = entrypoint;
-          const userConfig = api.useResolvedConfigContext();
-          const { packageName } = api.useAppContext();
-          const stateConfig = (_getEntryOptions = getEntryOptions(entryName, isMainEntry, userConfig.runtime, userConfig.runtimeByEntries, packageName)) === null || _getEntryOptions === void 0 ? void 0 : _getEntryOptions.state;
-          stateConfigMap.set(entryName, stateConfig);
-          if (stateConfig) {
-            imports.push({
-              value: "@modern-js/runtime/plugins",
-              specifiers: [
-                {
-                  imported: PLUGIN_IDENTIFIER
-                }
-              ]
-            });
           }
-          return {
-            entrypoint,
-            imports
-          };
-        },
-        modifyEntryRuntimePlugins({ entrypoint, plugins }) {
-          const stateOptions = stateConfigMap.get(entrypoint.entryName);
-          if (stateOptions) {
-            plugins.push({
-              name: PLUGIN_IDENTIFIER,
-              options: `${JSON.stringify(stateConfigMap.get(entrypoint.entryName))}`
-            });
-          }
-          return {
-            entrypoint,
-            plugins
-          };
-        },
-        validateSchema() {
-          return [
-            {
-              target: "runtime.state",
-              schema: {
-                type: [
-                  "boolean",
-                  "object"
-                ]
+        };
+      },
+      modifyEntryImports({ entrypoint, imports }) {
+        var _getEntryOptions;
+        const { entryName, isMainEntry } = entrypoint;
+        const userConfig = api.useResolvedConfigContext();
+        const { packageName } = api.useAppContext();
+        const stateConfig = (_getEntryOptions = getEntryOptions(entryName, isMainEntry, userConfig.runtime, userConfig.runtimeByEntries, packageName)) === null || _getEntryOptions === void 0 ? void 0 : _getEntryOptions.state;
+        stateConfigMap.set(entryName, stateConfig);
+        if (stateConfig) {
+          imports.push({
+            value: "@modern-js/runtime/plugins",
+            specifiers: [
+              {
+                imported: PLUGIN_IDENTIFIER
               }
-            }
-          ];
-        },
-        addRuntimeExports() {
-          pluginsExportsUtils.addExport(`export { default as state } from '@modern-js/runtime/model'`);
+            ]
+          });
         }
-      };
-    }
-  };
-};
+        return {
+          entrypoint,
+          imports
+        };
+      },
+      modifyEntryRuntimePlugins({ entrypoint, plugins }) {
+        const stateOptions = stateConfigMap.get(entrypoint.entryName);
+        if (stateOptions) {
+          plugins.push({
+            name: PLUGIN_IDENTIFIER,
+            options: `${JSON.stringify(stateConfigMap.get(entrypoint.entryName))}`
+          });
+        }
+        return {
+          entrypoint,
+          plugins
+        };
+      },
+      validateSchema() {
+        return [
+          {
+            target: "runtime.state",
+            schema: {
+              type: [
+                "boolean",
+                "object"
+              ]
+            }
+          }
+        ];
+      },
+      addRuntimeExports() {
+        pluginsExportsUtils.addExport(`export { default as state } from '@modern-js/runtime/model'`);
+      }
+    };
+  }
+});
 export default statePlugin;

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

@@ -30,49 +30,47 @@ const getStoreConfig = (config) => {
   storeConfig.plugins = plugins;
   return storeConfig;
 };
-const state = (config) => {
-  return {
-    name: "@modern-js/plugin-state",
-    setup: () => {
-      const storeConfig = getStoreConfig(config);
-      return {
-        hoc({ App }, next) {
-          const getStateApp = (props) => {
-            const context = useContext(RuntimeReactContext);
-            return /* @__PURE__ */ _jsx(Provider, {
-              store: context.store,
-              config: storeConfig,
-              children: /* @__PURE__ */ _jsx(App, {
-                ...props
-              })
-            });
-          };
-          return next({
-            App: hoistNonReactStatics(getStateApp, App)
-          });
-        },
-        init({ context }, next) {
-          if (isBrowser()) {
-            var _window__SSR_DATA, _window__SSR_DATA_data;
-            storeConfig.initialState = storeConfig.initialState || (window === null || window === void 0 ? void 0 : (_window__SSR_DATA = window._SSR_DATA) === null || _window__SSR_DATA === void 0 ? void 0 : (_window__SSR_DATA_data = _window__SSR_DATA.data) === null || _window__SSR_DATA_data === void 0 ? void 0 : _window__SSR_DATA_data.storeState) || {};
-          }
-          context.store = createStore(storeConfig);
-          return next({
-            context
-          });
-        },
-        pickContext({ context, pickedContext }, next) {
-          return next({
-            context,
-            pickedContext: {
-              ...pickedContext,
-              store: context.store
-            }
+const state = (config) => ({
+  name: "@modern-js/plugin-state",
+  setup: () => {
+    const storeConfig = getStoreConfig(config);
+    return {
+      hoc({ App }, next) {
+        const getStateApp = (props) => {
+          const context = useContext(RuntimeReactContext);
+          return /* @__PURE__ */ _jsx(Provider, {
+            store: context.store,
+            config: storeConfig,
+            children: /* @__PURE__ */ _jsx(App, {
+              ...props
+            })
           });
+        };
+        return next({
+          App: hoistNonReactStatics(getStateApp, App)
+        });
+      },
+      init({ context }, next) {
+        if (isBrowser()) {
+          var _window__SSR_DATA_data, _window__SSR_DATA, _window;
+          storeConfig.initialState = storeConfig.initialState || ((_window = window) === null || _window === void 0 ? void 0 : (_window__SSR_DATA = _window._SSR_DATA) === null || _window__SSR_DATA === void 0 ? void 0 : (_window__SSR_DATA_data = _window__SSR_DATA.data) === null || _window__SSR_DATA_data === void 0 ? void 0 : _window__SSR_DATA_data.storeState) || {};
         }
-      };
-    }
-  };
-};
+        context.store = createStore(storeConfig);
+        return next({
+          context
+        });
+      },
+      pickContext({ context, pickedContext }, next) {
+        return next({
+          context,
+          pickedContext: {
+            ...pickedContext,
+            store: context.store
+          }
+        });
+      }
+    };
+  }
+});
 export default state;
 export * from "../plugins";

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.26.0",
+  "version": "2.28.0",
   "engines": {
     "node": ">=14.17.6"
   },
@@ -29,6 +29,10 @@
       "types": "./dist/types/index.d.ts",
       "default": "./dist/esm/index.js"
     },
+    "./types": "./types/index.d.ts",
+    "./types/index": "./types/index.d.ts",
+    "./types/router": "./types/router.d.ts",
+    "./types/model": "./types/model.d.ts",
     "./loadable": {
       "jsnext:source": "./src/exports/loadable.ts",
       "types": "./dist/types/exports/loadable.d.ts",
@@ -169,9 +173,9 @@
     "redux-logger": "^3.0.6",
     "styled-components": "^5.3.1",
     "@swc/helpers": "0.5.1",
-    "@modern-js/plugin": "2.26.0",
-    "@modern-js/types": "2.26.0",
-    "@modern-js/utils": "2.26.0"
+    "@modern-js/plugin": "2.28.0",
+    "@modern-js/types": "2.28.0",
+    "@modern-js/utils": "2.28.0"
   },
   "peerDependencies": {
     "react": ">=17",
@@ -192,14 +196,13 @@
     "ts-jest": "^29.1.0",
     "typescript": "^5",
     "webpack": "^5.88.1",
-    "@modern-js/app-tools": "2.26.0",
-    "@modern-js/core": "2.26.0",
-    "@modern-js/server-core": "2.26.0",
-    "@scripts/build": "2.26.0",
-    "@scripts/jest-config": "2.26.0"
+    "@modern-js/app-tools": "2.28.0",
+    "@modern-js/core": "2.28.0",
+    "@modern-js/server-core": "2.28.0",
+    "@scripts/jest-config": "2.28.0",
+    "@scripts/build": "2.28.0"
   },
   "sideEffects": false,
-  "modernConfig": {},
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
     "access": "public",