@modern-js/plugin-state 1.1.1 → 1.1.4-rc.0

package/CHANGELOG.md

@@ -1,5 +1,41 @@
 # @modern-js/plugin-state
 
+## 1.1.4-rc.0
+
+### 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-rc.0
+  - @modern-js/core@1.2.1-rc.0
+
+## 1.1.3
+
+### Patch Changes
+
+- 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
+
+### Patch Changes
+
+- 0fa83663: support more .env files
+- f594fbc8: fix apple icon and favicon support
+- Updated dependencies [6f7fe574]
+- Updated dependencies [0fa83663]
+  - @modern-js/core@1.1.2
+  - @modern-js/runtime-core@1.1.1
+
 ## 1.1.1
 
 ### Patch Changes

package/dist/js/modern/cli/index.js

@@ -31,8 +31,12 @@ const index = createPlugin(() => {
         entryName
       } = entrypoint; // eslint-disable-next-line react-hooks/rules-of-hooks
 
-      const userConfig = useResolvedConfigContext();
-      const stateConfig = (_getEntryOptions = getEntryOptions(entryName, userConfig.runtime, userConfig.runtimeByEntries)) === null || _getEntryOptions === void 0 ? void 0 : _getEntryOptions.state;
+      const userConfig = useResolvedConfigContext(); // eslint-disable-next-line react-hooks/rules-of-hooks
+
+      const {
+        packageName
+      } = useAppContext();
+      const stateConfig = (_getEntryOptions = getEntryOptions(entryName, userConfig.runtime, userConfig.runtimeByEntries, packageName)) === null || _getEntryOptions === void 0 ? void 0 : _getEntryOptions.state;
       stateConfigMap.set(entryName, stateConfig);
 
       const getEnabledPlugins = () => {

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

@@ -1,6 +1,6 @@
-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; }); } keys.push.apply(keys, symbols); } return keys; }
+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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else 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; }
+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; }
 
 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; }
 
@@ -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/modern/types.js

@@ -1,2 +1 @@
-export {};
 export {};

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

@@ -46,8 +46,12 @@ const index = (0, _core.createPlugin)(() => {
         entryName
       } = entrypoint; // eslint-disable-next-line react-hooks/rules-of-hooks
 
-      const userConfig = (0, _core.useResolvedConfigContext)();
-      const stateConfig = (_getEntryOptions = (0, _utils.getEntryOptions)(entryName, userConfig.runtime, userConfig.runtimeByEntries)) === null || _getEntryOptions === void 0 ? void 0 : _getEntryOptions.state;
+      const userConfig = (0, _core.useResolvedConfigContext)(); // eslint-disable-next-line react-hooks/rules-of-hooks
+
+      const {
+        packageName
+      } = (0, _core.useAppContext)();
+      const stateConfig = (_getEntryOptions = (0, _utils.getEntryOptions)(entryName, userConfig.runtime, userConfig.runtimeByEntries, packageName)) === null || _getEntryOptions === void 0 ? void 0 : _getEntryOptions.state;
       stateConfigMap.set(entryName, stateConfig);
 
       const getEnabledPlugins = () => {

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,9 +32,11 @@ Object.keys(_plugins).forEach(function (key) {
   });
 });
 
-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; }); } keys.push.apply(keys, symbols); } return keys; }
+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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else 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; }
+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; }
 
 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; }
 
@@ -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/cli/index.js

@@ -27,8 +27,12 @@ var index = createPlugin(function () {
           imports = _ref.imports;
       var entryName = entrypoint.entryName; // eslint-disable-next-line react-hooks/rules-of-hooks
 
-      var userConfig = useResolvedConfigContext();
-      var stateConfig = (_getEntryOptions = getEntryOptions(entryName, userConfig.runtime, userConfig.runtimeByEntries)) === null || _getEntryOptions === void 0 ? void 0 : _getEntryOptions.state;
+      var userConfig = useResolvedConfigContext(); // eslint-disable-next-line react-hooks/rules-of-hooks
+
+      var _useAppContext = useAppContext(),
+          packageName = _useAppContext.packageName;
+
+      var stateConfig = (_getEntryOptions = getEntryOptions(entryName, userConfig.runtime, userConfig.runtimeByEntries, packageName)) === null || _getEntryOptions === void 0 ? void 0 : _getEntryOptions.state;
       stateConfigMap.set(entryName, stateConfig);
 
       var getEnabledPlugins = function getEnabledPlugins() {

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

@@ -1,6 +1,6 @@
-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; }); } keys.push.apply(keys, symbols); } return keys; }
+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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else 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; }
+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; }
 
 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; }
 
@@ -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/js/treeshaking/types.js

@@ -1,2 +1 @@
-export {};
 export {};

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

@@ -1,5 +1,8 @@
 declare const index: import("@modern-js/core").AsyncPlugin<Partial<import("@modern-js/core").Progresses2Threads<{
   config: import("@modern-js/core").ParallelWorkflow<void, unknown>;
+  resolvedConfig: import("@modern-js/core").AsyncWaterfall<{
+    resolved: import("@modern-js/core").NormalizedConfig;
+  }>;
   validateSchema: import("@modern-js/core").ParallelWorkflow<void, unknown>;
   prepare: import("@modern-js/core").AsyncWorkflow<void, void>;
   commands: import("@modern-js/core").AsyncWorkflow<{

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

@@ -7,14 +7,8 @@ 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];
@@ -36,7 +30,7 @@ declare const state: (config: PluginProps) => import("@modern-js/plugin").Plugin
     App: import("react").ComponentType<any>;
     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/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.1.1",
+  "version": "1.1.4-rc.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/runtime/index.d.ts",
   "main": "./dist/js/node/runtime/index.js",
@@ -53,26 +53,28 @@
     "@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.1",
-    "@modern-js/plugin": "^1.1.1",
-    "@modern-js/runtime-core": "^1.1.0",
-    "@modern-js/utils": "^1.1.1",
+    "@modern-js/core": "^1.2.1-rc.0",
+    "@modern-js/plugin": "^1.1.2",
+    "@modern-js/runtime-core": "^1.1.3-rc.0",
+    "@modern-js/utils": "^1.1.6-rc.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.0",
-    "@modern-js/module-tools": "^1.1.0"
+    "@modern-js/plugin-testing": "^1.2.2",
+    "@modern-js/module-tools": "^1.1.4"
   },
   "sideEffects": false,
   "peerDependencies": {
-    "@modern-js/core": "^1.1.1",
-    "@modern-js/runtime-core": "^1.1.0",
+    "@modern-js/core": "^1.2.1-rc.0",
+    "@modern-js/runtime-core": "^1.1.3-rc.0",
     "react": "^17.0.2"
   },
   "modernConfig": {},
@@ -84,5 +86,6 @@
     "new": "modern new",
     "build": "modern build",
     "test": "modern test --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/cli/index.ts

@@ -42,11 +42,14 @@ const index = createPlugin(
         const { entryName } = entrypoint;
         // eslint-disable-next-line react-hooks/rules-of-hooks
         const userConfig = useResolvedConfigContext();
+        // eslint-disable-next-line react-hooks/rules-of-hooks
+        const { packageName } = useAppContext();
 
         const stateConfig = getEntryOptions(
           entryName,
           userConfig.runtime,
           userConfig.runtimeByEntries,
+          packageName,
         )?.state;
 
         stateConfigMap.set(entryName, stateConfig);

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) {