@modern-js/runtime 2.7.0 → 2.8.0

package/CHANGELOG.md

@@ -1,5 +1,30 @@
 # @modern-js/runtime
 
+## 2.8.0
+
+### Patch Changes
+
+- 3ef832741b: fix: fix types pathname for model field
+  fix: 修复 model 字段对应的 types 路径
+- 9330022f4e: fix: add missing react-router type
+  fix: 添加丢失的 react-router 导出类型
+- 40747e6fdd: fix: fix the order of runtime plugins
+  fix: 修复 runtime plugin 执行顺序
+- 58a1fc64da: fix: pass basename to `matchRoutes`
+  fix: 修复 `matchRoutes` 未传入 basename 参数
+- 4cfea8ce49: fix: remove esbuild from bff-core
+  fix: 从 bff-core 移除 esbuild
+- 1f6ca2c7fb: fix: nested routes in ssg
+  fix: 修复嵌套路由在 SSG 中的问题
+- 9c9ebba6f2: fix: fix duplicate re-exports of reduck
+  fix: 修复从 reduck 重复导出的 API
+- Updated dependencies [1104a9f18b]
+- Updated dependencies [70d82e1408]
+- Updated dependencies [1f6ca2c7fb]
+  - @modern-js/utils@2.8.0
+  - @modern-js/types@2.8.0
+  - @modern-js/plugin@2.8.0
+
 ## 2.7.0
 
 ### Minor Changes

package/README.md

