@modern-js/plugin-state 1.2.1 → 1.2.2

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @modern-js/plugin-state
 
+## 1.2.2
+
+### Patch Changes
+
+- 94d02b35: feat(plugin-runtime): convert to new plugin
+- 681a1ff9: feat: remove unnecessary peerDependencies
+- e8bbc315: feat(plugin-state): convert to new plugin
+
 ## 1.2.1
 
 ### Patch Changes

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

@@ -1,62 +1,61 @@
 import path from 'path';
 import { getEntryOptions, createRuntimeExportsUtils, PLUGIN_SCHEMAS } from '@modern-js/utils';
-import { createPlugin, useAppContext, useResolvedConfigContext } from '@modern-js/core';
 import "../types";
 const PLUGIN_IDENTIFIER = 'state';
-const index = createPlugin(() => {
-  const stateConfigMap = new Map();
-  let pluginsExportsUtils;
-  const stateModulePath = path.resolve(__dirname, '../../../../');
-  return {
-    config() {
-      // eslint-disable-next-line react-hooks/rules-of-hooks
-      const appContext = useAppContext();
-      pluginsExportsUtils = createRuntimeExportsUtils(appContext.internalDirectory, 'plugins');
-      return {
-        source: {
-          alias: {
-            '@modern-js/runtime/plugins': pluginsExportsUtils.getPath()
+export default (() => ({
+  name: '@modern-js/plugin-state',
+  required: ['@modern-js/runtime'],
+  setup: api => {
+    const stateConfigMap = new Map();
+    let pluginsExportsUtils;
+    const stateModulePath = path.resolve(__dirname, '../../../../');
+    return {
+      config() {
+        const appContext = api.useAppContext();
+        pluginsExportsUtils = createRuntimeExportsUtils(appContext.internalDirectory, 'plugins');
+        return {
+          source: {
+            alias: {
+              '@modern-js/runtime/plugins': pluginsExportsUtils.getPath()
+            }
           }
-        }
-      };
-    },
-
-    modifyEntryImports({
-      entrypoint,
-      imports
-    }) {
-      var _getEntryOptions;
+        };
+      },
 
-      const {
-        entryName
-      } = entrypoint; // eslint-disable-next-line react-hooks/rules-of-hooks
-
-      const userConfig = useResolvedConfigContext(); // eslint-disable-next-line react-hooks/rules-of-hooks
+      modifyEntryImports({
+        entrypoint,
+        imports
+      }) {
+        var _getEntryOptions;
 
-      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 {
+          entryName
+        } = entrypoint;
+        const userConfig = api.useResolvedConfigContext();
+        const {
+          packageName
+        } = api.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 = () => {
-        const internalPlugins = ['immer', 'effects', 'autoActions', 'devtools'];
-        return internalPlugins.filter(name => stateConfig[name] !== false);
-      };
+        const getEnabledPlugins = () => {
+          const internalPlugins = ['immer', 'effects', 'autoActions', 'devtools'];
+          return internalPlugins.filter(name => stateConfig[name] !== false);
+        };
 
-      if (stateConfig) {
-        imports.push({
-          value: '@modern-js/runtime/plugins',
-          specifiers: [{
-            imported: PLUGIN_IDENTIFIER
-          }]
-        });
-        imports.push({
-          value: '@modern-js/runtime/model',
-          specifiers: getEnabledPlugins().map(imported => ({
-            imported
-          })),
-          initialize: `
+        if (stateConfig) {
+          imports.push({
+            value: '@modern-js/runtime/plugins',
+            specifiers: [{
+              imported: PLUGIN_IDENTIFIER
+            }]
+          });
+          imports.push({
+            value: '@modern-js/runtime/model',
+            specifiers: getEnabledPlugins().map(imported => ({
+              imported
+            })),
+            initialize: `
                 const createStatePlugins = (config) => {
                   const plugins = [];
 
@@ -67,48 +66,45 @@ const index = createPlugin(() => {
                   return plugins;
                 }
               `
-        });
-      }
-
-      return {
-        entrypoint,
-        imports
-      };
-    },
+          });
+        }
 
-    modifyEntryRuntimePlugins({
-      entrypoint,
-      plugins
-    }) {
-      const stateOptions = stateConfigMap.get(entrypoint.entryName);
+        return {
+          entrypoint,
+          imports
+        };
+      },
 
-      if (stateOptions) {
-        const isBoolean = typeof stateOptions === 'boolean';
-        let options = isBoolean ? '{}' : JSON.stringify(stateOptions);
-        options = `${options.substr(0, options.length - 1)}${isBoolean ? '' : ','}plugins: createStatePlugins(${JSON.stringify(stateConfigMap.get(entrypoint.entryName))})}`;
-        plugins.push({
-          name: PLUGIN_IDENTIFIER,
-          options
-        });
-      }
-
-      return {
+      modifyEntryRuntimePlugins({
         entrypoint,
         plugins
-      };
-    },
+      }) {
+        const stateOptions = stateConfigMap.get(entrypoint.entryName);
 
-    validateSchema() {
-      return PLUGIN_SCHEMAS['@modern-js/plugin-state'];
-    },
+        if (stateOptions) {
+          const isBoolean = typeof stateOptions === 'boolean';
+          let options = isBoolean ? '{}' : JSON.stringify(stateOptions);
+          options = `${options.substr(0, options.length - 1)}${isBoolean ? '' : ','}plugins: createStatePlugins(${JSON.stringify(stateConfigMap.get(entrypoint.entryName))})}`;
+          plugins.push({
+            name: PLUGIN_IDENTIFIER,
+            options
+          });
+        }
 
-    addRuntimeExports() {
-      pluginsExportsUtils.addExport(`export { default as state } from '${stateModulePath}'`);
-    }
+        return {
+          entrypoint,
+          plugins
+        };
+      },
 
-  };
-}, {
-  name: '@modern-js/plugin-state',
-  required: ['@modern-js/runtime']
-});
-export default index;
+      validateSchema() {
+        return PLUGIN_SCHEMAS['@modern-js/plugin-state'];
+      },
+
+      addRuntimeExports() {
+        pluginsExportsUtils.addExport(`export { default as state } from '${stateModulePath}'`);
+      }
+
+    };
+  }
+}));

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

@@ -6,62 +6,65 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 // eslint-disable-next-line filenames/match-exported
 import { useContext } from 'react';
-import { createPlugin, RuntimeReactContext } from '@modern-js/runtime-core';
+import { 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))
-      });
-    };
+const state = config => ({
+  name: '@modern-js/plugin-state',
+  setup: () => {
+    return {
+      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: hoistNonReactStatics(getStateApp, App)
-    });
-  },
+        return next({
+          App: hoistNonReactStatics(getStateApp, App)
+        });
+      },
 
-  init({
-    context
-  }, next) {
-    const storeConfig = config || {};
+      init({
+        context
+      }, next) {
+        const storeConfig = config || {};
 
-    if (typeof window !== 'undefined') {
-      var _window, _window$_SSR_DATA, _window$_SSR_DATA$dat;
+        if (typeof window !== 'undefined') {
+          var _window, _window$_SSR_DATA, _window$_SSR_DATA$dat;
 
-      storeConfig.initialState = storeConfig.initialState || ((_window = window) === null || _window === void 0 ? void 0 : (_window$_SSR_DATA = _window._SSR_DATA) === null || _window$_SSR_DATA === void 0 ? void 0 : (_window$_SSR_DATA$dat = _window$_SSR_DATA.data) === null || _window$_SSR_DATA$dat === void 0 ? void 0 : _window$_SSR_DATA$dat.storeState) || {};
-    }
+          storeConfig.initialState = storeConfig.initialState || ((_window = window) === null || _window === void 0 ? void 0 : (_window$_SSR_DATA = _window._SSR_DATA) === null || _window$_SSR_DATA === void 0 ? void 0 : (_window$_SSR_DATA$dat = _window$_SSR_DATA.data) === null || _window$_SSR_DATA$dat === void 0 ? void 0 : _window$_SSR_DATA$dat.storeState) || {};
+        }
 
-    context.store = createStore(storeConfig);
-    next({
-      context
-    });
-  },
+        context.store = createStore(storeConfig);
+        next({
+          context
+        });
+      },
 
-  pickContext({
-    context,
-    pickedContext
-  }, next) {
-    return next({
-      context,
-      pickedContext: _objectSpread(_objectSpread({}, pickedContext), {}, {
-        store: context.store
-      })
-    });
-  }
+      pickContext({
+        context,
+        pickedContext
+      }, next) {
+        return next({
+          context,
+          pickedContext: _objectSpread(_objectSpread({}, pickedContext), {}, {
+            store: context.store
+          })
+        });
+      }
 
-}), {
-  name: '@modern-js/plugin-state'
+    };
+  }
 });
 
 export default state;

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

@@ -9,69 +9,68 @@ var _path = _interopRequireDefault(require("path"));
 
 var _utils = require("@modern-js/utils");
 
-var _core = require("@modern-js/core");
-
 require("../types");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 const PLUGIN_IDENTIFIER = 'state';
-const index = (0, _core.createPlugin)(() => {
-  const stateConfigMap = new Map();
-  let pluginsExportsUtils;
-
-  const stateModulePath = _path.default.resolve(__dirname, '../../../../');
-
-  return {
-    config() {
-      // eslint-disable-next-line react-hooks/rules-of-hooks
-      const appContext = (0, _core.useAppContext)();
-      pluginsExportsUtils = (0, _utils.createRuntimeExportsUtils)(appContext.internalDirectory, 'plugins');
-      return {
-        source: {
-          alias: {
-            '@modern-js/runtime/plugins': pluginsExportsUtils.getPath()
+
+var _default = () => ({
+  name: '@modern-js/plugin-state',
+  required: ['@modern-js/runtime'],
+  setup: api => {
+    const stateConfigMap = new Map();
+    let pluginsExportsUtils;
+
+    const stateModulePath = _path.default.resolve(__dirname, '../../../../');
+
+    return {
+      config() {
+        const appContext = api.useAppContext();
+        pluginsExportsUtils = (0, _utils.createRuntimeExportsUtils)(appContext.internalDirectory, 'plugins');
+        return {
+          source: {
+            alias: {
+              '@modern-js/runtime/plugins': pluginsExportsUtils.getPath()
+            }
           }
-        }
-      };
-    },
-
-    modifyEntryImports({
-      entrypoint,
-      imports
-    }) {
-      var _getEntryOptions;
-
-      const {
-        entryName
-      } = entrypoint; // eslint-disable-next-line react-hooks/rules-of-hooks
-
-      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 = () => {
-        const internalPlugins = ['immer', 'effects', 'autoActions', 'devtools'];
-        return internalPlugins.filter(name => stateConfig[name] !== false);
-      };
-
-      if (stateConfig) {
-        imports.push({
-          value: '@modern-js/runtime/plugins',
-          specifiers: [{
-            imported: PLUGIN_IDENTIFIER
-          }]
-        });
-        imports.push({
-          value: '@modern-js/runtime/model',
-          specifiers: getEnabledPlugins().map(imported => ({
-            imported
-          })),
-          initialize: `
+        };
+      },
+
+      modifyEntryImports({
+        entrypoint,
+        imports
+      }) {
+        var _getEntryOptions;
+
+        const {
+          entryName
+        } = entrypoint;
+        const userConfig = api.useResolvedConfigContext();
+        const {
+          packageName
+        } = api.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 = () => {
+          const internalPlugins = ['immer', 'effects', 'autoActions', 'devtools'];
+          return internalPlugins.filter(name => stateConfig[name] !== false);
+        };
+
+        if (stateConfig) {
+          imports.push({
+            value: '@modern-js/runtime/plugins',
+            specifiers: [{
+              imported: PLUGIN_IDENTIFIER
+            }]
+          });
+          imports.push({
+            value: '@modern-js/runtime/model',
+            specifiers: getEnabledPlugins().map(imported => ({
+              imported
+            })),
+            initialize: `
                 const createStatePlugins = (config) => {
                   const plugins = [];
 
@@ -82,49 +81,47 @@ const index = (0, _core.createPlugin)(() => {
                   return plugins;
                 }
               `
-        });
-      }
+          });
+        }
 
-      return {
-        entrypoint,
-        imports
-      };
-    },
-
-    modifyEntryRuntimePlugins({
-      entrypoint,
-      plugins
-    }) {
-      const stateOptions = stateConfigMap.get(entrypoint.entryName);
-
-      if (stateOptions) {
-        const isBoolean = typeof stateOptions === 'boolean';
-        let options = isBoolean ? '{}' : JSON.stringify(stateOptions);
-        options = `${options.substr(0, options.length - 1)}${isBoolean ? '' : ','}plugins: createStatePlugins(${JSON.stringify(stateConfigMap.get(entrypoint.entryName))})}`;
-        plugins.push({
-          name: PLUGIN_IDENTIFIER,
-          options
-        });
-      }
+        return {
+          entrypoint,
+          imports
+        };
+      },
 
-      return {
+      modifyEntryRuntimePlugins({
         entrypoint,
         plugins
-      };
-    },
+      }) {
+        const stateOptions = stateConfigMap.get(entrypoint.entryName);
+
+        if (stateOptions) {
+          const isBoolean = typeof stateOptions === 'boolean';
+          let options = isBoolean ? '{}' : JSON.stringify(stateOptions);
+          options = `${options.substr(0, options.length - 1)}${isBoolean ? '' : ','}plugins: createStatePlugins(${JSON.stringify(stateConfigMap.get(entrypoint.entryName))})}`;
+          plugins.push({
+            name: PLUGIN_IDENTIFIER,
+            options
+          });
+        }
 
-    validateSchema() {
-      return _utils.PLUGIN_SCHEMAS['@modern-js/plugin-state'];
-    },
+        return {
+          entrypoint,
+          plugins
+        };
+      },
 
-    addRuntimeExports() {
-      pluginsExportsUtils.addExport(`export { default as state } from '${stateModulePath}'`);
-    }
+      validateSchema() {
+        return _utils.PLUGIN_SCHEMAS['@modern-js/plugin-state'];
+      },
 
-  };
-}, {
-  name: '@modern-js/plugin-state',
-  required: ['@modern-js/runtime']
+      addRuntimeExports() {
+        pluginsExportsUtils.addExport(`export { default as state } from '${stateModulePath}'`);
+      }
+
+    };
+  }
 });
-var _default = index;
+
 exports.default = _default;

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

@@ -40,56 +40,59 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 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; }
 
-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: (0, _hoistNonReactStatics.default)(getStateApp, App)
-    });
-  },
-
-  init({
-    context
-  }, next) {
-    const storeConfig = config || {};
-
-    if (typeof window !== 'undefined') {
-      var _window, _window$_SSR_DATA, _window$_SSR_DATA$dat;
+const state = config => ({
+  name: '@modern-js/plugin-state',
+  setup: () => {
+    return {
+      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: (0, _hoistNonReactStatics.default)(getStateApp, App)
+        });
+      },
+
+      init({
+        context
+      }, next) {
+        const storeConfig = config || {};
+
+        if (typeof window !== 'undefined') {
+          var _window, _window$_SSR_DATA, _window$_SSR_DATA$dat;
+
+          storeConfig.initialState = storeConfig.initialState || ((_window = window) === null || _window === void 0 ? void 0 : (_window$_SSR_DATA = _window._SSR_DATA) === null || _window$_SSR_DATA === void 0 ? void 0 : (_window$_SSR_DATA$dat = _window$_SSR_DATA.data) === null || _window$_SSR_DATA$dat === void 0 ? void 0 : _window$_SSR_DATA$dat.storeState) || {};
+        }
+
+        context.store = (0, _store.createStore)(storeConfig);
+        next({
+          context
+        });
+      },
+
+      pickContext({
+        context,
+        pickedContext
+      }, next) {
+        return next({
+          context,
+          pickedContext: _objectSpread(_objectSpread({}, pickedContext), {}, {
+            store: context.store
+          })
+        });
+      }
 
-      storeConfig.initialState = storeConfig.initialState || ((_window = window) === null || _window === void 0 ? void 0 : (_window$_SSR_DATA = _window._SSR_DATA) === null || _window$_SSR_DATA === void 0 ? void 0 : (_window$_SSR_DATA$dat = _window$_SSR_DATA.data) === null || _window$_SSR_DATA$dat === void 0 ? void 0 : _window$_SSR_DATA$dat.storeState) || {};
-    }
-
-    context.store = (0, _store.createStore)(storeConfig);
-    next({
-      context
-    });
-  },
-
-  pickContext({
-    context,
-    pickedContext
-  }, next) {
-    return next({
-      context,
-      pickedContext: _objectSpread(_objectSpread({}, pickedContext), {}, {
-        store: context.store
-      })
-    });
+    };
   }
