@modern-js/runtime 2.15.1-alpha.2 → 2.16.1-alpha.0

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

@@ -1,17 +1,18 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var server_exports = {};
-module.exports = __toCommonJS(server_exports);
-__reExport(server_exports, require("react-router-dom/server"), module.exports);
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+_export_star(require("react-router-dom/server"), 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;
+}

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

@@ -1,15 +1,4 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var types_exports = {};
-module.exports = __toCommonJS(types_exports);
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

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

@@ -1,87 +1,73 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+function _export(target, all) {
   for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var utils_exports = {};
-__export(utils_exports, {
-  deserializeErrors: () => deserializeErrors,
-  getLocation: () => getLocation,
+    Object.defineProperty(target, name, {
+      enumerable: true,
+      get: all[name]
+    });
+}
+_export(exports, {
   getRouteComponents: () => getRouteComponents,
   renderRoutes: () => renderRoutes,
-  serializeErrors: () => serializeErrors,
+  getLocation: () => getLocation,
+  urlJoin: () => urlJoin,
   standardSlash: () => standardSlash,
-  urlJoin: () => urlJoin
+  serializeErrors: () => serializeErrors,
+  deserializeErrors: () => deserializeErrors
 });
-module.exports = __toCommonJS(utils_exports);
-var import_jsx_runtime = require("react/jsx-runtime");
-var import_react_router_dom = require("react-router-dom");
-var import_remix_router = require("@modern-js/utils/universal/remix-router");
-var import_nestedRoutes = require("@modern-js/utils/universal/nestedRoutes");
-var import_DefaultNotFound = require("./DefaultNotFound");
-var import_DeferredDataScripts = __toESM(require("./DeferredDataScripts"));
-function getRouteComponents(routes, {
-  globalApp,
-  ssrMode,
-  props
-}) {
+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 _DefaultNotFound = require("./DefaultNotFound");
+const _DeferredDataScripts = /* @__PURE__ */ _interop_require_default(require("./DeferredDataScripts"));
+function _interop_require_default(obj) {
+  return obj && obj.__esModule ? obj : {
+    default: obj
+  };
+}
+function getRouteComponents(routes, { globalApp, ssrMode, props }) {
   const Layout = ({ Component, ...props2 }) => {
     const GlobalLayout = globalApp;
     if (!GlobalLayout) {
-      return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Component, { ...props2 });
+      return /* @__PURE__ */ (0, _jsxruntime.jsx)(Component, {
+        ...props2
+      });
     }
-    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(GlobalLayout, { Component, ...props2 });
+    return /* @__PURE__ */ (0, _jsxruntime.jsx)(GlobalLayout, {
+      Component,
+      ...props2
+    });
   };
   const routeElements = [];
   for (const route of routes) {
     if (route.type === "nested") {
-      const routeElement = (0, import_nestedRoutes.renderNestedRoute)(route, {
-        DeferredDataComponent: ssrMode === "stream" ? import_DeferredDataScripts.default : void 0,
+      const routeElement = (0, _nestedRoutes.renderNestedRoute)(route, {
+        DeferredDataComponent: ssrMode === "stream" ? _DeferredDataScripts.default : void 0,
         props
       });
       routeElements.push(routeElement);
     } else {
-      const routeElement = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
-        import_react_router_dom.Route,
-        {
-          path: route.path,
-          element: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Layout, { Component: route.component })
-        },
-        route.path
-      );
+      const routeElement = /* @__PURE__ */ (0, _jsxruntime.jsx)(_reactrouterdom.Route, {
+        path: route.path,
+        element: /* @__PURE__ */ (0, _jsxruntime.jsx)(Layout, {
+          Component: route.component
+        })
+      }, route.path);
       routeElements.push(routeElement);
     }
   }
-  routeElements.push(/* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react_router_dom.Route, { path: "*", element: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_DefaultNotFound.DefaultNotFound, {}) }, "*"));
+  routeElements.push(/* @__PURE__ */ (0, _jsxruntime.jsx)(_reactrouterdom.Route, {
+    path: "*",
+    element: /* @__PURE__ */ (0, _jsxruntime.jsx)(_DefaultNotFound.DefaultNotFound, {})
+  }, "*"));
   return routeElements;
 }
-function renderRoutes({
-  routesConfig,
-  props,
-  ssrMode
-}) {
+function renderRoutes({ routesConfig, props, ssrMode }) {
   if (!routesConfig) {
     return null;
   }
@@ -97,9 +83,9 @@ function renderRoutes({
   return routeElements;
 }
 function getLocation(serverContext) {
-  var _a;
-  const { pathname, url } = (serverContext == null ? void 0 : serverContext.request) || {};
-  const cleanUrl = (_a = url == null ? void 0 : url.replace("http://", "")) == null ? void 0 : _a.replace("https://", "");
+  var _url_replace;
+  const { pathname, url } = (serverContext === null || serverContext === void 0 ? void 0 : serverContext.request) || {};
+  const cleanUrl = (_url_replace = url === null || url === void 0 ? void 0 : url.replace("http://", "")) === null || _url_replace === void 0 ? void 0 : _url_replace.replace("https://", "");
   const index = (cleanUrl || "").indexOf(pathname);
   if (index === -1) {
     return pathname;
@@ -134,8 +120,11 @@ function serializeErrors(errors) {
   const entries = Object.entries(errors);
   const serialized = {};
   for (const [key, val] of entries) {
-    if ((0, import_remix_router.isRouteErrorResponse)(val)) {
-      serialized[key] = { ...val, __type: "RouteErrorResponse" };
+    if ((0, _remixrouter.isRouteErrorResponse)(val)) {
+      serialized[key] = {
+        ...val,
+        __type: "RouteErrorResponse"
+      };
     } else if (val instanceof Error) {
       serialized[key] = {
         message: val.message,
@@ -156,12 +145,7 @@ function deserializeErrors(errors) {
   const serialized = {};
   for (const [key, val] of entries) {
     if (val && val.__type === "RouteErrorResponse") {
-      serialized[key] = new import_remix_router.ErrorResponse(
-        val.status,
-        val.statusText,
-        val.data,
-        val.internal === true
-      );
+      serialized[key] = new _remixrouter.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;
@@ -172,13 +156,3 @@ function deserializeErrors(errors) {
   }
   return serialized;
 }
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  deserializeErrors,
-  getLocation,
-  getRouteComponents,
-  renderRoutes,
-  serializeErrors,
-  standardSlash,
-  urlJoin
-});

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

@@ -1,44 +1,29 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var withRouter_exports = {};
-__export(withRouter_exports, {
-  withRouter: () => withRouter
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "withRouter", {
+  enumerable: true,
+  get: () => withRouter
 });
-module.exports = __toCommonJS(withRouter_exports);
-var import_jsx_runtime = require("react/jsx-runtime");
-var import_react_router_dom = require("react-router-dom");
+const _jsxruntime = require("react/jsx-runtime");
+const _react = /* @__PURE__ */ _interop_require_default(require("react"));
+const _reactrouterdom = require("react-router-dom");
+function _interop_require_default(obj) {
+  return obj && obj.__esModule ? obj : {
+    default: obj
+  };
+}
 const withRouter = (Component) => {
   return (props) => {
-    const location = (0, import_react_router_dom.useLocation)();
-    const params = (0, import_react_router_dom.useParams)();
-    const navigate = (0, import_react_router_dom.useNavigate)();
-    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
-      Component,
-      {
-        ...props,
-        location,
-        params,
-        navigate
-      }
-    );
+    const location = (0, _reactrouterdom.useLocation)();
+    const params = (0, _reactrouterdom.useParams)();
+    const navigate = (0, _reactrouterdom.useNavigate)();
+    return /* @__PURE__ */ (0, _jsxruntime.jsx)(Component, {
+      ...props,
+      location,
+      params,
+      navigate
+    });
   };
 };
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  withRouter
-});

package/dist/cjs/runtimeContext.js

@@ -1,31 +1,18 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+function _export(target, all) {
   for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var runtimeContext_exports = {};
-__export(runtimeContext_exports, {
+    Object.defineProperty(target, name, {
+      enumerable: true,
+      get: all[name]
+    });
+}
+_export(exports, {
   RuntimeReactContext: () => RuntimeReactContext,
   ServerRouterContext: () => ServerRouterContext
 });
-module.exports = __toCommonJS(runtimeContext_exports);
-var import_react = require("react");
-const RuntimeReactContext = (0, import_react.createContext)({});
-const ServerRouterContext = (0, import_react.createContext)({});
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  RuntimeReactContext,
-  ServerRouterContext
-});
+const _react = require("react");
+const RuntimeReactContext = (0, _react.createContext)({});
+const ServerRouterContext = (0, _react.createContext)({});

package/dist/cjs/ssr/cli/babel-plugin-ssr-loader-id.js

@@ -1,30 +1,59 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+const _crypto = /* @__PURE__ */ _interop_require_default(require("crypto"));
+const _buffer = require("buffer");
+const _types = /* @__PURE__ */ _interop_require_wildcard(require("@babel/types"));
+const _lodash = require("@modern-js/utils/lodash");
+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;
   }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var import_crypto = __toESM(require("crypto"));
-var import_buffer = require("buffer");
-var t = __toESM(require("@babel/types"));
-var import_lodash = require("@modern-js/utils/lodash");
-const RUNTIME_PACKAGE_NAMES = ["@modern-js/runtime"];
+  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 RUNTIME_PACKAGE_NAMES = [
+  "@modern-js/runtime"
+];
 const FUNCTION_USE_LOADER_NAME = "useLoader";
 function getHash(filepath) {
   const cwd = process.cwd();
@@ -33,8 +62,8 @@ function getHash(filepath) {
   if (point !== -1) {
     relativePath = filepath.substring(point + cwd.length);
   }
-  const fileBuf = import_buffer.Buffer.from(relativePath);
-  const fsHash = import_crypto.default.createHash("md5");
+  const fileBuf = _buffer.Buffer.from(relativePath);
+  const fsHash = _crypto.default.createHash("md5");
   const md5 = fsHash.update(fileBuf).digest("hex");
   return md5;
 }
@@ -43,8 +72,8 @@ function getUseLoaderPath(path, calleeName) {
   if (!calleeName || node.callee.name !== calleeName) {
     return false;
   }
-  const arg1 = (0, import_lodash.get)(node, "arguments.0");
-  if (t.isFunction(arg1) || t.isFunctionExpression(arg1) || t.isArrowFunctionExpression(arg1) || t.isIdentifier(arg1) || t.isCallExpression(arg1) || t.isMemberExpression(arg1)) {
+  const arg1 = (0, _lodash.get)(node, "arguments.0");
+  if (_types.isFunction(arg1) || _types.isFunctionExpression(arg1) || _types.isArrowFunctionExpression(arg1) || _types.isIdentifier(arg1) || _types.isCallExpression(arg1) || _types.isMemberExpression(arg1)) {
     const loaderPath = path.get("arguments.0");
     if (isDuplicateInnerLoader(loaderPath)) {
       return false;
@@ -59,9 +88,9 @@ function getUseLoaderPath(path, calleeName) {
 }
 function isDuplicateInnerLoader(path) {
   const { node } = path;
-  if (t.isFunctionExpression(node.callee)) {
-    if (t.isBlockStatement(node.callee.body)) {
-      if ((0, import_lodash.get)(node.callee.body, "body.0.declarations.0.id.name") === "innerLoader" && (0, import_lodash.get)(node.callee.body, "body.2.argument.name") === "innerLoader") {
+  if (_types.isFunctionExpression(node.callee)) {
+    if (_types.isBlockStatement(node.callee.body)) {
+      if ((0, _lodash.get)(node.callee.body, "body.0.declarations.0.id.name") === "innerLoader" && (0, _lodash.get)(node.callee.body, "body.2.argument.name") === "innerLoader") {
         return true;
       }
     }
@@ -69,26 +98,13 @@ function isDuplicateInnerLoader(path) {
   return false;
 }
 function getSelfRunLoaderExpression(loaderExpression, id) {
-  return t.callExpression(
-    t.functionExpression(
-      null,
-      [],
-      t.blockStatement([
-        t.variableDeclaration("var", [
-          t.variableDeclarator(t.identifier("innerLoader"), loaderExpression)
-        ]),
-        t.expressionStatement(
-          t.assignmentExpression(
-            "=",
-            t.memberExpression(t.identifier("innerLoader"), t.identifier("id")),
-            t.stringLiteral(id)
-          )
-        ),
-        t.returnStatement(t.identifier("innerLoader"))
-      ])
-    ),
-    []
-  );
+  return _types.callExpression(_types.functionExpression(null, [], _types.blockStatement([
+    _types.variableDeclaration("var", [
+      _types.variableDeclarator(_types.identifier("innerLoader"), loaderExpression)
+    ]),
+    _types.expressionStatement(_types.assignmentExpression("=", _types.memberExpression(_types.identifier("innerLoader"), _types.identifier("id")), _types.stringLiteral(id))),
+    _types.returnStatement(_types.identifier("innerLoader"))
+  ])), []);
 }
 module.exports = function() {
   let useLoader = null;
@@ -109,15 +125,13 @@ module.exports = function() {
         if (useLoader) {
           return false;
         }
-        if (!RUNTIME_PACKAGE_NAMES.includes((0, import_lodash.get)(path, "node.source.value"))) {
+        if (!RUNTIME_PACKAGE_NAMES.includes((0, _lodash.get)(path, "node.source.value"))) {
           return false;
         }
         hash = getHash(state.file.opts.filename);
-        (0, import_lodash.get)(path, "node.specifiers", []).forEach(({ imported, local }) => {
+        (0, _lodash.get)(path, "node.specifiers", []).forEach(({ imported, local }) => {
           if (!imported) {
-            throw path.buildCodeFrameError(
-              `please \`import { useLoader } from ${RUNTIME_PACKAGE_NAMES[0]}\``
-            );
+            throw path.buildCodeFrameError(`please \`import { useLoader } from ${RUNTIME_PACKAGE_NAMES[0]}\``);
           }
           if (!useLoader && imported.name === FUNCTION_USE_LOADER_NAME) {
             useLoader = local.name;
@@ -129,7 +143,9 @@ module.exports = function() {
         let loaderPath = getUseLoaderPath(path, useLoader);
         if (loaderPath) {
           if (!Array.isArray(loaderPath)) {
-            loaderPath = [loaderPath];
+            loaderPath = [
+              loaderPath
+            ];
           }
           loaderPath.forEach((p) => {
             p.replaceWith(getSelfRunLoaderExpression(p.node, genId()));