@@ -19,8 +19,8 @@ Please follow [Quick Start](https://modernjs.dev/en/guides/get-started/quick-sta
 
 ## Contributing
 
-Please read the [Contributing Guide](https://github.com/modern-js-dev/modern.js/blob/main/CONTRIBUTING.md).
+Please read the [Contributing Guide](https://github.com/web-infra-dev/modern.js/blob/main/CONTRIBUTING.md).
 
 ## License
 
-Modern.js is [MIT licensed](https://github.com/modern-js-dev/modern.js/blob/main/LICENSE).
+Modern.js is [MIT licensed](https://github.com/web-infra-dev/modern.js/blob/main/LICENSE).

package/dist/cjs/cli/index.js

@@ -39,13 +39,14 @@ var import_cli4 = __toESM(require("../document/cli"));
 var cli_default = () => ({
   name: "@modern-js/runtime",
   post: [
-    "@modern-js/plugin-router",
     "@modern-js/plugin-ssr",
-    "@modern-js/plugin-document",
     "@modern-js/plugin-state",
+    "@modern-js/plugin-router",
+    "@modern-js/plugin-document",
     "@modern-js/plugin-design-token"
   ],
-  usePlugins: [(0, import_cli.default)(), (0, import_cli2.default)(), (0, import_cli3.default)(), (0, import_cli4.default)()],
+  // the order of runtime plugins is affected by runtime hooks, mainly `init` and `hoc` hooks
+  usePlugins: [(0, import_cli2.default)(), (0, import_cli.default)(), (0, import_cli3.default)(), (0, import_cli4.default)()],
   setup: (api) => {
     return {
       config() {

package/dist/cjs/ssr/cli/index.js

@@ -138,8 +138,7 @@ var cli_default = () => ({
             );
           }
         }
-        const ssgConfig = userConfig.output.ssg;
-        const useSSG = (0, import_utils.isSingleEntry)(entrypoints) ? Boolean(ssgConfig) : ssgConfig === true || typeof (ssgConfig == null ? void 0 : ssgConfig[0]) === "function" || Boolean(ssgConfig == null ? void 0 : ssgConfig[entryName]);
+        const useSSG = (0, import_utils.isSSGEntry)(userConfig, entryName, entrypoints);
         ssrConfigMap.set(entryName, ssrConfig || useSSG);
         if (ssrConfig || useSSG) {
           imports.push({

package/dist/cjs/ssr/serverRender/renderToStream/bulidTemplate.before.js

@@ -58,7 +58,11 @@ function getHeadTemplate(beforeEntryTemplate, context) {
       }
       const { routeAssets } = routeManifest;
       const cssChunks = [];
-      const matches = (0, import_react_router_dom.matchRoutes)(routes, routerContext.location);
+      const matches = (0, import_react_router_dom.matchRoutes)(
+        routes,
+        routerContext.location,
+        routerContext.basename
+      );
       matches == null ? void 0 : matches.forEach((match, index) => {
         if (!index) {
           return;

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

@@ -28,17 +28,11 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var runtime_exports = {};
 __export(runtime_exports, {
-  createStore: () => import_store.createStore,
-  default: () => import_plugin.default,
-  model: () => import_store.model
+  default: () => import_plugin.default
 });
 module.exports = __toCommonJS(runtime_exports);
 __reExport(runtime_exports, require("@modern-js-reduck/react"), module.exports);
-var import_store = require("@modern-js-reduck/store");
 var import_plugin = __toESM(require("./plugin"));
 __reExport(runtime_exports, require("./plugin"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  createStore,
-  model
-});
+0 && (module.exports = {});

package/dist/esm/cli/index.js

@@ -132,15 +132,16 @@ var cli_default = function() {
     return {
         name: "@modern-js/runtime",
         post: [
-            "@modern-js/plugin-router",
             "@modern-js/plugin-ssr",
-            "@modern-js/plugin-document",
             "@modern-js/plugin-state",
+            "@modern-js/plugin-router",
+            "@modern-js/plugin-document",
             "@modern-js/plugin-design-token"
         ],
+        // the order of runtime plugins is affected by runtime hooks, mainly `init` and `hoc` hooks
         usePlugins: [
-            PluginState(),
             PluginSSR(),
+            PluginState(),
             PluginRouter(),
             Document()
         ],

package/dist/esm/ssr/cli/index.js

@@ -61,7 +61,7 @@ function _unsupportedIterableToArray(o, minLen) {
     if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
 }
 import path from "path";
-import { getEntryOptions, SERVER_RENDER_FUNCTION_NAME, LOADABLE_STATS_FILE, isUseSSRBundle, createRuntimeExportsUtils, isSingleEntry } from "@modern-js/utils";
+import { getEntryOptions, SERVER_RENDER_FUNCTION_NAME, LOADABLE_STATS_FILE, isUseSSRBundle, createRuntimeExportsUtils, isSSGEntry } from "@modern-js/utils";
 var PLUGIN_IDENTIFIER = "ssr";
 var hasStringSSREntry = function(userConfig) {
     var isStreaming = function(ssr) {
@@ -165,8 +165,7 @@ var cli_default = function() {
                             throw new Error("You should switch to file-system based router to support streaming SSR.");
                         }
                     }
-                    var ssgConfig = userConfig.output.ssg;
-                    var useSSG = isSingleEntry(entrypoints) ? Boolean(ssgConfig) : ssgConfig === true || typeof (ssgConfig === null || ssgConfig === void 0 ? void 0 : ssgConfig[0]) === "function" || Boolean(ssgConfig === null || ssgConfig === void 0 ? void 0 : ssgConfig[entryName]);
+                    var useSSG = isSSGEntry(userConfig, entryName, entrypoints);
                     ssrConfigMap.set(entryName, ssrConfig || useSSG);
                     if (ssrConfig || useSSG) {
                         imports.push({

package/dist/esm/ssr/serverRender/renderToStream/bulidTemplate.before.js

@@ -71,7 +71,7 @@ function getHeadTemplate(beforeEntryTemplate, context) {
             }
             var routeAssets = routeManifest.routeAssets;
             var cssChunks = [];
-            var matches = matchRoutes(routes, routerContext.location);
+            var matches = matchRoutes(routes, routerContext.location, routerContext.basename);
             matches === null || matches === void 0 ? void 0 : matches.forEach(function(match, index) {
                 if (!index) {
                     return;

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

@@ -1,5 +1,4 @@
 export * from "@modern-js-reduck/react";
-import { model, createStore } from "@modern-js-reduck/store";
 import { default as default2 } from "./plugin";
 export * from "./plugin";
-export { createStore, default2 as default, model };
+export { default2 as default };

package/dist/esm-node/cli/index.js

@@ -7,13 +7,14 @@ import Document from "../document/cli";
 var cli_default = () => ({
   name: "@modern-js/runtime",
   post: [
-    "@modern-js/plugin-router",
     "@modern-js/plugin-ssr",
-    "@modern-js/plugin-document",
     "@modern-js/plugin-state",
+    "@modern-js/plugin-router",
+    "@modern-js/plugin-document",
     "@modern-js/plugin-design-token"
   ],
-  usePlugins: [PluginState(), PluginSSR(), PluginRouter(), Document()],
+  // the order of runtime plugins is affected by runtime hooks, mainly `init` and `hoc` hooks
+  usePlugins: [PluginSSR(), PluginState(), PluginRouter(), Document()],
   setup: (api) => {
     return {
       config() {

package/dist/esm-node/ssr/cli/index.js

@@ -5,7 +5,7 @@ import {
   LOADABLE_STATS_FILE,
   isUseSSRBundle,
   createRuntimeExportsUtils,
-  isSingleEntry
+  isSSGEntry
 } from "@modern-js/utils";
 const PLUGIN_IDENTIFIER = "ssr";
 const hasStringSSREntry = (userConfig) => {
@@ -113,8 +113,7 @@ var cli_default = () => ({
             );
           }
         }
-        const ssgConfig = userConfig.output.ssg;
-        const useSSG = isSingleEntry(entrypoints) ? Boolean(ssgConfig) : ssgConfig === true || typeof (ssgConfig == null ? void 0 : ssgConfig[0]) === "function" || Boolean(ssgConfig == null ? void 0 : ssgConfig[entryName]);
+        const useSSG = isSSGEntry(userConfig, entryName, entrypoints);
         ssrConfigMap.set(entryName, ssrConfig || useSSG);
         if (ssrConfig || useSSG) {
           imports.push({

package/dist/esm-node/ssr/serverRender/renderToStream/bulidTemplate.before.js

@@ -29,7 +29,11 @@ function getHeadTemplate(beforeEntryTemplate, context) {
       }
       const { routeAssets } = routeManifest;
       const cssChunks = [];
-      const matches = matchRoutes(routes, routerContext.location);
+      const matches = matchRoutes(
+        routes,
+        routerContext.location,
+        routerContext.basename
+      );
       matches == null ? void 0 : matches.forEach((match, index) => {
         if (!index) {
           return;

package/dist/esm-node/state/runtime/index.js

@@ -1,9 +1,6 @@
 export * from "@modern-js-reduck/react";
-import { model, createStore } from "@modern-js-reduck/store";
 import { default as default2 } from "./plugin";
 export * from "./plugin";
 export {
-  createStore,
-  default2 as default,
-  model
+  default2 as default
 };

package/dist/types/router/runtime/index.d.ts

@@ -4,6 +4,6 @@ export type { SingleRouteConfig, RouterConfig };
 export default routerPlugin;
 export { modifyRoutes } from './plugin';
 export * from './withRouter';
-export type { FormEncType, FormMethod, GetScrollRestorationKeyFunction, ParamKeyValuePair, SubmitOptions, URLSearchParamsInit, FetcherWithComponents, ActionFunction, ActionFunctionArgs, AwaitProps, unstable_Blocker, unstable_BlockerFunction, DataRouteMatch, DataRouteObject, Fetcher, Hash, IndexRouteObject, IndexRouteProps, JsonFunction, LayoutRouteProps, LoaderFunction, LoaderFunctionArgs, Location, MemoryRouterProps, NavigateFunction, NavigateOptions, NavigateProps, Navigation, Navigator, NonIndexRouteObject, OutletProps, Params, ParamParseKey, Path, PathMatch, Pathname, PathPattern, PathRouteProps, RedirectFunction, RelativeRoutingType, RouteMatch, RouteObject, RouteProps, RouterProps, RouterProviderProps, RoutesProps, Search, ShouldRevalidateFunction, To } from 'react-router-dom';
+export type { FormEncType, FormMethod, GetScrollRestorationKeyFunction, ParamKeyValuePair, SubmitOptions, URLSearchParamsInit, FetcherWithComponents, ActionFunction, ActionFunctionArgs, AwaitProps, unstable_Blocker, unstable_BlockerFunction, DataRouteMatch, DataRouteObject, Fetcher, Hash, IndexRouteObject, IndexRouteProps, JsonFunction, LayoutRouteProps, LoaderFunction, LoaderFunctionArgs, Location, MemoryRouterProps, NavigateFunction, NavigateOptions, NavigateProps, Navigation, Navigator, NavLinkProps, NonIndexRouteObject, OutletProps, Params, ParamParseKey, Path, PathMatch, Pathname, PathPattern, PathRouteProps, RedirectFunction, RelativeRoutingType, RouteMatch, RouteObject, RouteProps, RouterProps, RouterProviderProps, RoutesProps, Search, ShouldRevalidateFunction, To } from 'react-router-dom';
 export { createBrowserRouter, createHashRouter, createMemoryRouter, RouterProvider, BrowserRouter, HashRouter, MemoryRouter, Router, Await, Form, Link, NavLink, Navigate, Outlet, Route, Routes, ScrollRestoration, useActionData, useAsyncError, useAsyncValue, useBeforeUnload, useFetcher, useFetchers, useFormAction, useHref, useInRouterContext, useLinkClickHandler, useLoaderData, useLocation, useMatch, useMatches, useNavigate, useNavigation, useNavigationType, useOutlet, useOutletContext, useParams, useResolvedPath, useRevalidator, useRouteError, useRouteLoaderData, useRoutes, useSearchParams, useSubmit, createRoutesFromChildren, createRoutesFromElements, createSearchParams, generatePath, isRouteErrorResponse, matchPath, matchRoutes, renderMatches, resolvePath } from 'react-router-dom';
 export { defer, json, redirect } from '@modern-js/utils/remix-router';

package/dist/types/state/runtime/index.d.ts

@@ -1,4 +1,3 @@
 export * from '@modern-js-reduck/react';
-export { model, createStore } from '@modern-js-reduck/store';
 export { default } from './plugin';
 export * from './plugin';

package/package.json

@@ -2,8 +2,8 @@
   "name": "@modern-js/runtime",
   "description": "A Progressive React Framework for modern web development.",
   "homepage": "https://modernjs.dev",
-  "bugs": "https://github.com/modern-js-dev/modern.js/issues",
-  "repository": "modern-js-dev/modern.js",
+  "bugs": "https://github.com/web-infra-dev/modern.js/issues",
+  "repository": "web-infra-dev/modern.js",
   "license": "MIT",
   "keywords": [
     "react",
@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.7.0",
+  "version": "2.8.0",
   "engines": {
     "node": ">=14.17.6"
   },
@@ -67,7 +67,7 @@
     },
     "./model": {
       "jsnext:source": "./src/state/index.ts",
-      "types": "./dist/types/model.d.ts",
+      "types": "./types/model.d.ts",
       "default": "./dist/esm/state/index.js"
     },
     "./cli": {
@@ -158,9 +158,9 @@
     "react-side-effect": "^2.1.1",
     "redux-logger": "^3.0.6",
     "styled-components": "^5.3.1",
-    "@modern-js/plugin": "2.7.0",
-    "@modern-js/types": "2.7.0",
-    "@modern-js/utils": "2.7.0"
+    "@modern-js/plugin": "2.8.0",
+    "@modern-js/types": "2.8.0",
+    "@modern-js/utils": "2.8.0"
   },
   "peerDependencies": {
     "react": ">=17",
@@ -181,11 +181,11 @@
     "react-dom": "^18",
     "ts-jest": "^27.0.4",
     "typescript": "^4",
-    "@modern-js/core": "2.7.0",
-    "@modern-js/server-core": "2.7.0",
-    "@modern-js/app-tools": "2.7.0",
-    "@scripts/build": "2.7.0",
-    "@scripts/jest-config": "2.7.0"
+    "@modern-js/app-tools": "2.8.0",
+    "@modern-js/core": "2.8.0",
+    "@modern-js/server-core": "2.8.0",
+    "@scripts/jest-config": "2.8.0",
+    "@scripts/build": "2.8.0"
   },
   "sideEffects": false,
   "modernConfig": {},

package/types/router.d.ts

@@ -3,7 +3,7 @@ import '../dist/types/router';
 
 declare module '@modern-js/app-tools' {
   interface RuntimeUserConfig {
-    router?: RouterConfig | boolean;
+    router?: Partial<RouterConfig> | boolean;
   }
 }