-
-}), {
-  name: '@modern-js/plugin-state'
 });
 
 var _default = state;

package/dist/js/treeshaking/cli/index.js

@@ -1,101 +1,100 @@
 import path from 'path';
 import { getEntryOptions, createRuntimeExportsUtils, PLUGIN_SCHEMAS } from '@modern-js/utils';
-import { createPlugin, useAppContext, useResolvedConfigContext } from '@modern-js/core';
 import "../types";
 var PLUGIN_IDENTIFIER = 'state';
-var index = createPlugin(function () {
-  var stateConfigMap = new Map();
-  var pluginsExportsUtils;
-  var stateModulePath = path.resolve(__dirname, '../../../../');
+export default (function () {
   return {
-    config: function config() {
-      // eslint-disable-next-line react-hooks/rules-of-hooks
-      var appContext = useAppContext();
-      pluginsExportsUtils = createRuntimeExportsUtils(appContext.internalDirectory, 'plugins');
+    name: '@modern-js/plugin-state',
+    required: ['@modern-js/runtime'],
+    setup: function setup(api) {
+      var stateConfigMap = new Map();
+      var pluginsExportsUtils;
+      var stateModulePath = path.resolve(__dirname, '../../../../');
       return {
-        source: {
-          alias: {
-            '@modern-js/runtime/plugins': pluginsExportsUtils.getPath()
-          }
-        }
-      };
-    },
-    modifyEntryImports: function modifyEntryImports(_ref) {
-      var _getEntryOptions;
+        config: function config() {
+          var appContext = api.useAppContext();
+          pluginsExportsUtils = createRuntimeExportsUtils(appContext.internalDirectory, 'plugins');
+          return {
+            source: {
+              alias: {
+                '@modern-js/runtime/plugins': pluginsExportsUtils.getPath()
+              }
+            }
+          };
+        },
+        modifyEntryImports: function modifyEntryImports(_ref) {
+          var _getEntryOptions;
 
-      var entrypoint = _ref.entrypoint,
-          imports = _ref.imports;
-      var entryName = entrypoint.entryName; // eslint-disable-next-line react-hooks/rules-of-hooks
+          var entrypoint = _ref.entrypoint,
+              imports = _ref.imports;
+          var entryName = entrypoint.entryName;
+          var userConfig = api.useResolvedConfigContext();
 
-      var userConfig = useResolvedConfigContext(); // eslint-disable-next-line react-hooks/rules-of-hooks
+          var _api$useAppContext = api.useAppContext(),
+              packageName = _api$useAppContext.packageName;
 
-      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 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() {
+            var internalPlugins = ['immer', 'effects', 'autoActions', 'devtools'];
+            return internalPlugins.filter(function (name) {
+              return stateConfig[name] !== false;
+            });
+          };
 
-      var getEnabledPlugins = function getEnabledPlugins() {
-        var internalPlugins = ['immer', 'effects', 'autoActions', 'devtools'];
-        return internalPlugins.filter(function (name) {
-          return stateConfig[name] !== false;
-        });
-      };
+          if (stateConfig) {
+            imports.push({
+              value: '@modern-js/runtime/plugins',
+              specifiers: [{
+                imported: PLUGIN_IDENTIFIER
+              }]
+            });
+            imports.push({
+              value: '@modern-js/runtime/model',
+              specifiers: getEnabledPlugins().map(function (imported) {
+                return {
+                  imported: imported
+                };
+              }),
+              initialize: "\n                const createStatePlugins = (config) => {\n                  const plugins = [];\n\n                  ".concat(getEnabledPlugins().map(function (name) {
+                return "\n                      plugins.push(".concat(name, "(config['").concat(name, "']));\n                      ");
+              }).join('\n'), "\n\n                  return plugins;\n                }\n              ")
+            });
+          }
 
-      if (stateConfig) {
-        imports.push({
-          value: '@modern-js/runtime/plugins',
-          specifiers: [{
-            imported: PLUGIN_IDENTIFIER
-          }]
-        });
-        imports.push({
-          value: '@modern-js/runtime/model',
-          specifiers: getEnabledPlugins().map(function (imported) {
-            return {
-              imported: imported
-            };
-          }),
-          initialize: "\n                const createStatePlugins = (config) => {\n                  const plugins = [];\n\n                  ".concat(getEnabledPlugins().map(function (name) {
-            return "\n                      plugins.push(".concat(name, "(config['").concat(name, "']));\n                      ");
-          }).join('\n'), "\n\n                  return plugins;\n                }\n              ")
-        });
-      }
+          return {
+            entrypoint: entrypoint,
+            imports: imports
+          };
+        },
+        modifyEntryRuntimePlugins: function modifyEntryRuntimePlugins(_ref2) {
+          var entrypoint = _ref2.entrypoint,
+              plugins = _ref2.plugins;
+          var stateOptions = stateConfigMap.get(entrypoint.entryName);
 
-      return {
-        entrypoint: entrypoint,
-        imports: imports
-      };
-    },
-    modifyEntryRuntimePlugins: function modifyEntryRuntimePlugins(_ref2) {
-      var entrypoint = _ref2.entrypoint,
-          plugins = _ref2.plugins;
-      var stateOptions = stateConfigMap.get(entrypoint.entryName);
-
-      if (stateOptions) {
-        var isBoolean = typeof stateOptions === 'boolean';
-        var options = isBoolean ? '{}' : JSON.stringify(stateOptions);
-        options = "".concat(options.substr(0, options.length - 1)).concat(isBoolean ? '' : ',', "plugins: createStatePlugins(").concat(JSON.stringify(stateConfigMap.get(entrypoint.entryName)), ")}");
-        plugins.push({
-          name: PLUGIN_IDENTIFIER,
-          options: options
-        });
-      }
+          if (stateOptions) {
+            var isBoolean = typeof stateOptions === 'boolean';
+            var options = isBoolean ? '{}' : JSON.stringify(stateOptions);
+            options = "".concat(options.substr(0, options.length - 1)).concat(isBoolean ? '' : ',', "plugins: createStatePlugins(").concat(JSON.stringify(stateConfigMap.get(entrypoint.entryName)), ")}");
+            plugins.push({
+              name: PLUGIN_IDENTIFIER,
+              options: options
+            });
+          }
 
-      return {
-        entrypoint: entrypoint,
-        plugins: plugins
+          return {
+            entrypoint: entrypoint,
+            plugins: plugins
+          };
+        },
+        validateSchema: function validateSchema() {
+          return PLUGIN_SCHEMAS['@modern-js/plugin-state'];
+        },
+        addRuntimeExports: function addRuntimeExports() {
+          pluginsExportsUtils.addExport("export { default as state } from '".concat(stateModulePath, "'"));
+        }
       };
-    },
-    validateSchema: function validateSchema() {
-      return PLUGIN_SCHEMAS['@modern-js/plugin-state'];
-    },
-    addRuntimeExports: function addRuntimeExports() {
-      pluginsExportsUtils.addExport("export { default as state } from '".concat(stateModulePath, "'"));
     }
   };
-}, {
-  name: '@modern-js/plugin-state',
-  required: ['@modern-js/runtime']
-});
-export default index;
+});

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

@@ -6,61 +6,62 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 // eslint-disable-next-line filenames/match-exported
 import { useContext } from 'react';
-import { createPlugin, RuntimeReactContext } from '@modern-js/runtime-core';
+import { 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;
+  return {
+    name: '@modern-js/plugin-state',
+    setup: function setup() {
+      return {
+        hoc: function hoc(_ref, next) {
+          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))
+          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: hoistNonReactStatics(getStateApp, App)
           });
-        };
+        },
+        init: function init(_ref2, next) {
+          var context = _ref2.context;
+          var storeConfig = config || {};
 
-        return next({
-          App: hoistNonReactStatics(getStateApp, App)
-        });
-      },
-      init: function init(_ref2, next) {
-        var context = _ref2.context;
-        var storeConfig = config || {};
+          if (typeof window !== 'undefined') {
+            var _window, _window$_SSR_DATA, _window$_SSR_DATA$dat;
 
-        if (typeof window !== 'undefined') {
-          var _window, _window$_SSR_DATA, _window$_SSR_DATA$dat;
+            storeConfig.initialState = storeConfig.initialState || ((_window = window) === null || _window === void 0 ? void 0 : (_window$_SSR_DATA = _window._SSR_DATA) === null || _window$_SSR_DATA === void 0 ? void 0 : (_window$_SSR_DATA$dat = _window$_SSR_DATA.data) === null || _window$_SSR_DATA$dat === void 0 ? void 0 : _window$_SSR_DATA$dat.storeState) || {};
+          }
 
-          storeConfig.initialState = storeConfig.initialState || ((_window = window) === null || _window === void 0 ? void 0 : (_window$_SSR_DATA = _window._SSR_DATA) === null || _window$_SSR_DATA === void 0 ? void 0 : (_window$_SSR_DATA$dat = _window$_SSR_DATA.data) === null || _window$_SSR_DATA$dat === void 0 ? void 0 : _window$_SSR_DATA$dat.storeState) || {};
+          context.store = createStore(storeConfig);
+          next({
+            context: context
+          });
+        },
+        pickContext: function pickContext(_ref3, next) {
+          var context = _ref3.context,
+              pickedContext = _ref3.pickedContext;
+          return next({
+            context: context,
+            pickedContext: _objectSpread(_objectSpread({}, pickedContext), {}, {
+              store: context.store
+            })
+          });
         }
-
-        context.store = createStore(storeConfig);
-        next({
-          context: context
-        });
-      },
-      pickContext: function pickContext(_ref3, next) {
-        var context = _ref3.context,
-            pickedContext = _ref3.pickedContext;
-        return next({
-          context: context,
-          pickedContext: _objectSpread(_objectSpread({}, pickedContext), {}, {
-            store: context.store
-          })
-        });
-      }
-    };
-  }, {
-    name: '@modern-js/plugin-state'
-  });
+      };
+    }
+  };
 };
 
 export default state;

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

