@modern-js/runtime 2.12.0 → 2.13.0

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @modern-js/runtime
 
+## 2.13.0
+
+### Patch Changes
+
+- cad9676: fix(runtime): compile react-router to ensure the compatibility
+
+  fix(runtime): 通过编译 react-router 来保证对低版本浏览器的兼容性
+
+- e9b1656: fix: plugin config hook can not get bundlerType, so we can't set babelConfig correctly in ssr plugin
+  fix: 插件的 config 钩子不能获得 bundlerType，所以我们在 ssr 插件不能正确的设置 babelConfig
+- 4d413c4: docs: add prefetch docs
+  docs: 添加 prefetch 的文档
+- 4220c0e: feat: support global props in createApp and pass garfish props in
+  feat: createApp 支持全局属性，garfish 通过这个方式透传 garfish props
+- Updated dependencies [78431f4]
+  - @modern-js/plugin@2.13.0
+  - @modern-js/types@2.13.0
+  - @modern-js/utils@2.13.0
+
 ## 2.12.0
 
 ### Patch Changes

package/dist/cjs/core/compatible.js

@@ -50,7 +50,10 @@ const getInitialContext = (runner) => ({
   isBrowser: true,
   routeManifest: typeof window !== "undefined" && window[import_constants.ROUTE_MANIFEST]
 });
-const createApp = ({ plugins }) => {
+const createApp = ({
+  plugins,
+  props: globalProps
+}) => {
   const appRuntime = import_plugin.runtime.clone();
   appRuntime.usePlugin(...plugins);
   return (App) => {
@@ -94,7 +97,8 @@ const createApp = ({ plugins }) => {
                 }
               );
             }
-            return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_runtimeContext.RuntimeReactContext.Provider, { value: contextValue, children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(App2, { ...props }) });
+            const mergedProps = { ...props, ...globalProps };
+            return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_runtimeContext.RuntimeReactContext.Provider, { value: contextValue, children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(App2, { ...mergedProps }) });
           };
           return (0, import_hoist_non_react_statics.default)(WrapComponent, App2);
         }

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

