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

package/dist/js/treeshaking/exports/styled.js

@@ -1,3 +1,4 @@
-import styled from 'styled-components';
-export default styled;
-export * from 'styled-components';
+import styled from "styled-components";
+var styled_default = styled;
+export * from "styled-components";
+export { styled_default as default };

package/dist/js/treeshaking/index.js

@@ -1,2 +1,3 @@
-export { isBrowser } from "./common";
-export { createApp, createPlugin, useLoader, bootstrap, RuntimeReactContext, defineConfig, registerInit, useRuntimeContext } from "./core";
+import { isBrowser } from "./common";
+import { createApp, createPlugin, useLoader, bootstrap, RuntimeReactContext, defineConfig, registerInit, useRuntimeContext } from "./core";
+export { RuntimeReactContext, bootstrap, createApp, createPlugin, defineConfig, isBrowser, registerInit, useLoader, useRuntimeContext };

package/dist/js/treeshaking/modern-app.env.d.js

@@ -0,0 +1 @@
+"use strict";

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

@@ -1,102 +1,148 @@
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import { getEntryOptions, createRuntimeExportsUtils, PLUGIN_SCHEMAS } from '@modern-js/utils';
-var PLUGIN_IDENTIFIER = 'router';
-var ROUTES_IDENTIFIER = 'routes';
-export default (function () {
-  return {
-    name: '@modern-js/plugin-router',
-    required: ['@modern-js/runtime'],
-    setup: function setup(api) {
-      var runtimeConfigMap = new Map();
-      var pluginsExportsUtils;
-      return {
-        config: function config() {
-          var appContext = api.useAppContext();
-          pluginsExportsUtils = createRuntimeExportsUtils(appContext.internalDirectory, 'plugins');
-          return {
-            source: {
-              alias: {
-                '@modern-js/runtime/plugins': pluginsExportsUtils.getPath()
-              }
-            }
-          };
-        },
-        validateSchema: function validateSchema() {
-          return PLUGIN_SCHEMAS['@modern-js/plugin-router'];
-        },
-        modifyEntryImports: function modifyEntryImports(_ref) {
-          var _userConfig$runtime, _userConfig$runtime$r;
-          var entrypoint = _ref.entrypoint,
-            imports = _ref.imports;
-          var entryName = entrypoint.entryName,
-            fileSystemRoutes = entrypoint.fileSystemRoutes;
-          var userConfig = api.useResolvedConfigContext();
-          var isLegacy = Boolean(userConfig === null || userConfig === void 0 ? void 0 : (_userConfig$runtime = userConfig.runtime) === null || _userConfig$runtime === void 0 ? void 0 : (_userConfig$runtime$r = _userConfig$runtime.router) === null || _userConfig$runtime$r === void 0 ? void 0 : _userConfig$runtime$r.legacy);
-          var _api$useAppContext = api.useAppContext(),
-            packageName = _api$useAppContext.packageName;
-          var runtimeConfig = getEntryOptions(entryName, userConfig.runtime, userConfig.runtimeByEntries, packageName);
-          runtimeConfigMap.set(entryName, runtimeConfig);
-          if (runtimeConfig !== null && runtimeConfig !== void 0 && runtimeConfig.router) {
-            if (!isLegacy) {
-              imports.push({
-                value: '@modern-js/runtime/plugins',
-                specifiers: [{
-                  imported: PLUGIN_IDENTIFIER
-                }]
-              });
-            }
-          } else if (fileSystemRoutes) {
-            throw new Error("should enable runtime.router for entry ".concat(entryName));
-          }
-          return {
-            entrypoint: entrypoint,
-            imports: imports
-          };
-        },
-        modifyEntryRuntimePlugins: function modifyEntryRuntimePlugins(_ref2) {
-          var _userConfig$runtime2, _userConfig$runtime2$;
-          var entrypoint = _ref2.entrypoint,
-            plugins = _ref2.plugins;
-          var entryName = entrypoint.entryName,
-            fileSystemRoutes = entrypoint.fileSystemRoutes;
-          var _api$useAppContext2 = api.useAppContext(),
-            serverRoutes = _api$useAppContext2.serverRoutes;
-          var userConfig = api.useResolvedConfigContext();
-          var isLegacy = Boolean(userConfig === null || userConfig === void 0 ? void 0 : (_userConfig$runtime2 = userConfig.runtime) === null || _userConfig$runtime2 === void 0 ? void 0 : (_userConfig$runtime2$ = _userConfig$runtime2.router) === null || _userConfig$runtime2$ === void 0 ? void 0 : _userConfig$runtime2$.legacy);
-          var runtimeConfig = runtimeConfigMap.get(entryName);
-          if (runtimeConfig.router && !isLegacy) {
-            // Todo: plugin-router best to only handle manage client route.
-            // here support base server route usage, part for compatibility
-            var serverBase = serverRoutes.filter(function (route) {
-              return route.entryName === entryName;
-            }).map(function (route) {
-              return route.urlPath;
-            }).sort(function (a, b) {
-              return a.length - b.length > 0 ? -1 : 1;
-            });
-            plugins.push({
-              name: PLUGIN_IDENTIFIER,
-              options: JSON.stringify(_objectSpread(_objectSpread({
-                serverBase: serverBase
-              }, runtimeConfig.router), {}, {
-                routesConfig: fileSystemRoutes ? "{ ".concat(ROUTES_IDENTIFIER, ", globalApp: App }") : undefined
-              })).replace(/"routesConfig"\s*:\s*"((\S|\s)+)"/g, '"routesConfig": $1,')
+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;
             });
-          }
-          return {
-            entrypoint: entrypoint,
-            plugins: plugins
-          };
-        },
-        addRuntimeExports: function addRuntimeExports() {
-          var _userConfig$runtime3, _userConfig$runtime3$;
-          var userConfig = api.useResolvedConfigContext();
-          var isLegacy = Boolean(userConfig === null || userConfig === void 0 ? void 0 : (_userConfig$runtime3 = userConfig.runtime) === null || _userConfig$runtime3 === void 0 ? void 0 : (_userConfig$runtime3$ = _userConfig$runtime3.router) === null || _userConfig$runtime3$ === void 0 ? void 0 : _userConfig$runtime3$.legacy);
-          if (!isLegacy) {
-            pluginsExportsUtils.addExport("export { default as router } from '@modern-js/runtime/router'");
-          }
         }
-      };
+        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 { getEntryOptions, createRuntimeExportsUtils, PLUGIN_SCHEMAS } from "@modern-js/utils";
+var PLUGIN_IDENTIFIER = "router";
+var ROUTES_IDENTIFIER = "routes";
+var isV5 = function(config) {
+    var ref, ref1;
+    return (config === null || config === void 0 ? void 0 : (ref = config.runtime) === null || ref === void 0 ? void 0 : (ref1 = ref.router) === null || ref1 === void 0 ? void 0 : ref1.mode) === "react-router-5";
+};
+var cli_default = function() {
+    return {
+        name: "@modern-js/plugin-router",
+        required: [
+            "@modern-js/runtime"
+        ],
+        setup: function(api) {
+            var runtimeConfigMap = /* @__PURE__ */ new Map();
+            var pluginsExportsUtils;
+            return {
+                config: function config() {
+                    var appContext = api.useAppContext();
+                    pluginsExportsUtils = createRuntimeExportsUtils(appContext.internalDirectory, "plugins");
+                    return {
+                        source: {
+                            alias: {
+                                "@modern-js/runtime/plugins": pluginsExportsUtils.getPath()
+                            }
+                        }
+                    };
+                },
+                validateSchema: function validateSchema() {
+                    return PLUGIN_SCHEMAS["@modern-js/plugin-router"];
+                },
+                modifyEntryImports: function modifyEntryImports(param) {
+                    var entrypoint = param.entrypoint, imports = param.imports;
+                    var entryName = entrypoint.entryName, fileSystemRoutes = entrypoint.fileSystemRoutes;
+                    var userConfig = api.useResolvedConfigContext();
+                    var packageName = api.useAppContext().packageName;
+                    var runtimeConfig = getEntryOptions(entryName, userConfig.runtime, userConfig.runtimeByEntries, packageName);
+                    runtimeConfigMap.set(entryName, runtimeConfig);
+                    if (runtimeConfig === null || runtimeConfig === void 0 ? void 0 : runtimeConfig.router) {
+                        if (!isV5(userConfig)) {
+                            imports.push({
+                                value: "@modern-js/runtime/plugins",
+                                specifiers: [
+                                    {
+                                        imported: PLUGIN_IDENTIFIER
+                                    }
+                                ]
+                            });
+                        }
+                    } else if (fileSystemRoutes) {
+                        throw new Error("should enable runtime.router for entry ".concat(entryName));
+                    }
+                    return {
+                        entrypoint: entrypoint,
+                        imports: imports
+                    };
+                },
+                modifyEntryRuntimePlugins: function modifyEntryRuntimePlugins(param) {
+                    var entrypoint = param.entrypoint, plugins = param.plugins;
+                    var entryName = entrypoint.entryName, fileSystemRoutes = entrypoint.fileSystemRoutes;
+                    var serverRoutes = api.useAppContext().serverRoutes;
+                    var userConfig = api.useResolvedConfigContext();
+                    var runtimeConfig = runtimeConfigMap.get(entryName);
+                    if (runtimeConfig.router && !isV5(userConfig)) {
+                        var serverBase = serverRoutes.filter(function(route) {
+                            return route.entryName === entryName;
+                        }).map(function(route) {
+                            return route.urlPath;
+                        }).sort(function(a, b) {
+                            return a.length - b.length > 0 ? -1 : 1;
+                        });
+                        plugins.push({
+                            name: PLUGIN_IDENTIFIER,
+                            options: JSON.stringify(_objectSpreadProps(_objectSpread({
+                                serverBase: serverBase
+                            }, runtimeConfig.router), {
+                                routesConfig: fileSystemRoutes ? "{ ".concat(ROUTES_IDENTIFIER, ", globalApp: App }") : void 0
+                            })).replace(/"routesConfig"\s*:\s*"((\S|\s)+)"/g, '"routesConfig": $1,')
+                        });
+                    }
+                    return {
+                        entrypoint: entrypoint,
+                        plugins: plugins
+                    };
+                },
+                addRuntimeExports: function addRuntimeExports() {
+                    var userConfig = api.useResolvedConfigContext();
+                    if (!isV5(userConfig)) {
+                        pluginsExportsUtils.addExport("export { default as router } from '@modern-js/runtime/router'");
+                    }
+                }
+            };
+        }
+    };
+};
+export { cli_default as default };

package/dist/js/treeshaking/router/index.js

@@ -1,3 +1,4 @@
-export { default as router } from "./runtime";
-export { default } from "./runtime";
-export * from "./runtime";
+import { default as default2 } from "./runtime";
+import { default as default3 } from "./runtime";
+export * from "./runtime";
+export { default3 as default, default2 as router };

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

@@ -1,15 +1,14 @@
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-import React from 'react';
-import { jsx as _jsx } from "react/jsx-runtime";
-export var DefaultNotFound = function DefaultNotFound() {
-  return /*#__PURE__*/_jsx("div", {
-    style: {
-      margin: '150px auto',
-      textAlign: 'center',
-      display: 'flex',
-      alignItems: 'center',
-      justifyContent: 'center'
-    },
-    children: "404"
-  });
-};
+import { jsx } from "react/jsx-runtime";
+var DefaultNotFound = function() {
+    return /* @__PURE__ */ jsx("div", {
+        style: {
+            margin: "150px auto",
+            textAlign: "center",
+            display: "flex",
+            alignItems: "center",
+            justifyContent: "center"
+        },
+        children: "404"
+    });
+};
+export { DefaultNotFound };

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

@@ -1,4 +1,6 @@
 import { routerPlugin } from "./plugin";
-export default routerPlugin;
-export * from 'react-router-dom';
-export * from "./withRouter";
+var runtime_default = routerPlugin;
+import { modifyRoutes } from "./plugin";
+export * from "react-router-dom";
+export * from "./withRouter";
+export { runtime_default as default, modifyRoutes };

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

@@ -1,65 +1,132 @@
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import React from 'react';
-import { createBrowserRouter, createHashRouter, RouterProvider, createRoutesFromElements } from 'react-router-dom';
-import hoistNonReactStatics from 'hoist-non-react-statics';
-import { renderRoutes, urlJoin } from "./utils";
-import { jsx as _jsx } from "react/jsx-runtime";
-export var routerPlugin = function routerPlugin(_ref) {
-  var _ref$serverBase = _ref.serverBase,
-    serverBase = _ref$serverBase === void 0 ? [] : _ref$serverBase,
-    _ref$supportHtml5Hist = _ref.supportHtml5History,
-    supportHtml5History = _ref$supportHtml5Hist === void 0 ? true : _ref$supportHtml5Hist,
-    _ref$basename = _ref.basename,
-    basename = _ref$basename === void 0 ? '' : _ref$basename,
-    routesConfig = _ref.routesConfig,
-    createRoutes = _ref.createRoutes;
-  var select = function select(pathname) {
-    return serverBase.find(function (baseUrl) {
-      return pathname.search(baseUrl) === 0;
-    }) || '/';
-  };
-  return {
-    name: '@modern-js/plugin-router',
-    setup: function setup() {
-      return {
-        hoc: function hoc(_ref2, next) {
-          var App = _ref2.App;
-          // can not get routes config, skip wrapping React Router.
-          // e.g. App.tsx as the entrypoint
-          if (!routesConfig && !createRoutes) {
-            return next({
-              App: App
-            });
-          }
-          var getRouteApp = function getRouteApp() {
-            return function (props) {
-              var _window$_SERVER_DATA;
-              var routes = createRoutes ? createRoutes() : createRoutesFromElements(renderRoutes(routesConfig));
-              var baseUrl = ((_window$_SERVER_DATA = window._SERVER_DATA) === null || _window$_SERVER_DATA === void 0 ? void 0 : _window$_SERVER_DATA.router.baseUrl) || select(location.pathname);
-              var _basename = baseUrl === '/' ? urlJoin(baseUrl, basename) : baseUrl;
-              var router = supportHtml5History ? createBrowserRouter(routes, {
-                basename: _basename
-              }) : createHashRouter(routes, {
-                basename: _basename
-              });
-              return /*#__PURE__*/_jsx(App, _objectSpread(_objectSpread({}, props), {}, {
-                children: /*#__PURE__*/_jsx(RouterProvider, {
-                  router: router
-                })
-              }));
-            };
-          };
-          var RouteApp = getRouteApp();
-          if (routesConfig !== null && routesConfig !== void 0 && routesConfig.globalApp) {
-            return next({
-              App: hoistNonReactStatics(RouteApp, routesConfig.globalApp)
+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;
             });
-          }
-          return next({
-            App: RouteApp
-          });
         }
-      };
+        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 { createBrowserRouter, createHashRouter, RouterProvider, createRoutesFromElements, useMatches, useLocation } from "react-router-dom";
+import hoistNonReactStatics from "hoist-non-react-statics";
+import { renderRoutes, urlJoin } from "./utils";
+var finalRouteConfig = {
+    routes: []
+};
+var beforeCreateRouter = true;
+function modifyRoutes(modifyFunction) {
+    if (beforeCreateRouter) {
+        var originRoutes = finalRouteConfig.routes;
+        var newRoutes = modifyFunction(originRoutes);
+        finalRouteConfig.routes = newRoutes;
+    } else {
+        console.error("It is not allowed to modify routes config after create router.");
+    }
+}
+var routerPlugin = function(param) {
+    var _serverBase = param.serverBase, serverBase = _serverBase === void 0 ? [] : _serverBase, _supportHtml5History = param.supportHtml5History, supportHtml5History = _supportHtml5History === void 0 ? true : _supportHtml5History, _basename = param.basename, basename = _basename === void 0 ? "" : _basename, routesConfig = param.routesConfig, createRoutes = param.createRoutes;
+    var select = function(pathname) {
+        return serverBase.find(function(baseUrl) {
+            return pathname.search(baseUrl) === 0;
+        }) || "/";
+    };
+    finalRouteConfig = routesConfig;
+    return {
+        name: "@modern-js/plugin-router",
+        setup: function() {
+            return {
+                init: function init(param, next) {
+                    var context = param.context;
+                    context.router = {
+                        useMatches: useMatches,
+                        useLocation: useLocation
+                    };
+                    return next({
+                        context: context
+                    });
+                },
+                hoc: function(param, next) {
+                    var App = param.App;
+                    if (!finalRouteConfig && !createRoutes) {
+                        return next({
+                            App: App
+                        });
+                    }
+                    var getRouteApp = function() {
+                        return function(props) {
+                            var ref;
+                            beforeCreateRouter = true;
+                            var routes = createRoutes ? createRoutes() : createRoutesFromElements(renderRoutes(finalRouteConfig));
+                            var baseUrl = ((ref = window._SERVER_DATA) === null || ref === void 0 ? void 0 : ref.router.baseUrl) || select(location.pathname);
+                            var _basename = baseUrl === "/" ? urlJoin(baseUrl, basename) : baseUrl;
+                            var router = supportHtml5History ? createBrowserRouter(routes, {
+                                basename: _basename
+                            }) : createHashRouter(routes, {
+                                basename: _basename
+                            });
+                            return /* @__PURE__ */ jsx(App, _objectSpreadProps(_objectSpread({}, props), {
+                                children: /* @__PURE__ */ jsx(RouterProvider, {
+                                    router: router
+                                })
+                            }));
+                        };
+                    };
+                    var RouteApp = getRouteApp();
+                    if (routesConfig === null || routesConfig === void 0 ? void 0 : routesConfig.globalApp) {
+                        return next({
+                            App: hoistNonReactStatics(RouteApp, routesConfig.globalApp)
+                        });
+                    }
+                    return next({
+                        App: RouteApp
+                    });
+                }
+            };
+        }
+    };
+};
+export { beforeCreateRouter, finalRouteConfig, modifyRoutes, routerPlugin };