@modern-js/runtime 2.19.1 → 2.21.0

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

@@ -6,78 +6,23 @@ Object.defineProperty(exports, "default", {
   enumerable: true,
   get: () => Entry
 });
-const _react = /* @__PURE__ */ _interop_require_default(require("react"));
-const _server = /* @__PURE__ */ _interop_require_default(require("react-dom/server"));
+const _define_property = require("@swc/helpers/_/_define_property");
+const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
+const _interop_require_wildcard = require("@swc/helpers/_/_interop_require_wildcard");
+const _react = /* @__PURE__ */ _interop_require_default._(require("react"));
+const _server = /* @__PURE__ */ _interop_require_default._(require("react-dom/server"));
 const _runtimenode = require("@modern-js/utils/runtime-node");
-const _reacthelmet = /* @__PURE__ */ _interop_require_default(require("react-helmet"));
+const _reacthelmet = /* @__PURE__ */ _interop_require_default._(require("react-helmet"));
 const _utils = require("../../../router/runtime/utils");
-const _helmet = /* @__PURE__ */ _interop_require_default(require("../helmet"));
+const _helmet = /* @__PURE__ */ _interop_require_default._(require("../helmet"));
 const _types = require("../types");
 const _time = require("../time");
-const _prefetch = /* @__PURE__ */ _interop_require_default(require("../../prefetch"));
+const _prefetch = /* @__PURE__ */ _interop_require_default._(require("../../prefetch"));
 const _utils1 = require("../utils");
 const _template = require("./template");
 const _reduce = require("./reduce");
