@modern-js/runtime 1.21.4 → 1.21.6

package/CHANGELOG.md

@@ -1,5 +1,35 @@
 # @modern-js/runtime
 
+## 1.21.6
+
+### Patch Changes
+
+- bb7788d: fix: bootstrap func ReactDOM params type when use react18
+
+  fix: 修复当使用 React18 时， bootstrap 函数 ReactDOM 参数类型
+
+- e951ac1: fix: state runtime plugin init hook not return next function
+
+  fix: 修复 state runtime 插件 init 钩子未返回 next 函数
+
+  - @modern-js/webpack@1.21.6
+  - @modern-js/plugin@1.21.6
+  - @modern-js/utils@1.21.6
+
+## 1.21.5
+
+### Patch Changes
+
+- a150632: fix: bootstrap function params type define
+
+  fix: 修复 bootstrap 函数参数类型定义
+
+- 29576fc: fix: extname function logic bug fix
+  fix: 修复 extname 函数的逻辑问题
+  - @modern-js/webpack@1.21.5
+  - @modern-js/plugin@1.21.5
+  - @modern-js/utils@1.21.5
+
 ## 1.21.4
 
 ### Patch Changes

package/dist/js/modern/core/compatible.js

@@ -178,16 +178,34 @@ root, ReactDOM = defaultReactDOM) => {
 
       const ModernRender = App => {
         if (IS_REACT18) {
-          (root || ReactDOM.createRoot(rootElement)).render(App);
+          if (root) {
+            root.render(App);
+          } else if (ReactDOM.createRoot) {
+            ReactDOM.createRoot(rootElement).render(App);
+          } else {
+            throw Error('The `bootstrap` `ReactDOM` parameter needs to provide the `createRoot` method');
+          }
         } else {
+          if (!ReactDOM.render) {
+            throw Error('The `bootstrap` `ReactDOM` parameter needs to provide the `render` method');
+          }
+
           ReactDOM.render(App, rootElement);
         }
       };
 
       const ModernHydrate = (App, callback) => {
         if (IS_REACT18) {
+          if (!ReactDOM.hydrateRoot) {
+            throw Error('The `bootstrap` `ReactDOM` parameter needs to provide the `hydrateRoot` method');
+          }
+
           ReactDOM.hydrateRoot(rootElement, App);
         } else {
+          if (!ReactDOM.hydrate) {
+            throw Error('The `bootstrap` `ReactDOM` parameter needs to provide the `hydrate` method');
+          }
+
           ReactDOM.hydrate(App, rootElement, callback);
         }
       };

package/dist/js/modern/ssr/serverRender/loadable.js

@@ -2,7 +2,11 @@ import { ChunkExtractor } from '@loadable/server';
 import { isCrossOrigin } from "../utils";
 
 const extname = uri => {
-  return uri.match(/\.[^.]+$/) || '';
+  if (typeof uri !== 'string' || !uri.includes('.')) {
+    return '';
+  }
+
+  return `.${uri === null || uri === void 0 ? void 0 : uri.split('.').pop()}` || '';
 };
 
 function getLoadableScripts(extractor) {

package/dist/js/modern/state/runtime/plugin.js

@@ -62,7 +62,7 @@ const state = config => ({
         }
 
         context.store = createStore(storeConfig);
-        next({
+        return next({
           context
         });
       },

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

@@ -203,16 +203,34 @@ root, ReactDOM = _reactDom.default) => {
 
       const ModernRender = App => {
         if (IS_REACT18) {
-          (root || ReactDOM.createRoot(rootElement)).render(App);
+          if (root) {
+            root.render(App);
+          } else if (ReactDOM.createRoot) {
+            ReactDOM.createRoot(rootElement).render(App);
+          } else {
+            throw Error('The `bootstrap` `ReactDOM` parameter needs to provide the `createRoot` method');
+          }
         } else {
+          if (!ReactDOM.render) {
+            throw Error('The `bootstrap` `ReactDOM` parameter needs to provide the `render` method');
+          }
+
           ReactDOM.render(App, rootElement);
         }
       };
 
       const ModernHydrate = (App, callback) => {
         if (IS_REACT18) {
+          if (!ReactDOM.hydrateRoot) {
+            throw Error('The `bootstrap` `ReactDOM` parameter needs to provide the `hydrateRoot` method');
+          }
+
           ReactDOM.hydrateRoot(rootElement, App);
         } else {
+          if (!ReactDOM.hydrate) {
+            throw Error('The `bootstrap` `ReactDOM` parameter needs to provide the `hydrate` method');
+          }
+
           ReactDOM.hydrate(App, rootElement, callback);
         }
       };

package/dist/js/node/ssr/serverRender/loadable.js

@@ -10,7 +10,11 @@ var _server = require("@loadable/server");
 var _utils = require("../utils");
 
 const extname = uri => {
-  return uri.match(/\.[^.]+$/) || '';
+  if (typeof uri !== 'string' || !uri.includes('.')) {
+    return '';
+  }
+
+  return `.${uri === null || uri === void 0 ? void 0 : uri.split('.').pop()}` || '';
 };
 
 function getLoadableScripts(extractor) {

package/dist/js/node/state/runtime/plugin.js

@@ -92,7 +92,7 @@ const state = config => ({
         }
 
         context.store = (0, _store.createStore)(storeConfig);
-        next({
+        return next({
           context
         });
       },

package/dist/js/treeshaking/core/compatible.js

@@ -210,16 +210,34 @@ export var bootstrap = /*#__PURE__*/function () {
 
             ModernRender = function ModernRender(App) {
               if (IS_REACT18) {
-                (root || ReactDOM.createRoot(_rootElement)).render(App);
+                if (root) {
+                  root.render(App);
+                } else if (ReactDOM.createRoot) {
+                  ReactDOM.createRoot(_rootElement).render(App);
+                } else {
+                  throw Error('The `bootstrap` `ReactDOM` parameter needs to provide the `createRoot` method');
+                }
               } else {
+                if (!ReactDOM.render) {
+                  throw Error('The `bootstrap` `ReactDOM` parameter needs to provide the `render` method');
+                }
+
                 ReactDOM.render(App, _rootElement);
               }
             };
 
             ModernHydrate = function ModernHydrate(App, callback) {
               if (IS_REACT18) {
+                if (!ReactDOM.hydrateRoot) {
+                  throw Error('The `bootstrap` `ReactDOM` parameter needs to provide the `hydrateRoot` method');
+                }
+
                 ReactDOM.hydrateRoot(_rootElement, App);
               } else {
+                if (!ReactDOM.hydrate) {
+                  throw Error('The `bootstrap` `ReactDOM` parameter needs to provide the `hydrate` method');
+                }
+
                 ReactDOM.hydrate(App, _rootElement, callback);
               }
             };

package/dist/js/treeshaking/ssr/serverRender/loadable.js

@@ -3,7 +3,11 @@ import { ChunkExtractor } from '@loadable/server';
 import { isCrossOrigin } from "../utils";
 
 var extname = function extname(uri) {
-  return uri.match(/\.[^.]+$/) || '';
+  if (typeof uri !== 'string' || !uri.includes('.')) {
+    return '';
+  }
+
+  return ".".concat(uri === null || uri === void 0 ? void 0 : uri.split('.').pop()) || '';
 };
 
 function getLoadableScripts(extractor) {

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

@@ -60,7 +60,7 @@ var state = function state(config) {
           }
 
           context.store = createStore(storeConfig);
-          next({
+          return next({
             context: context
           });
         },

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

@@ -7,15 +7,23 @@ export declare type CreateAppOptions = {
 export declare const createApp: ({
   plugins
 }: CreateAppOptions) => (App?: React.ComponentType<any>) => React.ComponentType<any>;
+export interface Root {
+  render: (children: React.ReactNode) => void;
+  unmount: () => void;
+}
+export interface HydrationOptions {
+  identifierPrefix?: string;
+  onRecoverableError?: (error: unknown) => void;
+}
 interface HydrateFunc {
-  (container: Element | Document, initialChildren: React.ReactNode): void;
+  (container: Element | Document, initialChildren: React.ReactNode, options?: HydrationOptions): Root;
   (initialChildren: React.ReactNode, container: Element | Document, callback?: () => void): void;
 }
-declare type BootStrap<T = unknown> = (App: React.ComponentType, id: string | Record<string, any> | HTMLElement, root: any, ReactDOM: {
-  render: (children: React.ReactNode, rootElement?: HTMLElement) => void;
-  hydrate: HydrateFunc;
+declare type BootStrap<T = unknown> = (App: React.ComponentType, id: string | Record<string, any> | HTMLElement, root?: any, ReactDOM?: {
+  render?: (children: React.ReactNode, rootElement?: HTMLElement) => void;
+  hydrate?: HydrateFunc;
   createRoot?: (rootElement: HTMLElement) => any;
-  hydrateRoot: HydrateFunc;
+  hydrateRoot?: HydrateFunc;
 }) => Promise<T>;
 export declare const bootstrap: BootStrap;
 export declare const useRuntimeContext: () => TRuntimeContext;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.21.4",
+  "version": "1.21.6",
   "jsnext:source": "./src/index.ts",
   "types": "./type.d.ts",
   "main": "./dist/js/node/index.js",
@@ -116,9 +116,6 @@
     "@loadable/babel-plugin": "^5.13.2",
     "@loadable/server": "^5.15.1",
     "@loadable/component": "^5.15.0",
-    "@modern-js/plugin": "1.21.4",
-    "@modern-js/webpack": "1.21.4",
-    "@modern-js/utils": "1.21.4",
     "@modern-js-reduck/plugin-auto-actions": "^1.0.2",
     "@modern-js-reduck/plugin-devtools": "^1.0.3",
     "@modern-js-reduck/plugin-effects": "^1.0.2",
@@ -130,7 +127,10 @@
     "@types/react-helmet": "^6.1.2",
     "@types/redux-logger": "^3.0.9",
     "@types/loadable__component": "^5.13.4",
-    "@types/styled-components": "^5.1.14"
+    "@types/styled-components": "^5.1.14",
+    "@modern-js/plugin": "1.21.6",
+    "@modern-js/webpack": "1.21.6",
+    "@modern-js/utils": "1.21.6"
   },
   "peerDependencies": {
     "react": ">=17",
@@ -142,20 +142,20 @@
     "ts-jest": "^27.0.4",
     "typescript": "^4",
     "jest": "^27",
-    "@modern-js/core": "1.21.4",
-    "@modern-js/types": "1.21.4",
-    "@modern-js/utils": "1.21.4",
     "@types/jest": "^27",
     "@types/node": "^14",
     "@types/react-side-effect": "^1.1.1",
     "@types/loadable__webpack-plugin": "^5.7.3",
     "@types/serialize-javascript": "^5.0.1",
-    "@scripts/build": "1.21.4",
-    "@scripts/jest-config": "1.21.4",
     "@testing-library/react": "^12.0.0",
     "@testing-library/react-hooks": "^7.0.1",
     "@types/hoist-non-react-statics": "^3.3.1",
-    "@types/invariant": "^2.2.30"
+    "@types/invariant": "^2.2.30",
+    "@modern-js/core": "1.21.6",
+    "@modern-js/types": "1.21.6",
+    "@modern-js/utils": "1.21.6",
+    "@scripts/build": "1.21.6",
+    "@scripts/jest-config": "1.21.6"
   },
   "sideEffects": false,
   "modernConfig": {},