@modern-js/plugin-state 1.1.3-rc.0 → 1.2.0

package/CHANGELOG.md

@@ -1,16 +1,42 @@
 # @modern-js/plugin-state
 
-## 1.1.3-rc.0
+## 1.2.0
+
+### Minor Changes
+
+- cfe11628: Make Modern.js self bootstraping
+
+### Patch Changes
+
+- Updated dependencies [fc71e36f]
+- Updated dependencies [a2cb9abc]
+- Updated dependencies [cfe11628]
+  - @modern-js/core@1.3.0
+  - @modern-js/runtime-core@1.2.0
+
+## 1.1.4
+
+### Patch Changes
+
+- 4a281912: fix: app init function not work
+- Updated dependencies [4a281912]
+- Updated dependencies [4a281912]
+- Updated dependencies [eb026119]
+  - @modern-js/runtime-core@1.1.3
+
+## 1.1.3
 
 ### Patch Changes
 
-- Updated dependencies [d73ff455]
-- Updated dependencies [d73ff455]
-- Updated dependencies [d73ff455]
-- Updated dependencies [d73ff455]
-- Updated dependencies [d73ff455]
-  - @modern-js/core@1.1.4-rc.0
-  - @modern-js/runtime-core@1.1.2-rc.0
+- 4406c2db: fix: avoid fetching data again when ssr succeeds
+- Updated dependencies [90eeb72c]
+- Updated dependencies [e04914ce]
+- Updated dependencies [4406c2db]
+- Updated dependencies [5a4c557e]
+- Updated dependencies [e04914ce]
+- Updated dependencies [ecb344dc]
+  - @modern-js/core@1.2.0
+  - @modern-js/runtime-core@1.1.2
 
 ## 1.1.2
 

package/dist/js/modern/runtime/index.js

@@ -1,6 +1,4 @@
-// eslint-disable-next-line filenames/match-exported
-import statePlugin from "./plugin";
 export * from '@modern-js-reduck/react';
 export { model, createStore } from '@modern-js-reduck/store';
-export * from "./plugin";
-export default statePlugin;
+export { default } from "./plugin";
+export * from "./plugin";

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

@@ -9,21 +9,25 @@ import { useContext } from 'react';
 import { createPlugin, RuntimeReactContext } from '@modern-js/runtime-core';
 import { createStore } from '@modern-js-reduck/store';
 import { Provider } from '@modern-js-reduck/react';