-const _loadable = /* @__PURE__ */ _interop_require_wildcard(require("./loadable"));
-const _styledComponent = /* @__PURE__ */ _interop_require_wildcard(require("./styledComponent"));
-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
-  };
-}
-function _getRequireWildcardCache(nodeInterop) {
-  if (typeof WeakMap !== "function")
-    return null;
-  var cacheBabelInterop = /* @__PURE__ */ new WeakMap();
-  var cacheNodeInterop = /* @__PURE__ */ new WeakMap();
-  return (_getRequireWildcardCache = function(nodeInterop2) {
-    return nodeInterop2 ? cacheNodeInterop : cacheBabelInterop;
-  })(nodeInterop);
-}
-function _interop_require_wildcard(obj, nodeInterop) {
-  if (!nodeInterop && obj && obj.__esModule) {
-    return obj;
-  }
-  if (obj === null || typeof obj !== "object" && typeof obj !== "function") {
-    return {
-      default: obj
-    };
-  }
-  var cache = _getRequireWildcardCache(nodeInterop);
-  if (cache && cache.has(obj)) {
-    return cache.get(obj);
-  }
-  var newObj = {};
-  var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
-  for (var key in obj) {
-    if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
-      var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;
-      if (desc && (desc.get || desc.set)) {
-        Object.defineProperty(newObj, key, desc);
-      } else {
-        newObj[key] = obj[key];
-      }
-    }
-  }
-  newObj.default = obj;
-  if (cache) {
-    cache.set(obj, newObj);
-  }
-  return newObj;
-}
+const _loadable = /* @__PURE__ */ _interop_require_wildcard._(require("./loadable"));
+const _styledComponent = /* @__PURE__ */ _interop_require_wildcard._(require("./styledComponent"));
 const buildTemplateData = (context, data, renderLevel) => {
   const { request, enableUnsafeCtx } = context;
   const unsafeContext = {
@@ -164,7 +109,8 @@ class Entry {
         host: this.host,
         result: this.result,
         entryName: this.entryName,
-        config: this.pluginConfig
+        config: this.pluginConfig,
+        nonce: this.nonce
       };
       html = (0, _reduce.reduce)(App, renderContext, [
         _styledComponent.toHtml,
@@ -184,11 +130,14 @@ class Entry {
   getSSRDataScript(templateData, routerData) {
     const useInlineScript = this.pluginConfig.inlineScript !== false;
     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>`;
+    const attrsStr = (0, _utils1.attributesToString)({
+      nonce: this.nonce
+    });
+    let ssrDataScripts = useInlineScript ? `<script${attrsStr}>window._SSR_DATA = ${ssrData}</script>` : `<script type="application/json" id="${_utils1.SSR_DATA_JSON_ID}">${ssrData}</script>`;
     if (routerData) {
       const serializedRouterData = (0, _runtimenode.serializeJson)(routerData);
       ssrDataScripts += useInlineScript ? `
-<script>window._ROUTER_DATA = ${serializedRouterData}</script>` : `
+<script${attrsStr}>window._ROUTER_DATA = ${serializedRouterData}</script>` : `
 <script type="application/json" id="${_utils1.ROUTER_DATA_JSON_ID}">${serializedRouterData}</script>`;
     }
     return {
@@ -196,16 +145,17 @@ class Entry {
     };
   }
   constructor(options) {
-    _define_property(this, "entryName", void 0);
-    _define_property(this, "result", void 0);
-    _define_property(this, "metrics", void 0);
-    _define_property(this, "logger", void 0);
-    _define_property(this, "App", void 0);
-    _define_property(this, "fragments", void 0);
-    _define_property(this, "pluginConfig", void 0);
-    _define_property(this, "host", void 0);
+    _define_property._(this, "entryName", void 0);
+    _define_property._(this, "result", void 0);
+    _define_property._(this, "metrics", void 0);
+    _define_property._(this, "logger", void 0);
+    _define_property._(this, "App", void 0);
+    _define_property._(this, "fragments", void 0);
+    _define_property._(this, "pluginConfig", void 0);
+    _define_property._(this, "host", void 0);
+    _define_property._(this, "nonce", void 0);
     const { ctx, config } = options;
-    const { entryName, template, request: { host } } = ctx;
+    const { entryName, template, request: { host }, nonce } = ctx;
     this.fragments = (0, _template.toFragments)(template, entryName);
     this.entryName = entryName;
     this.host = host;
@@ -213,6 +163,7 @@ class Entry {
     this.pluginConfig = config;
     this.metrics = ctx.metrics;
     this.logger = ctx.logger;
+    this.nonce = nonce;
     this.result = {
       renderLevel: _types.RenderLevel.CLIENT_RENDER,
       html: "",

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

@@ -6,15 +6,11 @@ Object.defineProperty(exports, "render", {
   enumerable: true,
   get: () => render
 });
+const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
 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"));
-function _interop_require_default(obj) {
-  return obj && obj.__esModule ? obj : {
-    default: obj
-  };
-}
+const _entry = /* @__PURE__ */ _interop_require_default._(require("./entry"));
 const render = ({ App, context, config }) => {
   const ssrContext = context.ssrContext;
   return (0, _runtimenode.run)(ssrContext.request.headers, async () => {

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

@@ -16,7 +16,7 @@ const extname = (uri) => {
   return `.${uri === null || uri === void 0 ? void 0 : uri.split(".").pop()}` || "";
 };
 const toHtml = (jsx, renderer, next) => {
-  const { stats, result: { chunksMap }, host, config = {} } = renderer;
+  const { stats, result: { chunksMap }, host, config = {}, nonce } = renderer;
   if (!stats || chunksMap.js) {
     return next(jsx);
   }
@@ -32,12 +32,15 @@ const toHtml = (jsx, renderer, next) => {
   for (const v of chunks) {
     const fileType = extname(v.url).slice(1);
     if (fileType === "js") {
-      const props = [];
+      const attributes = {
+        nonce
+      };
       const { crossorigin } = config;
       if (crossorigin && (0, _utils.isCrossOrigin)(v.url, host)) {
-        props.push(`crossorigin="${crossorigin === true ? "anonymous" : crossorigin}"`);
+        attributes.crossorigin = crossorigin === true ? "anonymous" : crossorigin;
       }
-      chunksMap[fileType] += `<script src="${v.url}" ${props.join(" ")}></script>`;
+      const attrsStr = (0, _utils1.attributesToString)(attributes);
+      chunksMap[fileType] += `<script${attrsStr} src="${v.url}"></script>`;
     } else if (fileType === "css") {
       chunksMap[fileType] += `<link href="${v.url}" rel="stylesheet" />`;
     }

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

@@ -6,12 +6,8 @@ Object.defineProperty(exports, "reduce", {
   enumerable: true,
   get: () => reduce
 });
-const _react = /* @__PURE__ */ _interop_require_default(require("react"));
-function _interop_require_default(obj) {
-  return obj && obj.__esModule ? obj : {
-    default: obj
-  };
-}
+const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
+const _react = /* @__PURE__ */ _interop_require_default._(require("react"));
 function reduce(jsx, renderer, middleware) {
   let index = 0;
   const createNext = () => (App) => middleware[index++](App, renderer, createNext());

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

@@ -13,19 +13,7 @@ _export(exports, {
   Fragment: () => Fragment,
   toFragments: () => toFragments
 });
-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;
-}
+const _define_property = require("@swc/helpers/_/_define_property");
 const VARIABLE_REG_EXP = /<!--<\?([-=+])\s*(.*?)\s*\?>-->/;
 const VARIABLE_SPLITTER = /(<!--<\?.*?\?>-->)/;
 const ENCODE_HTML_RULES = {
@@ -51,10 +39,10 @@ class Fragment {
     return this.content;
   }
   constructor(template) {
-    _define_property(this, "isVariable", void 0);
-    _define_property(this, "content", void 0);
-    _define_property(this, "filters", void 0);
-    _define_property(this, "path", void 0);
+    _define_property._(this, "isVariable", void 0);
+    _define_property._(this, "content", void 0);
+    _define_property._(this, "filters", void 0);
+    _define_property._(this, "path", void 0);
     const match = VARIABLE_REG_EXP.exec(template);
     if (match) {
       const [, filterFlag, content] = match;
@@ -72,7 +60,7 @@ class Fragment {
     }
   }
 }
-_define_property(Fragment, "filterMap", {
+_define_property._(Fragment, "filterMap", {
   "=": escape,
   "-": (v) => v
 });

package/dist/cjs/ssr/serverRender/utils.js

@@ -13,7 +13,8 @@ _export(exports, {
   CSS_CHUNKS_PLACEHOLDER: () => CSS_CHUNKS_PLACEHOLDER,
   SSR_DATA_JSON_ID: () => SSR_DATA_JSON_ID,
   ROUTER_DATA_JSON_ID: () => ROUTER_DATA_JSON_ID,
-  getLoadableScripts: () => getLoadableScripts
+  getLoadableScripts: () => getLoadableScripts,
+  attributesToString: () => attributesToString
 });
 const CSS_CHUNKS_PLACEHOLDER = "<!--<?- chunksMap.css ?>-->";
 const SSR_DATA_JSON_ID = "__MODERN_SSR_DATA__";
@@ -26,3 +27,8 @@ function getLoadableScripts(extractor) {
   }
   return scripts.split("</script>").slice(0, 2).map((i) => `${i}</script>`).join("");
 }
+function attributesToString(attributes) {
+  return Object.entries(attributes).reduce((str, [key, value]) => {
+    return value === void 0 ? str : `${str} ${key}="${value}"`;
+  }, "");
+}

package/dist/cjs/ssr/utils.js

@@ -16,12 +16,8 @@ _export(exports, {
   mockResponse: () => mockResponse,
   isCrossOrigin: () => isCrossOrigin
 });
-const _cookie = /* @__PURE__ */ _interop_require_default(require("cookie"));
-function _interop_require_default(obj) {
-  return obj && obj.__esModule ? obj : {
-    default: obj
-  };
-}
+const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
+const _cookie = /* @__PURE__ */ _interop_require_default._(require("cookie"));
 const isReact18 = () => process.env.IS_REACT18 === "true";
 const formatServer = (request) => {
   const { cookie = "", "user-agent": userAgent = "", referer } = request.headers || {};

package/dist/cjs/state/index.js

@@ -13,22 +13,6 @@ _export(exports, {
   state: () => _runtime.default,
   default: () => _runtime.default
 });
-const _runtime = /* @__PURE__ */ _interop_require_default(_export_star(require("./runtime"), exports));
-function _export_star(from, to) {
-  Object.keys(from).forEach(function(k) {
-    if (k !== "default" && !Object.prototype.hasOwnProperty.call(to, k)) {
-      Object.defineProperty(to, k, {
-        enumerable: true,
-        get: function() {
-          return from[k];
-        }
-      });
-    }
-  });
-  return from;
-}
-function _interop_require_default(obj) {
-  return obj && obj.__esModule ? obj : {
-    default: obj
-  };
-}
+const _export_star = require("@swc/helpers/_/_export_star");
+const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
+const _runtime = /* @__PURE__ */ _interop_require_default._(_export_star._(require("./runtime"), exports));

package/dist/cjs/state/plugins.js

@@ -15,15 +15,11 @@ _export(exports, {
   immer: () => immer,
   autoActions: () => autoActions
 });
+const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
 const _plugineffects = require("@modern-js-reduck/plugin-effects");
-const _pluginautoactions = /* @__PURE__ */ _interop_require_default(require("@modern-js-reduck/plugin-auto-actions"));
-const _pluginimmutable = /* @__PURE__ */ _interop_require_default(require("@modern-js-reduck/plugin-immutable"));
-const _plugindevtools = /* @__PURE__ */ _interop_require_default(require("@modern-js-reduck/plugin-devtools"));
-function _interop_require_default(obj) {
-  return obj && obj.__esModule ? obj : {
-    default: obj
-  };
-}
+const _pluginautoactions = /* @__PURE__ */ _interop_require_default._(require("@modern-js-reduck/plugin-auto-actions"));
+const _pluginimmutable = /* @__PURE__ */ _interop_require_default._(require("@modern-js-reduck/plugin-immutable"));
+const _plugindevtools = /* @__PURE__ */ _interop_require_default._(require("@modern-js-reduck/plugin-devtools"));
 const effects = () => _plugineffects.plugin;
 const immer = () => _pluginimmutable.default;
 const autoActions = () => _pluginautoactions.default;

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

@@ -6,23 +6,7 @@ Object.defineProperty(exports, "default", {
   enumerable: true,
   get: () => _plugin.default
 });
-_export_star(require("@modern-js-reduck/react"), exports);
-const _plugin = /* @__PURE__ */ _interop_require_default(_export_star(require("./plugin"), exports));
-function _export_star(from, to) {
-  Object.keys(from).forEach(function(k) {
-    if (k !== "default" && !Object.prototype.hasOwnProperty.call(to, k)) {
-      Object.defineProperty(to, k, {
-        enumerable: true,
-        get: function() {
-          return from[k];
-        }
-      });
-    }
-  });
-  return from;
-}
-function _interop_require_default(obj) {
-  return obj && obj.__esModule ? obj : {
-    default: obj
-  };
-}
+const _export_star = require("@swc/helpers/_/_export_star");
+const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
+_export_star._(require("@modern-js-reduck/react"), exports);
+const _plugin = /* @__PURE__ */ _interop_require_default._(_export_star._(require("./plugin"), exports));

package/dist/cjs/state/runtime/plugin.js

@@ -6,32 +6,16 @@ Object.defineProperty(exports, "default", {
   enumerable: true,
   get: () => _default
 });
+const _export_star = require("@swc/helpers/_/_export_star");
+const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
 const _jsxruntime = require("react/jsx-runtime");
 const _react = require("react");
 const _store = require("@modern-js-reduck/store");
 const _react1 = require("@modern-js-reduck/react");
-const _hoistnonreactstatics = /* @__PURE__ */ _interop_require_default(require("hoist-non-react-statics"));
-const _plugins = _export_star(require("../plugins"), exports);
+const _hoistnonreactstatics = /* @__PURE__ */ _interop_require_default._(require("hoist-non-react-statics"));
+const _plugins = _export_star._(require("../plugins"), exports);
 const _core = require("../../core");
 const _common = require("../../common");
-function _export_star(from, to) {
-  Object.keys(from).forEach(function(k) {
-    if (k !== "default" && !Object.prototype.hasOwnProperty.call(to, k)) {
-      Object.defineProperty(to, k, {
-        enumerable: true,
-        get: function() {
-          return from[k];
-        }
-      });
-    }
-  });
-  return from;
-}
-function _interop_require_default(obj) {
-  return obj && obj.__esModule ? obj : {
-    default: obj
-  };
-}
 const StatePluginHandleMap = {
   immer: _plugins.immer,
   effects: _plugins.effects,

package/dist/esm/cli/index.js

@@ -1,134 +1,5 @@
-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 _async_to_generator(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(void 0);
-    });
-  };
-}
-var __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 { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
+import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import path from "path";
 import { PLUGIN_SCHEMAS, cleanRequireCache, isReact18 } from "@modern-js/utils";
 import PluginState from "../state/cli";
@@ -180,7 +51,7 @@ export default function() {
         },
         beforeRestart: function beforeRestart() {
           return _async_to_generator(function() {
-            return __generator(this, function(_state) {
+            return _ts_generator(this, function(_state) {
               cleanRequireCache([
                 require.resolve("../state/cli"),
                 require.resolve("../router/cli"),