@@ -1,17 +1,5 @@
-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<{
-    program: import("commander").Command;
-  }, void>;
-  watchFiles: import("@modern-js/core").ParallelWorkflow<void, unknown>;
-  fileChange: import("@modern-js/core").AsyncWorkflow<{
-    filename: string;
-  }, void>;
-  beforeExit: import("@modern-js/core").AsyncWorkflow<void, void>;
-} & import("@modern-js/core").ClearDraftProgress<import("@modern-js/core").Hooks>>>>;
-export default index;
+import type { CliPlugin } from '@modern-js/core';
+
+declare const _default: () => CliPlugin;
+
+export default _default;

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

@@ -1,5 +1,5 @@
-/// <reference types="react" />
 import { createStore, Store } from '@modern-js-reduck/store';
+import type { Plugin } from '@modern-js/runtime-core';
 declare module '@modern-js/runtime-core' {
   interface RuntimeContext {
     store: Store;
@@ -12,31 +12,6 @@ declare module '@modern-js/runtime-core' {
   }
 }
 declare type PluginProps = Parameters<typeof createStore>[0];
-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;
-    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>;
-    readonly context?: import("@modern-js/runtime-core").RuntimeContext | undefined;
-    rootElement: HTMLElement;
-  }, void>;
-  server: import("@modern-js/runtime-core").AsyncPipeline<{
-    App: import("react").ComponentType<any>;
-    readonly context?: import("@modern-js/runtime-core").RuntimeContext | undefined;
-  }, string>;
-  init: import("@modern-js/runtime-core").AsyncPipeline<{
-    context: import("@modern-js/runtime-core").RuntimeContext;
-  }, unknown>;
-  pickContext: import("@modern-js/runtime-core").Pipeline<{
-    context: import("@modern-js/runtime-core").RuntimeContext;
-    pickedContext: import("@modern-js/runtime-core").TRuntimeContext;
-  }, import("@modern-js/runtime-core").TRuntimeContext>;
-} & import("@modern-js/runtime-core").ClearDraftProgress<{}>>>>;
+declare const state: (config: PluginProps) => Plugin;
 export default state;
 export * from '../plugins';

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.2.1",
+  "version": "1.2.2",
   "jsnext:source": "./src/runtime/index.tsx",
   "types": "./dist/types/runtime/index.d.ts",
   "main": "./dist/js/node/runtime/index.js",