@@ -38,6 +38,14 @@ var cli_default = () => ({
         );
         return {
           source: {
+            include: [
+              // react-router v6 is no longer support ie 11
+              // so we need to compile these packages to ensure the compatibility
+              // https://github.com/remix-run/react-router/commit/f6df0697e1b2064a2b3a12e8b39577326fdd945b
+              /node_modules\/react-router/,
+              /node_modules\/react-router-dom/,
+              /node_modules\/@remix-run\/router/
+            ],
             alias: {
               "@modern-js/runtime/plugins": pluginsExportsUtils.getPath()
             }

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

@@ -27,8 +27,8 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var PrefetchLink_exports = {};
 __export(PrefetchLink_exports, {
-  PrefetchLink: () => Link,
-  PrefetchNavLink: () => NavLink,
+  Link: () => Link,
+  NavLink: () => NavLink,
   composeEventHandlers: () => composeEventHandlers
 });
 module.exports = __toCommonJS(PrefetchLink_exports);
@@ -200,7 +200,7 @@ const NavLink = createPrefetchLink(import_react_router_dom.NavLink);
 NavLink.displayName = "NavLink";
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  PrefetchLink,
-  PrefetchNavLink,
+  Link,
+  NavLink,
   composeEventHandlers
 });

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

@@ -22,13 +22,11 @@ __export(runtime_exports, {
   BrowserRouter: () => import_react_router_dom.BrowserRouter,
   Form: () => import_react_router_dom.Form,
   HashRouter: () => import_react_router_dom.HashRouter,
-  Link: () => import_react_router_dom.Link,
+  Link: () => import_PrefetchLink.Link,
   MemoryRouter: () => import_react_router_dom.MemoryRouter,
-  NavLink: () => import_react_router_dom.NavLink,
+  NavLink: () => import_PrefetchLink.NavLink,
   Navigate: () => import_react_router_dom.Navigate,
   Outlet: () => import_react_router_dom.Outlet,
-  PrefetchLink: () => import_PrefetchLink.PrefetchLink,
-  PrefetchNavLink: () => import_PrefetchLink.PrefetchNavLink,
   Route: () => import_react_router_dom.Route,
   Router: () => import_react_router_dom.Router,
   RouterProvider: () => import_react_router_dom.RouterProvider,
@@ -98,8 +96,6 @@ var runtime_default = import_plugin.routerPlugin;
   NavLink,
   Navigate,
   Outlet,
-  PrefetchLink,
-  PrefetchNavLink,
   Route,
   Router,
   RouterProvider,

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

@@ -61,8 +61,7 @@ var cli_default = () => ({
           appContext.internalDirectory,
           "plugins"
         );
-        const { builder } = api.useAppContext();
-        const bundlerType = (builder == null ? void 0 : builder.context.bundlerType) || "webpack";
+        const { bundlerType = "webpack" } = api.useAppContext();
         const babelConfig = bundlerType === "webpack" ? (config) => {
           var _a, _b;
           (_a = config.plugins) == null ? void 0 : _a.push(

package/dist/esm/core/compatible.js

@@ -230,7 +230,7 @@ var getInitialContext = function(runner) {
     };
 };
 var createApp = function(param) {
-    var plugins = param.plugins;
+    var plugins = param.plugins, globalProps = param.props;
     var _appRuntime;
     var appRuntime = runtime.clone();
     (_appRuntime = appRuntime).usePlugin.apply(_appRuntime, _toConsumableArray(plugins));
@@ -276,9 +276,10 @@ var createApp = function(param) {
                             }
                         });
                     }
+                    var mergedProps = _objectSpread({}, props, globalProps);
                     return /* @__PURE__ */ jsx(RuntimeReactContext.Provider, {
                         value: contextValue,
-                        children: /* @__PURE__ */ jsx(App2, _objectSpread({}, props))
+                        children: /* @__PURE__ */ jsx(App2, _objectSpread({}, mergedProps))
                     });
                 };
                 return hoistNonReactStatics(WrapComponent, App2);

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

@@ -68,6 +68,14 @@ var cli_default = function() {
                     pluginsExportsUtils = createRuntimeExportsUtils(appContext.internalDirectory, "plugins");
                     return {
                         source: {
+                            include: [
+                                // react-router v6 is no longer support ie 11
+                                // so we need to compile these packages to ensure the compatibility
+                                // https://github.com/remix-run/react-router/commit/f6df0697e1b2064a2b3a12e8b39577326fdd945b
+                                /node_modules\/react-router/,
+                                /node_modules\/react-router-dom/,
+                                /node_modules\/@remix-run\/router/
+                            ],
                             alias: {
                                 "@modern-js/runtime/plugins": pluginsExportsUtils.getPath()
                             }

package/dist/esm/router/runtime/PrefetchLink.js

@@ -444,4 +444,4 @@ var Link = createPrefetchLink(RouterLink);
 Link.displayName = "Link";
 var NavLink = createPrefetchLink(RouterNavLink);
 NavLink.displayName = "NavLink";
-export { Link as PrefetchLink, NavLink as PrefetchNavLink, composeEventHandlers };
+export { Link, NavLink, composeEventHandlers };

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

@@ -2,7 +2,7 @@ import { routerPlugin } from "./plugin";
 var runtime_default = routerPlugin;
 import { modifyRoutes } from "./plugin";
 export * from "./withRouter";
-import { PrefetchLink, PrefetchNavLink } from "./PrefetchLink";
-import { 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";
+import { Link, NavLink } from "./PrefetchLink";
+import { createBrowserRouter, createHashRouter, createMemoryRouter, RouterProvider, BrowserRouter, HashRouter, MemoryRouter, Router, Await, Form, 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";
 import { defer, json, redirect } from "@modern-js/utils/universal/remix-router";
-export { Await, BrowserRouter, Form, HashRouter, Link, MemoryRouter, NavLink, Navigate, Outlet, PrefetchLink, PrefetchNavLink, Route, Router, RouterProvider, Routes, ScrollRestoration, createBrowserRouter, createHashRouter, createMemoryRouter, createRoutesFromChildren, createRoutesFromElements, createSearchParams, runtime_default as default, defer, generatePath, isRouteErrorResponse, json, matchPath, matchRoutes, modifyRoutes, redirect, renderMatches, resolvePath, 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 };
+export { Await, BrowserRouter, Form, HashRouter, Link, MemoryRouter, NavLink, Navigate, Outlet, Route, Router, RouterProvider, Routes, ScrollRestoration, createBrowserRouter, createHashRouter, createMemoryRouter, createRoutesFromChildren, createRoutesFromElements, createSearchParams, runtime_default as default, defer, generatePath, isRouteErrorResponse, json, matchPath, matchRoutes, modifyRoutes, redirect, renderMatches, resolvePath, 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 };

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

@@ -110,8 +110,7 @@ var cli_default = function() {
                 config: function config() {
                     var appContext = api.useAppContext();
                     pluginsExportsUtils = createRuntimeExportsUtils(appContext.internalDirectory, "plugins");
-                    var builder = api.useAppContext().builder;
-                    var bundlerType = (builder === null || builder === void 0 ? void 0 : builder.context.bundlerType) || "webpack";
+                    var _api_useAppContext = api.useAppContext(), _api_useAppContext_bundlerType = _api_useAppContext.bundlerType, bundlerType = _api_useAppContext_bundlerType === void 0 ? "webpack" : _api_useAppContext_bundlerType;
                     var babelConfig = bundlerType === "webpack" ? function(config) {
                         var _config_plugins;
                         (_config_plugins = config.plugins) === null || _config_plugins === void 0 ? void 0 : _config_plugins.push(path.join(__dirname, "./babel-plugin-ssr-loader-id"));

package/dist/esm-node/core/compatible.js

@@ -18,7 +18,10 @@ const getInitialContext = (runner) => ({
   isBrowser: true,
   routeManifest: typeof window !== "undefined" && window[ROUTE_MANIFEST]
 });
-const createApp = ({ plugins }) => {
+const createApp = ({
+  plugins,
+  props: globalProps
+}) => {
   const appRuntime = runtime.clone();
   appRuntime.usePlugin(...plugins);
   return (App) => {
@@ -62,7 +65,8 @@ const createApp = ({ plugins }) => {
                 }
               );
             }
-            return /* @__PURE__ */ jsx(RuntimeReactContext.Provider, { value: contextValue, children: /* @__PURE__ */ jsx(App2, { ...props }) });
+            const mergedProps = { ...props, ...globalProps };
+            return /* @__PURE__ */ jsx(RuntimeReactContext.Provider, { value: contextValue, children: /* @__PURE__ */ jsx(App2, { ...mergedProps }) });
           };
           return hoistNonReactStatics(WrapComponent, App2);
         }

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

@@ -21,6 +21,14 @@ var cli_default = () => ({
         );
         return {
           source: {
+            include: [
+              // react-router v6 is no longer support ie 11
+              // so we need to compile these packages to ensure the compatibility
+              // https://github.com/remix-run/react-router/commit/f6df0697e1b2064a2b3a12e8b39577326fdd945b
+              /node_modules\/react-router/,
+              /node_modules\/react-router-dom/,
+              /node_modules\/@remix-run\/router/
+            ],
             alias: {
               "@modern-js/runtime/plugins": pluginsExportsUtils.getPath()
             }

package/dist/esm-node/router/runtime/PrefetchLink.js

@@ -172,7 +172,7 @@ Link.displayName = "Link";
 const NavLink = createPrefetchLink(RouterNavLink);
 NavLink.displayName = "NavLink";
 export {
-  Link as PrefetchLink,
-  NavLink as PrefetchNavLink,
+  Link,
+  NavLink,
   composeEventHandlers
 };

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

@@ -2,7 +2,7 @@ import { routerPlugin } from "./plugin";
 var runtime_default = routerPlugin;
 import { modifyRoutes } from "./plugin";
 export * from "./withRouter";
-import { PrefetchLink, PrefetchNavLink } from "./PrefetchLink";
+import { Link, NavLink } from "./PrefetchLink";
 import {
   createBrowserRouter,
   createHashRouter,
@@ -14,8 +14,6 @@ import {
   Router,
   Await,
   Form,
-  Link,
-  NavLink,
   Navigate,
   Outlet,
   Route,
@@ -69,8 +67,6 @@ export {
   NavLink,
   Navigate,
   Outlet,
-  PrefetchLink,
-  PrefetchNavLink,
   Route,
   Router,
   RouterProvider,

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

@@ -36,8 +36,7 @@ var cli_default = () => ({
           appContext.internalDirectory,
           "plugins"
         );
-        const { builder } = api.useAppContext();
-        const bundlerType = (builder == null ? void 0 : builder.context.bundlerType) || "webpack";
+        const { bundlerType = "webpack" } = api.useAppContext();
         const babelConfig = bundlerType === "webpack" ? (config) => {
           var _a, _b;
           (_a = config.plugins) == null ? void 0 : _a.push(

package/dist/types/core/compatible.d.ts

@@ -5,9 +5,11 @@ import { RuntimeContext, TRuntimeContext } from '../runtimeContext';
 import { Plugin } from './plugin';
 export type CreateAppOptions = {
   plugins: Plugin[];
+  props?: any;
 };
 export declare const createApp: ({
-  plugins
+  plugins,
+  props: globalProps
 }: CreateAppOptions) => (App?: React.ComponentType<any>) => React.ComponentType<any>;
 type BootStrap<T = unknown> = (App: React.ComponentType, id: string | HTMLElement | RuntimeContext, root?: any, ReactDOM?: {
   render?: Renderer;

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

@@ -19,12 +19,12 @@ export declare function composeEventHandlers<EventType extends React.SyntheticEv
  */
 
 type PrefetchBehavior = 'intent' | 'render' | 'none';
-export interface PrefetchLinkProps extends RouterLinkProps {
+export interface LinkProps extends RouterLinkProps {
   prefetch?: PrefetchBehavior;
 }
-export interface PrefetchNavLinkProps extends RouterNavLinkProps {
+export interface NavLinkProps extends RouterNavLinkProps {
   prefetch?: PrefetchBehavior;
 }
-declare const Link: React.ForwardRefExoticComponent<PrefetchLinkProps & React.RefAttributes<HTMLAnchorElement>>;
-declare const NavLink: React.ForwardRefExoticComponent<PrefetchNavLinkProps & React.RefAttributes<HTMLAnchorElement>>;
-export { Link as PrefetchLink, NavLink as PrefetchNavLink };
+declare const Link: React.ForwardRefExoticComponent<LinkProps & React.RefAttributes<HTMLAnchorElement>>;
+declare const NavLink: React.ForwardRefExoticComponent<NavLinkProps & React.RefAttributes<HTMLAnchorElement>>;
+export { Link, NavLink };

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

@@ -4,8 +4,8 @@ export type { SingleRouteConfig, RouterConfig };
 export default routerPlugin;
 export { modifyRoutes } from './plugin';
 export * from './withRouter';
-export { PrefetchLink, PrefetchNavLink } from './PrefetchLink';
-export type { PrefetchLinkProps, PrefetchNavLinkProps } from './PrefetchLink';
-export type { FormEncType, FormMethod, GetScrollRestorationKeyFunction, ParamKeyValuePair, SubmitOptions, URLSearchParamsInit, FetcherWithComponents, BrowserRouterProps, HashRouterProps, HistoryRouterProps, LinkProps, NavLinkProps, FormProps, ScrollRestorationProps, SubmitFunction, 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 { 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 { Link, NavLink } from './PrefetchLink';
+export type { LinkProps, NavLinkProps } from './PrefetchLink';
+export type { FormEncType, FormMethod, GetScrollRestorationKeyFunction, ParamKeyValuePair, SubmitOptions, URLSearchParamsInit, FetcherWithComponents, BrowserRouterProps, HashRouterProps, HistoryRouterProps, FormProps, ScrollRestorationProps, SubmitFunction, 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 { createBrowserRouter, createHashRouter, createMemoryRouter, RouterProvider, BrowserRouter, HashRouter, MemoryRouter, Router, Await, Form, 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/universal/remix-router';

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.12.0",
+  "version": "2.13.0",
   "engines": {
     "node": ">=14.17.6"
   },
@@ -158,9 +158,9 @@
     "react-side-effect": "^2.1.1",
     "redux-logger": "^3.0.6",
     "styled-components": "^5.3.1",
-    "@modern-js/plugin": "2.12.0",
-    "@modern-js/types": "2.12.0",
-    "@modern-js/utils": "2.12.0"
+    "@modern-js/plugin": "2.13.0",
+    "@modern-js/types": "2.13.0",
+    "@modern-js/utils": "2.13.0"
   },
   "peerDependencies": {
     "react": ">=17",
@@ -181,11 +181,11 @@
     "react-dom": "^18",
     "ts-jest": "^29.0.5",
     "typescript": "^4",
-    "@modern-js/app-tools": "2.12.0",
-    "@modern-js/core": "2.12.0",
-    "@modern-js/server-core": "2.12.0",
-    "@scripts/build": "2.12.0",
-    "@scripts/jest-config": "2.12.0"
+    "@modern-js/app-tools": "2.13.0",
+    "@modern-js/core": "2.13.0",
+    "@modern-js/server-core": "2.13.0",
+    "@scripts/build": "2.13.0",
+    "@scripts/jest-config": "2.13.0"
   },
   "sideEffects": false,
   "modernConfig": {},