@modern-js/runtime 2.0.0-beta.3 → 2.0.0-beta.4

package/dist/js/modern/router/runtime/root/load.js

@@ -1,5 +1,24 @@
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-import { matchRoutes } from 'react-router-dom';
+var __async = (__this, __arguments, generator) => {
+  return new Promise((resolve, reject) => {
+    var fulfilled = (value) => {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var rejected = (value) => {
+      try {
+        step(generator.throw(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+    step((generator = generator.apply(__this, __arguments)).next());
+  });
+};
+import { matchRoutes } from "react-router-dom";
 class Logger {
   static getLogger(options) {
     if (this.logger) {
@@ -9,53 +28,55 @@ class Logger {
     return this.logger;
   }
   constructor(options) {
-    _defineProperty(this, "enableLogging", void 0);
     this.enableLogging = options.enableLogging;
   }
   log(...args) {
     if (this.enableLogging) {
-      // eslint-disable-next-line no-console
       console.log(...args);
     }
   }
 }
-_defineProperty(Logger, "logger", void 0);
-export function handleLoad(routes, location, routeManifest) {
+function handleLoad(routes, location, routeManifest) {
   if (!routeManifest || !routeManifest.enableFetchParallel === false) {
     return;
   }
-  const {
-    routeAssets
-  } = routeManifest;
-  Logger.getLogger({
-    enableLogging: routeManifest.enableLogging
-  }).log('handle page load');
+  const { routeAssets } = routeManifest;
+  Logger.getLogger({ enableLogging: routeManifest.enableLogging }).log(
+    "handle page load"
+  );
   const matches = matchClientRoutes(routes, location);
-  matches === null || matches === void 0 ? void 0 : matches.forEach(match => loadRouteModule(match.route, routeAssets));
+  matches == null ? void 0 : matches.forEach((match) => loadRouteModule(match.route, routeAssets));
 }
-export function matchClientRoutes(routes, location) {
+function matchClientRoutes(routes, location) {
   const matches = matchRoutes(routes, location);
   return matches;
 }
-export async function loadRouteModule(route, routeAssets) {
-  const routeId = route.id;
-  if (!routeId) {
-    return;
-  }
-  if (!routeAssets[routeId]) {
-    return;
-  }
-  const {
-    chunkIds
-  } = routeAssets[routeId];
-  if (!chunkIds) {
-    return;
-  }
-  try {
-    await Promise.all(chunkIds.map(chunkId => {
-      return __webpack_chunk_load__(String(chunkId));
-    }));
-  } catch (error) {
-    console.error(error);
-  }
-}
+function loadRouteModule(route, routeAssets) {
+  return __async(this, null, function* () {
+    const routeId = route.id;
+    if (!routeId) {
+      return;
+    }
+    if (!routeAssets[routeId]) {
+      return;
+    }
+    const { chunkIds } = routeAssets[routeId];
+    if (!chunkIds) {
+      return;
+    }
+    try {
+      yield Promise.all(
+        chunkIds.map((chunkId) => {
+          return __webpack_chunk_load__(String(chunkId));
+        })
+      );
+    } catch (error) {
+      console.error(error);
+    }
+  });
+}
+export {
+  handleLoad,
+  loadRouteModule,
+  matchClientRoutes
+};

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

@@ -1 +1 @@
-export * from 'react-router-dom/server';
+export * from "react-router-dom/server";

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

@@ -1 +0,0 @@
-export {};

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

@@ -1,22 +1,42 @@
-const _excluded = ["Component"];
-function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-import React, { Suspense } from 'react';
-import { Route } from 'react-router-dom';
+var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+var __objRest = (source, exclude) => {
+  var target = {};
+  for (var prop in source)
+    if (__hasOwnProp.call(source, prop) && exclude.indexOf(prop) < 0)
+      target[prop] = source[prop];
+  if (source != null && __getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(source)) {
+      if (exclude.indexOf(prop) < 0 && __propIsEnum.call(source, prop))
+        target[prop] = source[prop];
+    }
+  return target;
+};
+import { jsx } from "react/jsx-runtime";
+import { Suspense } from "react";
+import { Route } from "react-router-dom";
 import { DefaultNotFound } from "./DefaultNotFound";
 import { RootLayout } from "./root";
-import { jsx as _jsx } from "react/jsx-runtime";
 const renderNestedRoute = (nestedRoute, parent) => {
-  const {
-    children,
-    index,
-    id,
-    component: Component
-  } = nestedRoute;
-  const childElements = children === null || children === void 0 ? void 0 : children.map(childRoute => {
+  const { children, index, id, component: Component } = nestedRoute;
+  const childElements = children == null ? void 0 : children.map((childRoute) => {
     return renderNestedRoute(childRoute, nestedRoute);
   });
   const routeProps = {
@@ -29,121 +49,122 @@ const renderNestedRoute = (nestedRoute, parent) => {
     shouldRevalidate: nestedRoute.shouldRevalidate,
     handle: nestedRoute.handle,
     index: nestedRoute.index,
+    element: nestedRoute.element,
     errorElement: nestedRoute.errorElement
   };
   if (nestedRoute.error) {
-    const errorElement = /*#__PURE__*/_jsx(nestedRoute.error, {});
+    const errorElement = /* @__PURE__ */ jsx(nestedRoute.error, {});
     routeProps.errorElement = errorElement;
   }
   let element;
   if (Component) {
-    if (parent !== null && parent !== void 0 && parent.loading) {
+    if (parent == null ? void 0 : parent.loading) {
       const Loading = parent.loading;
-      element = /*#__PURE__*/_jsx(Suspense, {
-        fallback: /*#__PURE__*/_jsx(Loading, {}),
-        children: /*#__PURE__*/_jsx(Component, {})
+      element = /* @__PURE__ */ jsx(Suspense, {
+        fallback: /* @__PURE__ */ jsx(Loading, {}),
+        children: /* @__PURE__ */ jsx(Component, {})
       });
     } else {
-      element = /*#__PURE__*/_jsx(Suspense, {
-        children: /*#__PURE__*/_jsx(Component, {})
+      element = /* @__PURE__ */ jsx(Suspense, {
+        children: /* @__PURE__ */ jsx(Component, {})
       });
     }
   }
   if (!parent && element) {
-    element = /*#__PURE__*/_jsx(RootLayout, {
+    element = /* @__PURE__ */ jsx(RootLayout, {
       routes: [nestedRoute],
       children: element
     });
   }
-  routeProps.element = element;
-  const routeElement = index ? /*#__PURE__*/_jsx(Route, _objectSpread(_objectSpread({}, routeProps), {}, {
+  if (element) {
+    routeProps.element = element;
+  }
+  const routeElement = index ? /* @__PURE__ */ jsx(Route, __spreadProps(__spreadValues({}, routeProps), {
     index: true
-  }), id) : /*#__PURE__*/_jsx(Route, _objectSpread(_objectSpread({}, routeProps), {}, {
+  }), id) : /* @__PURE__ */ jsx(Route, __spreadProps(__spreadValues({}, routeProps), {
     index: false,
     children: childElements
   }), id);
   return routeElement;
 };
-export function getRouteComponents(routes, globalApp) {
-  const Layout = _ref => {
-    let {
-        Component
-      } = _ref,
-      props = _objectWithoutProperties(_ref, _excluded);
+function getRouteComponents(routes, globalApp) {
+  const Layout = (_a) => {
+    var _b = _a, { Component } = _b, props = __objRest(_b, ["Component"]);
     const GlobalLayout = globalApp;
     if (!GlobalLayout) {
-      return /*#__PURE__*/_jsx(Component, _objectSpread({}, props));
+      return /* @__PURE__ */ jsx(Component, __spreadValues({}, props));
     }
-    return /*#__PURE__*/_jsx(GlobalLayout, _objectSpread({
-      Component: Component
+    return /* @__PURE__ */ jsx(GlobalLayout, __spreadValues({
+      Component
     }, props));
   };
   const routeElements = [];
   for (const route of routes) {
-    if (route.type === 'nested') {
+    if (route.type === "nested") {
       const routeElement = renderNestedRoute(route);
       routeElements.push(routeElement);
     } else {
-      const routeElement = /*#__PURE__*/_jsx(Route, {
+      const routeElement = /* @__PURE__ */ jsx(Route, {
         path: route.path,
-        element: /*#__PURE__*/_jsx(Layout, {
+        element: /* @__PURE__ */ jsx(Layout, {
           Component: route.component
         })
       }, route.path);
       routeElements.push(routeElement);
     }
   }
-  routeElements.push( /*#__PURE__*/_jsx(Route, {
+  routeElements.push(/* @__PURE__ */ jsx(Route, {
     path: "*",
-    element: /*#__PURE__*/_jsx(DefaultNotFound, {})
+    element: /* @__PURE__ */ jsx(DefaultNotFound, {})
   }, "*"));
   return routeElements;
 }
-export function renderRoutes(routesConfig) {
+function renderRoutes(routesConfig) {
   if (!routesConfig) {
     return null;
   }
-  const {
-    routes,
-    globalApp
-  } = routesConfig;
+  const { routes, globalApp } = routesConfig;
   if (!routes) {
     return null;
   }
   const routeElements = getRouteComponents(routes, globalApp);
   return routeElements;
 }
-export function getLocation(serverContext) {
-  var _url$replace;
-  const {
-    pathname,
-    url
-  } = (serverContext === null || serverContext === void 0 ? void 0 : serverContext.request) || {};
-  const cleanUrl = url === null || url === void 0 ? void 0 : (_url$replace = url.replace('http://', '')) === null || _url$replace === void 0 ? void 0 : _url$replace.replace('https://', '');
-  const index = (cleanUrl || '').indexOf(pathname);
+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://", "");
+  const index = (cleanUrl || "").indexOf(pathname);
   if (index === -1) {
     return pathname;
   }
   return cleanUrl.substring(index);
 }
-export const urlJoin = (...parts) => {
-  const separator = '/';
-  const replace = new RegExp(`${separator}{1,}`, 'g');
+const urlJoin = (...parts) => {
+  const separator = "/";
+  const replace = new RegExp(`${separator}{1,}`, "g");
   return standardSlash(parts.join(separator).replace(replace, separator));
 };
-export function standardSlash(str) {
+function standardSlash(str) {
   let addr = str;
-  if (!addr || typeof addr !== 'string') {
+  if (!addr || typeof addr !== "string") {
     return addr;
   }
-  if (addr.startsWith('.')) {
+  if (addr.startsWith(".")) {
     addr = addr.slice(1);
   }
-  if (!addr.startsWith('/')) {
+  if (!addr.startsWith("/")) {
     addr = `/${addr}`;
   }
-  if (addr.endsWith('/') && addr !== '/') {
+  if (addr.endsWith("/") && addr !== "/") {
     addr = addr.slice(0, addr.length - 1);
   }
   return addr;
-}
+}
+export {
+  getLocation,
+  getRouteComponents,
+  renderRoutes,
+  standardSlash,
+  urlJoin
+};

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

@@ -1,20 +1,36 @@
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-// legacy withRouter
-
-import React from 'react';
-import { useLocation, useNavigate, useParams } from 'react-router-dom';
-import { jsx as _jsx } from "react/jsx-runtime";
-export const withRouter = Component => {
-  return props => {
+var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+import { jsx } from "react/jsx-runtime";
+import { useLocation, useNavigate, useParams } from "react-router-dom";
+const withRouter = (Component) => {
+  return (props) => {
     const location = useLocation();
     const params = useParams();
     const navigate = useNavigate();
-    return /*#__PURE__*/_jsx(Component, _objectSpread(_objectSpread({}, props), {}, {
-      location: location,
-      params: params,
-      navigate: navigate
+    return /* @__PURE__ */ jsx(Component, __spreadProps(__spreadValues({}, props), {
+      location,
+      params,
+      navigate
     }));
   };
-};
+};
+export {
+  withRouter
+};

package/dist/js/modern/runtime-context.js

@@ -1,3 +1,7 @@
-import { createContext } from 'react';
-export const RuntimeReactContext = /*#__PURE__*/createContext({});
-export const ServerRouterContext = /*#__PURE__*/createContext({});
+import { createContext } from "react";
+const RuntimeReactContext = createContext({});
+const ServerRouterContext = createContext({});
+export {
+  RuntimeReactContext,
+  ServerRouterContext
+};

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

@@ -0,0 +1,130 @@
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __commonJS = (cb, mod) => function __require() {
+  return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
+};
+import crypto from "crypto";
+import { Buffer as Buffer2 } from "buffer";
+import * as t from "@babel/types";
+import { get } from "@modern-js/utils/lodash";
+var require_babel_plugin_ssr_loader_id = __commonJS({
+  "src/ssr/cli/babel-plugin-ssr-loader-id.ts"(exports, module) {
+    const RUNTIME_PACKAGE_NAMES = ["@modern-js/runtime"];
+    const FUNCTION_USE_LOADER_NAME = "useLoader";
+    function getHash(filepath) {
+      const cwd = process.cwd();
+      const point = filepath.indexOf(cwd);
+      let relativePath = filepath;
+      if (point !== -1) {
+        relativePath = filepath.substring(point + cwd.length);
+      }
+      const fileBuf = Buffer2.from(relativePath);
+      const fsHash = crypto.createHash("md5");
+      const md5 = fsHash.update(fileBuf).digest("hex");
+      return md5;
+    }
+    function getUseLoaderPath(path, calleeName) {
+      const { node } = path;
+      if (!calleeName || node.callee.name !== calleeName) {
+        return false;
+      }
+      const arg1 = get(node, "arguments.0");
+      if (t.isFunction(arg1) || t.isFunctionExpression(arg1) || t.isArrowFunctionExpression(arg1) || t.isIdentifier(arg1) || t.isCallExpression(arg1) || t.isMemberExpression(arg1)) {
+        const loaderPath = path.get("arguments.0");
+        if (isDuplicateInnerLoader(loaderPath)) {
+          return false;
+        } else {
+          return loaderPath;
+        }
+      }
+      console.warn("useLoader 中 loaderId 生成失败，请检查 useLoader");
+      throw path.buildCodeFrameError(`
+    please check the usage of ${path.node.name}
+  `);
+    }
+    function isDuplicateInnerLoader(path) {
+      const { node } = path;
+      if (t.isFunctionExpression(node.callee)) {
+        if (t.isBlockStatement(node.callee.body)) {
+          if (get(node.callee.body, "body.0.declarations.0.id.name") === "innerLoader" && get(node.callee.body, "body.2.argument.name") === "innerLoader") {
+            return true;
+          }
+        }
+      }
+      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"))
+          ])
+        ),
+        []
+      );
+    }
+    module.exports = function() {
+      let useLoader = null;
+      let hash = "";
+      let index = 0;
+      function genId() {
+        return `${hash}_${index++}`;
+      }
+      return {
+        name: "babel-plugin-ssr-loader-id",
+        pre() {
+          index = 0;
+          useLoader = null;
+          hash = "";
+        },
+        visitor: {
+          ImportDeclaration(path, state) {
+            if (useLoader) {
+              return false;
+            }
+            if (!RUNTIME_PACKAGE_NAMES.includes(get(path, "node.source.value"))) {
+              return false;
+            }
+            hash = getHash(state.file.opts.filename);
+            get(path, "node.specifiers", []).forEach(({ imported, local }) => {
+              if (!imported) {
+                throw path.buildCodeFrameError(
+                  `please \`import { useLoader } from ${RUNTIME_PACKAGE_NAMES[0]}\``
+                );
+              }
+              if (!useLoader && imported.name === FUNCTION_USE_LOADER_NAME) {
+                useLoader = local.name;
+              }
+            });
+            return false;
+          },
+          CallExpression(path) {
+            let loaderPath = getUseLoaderPath(path, useLoader);
+            if (loaderPath) {
+              if (!Array.isArray(loaderPath)) {
+                loaderPath = [loaderPath];
+              }
+              loaderPath.forEach((p) => {
+                p.replaceWith(getSelfRunLoaderExpression(p.node, genId()));
+              });
+              return false;
+            }
+            return false;
+          }
+        }
+      };
+    };
+  }
+});
+export default require_babel_plugin_ssr_loader_id();