@@ -46,6 +46,12 @@
       ],
       "plugins": [
         "./dist/types/plugins.d.ts"
+      ],
+      "cli": [
+        "./dist/types/cli/index.d.ts"
+      ],
+      "runtime": [
+        "./dist/types/runtime/index.d.ts"
       ]
     }
   },
@@ -62,10 +68,10 @@
     "hoist-non-react-statics": "^3.3.2"
   },
   "devDependencies": {
-    "@modern-js/core": "^1.3.2",
-    "@modern-js/plugin": "^1.2.1",
-    "@modern-js/runtime-core": "^1.2.1",
-    "@modern-js/utils": "^1.2.2",
+    "@modern-js/core": "^1.6.0",
+    "@modern-js/plugin": "^1.3.2",
+    "@modern-js/runtime-core": "^1.4.0",
+    "@modern-js/utils": "^1.3.6",
     "@types/hoist-non-react-statics": "^3.3.1",
     "@types/jest": "^26",
     "@types/node": "^14",
@@ -79,15 +85,12 @@
   },
   "sideEffects": false,
   "peerDependencies": {
-    "@modern-js/core": "^1.3.2",
-    "@modern-js/runtime-core": "^1.2.1",
     "react": "^17.0.2"
   },
   "modernConfig": {},
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
-    "access": "public",
-    "types": "./dist/types/runtime/index.d.ts"
+    "access": "public"
   },
   "scripts": {
     "new": "modern new",

package/tests/tsconfig.json

@@ -0,0 +1,13 @@
+{
+  "extends": "@modern-js/tsconfig/base",
+  "compilerOptions": {
+    "declaration": true,
+    "jsx": "preserve",
+    "baseUrl": "./",
+    "outDir": "./out",
+    "emitDeclarationOnly": true,
+    "isolatedModules": true,
+    "paths": {},
+    "types": ["node", "jest"]
+  }
+}