@modern-js/plugin-state 1.1.4 → 1.2.2

package/CHANGELOG.md

@@ -1,5 +1,39 @@
 # @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
+
+- 83166714: change .npmignore
+- Updated dependencies [83166714]
+- Updated dependencies [c3de9882]
+- Updated dependencies [33ff48af]
+- Updated dependencies [c74597bd]
+  - @modern-js/core@1.3.2
+  - @modern-js/runtime-core@1.2.1
+
+## 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

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/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

@@ -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/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; }