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

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

@@ -1,152 +1,236 @@
-import _createForOfIteratorHelper from "@babel/runtime/helpers/esm/createForOfIteratorHelper";
-import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-var _excluded = ["Component"];
-import React, { Suspense } from 'react';
-import { Route } from 'react-router-dom';
+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;
+}
+function _objectSpread(target) {
+    for(var i = 1; i < arguments.length; i++){
+        var source = arguments[i] != null ? arguments[i] : {};
+        var ownKeys = Object.keys(source);
+        if (typeof Object.getOwnPropertySymbols === "function") {
+            ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
+                return Object.getOwnPropertyDescriptor(source, sym).enumerable;
+            }));
+        }
+        ownKeys.forEach(function(key) {
+            _defineProperty(target, key, source[key]);
+        });
+    }
+    return target;
+}
+function ownKeys(object, enumerableOnly) {
+    var keys = Object.keys(object);
+    if (Object.getOwnPropertySymbols) {
+        var symbols = Object.getOwnPropertySymbols(object);
+        if (enumerableOnly) {
+            symbols = symbols.filter(function(sym) {
+                return Object.getOwnPropertyDescriptor(object, sym).enumerable;
+            });
+        }
+        keys.push.apply(keys, symbols);
+    }
+    return keys;
+}
+function _objectSpreadProps(target, source) {
+    source = source != null ? source : {};
+    if (Object.getOwnPropertyDescriptors) {
+        Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
+    } else {
+        ownKeys(Object(source)).forEach(function(key) {
+            Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
+        });
+    }
+    return target;
+}
+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;
+}
+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";
-var renderNestedRoute = function renderNestedRoute(nestedRoute, parent) {
-  var children = nestedRoute.children,
-    index = nestedRoute.index,
-    id = nestedRoute.id,
-    Component = nestedRoute.component;
-  var childElements = children === null || children === void 0 ? void 0 : children.map(function (childRoute) {
-    return renderNestedRoute(childRoute, nestedRoute);
-  });
-  var routeProps = {
-    caseSensitive: nestedRoute.caseSensitive,
-    path: nestedRoute.path,
-    id: nestedRoute.id,
-    loader: nestedRoute.loader,
-    action: nestedRoute.action,
-    hasErrorBoundary: nestedRoute.hasErrorBoundary,
-    shouldRevalidate: nestedRoute.shouldRevalidate,
-    handle: nestedRoute.handle,
-    index: nestedRoute.index,
-    errorElement: nestedRoute.errorElement
-  };
-  if (nestedRoute.error) {
-    var errorElement = /*#__PURE__*/_jsx(nestedRoute.error, {});
-    routeProps.errorElement = errorElement;
-  }
-  var element;
-  if (Component) {
-    if (parent !== null && parent !== void 0 && parent.loading) {
-      var Loading = parent.loading;
-      element = /*#__PURE__*/_jsx(Suspense, {
-        fallback: /*#__PURE__*/_jsx(Loading, {}),
-        children: /*#__PURE__*/_jsx(Component, {})
-      });
-    } else {
-      element = /*#__PURE__*/_jsx(Suspense, {
-        children: /*#__PURE__*/_jsx(Component, {})
-      });
-    }
-  }
-  if (!parent && element) {
-    element = /*#__PURE__*/_jsx(RootLayout, {
-      routes: [nestedRoute],
-      children: element
+var renderNestedRoute = function(nestedRoute, parent) {
+    var children = nestedRoute.children, index = nestedRoute.index, id = nestedRoute.id, Component = nestedRoute.component;
+    var childElements = children === null || children === void 0 ? void 0 : children.map(function(childRoute) {
+        return renderNestedRoute(childRoute, nestedRoute);
     });
-  }
-  routeProps.element = element;
-  var routeElement = index ? /*#__PURE__*/_jsx(Route, _objectSpread(_objectSpread({}, routeProps), {}, {
-    index: true
-  }), id) : /*#__PURE__*/_jsx(Route, _objectSpread(_objectSpread({}, routeProps), {}, {
-    index: false,
-    children: childElements
-  }), id);
-  return routeElement;
+    var routeProps = {
+        caseSensitive: nestedRoute.caseSensitive,
+        path: nestedRoute.path,
+        id: nestedRoute.id,
+        loader: nestedRoute.loader,
+        action: nestedRoute.action,
+        hasErrorBoundary: nestedRoute.hasErrorBoundary,
+        shouldRevalidate: nestedRoute.shouldRevalidate,
+        handle: nestedRoute.handle,
+        index: nestedRoute.index,
+        element: nestedRoute.element,
+        errorElement: nestedRoute.errorElement
+    };
+    if (nestedRoute.error) {
+        var errorElement = /* @__PURE__ */ jsx(nestedRoute.error, {});
+        routeProps.errorElement = errorElement;
+    }
+    var element;
+    if (Component) {
+        if (parent === null || parent === void 0 ? void 0 : parent.loading) {
+            var Loading = parent.loading;
+            element = /* @__PURE__ */ jsx(Suspense, {
+                fallback: /* @__PURE__ */ jsx(Loading, {}),
+                children: /* @__PURE__ */ jsx(Component, {})
+            });
+        } else {
+            element = /* @__PURE__ */ jsx(Suspense, {
+                children: /* @__PURE__ */ jsx(Component, {})
+            });
+        }
+    }
+    if (!parent && element) {
+        element = /* @__PURE__ */ jsx(RootLayout, {
+            routes: [
+                nestedRoute
+            ],
+            children: element
+        });
+    }
+    if (element) {
+        routeProps.element = element;
+    }
+    var routeElement = index ? /* @__PURE__ */ jsx(Route, _objectSpreadProps(_objectSpread({}, routeProps), {
+        index: true
+    }), id) : /* @__PURE__ */ jsx(Route, _objectSpreadProps(_objectSpread({}, routeProps), {
+        index: false,
+        children: childElements
+    }), id);
+    return routeElement;
 };
-export function getRouteComponents(routes, globalApp) {
-  var Layout = function Layout(_ref) {
-    var Component = _ref.Component,
-      props = _objectWithoutProperties(_ref, _excluded);
-    var GlobalLayout = globalApp;
-    if (!GlobalLayout) {
-      return /*#__PURE__*/_jsx(Component, _objectSpread({}, props));
-    }
-    return /*#__PURE__*/_jsx(GlobalLayout, _objectSpread({
-      Component: Component
-    }, props));
-  };
-  var routeElements = [];
-  var _iterator = _createForOfIteratorHelper(routes),
-    _step;
-  try {
-    for (_iterator.s(); !(_step = _iterator.n()).done;) {
-      var route = _step.value;
-      if (route.type === 'nested') {
-        var routeElement = renderNestedRoute(route);
-        routeElements.push(routeElement);
-      } else {
-        var _routeElement = /*#__PURE__*/_jsx(Route, {
-          path: route.path,
-          element: /*#__PURE__*/_jsx(Layout, {
-            Component: route.component
-          })
-        }, route.path);
-        routeElements.push(_routeElement);
-      }
-    }
-  } catch (err) {
-    _iterator.e(err);
-  } finally {
-    _iterator.f();
-  }
-  routeElements.push( /*#__PURE__*/_jsx(Route, {
-    path: "*",
-    element: /*#__PURE__*/_jsx(DefaultNotFound, {})
-  }, "*"));
-  return routeElements;
+function getRouteComponents(routes, globalApp) {
+    var Layout = function(_param) {
+        var Component = _param.Component, props = _objectWithoutProperties(_param, [
+            "Component"
+        ]);
+        var GlobalLayout = globalApp;
+        if (!GlobalLayout) {
+            return /* @__PURE__ */ jsx(Component, _objectSpread({}, props));
+        }
+        return /* @__PURE__ */ jsx(GlobalLayout, _objectSpread({
+            Component: Component
+        }, props));
+    };
+    var routeElements = [];
+    var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+    try {
+        for(var _iterator = routes[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+            var route = _step.value;
+            if (route.type === "nested") {
+                var routeElement = renderNestedRoute(route);
+                routeElements.push(routeElement);
+            } else {
+                var routeElement1 = /* @__PURE__ */ jsx(Route, {
+                    path: route.path,
+                    element: /* @__PURE__ */ jsx(Layout, {
+                        Component: route.component
+                    })
+                }, route.path);
+                routeElements.push(routeElement1);
+            }
+        }
+    } catch (err) {
+        _didIteratorError = true;
+        _iteratorError = err;
+    } finally{
+        try {
+            if (!_iteratorNormalCompletion && _iterator.return != null) {
+                _iterator.return();
+            }
+        } finally{
+            if (_didIteratorError) {
+                throw _iteratorError;
+            }
+        }
+    }
+    routeElements.push(/* @__PURE__ */ jsx(Route, {
+        path: "*",
+        element: /* @__PURE__ */ jsx(DefaultNotFound, {})
+    }, "*"));
+    return routeElements;
 }
-export function renderRoutes(routesConfig) {
-  if (!routesConfig) {
-    return null;
-  }
-  var routes = routesConfig.routes,
-    globalApp = routesConfig.globalApp;
-  if (!routes) {
-    return null;
-  }
-  var routeElements = getRouteComponents(routes, globalApp);
-  return routeElements;
+function renderRoutes(routesConfig) {
+    if (!routesConfig) {
+        return null;
+    }
+    var routes = routesConfig.routes, globalApp = routesConfig.globalApp;
+    if (!routes) {
+        return null;
+    }
+    var routeElements = getRouteComponents(routes, globalApp);
+    return routeElements;
 }
-export function getLocation(serverContext) {
-  var _url$replace;
-  var _ref2 = (serverContext === null || serverContext === void 0 ? void 0 : serverContext.request) || {},
-    pathname = _ref2.pathname,
-    url = _ref2.url;
-  var cleanUrl = url === null || url === void 0 ? void 0 : (_url$replace = url.replace('http://', '')) === null || _url$replace === void 0 ? void 0 : _url$replace.replace('https://', '');
-  var index = (cleanUrl || '').indexOf(pathname);
-  if (index === -1) {
-    return pathname;
-  }
-  return cleanUrl.substring(index);
+function getLocation(serverContext) {
+    var ref;
+    var ref1 = (serverContext === null || serverContext === void 0 ? void 0 : serverContext.request) || {}, pathname = ref1.pathname, url = ref1.url;
+    var cleanUrl = (ref = url === null || url === void 0 ? void 0 : url.replace("http://", "")) === null || ref === void 0 ? void 0 : ref.replace("https://", "");
+    var index = (cleanUrl || "").indexOf(pathname);
+    if (index === -1) {
+        return pathname;
+    }
+    return cleanUrl.substring(index);
 }
-export var urlJoin = function urlJoin() {
-  var separator = '/';
-  var replace = new RegExp("".concat(separator, "{1,}"), 'g');
-  for (var _len = arguments.length, parts = new Array(_len), _key = 0; _key < _len; _key++) {
-    parts[_key] = arguments[_key];
-  }
-  return standardSlash(parts.join(separator).replace(replace, separator));
+var urlJoin = function() {
+    for(var _len = arguments.length, parts = new Array(_len), _key = 0; _key < _len; _key++){
+        parts[_key] = arguments[_key];
+    }
+    var separator = "/";
+    var replace = new RegExp("".concat(separator, "{1,}"), "g");
+    return standardSlash(parts.join(separator).replace(replace, separator));
 };
-export function standardSlash(str) {
-  var addr = str;
-  if (!addr || typeof addr !== 'string') {
+function standardSlash(str) {
+    var addr = str;
+    if (!addr || typeof addr !== "string") {
+        return addr;
+    }
+    if (addr.startsWith(".")) {
+        addr = addr.slice(1);
+    }
+    if (!addr.startsWith("/")) {
+        addr = "/".concat(addr);
+    }
+    if (addr.endsWith("/") && addr !== "/") {
+        addr = addr.slice(0, addr.length - 1);
+    }
     return addr;
-  }
-  if (addr.startsWith('.')) {
-    addr = addr.slice(1);
-  }
-  if (!addr.startsWith('/')) {
-    addr = "/".concat(addr);
-  }
-  if (addr.endsWith('/') && addr !== '/') {
-    addr = addr.slice(0, addr.length - 1);
-  }
-  return addr;
-}
+}
+export { getLocation, getRouteComponents, renderRoutes, standardSlash, urlJoin };

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

@@ -1,18 +1,67 @@
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-// legacy withRouter
-
-import React from 'react';
-import { useLocation, useNavigate, useParams } from 'react-router-dom';
-import { jsx as _jsx } from "react/jsx-runtime";
-export var withRouter = function withRouter(Component) {
-  return function (props) {
-    var location = useLocation();
-    var params = useParams();
-    var navigate = useNavigate();
-    return /*#__PURE__*/_jsx(Component, _objectSpread(_objectSpread({}, props), {}, {
-      location: location,
-      params: params,
-      navigate: navigate
-    }));
-  };
-};
+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;
+}
+function _objectSpread(target) {
+    for(var i = 1; i < arguments.length; i++){
+        var source = arguments[i] != null ? arguments[i] : {};
+        var ownKeys = Object.keys(source);
+        if (typeof Object.getOwnPropertySymbols === "function") {
+            ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
+                return Object.getOwnPropertyDescriptor(source, sym).enumerable;
+            }));
+        }
+        ownKeys.forEach(function(key) {
+            _defineProperty(target, key, source[key]);
+        });
+    }
+    return target;
+}
+function ownKeys(object, enumerableOnly) {
+    var keys = Object.keys(object);
+    if (Object.getOwnPropertySymbols) {
+        var symbols = Object.getOwnPropertySymbols(object);
+        if (enumerableOnly) {
+            symbols = symbols.filter(function(sym) {
+                return Object.getOwnPropertyDescriptor(object, sym).enumerable;
+            });
+        }
+        keys.push.apply(keys, symbols);
+    }
+    return keys;
+}
+function _objectSpreadProps(target, source) {
+    source = source != null ? source : {};
+    if (Object.getOwnPropertyDescriptors) {
+        Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
+    } else {
+        ownKeys(Object(source)).forEach(function(key) {
+            Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
+        });
+    }
+    return target;
+}
+import { jsx } from "react/jsx-runtime";
+import { useLocation, useNavigate, useParams } from "react-router-dom";
+var withRouter = function(Component) {
+    return function(props) {
+        var location = useLocation();
+        var params = useParams();
+        var navigate = useNavigate();
+        return /* @__PURE__ */ jsx(Component, _objectSpreadProps(_objectSpread({}, props), {
+            location: location,
+            params: params,
+            navigate: navigate
+        }));
+    };
+};
+export { withRouter };

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

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

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

@@ -0,0 +1,122 @@
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __commonJS = function(cb, mod) {
+    return 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": function(exports, module) {
+        var getHash = function getHash(filepath) {
+            var cwd = process.cwd();
+            var point = filepath.indexOf(cwd);
+            var relativePath = filepath;
+            if (point !== -1) {
+                relativePath = filepath.substring(point + cwd.length);
+            }
+            var fileBuf = Buffer2.from(relativePath);
+            var fsHash = crypto.createHash("md5");
+            var md5 = fsHash.update(fileBuf).digest("hex");
+            return md5;
+        };
+        var getUseLoaderPath = function getUseLoaderPath(path, calleeName) {
+            var node = path.node;
+            if (!calleeName || node.callee.name !== calleeName) {
+                return false;
+            }
+            var arg1 = get(node, "arguments.0");
+            if (t.isFunction(arg1) || t.isFunctionExpression(arg1) || t.isArrowFunctionExpression(arg1) || t.isIdentifier(arg1) || t.isCallExpression(arg1) || t.isMemberExpression(arg1)) {
+                var loaderPath = path.get("arguments.0");
+                if (isDuplicateInnerLoader(loaderPath)) {
+                    return false;
+                } else {
+                    return loaderPath;
+                }
+            }
+            console.warn("useLoader 中 loaderId 生成失败，请检查 useLoader");
+            throw path.buildCodeFrameError("\n    please check the usage of ".concat(path.node.name, "\n  "));
+        };
+        var isDuplicateInnerLoader = function isDuplicateInnerLoader(path) {
+            var node = path.node;
+            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;
+        };
+        var getSelfRunLoaderExpression = 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"))
+            ])), []);
+        };
+        var RUNTIME_PACKAGE_NAMES = [
+            "@modern-js/runtime"
+        ];
+        var FUNCTION_USE_LOADER_NAME = "useLoader";
+        module.exports = function() {
+            var genId = function genId() {
+                return "".concat(hash, "_").concat(index++);
+            };
+            var useLoader = null;
+            var hash = "";
+            var index = 0;
+            return {
+                name: "babel-plugin-ssr-loader-id",
+                pre: function pre() {
+                    index = 0;
+                    useLoader = null;
+                    hash = "";
+                },
+                visitor: {
+                    ImportDeclaration: function 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(function(param) {
+                            var imported = param.imported, local = param.local;
+                            if (!imported) {
+                                throw path.buildCodeFrameError("please `import { useLoader } from ".concat(RUNTIME_PACKAGE_NAMES[0], "`"));
+                            }
+                            if (!useLoader && imported.name === FUNCTION_USE_LOADER_NAME) {
+                                useLoader = local.name;
+                            }
+                        });
+                        return false;
+                    },
+                    CallExpression: function CallExpression(path) {
+                        var loaderPath = getUseLoaderPath(path, useLoader);
+                        if (loaderPath) {
+                            if (!Array.isArray(loaderPath)) {
+                                loaderPath = [
+                                    loaderPath
+                                ];
+                            }
+                            loaderPath.forEach(function(p) {
+                                p.replaceWith(getSelfRunLoaderExpression(p.node, genId()));
+                            });
+                            return false;
+                        }
+                        return false;
+                    }
+                }
+            };
+        };
+    }
+});
+export default require_babel_plugin_ssr_loader_id();