@modern-js/runtime 2.3.1-alpha.0 → 2.4.1-beta.0

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

@@ -118,7 +118,7 @@ var cli_default = function() {
                         },
                         tools: {
                             webpackChain: function(chain, param) {
-                                var name = param.name, isServer = param.isServer, CHAIN_ID = param.CHAIN_ID;
+                                var name = param.name, isServer = param.isServer, isServiceWorker = param.isServiceWorker, CHAIN_ID = param.CHAIN_ID;
                                 var userConfig = api.useResolvedConfigContext();
                                 if (isUseSSRBundle(userConfig) && name !== "server" && hasStringSSREntry(userConfig)) {
                                     var LoadableWebpackPlugin = require("@loadable/webpack-plugin");
@@ -128,7 +128,7 @@ var cli_default = function() {
                                         }
                                     ]);
                                 }
-                                var modernVars = _defineProperty({}, "process.env.MODERN_TARGET", JSON.stringify(isServer ? "node" : "browser"));
+                                var modernVars = _defineProperty({}, "process.env.MODERN_TARGET", JSON.stringify(isServer || isServiceWorker ? "node" : "browser"));
                                 chain.plugin(CHAIN_ID.PLUGIN.DEFINE).tap(function(args) {
                                     var _args = _toArray(args), vars = _args[0], rest = _args.slice(1);
                                     return [
@@ -150,13 +150,13 @@ var cli_default = function() {
                     var entrypoint = param.entrypoint, imports = param.imports;
                     var entryName = entrypoint.entryName, fileSystemRoutes = entrypoint.fileSystemRoutes;
                     var userConfig = api.useResolvedConfigContext();
-                    var ref = api.useAppContext(), packageName = ref.packageName, entrypoints = ref.entrypoints;
+                    var _api_useAppContext = api.useAppContext(), packageName = _api_useAppContext.packageName, entrypoints = _api_useAppContext.entrypoints;
                     pluginsExportsUtils.addExport("export { default as ssr } from '@modern-js/runtime/ssr'");
                     var ssrConfig = getEntryOptions(entryName, userConfig.server.ssr, userConfig.server.ssrByEntries, packageName);
                     if (typeof ssrConfig === "object" && ssrConfig.mode === "stream") {
-                        var ref1;
+                        var _runtimeConfig_router;
                         var runtimeConfig = getEntryOptions(entryName, userConfig.runtime, userConfig.runtimeByEntries, packageName);
-                        if ((runtimeConfig === null || runtimeConfig === void 0 ? void 0 : (ref1 = runtimeConfig.router) === null || ref1 === void 0 ? void 0 : ref1.mode) === "react-router-5") {
+                        if ((runtimeConfig === null || runtimeConfig === void 0 ? void 0 : (_runtimeConfig_router = runtimeConfig.router) === null || _runtimeConfig_router === void 0 ? void 0 : _runtimeConfig_router.mode) === "react-router-5") {
                             throw new Error("router v5 plugin doesn't support streaming SSR, check your config 'runtime.router'");
                         }
                         if (fileSystemRoutes && !entrypoint.nestedRoutesEntry) {

package/dist/js/treeshaking/ssr/index.js

@@ -188,7 +188,7 @@ var ssr = function(config) {
             return {
                 client: function() {
                     var _ref = _asyncToGenerator(function(param) {
-                        var App, context, ModernRender, ModernHydrate, ref, hydrateContext, callback, renderLevel;
+                        var App, context, ModernRender, ModernHydrate, _window__SSR_DATA, hydrateContext, callback, renderLevel;
                         function stringSSRHydrate() {
                             if (renderLevel === RenderLevel.CLIENT_RENDER || renderLevel === RenderLevel.SERVER_PREFETCH) {
                                 ModernRender(/* @__PURE__ */ jsx(App, {
@@ -248,7 +248,7 @@ var ssr = function(config) {
                             callback = function() {
                                 delete hydrateContext._hydration;
                             };
-                            renderLevel = (window === null || window === void 0 ? void 0 : (ref = window._SSR_DATA) === null || ref === void 0 ? void 0 : ref.renderLevel) || RenderLevel.CLIENT_RENDER;
+                            renderLevel = (window === null || window === void 0 ? void 0 : (_window__SSR_DATA = window._SSR_DATA) === null || _window__SSR_DATA === void 0 ? void 0 : _window__SSR_DATA.renderLevel) || RenderLevel.CLIENT_RENDER;
                             if (isReact18() && config.mode === "stream") {
                                 return [
                                     2,
@@ -267,8 +267,8 @@ var ssr = function(config) {
                 }(),
                 init: function init(param, next) {
                     var context = param.context;
-                    var ref, ref1;
-                    var request = window === null || window === void 0 ? void 0 : (ref = window._SSR_DATA) === null || ref === void 0 ? void 0 : (ref1 = ref.context) === null || ref1 === void 0 ? void 0 : ref1.request;
+                    var _window__SSR_DATA, _window__SSR_DATA_context;
+                    var request = window === null || window === void 0 ? void 0 : (_window__SSR_DATA = window._SSR_DATA) === null || _window__SSR_DATA === void 0 ? void 0 : (_window__SSR_DATA_context = _window__SSR_DATA.context) === null || _window__SSR_DATA_context === void 0 ? void 0 : _window__SSR_DATA_context.request;
                     if (!request) {
                         context.ssrContext = _objectSpreadProps(_objectSpread({}, context.ssrContext), {
                             response: mockResp,
@@ -286,8 +286,8 @@ var ssr = function(config) {
                 },
                 pickContext: function(param, next) {
                     var context = param.context, pickedContext = param.pickedContext;
-                    var ref, ref1;
-                    var request = window === null || window === void 0 ? void 0 : (ref = window._SSR_DATA) === null || ref === void 0 ? void 0 : (ref1 = ref.context) === null || ref1 === void 0 ? void 0 : ref1.request;
+                    var _window__SSR_DATA, _window__SSR_DATA_context;
+                    var request = window === null || window === void 0 ? void 0 : (_window__SSR_DATA = window._SSR_DATA) === null || _window__SSR_DATA === void 0 ? void 0 : (_window__SSR_DATA_context = _window__SSR_DATA.context) === null || _window__SSR_DATA_context === void 0 ? void 0 : _window__SSR_DATA_context.request;
                     var initialData = context.initialData;
                     if (!request) {
                         return next({

package/dist/js/treeshaking/ssr/index.node.js

@@ -220,7 +220,7 @@ var ssr = function() {
                 },
                 pickContext: function(param, next) {
                     var context = param.context, pickedContext = param.pickedContext;
-                    var ref = context === null || context === void 0 ? void 0 : context.ssrContext, request = ref.request, response = ref.response;
+                    var _ref = context === null || context === void 0 ? void 0 : context.ssrContext, request = _ref.request, response = _ref.response;
                     var initialData = context.initialData;
                     return next({
                         context: context,

package/dist/js/treeshaking/ssr/prefetch.js

@@ -132,7 +132,7 @@ var prefetch = function() {
             return [
                 2,
                 run(context.ssrContext.request.headers, /*#__PURE__*/ _asyncToGenerator(function() {
-                    var ref, ssrContext, loadableStats, extractor, loadersData;
+                    var _context_store, ssrContext, loadableStats, extractor, loadersData;
                     return __generator(this, function(_state) {
                         switch(_state.label){
                             case 0:
@@ -182,7 +182,7 @@ var prefetch = function() {
                                         loadersData: loadersData,
                                         initialData: context.initialData,
                                         i18nData: context.__i18nData__,
-                                        storeState: context === null || context === void 0 ? void 0 : (ref = context.store) === null || ref === void 0 ? void 0 : ref.getState()
+                                        storeState: context === null || context === void 0 ? void 0 : (_context_store = context.store) === null || _context_store === void 0 ? void 0 : _context_store.getState()
                                     }
                                 ];
                         }

package/dist/js/treeshaking/ssr/prefetch.worker.js

@@ -0,0 +1,191 @@
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
+    try {
+        var info = gen[key](arg);
+        var value = info.value;
+    } catch (error) {
+        reject(error);
+        return;
+    }
+    if (info.done) {
+        resolve(value);
+    } else {
+        Promise.resolve(value).then(_next, _throw);
+    }
+}
+function _asyncToGenerator(fn) {
+    return function() {
+        var self = this, args = arguments;
+        return new Promise(function(resolve, reject) {
+            var gen = fn.apply(self, args);
+            function _next(value) {
+                asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
+            }
+            function _throw(err) {
+                asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
+            }
+            _next(undefined);
+        });
+    };
+}
+var __generator = this && this.__generator || function(thisArg, body) {
+    var f, y, t, g, _ = {
+        label: 0,
+        sent: function() {
+            if (t[0] & 1) throw t[1];
+            return t[1];
+        },
+        trys: [],
+        ops: []
+    };
+    return(g = {
+        next: verb(0),
+        "throw": verb(1),
+        "return": verb(2)
+    }, typeof Symbol === "function" && (g[Symbol.iterator] = function() {
+        return this;
+    }), g);
+    function verb(n) {
+        return function(v) {
+            return step([
+                n,
+                v
+            ]);
+        };
+    }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while(_)try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [
+                op[0] & 2,
+                t.value
+            ];
+            switch(op[0]){
+                case 0:
+                case 1:
+                    t = op;
+                    break;
+                case 4:
+                    _.label++;
+                    return {
+                        value: op[1],
+                        done: false
+                    };
+                case 5:
+                    _.label++;
+                    y = op[1];
+                    op = [
+                        0
+                    ];
+                    continue;
+                case 7:
+                    op = _.ops.pop();
+                    _.trys.pop();
+                    continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
+                        _ = 0;
+                        continue;
+                    }
+                    if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
+                        _.label = op[1];
+                        break;
+                    }
+                    if (op[0] === 6 && _.label < t[1]) {
+                        _.label = t[1];
+                        t = op;
+                        break;
+                    }
+                    if (t && _.label < t[2]) {
+                        _.label = t[2];
+                        _.ops.push(op);
+                        break;
+                    }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop();
+                    continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) {
+            op = [
+                6,
+                e
+            ];
+            y = 0;
+        } finally{
+            f = t = 0;
+        }
+        if (op[0] & 5) throw op[1];
+        return {
+            value: op[0] ? op[1] : void 0,
+            done: true
+        };
+    }
+};
+import { jsx } from "react/jsx-runtime";
+import { renderToStaticMarkup } from "react-dom/server";
+import { ChunkExtractor } from "@loadable/server";
+var prefetch = function() {
+    var _ref = _asyncToGenerator(function(App, context) {
+        var _context_store, ssrContext, loadableStats, extractor, loadersData;
+        return __generator(this, function(_state) {
+            switch(_state.label){
+                case 0:
+                    ssrContext = context.ssrContext;
+                    loadableStats = ssrContext.loadableStats;
+                    if (loadableStats) {
+                        extractor = new ChunkExtractor({
+                            stats: loadableStats,
+                            entrypoints: [
+                                ssrContext.entryName
+                            ].filter(Boolean)
+                        });
+                        renderToStaticMarkup(extractor.collectChunks(/* @__PURE__ */ jsx(App, {
+                            context: context
+                        })));
+                    } else {
+                        renderToStaticMarkup(/* @__PURE__ */ jsx(App, {
+                            context: context
+                        }));
+                    }
+                    if (!context.loaderManager.hasPendingLoaders()) {
+                        return [
+                            2,
+                            {
+                                initialData: context.initialData,
+                                i18nData: context.__i18nData__
+                            }
+                        ];
+                    }
+                    return [
+                        4,
+                        context.loaderManager.awaitPendingLoaders()
+                    ];
+                case 1:
+                    loadersData = _state.sent();
+                    Object.keys(loadersData).forEach(function(id) {
+                        var 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 [
+                        2,
+                        {
+                            loadersData: loadersData,
+                            initialData: context.initialData,
+                            i18nData: context.__i18nData__,
+                            storeState: context === null || context === void 0 ? void 0 : (_context_store = context.store) === null || _context_store === void 0 ? void 0 : _context_store.getState()
+                        }
+                    ];
+            }
+        });
+    });
+    return function prefetch(App, context) {
+        return _ref.apply(this, arguments);
+    };
+}();
+var prefetch_worker_default = prefetch;
+export { prefetch_worker_default as default };

package/dist/js/treeshaking/ssr/react/nossr/index.js

@@ -47,12 +47,12 @@ function _unsupportedIterableToArray(o, minLen) {
 import React, { useEffect, useState } from "react";
 var csr = false;
 var NoSSR = function(props) {
-    var ref = _slicedToArray(useState(csr), 2), isMounted = ref[0], setMounted = ref[1];
+    var _useState = _slicedToArray(useState(csr), 2), isMounted = _useState[0], setMounted = _useState[1];
     useEffect(function() {
         csr = true;
         setMounted(true);
     });
-    var children = props.children;
-    return React.createElement(React.Fragment, null, isMounted ? children : null);
+    var children = props.children, _props_fallback = props.fallback, fallback = _props_fallback === void 0 ? null : _props_fallback;
+    return React.createElement(React.Fragment, null, isMounted ? children : fallback);
 };
 export { NoSSR };

package/dist/js/treeshaking/ssr/react/prerender/index.js

@@ -181,7 +181,7 @@ var reducePropsToState = function(propsList) {
     return reduceProps;
 };
 function factory(Component) {
-    var _Component;
+    var _React_Component;
     var Spr = /*#__PURE__*/ function(_superClass) {
         "use strict";
         _inherits(Spr, _superClass);
@@ -220,7 +220,7 @@ function factory(Component) {
             }
         ]);
         return Spr;
-    }(_Component = React.Component);
+    }(_React_Component = React.Component);
     _defineProperty(Spr, "peek", Component.peek);
     _defineProperty(Spr, "rewind", Component.rewind);
     _defineProperty(Spr, "config", function() {

package/dist/js/treeshaking/ssr/react/prerender/util.js

@@ -54,9 +54,9 @@ var aggKeysFromPropsList = function aggKeysFromPropsList2(propsList, propName) {
         return result;
     }, initResult);
     return REQUEST_META.reduce(function(result, next) {
-        var ref;
+        var _result_key;
         var key = next;
-        if (result[key] && ((ref = result[key]) === null || ref === void 0 ? void 0 : ref.length) === 0) {
+        if (result[key] && ((_result_key = result[key]) === null || _result_key === void 0 ? void 0 : _result_key.length) === 0) {
             delete result[key];
         }
         return result;

package/dist/js/treeshaking/ssr/serverRender/renderToStream/bulidTemplate.before.js

@@ -81,7 +81,7 @@ function getHeadTemplate(beforeEntryTemplate, context) {
                     var routeManifest2 = routeAssets[routeId];
                     if (routeManifest2) {
                         var _cssChunks;
-                        var _assets = routeManifest2.assets, assets = _assets === void 0 ? [] : _assets;
+                        var _routeManifest2_assets = routeManifest2.assets, assets = _routeManifest2_assets === void 0 ? [] : _routeManifest2_assets;
                         var _cssChunks1 = assets.filter(function(asset) {
                             return asset === null || asset === void 0 ? void 0 : asset.endsWith(".css");
                         });
@@ -102,7 +102,7 @@ function getHeadTemplate(beforeEntryTemplate, context) {
         },
         injectCss
     ];
-    var ref = _slicedToArray(beforeEntryTemplate.match(HEAD_REG_EXP) || [], 1), tmp = ref[0], headTemplate = tmp === void 0 ? "" : tmp;
+    var _ref = _slicedToArray(beforeEntryTemplate.match(HEAD_REG_EXP) || [], 1), tmp = _ref[0], headTemplate = tmp === void 0 ? "" : tmp;
     if (!headTemplate.length) {
         return "";
     }

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

@@ -125,7 +125,7 @@ var __generator = this && this.__generator || function(thisArg, body) {
 import { createElement } from "react";
 import { run } from "@modern-js/utils/ssr";
 import { PreRender } from "../../react/prerender";
-import { time } from "../utils";
+import { time } from "../time";
 import renderToPipe from "./renderToPipe";
 var render = function(param) {
     var App = param.App, context = param.context;

package/dist/js/treeshaking/ssr/serverRender/renderToStream/index.worker.js

@@ -0,0 +1,32 @@
+import { createElement } from "react";
+import { PreRender } from "../../react/prerender";
+import { time } from "../time";
+import renderToPipe from "./renderToPipe";
+var render = function(param) {
+    var App = param.App, context = param.context;
+    var ssrContext = context.ssrContext;
+    if (!ssrContext) {
+        throw new Error('The "ssrContext" must not be undefined, but received undefined');
+    }
+    var end = time();
+    var rootElement = createElement(App, {
+        context: Object.assign(context || {}, {
+            ssr: true
+        })
+    });
+    var pipe = renderToPipe(rootElement, context, {
+        onShellReady: function onShellReady() {
+            var cacheConfig = PreRender.config();
+            if (cacheConfig) {
+                ssrContext.cacheConfig = cacheConfig;
+            }
+        },
+        onAllReady: function onAllReady() {
+            var cost = end();
+            ssrContext.logger.debug("App Render To HTML cost = %d ms", cost);
+            ssrContext.metrics.emitTimer("app.render.html.cost", cost);
+        }
+    });
+    return pipe;
+};
+export { render };

package/dist/js/treeshaking/ssr/serverRender/renderToStream/loadable.js

@@ -1,7 +1,7 @@
 import { ChunkExtractor } from "@loadable/server";
 function getLoadableChunks(param) {
     var context = param.context, jsx = param.jsx;
-    var _ssrContext = context.ssrContext, loadableStats = _ssrContext.loadableStats, entryName = _ssrContext.entryName;
+    var _context_ssrContext = context.ssrContext, loadableStats = _context_ssrContext.loadableStats, entryName = _context_ssrContext.entryName;
     if (!loadableStats) {
         return {
             jsx: jsx

package/dist/js/treeshaking/ssr/serverRender/renderToStream/renderToPipe.js

@@ -58,7 +58,6 @@ function _objectSpreadProps(target, source) {
     return target;
 }
 import { Transform } from "stream";
-import { renderToPipeableStream } from "react-dom/server";
 import { RenderLevel } from "../types";
 import { getTemplates } from "./template";
 function renderToPipe(rootElement, context, options) {
@@ -70,11 +69,15 @@ function renderToPipe(rootElement, context, options) {
     var ssrContext = context.ssrContext;
     var forUserPipe = function(stream) {
         return new Promise(function(resolve) {
+            var renderToPipeableStream;
+            try {
+                renderToPipeableStream = require("react-dom/server").renderToPipeableStream;
+            } catch (e) {}
             var pipe = renderToPipeableStream(rootElement, _objectSpreadProps(_objectSpread({}, options), {
                 onShellReady: function onShellReady() {
-                    var ref;
-                    var ref1 = getTemplates(context, RenderLevel.SERVER_RENDER), shellAfter = ref1.shellAfter, shellBefore = ref1.shellBefore;
-                    options === null || options === void 0 ? void 0 : (ref = options.onShellReady) === null || ref === void 0 ? void 0 : ref.call(options);
+                    var _options_onShellReady;
+                    var _getTemplates = getTemplates(context, RenderLevel.SERVER_RENDER), shellAfter = _getTemplates.shellAfter, shellBefore = _getTemplates.shellBefore;
+                    options === null || options === void 0 ? void 0 : (_options_onShellReady = options.onShellReady) === null || _options_onShellReady === void 0 ? void 0 : _options_onShellReady.call(options);
                     var injectableTransform = new Transform({
                         transform: function transform(chunk, _encoding, callback) {
                             try {
@@ -97,18 +100,18 @@ function renderToPipe(rootElement, context, options) {
                     resolve(pipe(injectableTransform).pipe(stream));
                 },
                 onShellError: function onShellError(error) {
-                    var ref;
+                    var _options_onShellError;
                     ssrContext.metrics.emitCounter("app.render.streaming.shell.error", 1);
-                    var ref1 = getTemplates(context, RenderLevel.CLIENT_RENDER), shellAfter = ref1.shellAfter, shellBefore = ref1.shellBefore;
+                    var _getTemplates = getTemplates(context, RenderLevel.CLIENT_RENDER), shellAfter = _getTemplates.shellAfter, shellBefore = _getTemplates.shellBefore;
                     var fallbackHtml = "".concat(shellBefore).concat(shellAfter);
                     resolve(fallbackHtml);
-                    options === null || options === void 0 ? void 0 : (ref = options.onShellError) === null || ref === void 0 ? void 0 : ref.call(options, error);
+                    options === null || options === void 0 ? void 0 : (_options_onShellError = options.onShellError) === null || _options_onShellError === void 0 ? void 0 : _options_onShellError.call(options, error);
                 },
                 onError: function onError(error) {
-                    var ref;
+                    var _options_onError;
                     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 : (ref = options.onError) === null || ref === void 0 ? void 0 : ref.call(options, error);
+                    options === null || options === void 0 ? void 0 : (_options_onError = options.onError) === null || _options_onError === void 0 ? void 0 : _options_onError.call(options, error);
                 }
             })).pipe;
         });