+import hoistNonReactStatics from 'hoist-non-react-statics';
 import { jsx as _jsx } from "react/jsx-runtime";
 
 const state = config => createPlugin(() => ({
   hoc({
     App
   }, next) {
+    const getStateApp = props => {
+      // eslint-disable-next-line react-hooks/rules-of-hooks
+      const context = useContext(RuntimeReactContext);
+      return /*#__PURE__*/_jsx(Provider, {
+        store: context.store,
+        config: config,
+        children: /*#__PURE__*/_jsx(App, _objectSpread({}, props))
+      });
+    };
+
     return next({
-      App: props => {
-        const context = useContext(RuntimeReactContext);
-        return /*#__PURE__*/_jsx(Provider, {
-          store: context.store,
-          config: config,
-          children: /*#__PURE__*/_jsx(App, _objectSpread({}, props))
-        });
-      }
+      App: hoistNonReactStatics(getStateApp, App)
     });
   },
 

package/dist/js/node/runtime/index.js

@@ -13,7 +13,12 @@ Object.defineProperty(exports, "createStore", {
     return _store.createStore;
   }
 });
-exports.default = void 0;
+Object.defineProperty(exports, "default", {
+  enumerable: true,
+  get: function () {
+    return _plugin.default;
+  }
+});
 Object.defineProperty(exports, "model", {
   enumerable: true,
   get: function () {
@@ -21,40 +26,36 @@ Object.defineProperty(exports, "model", {
   }
 });
 
-var _plugin = _interopRequireWildcard(require("./plugin"));
+var _react = require("@modern-js-reduck/react");
 
-Object.keys(_plugin).forEach(function (key) {
+Object.keys(_react).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _plugin[key]) return;
+  if (key in exports && exports[key] === _react[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
     get: function () {
-      return _plugin[key];
+      return _react[key];
     }
   });
 });
 
-var _react = require("@modern-js-reduck/react");
+var _store = require("@modern-js-reduck/store");
 
-Object.keys(_react).forEach(function (key) {
+var _plugin = _interopRequireWildcard(require("./plugin"));
+
+Object.keys(_plugin).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _react[key]) return;
+  if (key in exports && exports[key] === _plugin[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
     get: function () {
-      return _react[key];
+      return _plugin[key];
     }
   });
 });
 
-var _store = require("@modern-js-reduck/store");
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
-// eslint-disable-next-line filenames/match-exported
-var _default = _plugin.default;
-exports.default = _default;
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }

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

@@ -14,6 +14,8 @@ var _store = require("@modern-js-reduck/store");
 
 var _react2 = require("@modern-js-reduck/react");
 
+var _hoistNonReactStatics = _interopRequireDefault(require("hoist-non-react-statics"));
+
 var _jsxRuntime = require("react/jsx-runtime");
 
 var _plugins = require("../plugins");
@@ -30,6 +32,8 @@ Object.keys(_plugins).forEach(function (key) {
   });
 });
 
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -40,15 +44,18 @@ const state = config => (0, _runtimeCore.createPlugin)(() => ({
   hoc({
     App
   }, next) {
+    const getStateApp = props => {
+      // eslint-disable-next-line react-hooks/rules-of-hooks
+      const context = (0, _react.useContext)(_runtimeCore.RuntimeReactContext);
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_react2.Provider, {
+        store: context.store,
+        config: config,
+        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(App, _objectSpread({}, props))
+      });
+    };
+
     return next({
-      App: props => {
-        const context = (0, _react.useContext)(_runtimeCore.RuntimeReactContext);
-        return /*#__PURE__*/(0, _jsxRuntime.jsx)(_react2.Provider, {
-          store: context.store,
-          config: config,
-          children: /*#__PURE__*/(0, _jsxRuntime.jsx)(App, _objectSpread({}, props))
-        });
-      }
+      App: (0, _hoistNonReactStatics.default)(getStateApp, App)
     });
   },
 

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

@@ -1,6 +1,4 @@
-// eslint-disable-next-line filenames/match-exported
-import statePlugin from "./plugin";
 export * from '@modern-js-reduck/react';
 export { model, createStore } from '@modern-js-reduck/store';
-export * from "./plugin";
-export default statePlugin;
+export { default } from "./plugin";
+export * from "./plugin";

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

@@ -9,22 +9,27 @@ import { useContext } from 'react';
 import { createPlugin, RuntimeReactContext } from '@modern-js/runtime-core';
 import { createStore } from '@modern-js-reduck/store';
 import { Provider } from '@modern-js-reduck/react';
+import hoistNonReactStatics from 'hoist-non-react-statics';
 import { jsx as _jsx } from "react/jsx-runtime";
 
 var state = function state(config) {
   return createPlugin(function () {
     return {
       hoc: function hoc(_ref, next) {
-        var _App = _ref.App;
+        var App = _ref.App;
+
+        var getStateApp = function getStateApp(props) {
+          // eslint-disable-next-line react-hooks/rules-of-hooks
+          var context = useContext(RuntimeReactContext);
+          return /*#__PURE__*/_jsx(Provider, {
+            store: context.store,
+            config: config,
+            children: /*#__PURE__*/_jsx(App, _objectSpread({}, props))
+          });
+        };
+
         return next({
-          App: function App(props) {
-            var context = useContext(RuntimeReactContext);
-            return /*#__PURE__*/_jsx(Provider, {
-              store: context.store,
-              config: config,
-              children: /*#__PURE__*/_jsx(_App, _objectSpread({}, props))
-            });
-          }
+          App: hoistNonReactStatics(getStateApp, App)
         });
       },
       init: function init(_ref2, next) {

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

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

package/dist/types/runtime/plugin.d.ts

@@ -7,36 +7,30 @@ declare module '@modern-js/runtime-core' {
   interface TRuntimeContext {
     store: Store;
   }
-}
-declare global {
-  interface Window {
-    _SSR_DATA?: {
-      data: {
-        storeState: any;
-      };
-    };
+  interface SSRData {
+    storeState: any;
   }
 }
 declare type PluginProps = Parameters<typeof createStore>[0];
-declare const state: (config: PluginProps) => import("@modern-js/plugin").Plugin<Partial<import("@modern-js/runtime-core").Progresses2Threads<{
+declare const state: (config: PluginProps) => import("@modern-js/core").Plugin<Partial<import("@modern-js/runtime-core").Progresses2Threads<{
   hoc: import("@modern-js/runtime-core").Pipeline<{
     App: import("react").ComponentType<any>;
   }, import("react").ComponentType<any>>;
   provide: import("@modern-js/runtime-core").Pipeline<{
     element: JSX.Element;
-    props: import("@modern-js/runtime-core/dist/types/plugin").AppProps;
-    context: import("@modern-js/runtime-core").RuntimeContext;
+    readonly props: import("@modern-js/runtime-core/src/plugin").AppProps;
+    readonly context: import("@modern-js/runtime-core").RuntimeContext;
   }, JSX.Element>;
   client: import("@modern-js/runtime-core").AsyncPipeline<{
     App: import("react").ComponentType<any>;
-    context?: import("@modern-js/runtime-core").RuntimeContext | undefined;
+    readonly context?: import("@modern-js/runtime-core").RuntimeContext | undefined;
     rootElement: HTMLElement;
   }, void>;
   server: import("@modern-js/runtime-core").AsyncPipeline<{
     App: import("react").ComponentType<any>;
-    context?: import("@modern-js/runtime-core").RuntimeContext | undefined;
+    readonly context?: import("@modern-js/runtime-core").RuntimeContext | undefined;
   }, string>;
-  init: import("@modern-js/runtime-core").Pipeline<{
+  init: import("@modern-js/runtime-core").AsyncPipeline<{
     context: import("@modern-js/runtime-core").RuntimeContext;
   }, unknown>;
   pickContext: import("@modern-js/runtime-core").Pipeline<{

package/jest.config.js

@@ -0,0 +1,8 @@
+const sharedConfig = require('@scripts/jest-config');
+
+/** @type {import('@jest/types').Config.InitialOptions} */
+module.exports = {
+  // eslint-disable-next-line node/no-unsupported-features/es-syntax
+  ...sharedConfig,
+  rootDir: __dirname,
+};

package/package.json

@@ -11,8 +11,8 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.1.3-rc.0",
-  "jsnext:source": "./src/index.ts",
+  "version": "1.2.0",
+  "jsnext:source": "./src/runtime/index.tsx",
   "types": "./dist/types/runtime/index.d.ts",
   "main": "./dist/js/node/runtime/index.js",
   "module": "./dist/js/treeshaking/runtime/index.js",
@@ -20,13 +20,18 @@
   "exports": {
     ".": {
       "node": {
+        "jsnext:source": "./src/runtime/index.tsx",
         "import": "./dist/js/modern/runtime/index.js",
         "require": "./dist/js/node/runtime/index.js"
       },
       "default": "./dist/js/treeshaking/runtime/index.js"
     },
-    "./cli": "./dist/js/node/cli/index.js",
+    "./cli": {
+      "jsnext:source": "./src/cli/index.ts",
+      "default": "./dist/js/node/cli/index.js"
+    },
     "./plugins": {
+      "jsnext:source": "./src/plugins.ts",
       "node": {
         "import": "./dist/js/node/plugins.js",
         "require": "./dist/js/node/plugins.js"
@@ -53,37 +58,41 @@
     "@modern-js-reduck/react": "^1.0.0",
     "@modern-js-reduck/store": "^1.0.0",
     "@types/redux-logger": "^3.0.9",
-    "redux-logger": "^3.0.6"
+    "redux-logger": "^3.0.6",
+    "hoist-non-react-statics": "^3.3.2"
   },
   "devDependencies": {
-    "@modern-js/core": "^1.1.4-rc.0",
-    "@modern-js/plugin": "^1.1.2",
-    "@modern-js/runtime-core": "^1.1.2-rc.0",
-    "@modern-js/utils": "^1.1.4-rc.0",
+    "@modern-js/core": "^1.3.0",
+    "@modern-js/plugin": "^1.2.0",
+    "@modern-js/runtime-core": "^1.2.0",
+    "@modern-js/utils": "^1.2.0",
+    "@types/hoist-non-react-statics": "^3.3.1",
     "@types/jest": "^26",
     "@types/node": "^14",
     "@types/react": "^17",
     "@types/react-dom": "^17",
     "react": "^17.0.2",
     "typescript": "^4",
-    "@modern-js/plugin-testing": "^1.1.1",
-    "@modern-js/module-tools": "^1.1.1"
+    "@scripts/build": "0.0.0",
+    "jest": "^27",
+    "@scripts/jest-config": "0.0.0"
   },
   "sideEffects": false,
   "peerDependencies": {
-    "@modern-js/core": "^1.1.4-rc.0",
-    "@modern-js/runtime-core": "^1.1.2-rc.0",
+    "@modern-js/core": "^1.3.0",
+    "@modern-js/runtime-core": "^1.2.0",
     "react": "^17.0.2"
   },
   "modernConfig": {},
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
-    "access": "public"
+    "access": "public",
+    "types": "./dist/types/runtime/index.d.ts"
   },
   "scripts": {
     "new": "modern new",
     "build": "modern build",
-    "test": "modern test --passWithNoTests"
+    "test": "jest --passWithNoTests"
   },
   "readme": "\n<p align=\"center\">\n  <a href=\"https://modernjs.dev\" target=\"blank\"><img src=\"https://lf3-static.bytednsdoc.com/obj/eden-cn/ylaelkeh7nuhfnuhf/modernjs-cover.png\" width=\"300\" alt=\"Modern.js Logo\" /></a>\n</p>\n<p align=\"center\">\n现代 Web 工程体系\n  <br/>\n  <a href=\"https://modernjs.dev\" target=\"blank\">\n    modernjs.dev\n  </a>\n</p>\n<p align=\"center\">\n  The meta-framework suite designed from scratch for frontend-focused modern web development\n</p>\n\n# Introduction\n\n> The doc site ([modernjs.dev](https://modernjs.dev)) and articles are only available in Chinese for now, we are planning to add English versions soon.\n\n- [Modern.js: Hello, World!](https://zhuanlan.zhihu.com/p/426707646)\n\n## Getting Started\n\n- [Quick Start](https://modernjs.dev/docs/start)\n- [Guides](https://modernjs.dev/docs/guides)\n- [API References](https://modernjs.dev/docs/apis)\n\n## Contributing\n\n- [Contributing Guide](https://github.com/modern-js-dev/modern.js/blob/main/CONTRIBUTING.md)\n"
 }

package/src/runtime/index.tsx

@@ -1,9 +1,4 @@
-// eslint-disable-next-line filenames/match-exported
-import statePlugin from './plugin';
-
 export * from '@modern-js-reduck/react';
 export { model, createStore } from '@modern-js-reduck/store';
-
+export { default } from './plugin';
 export * from './plugin';
-
-export default statePlugin;

package/src/runtime/plugin.tsx

@@ -3,6 +3,7 @@ import { useContext } from 'react';
 import { createPlugin, RuntimeReactContext } from '@modern-js/runtime-core';
 import { createStore, Store } from '@modern-js-reduck/store';
 import { Provider } from '@modern-js-reduck/react';
+import hoistNonReactStatics from 'hoist-non-react-statics';
 
 declare module '@modern-js/runtime-core' {
   interface RuntimeContext {
@@ -12,15 +13,9 @@ declare module '@modern-js/runtime-core' {
   interface TRuntimeContext {
     store: Store;
   }
-}
 
-declare global {
-  interface Window {
-    _SSR_DATA?: {
-      data: {
-        storeState: any;
-      };
-    };
+  interface SSRData {
+    storeState: any;
   }
 }
 
@@ -30,16 +25,18 @@ const state = (config: PluginProps) =>
   createPlugin(
     () => ({
       hoc({ App }, next) {
-        return next({
-          App: (props: any) => {
-            const context = useContext(RuntimeReactContext);
+        const getStateApp = (props: any) => {
+          // eslint-disable-next-line react-hooks/rules-of-hooks
+          const context = useContext(RuntimeReactContext);
 
-            return (
-              <Provider store={context.store} config={config}>
-                <App {...props} />
-              </Provider>
-            );
-          },
+          return (
+            <Provider store={context.store} config={config}>
+              <App {...props} />
+            </Provider>
+          );
+        };
+        return next({
+          App: hoistNonReactStatics(getStateApp, App),
         });
       },
       init({ context }, next) {

package/tests/index.test.ts

@@ -0,0 +1,9 @@
+import plugin from '../src/runtime';
+import cliPlugin from '../src/cli';
+
+describe('plugin-state', () => {
+  it('default', () => {
+    expect(plugin).toBeDefined();
+    expect(cliPlugin).toBeDefined();
+  });
+});

package/tsconfig.json

@@ -5,10 +5,7 @@
     "jsx": "preserve",
     "skipLibCheck": true,
     "baseUrl": "./",
-    "paths": {
-      "@/*": ["./src/*"],
-      "@modern-js/plugin": ["node_modules/@modern-js/plugin"]
-    }
+    "paths": {}
   },
   "include": ["src"]
 }