@modern-js/plugin-state 2.65.5-alpha.2 → 2.67.0

package/dist/cjs/cli/index.js

@@ -23,6 +23,7 @@ __export(cli_exports, {
 });
 module.exports = __toCommonJS(cli_exports);
 var import_utils = require("@modern-js/utils");
+var import_types = require("./types");
 const PLUGIN_IDENTIFIER = "state";
 const statePlugin = () => ({
   name: "@modern-js/plugin-state",

package/dist/cjs/runtime/plugin.js

@@ -19,9 +19,7 @@ var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "defau
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var plugin_exports = {};
 __export(plugin_exports, {
-  Provider: () => import_react.Provider,
   default: () => plugin_default,
-  getStoreConfig: () => getStoreConfig,
   statePlugin: () => statePlugin
 });
 module.exports = __toCommonJS(plugin_exports);
@@ -30,6 +28,7 @@ var import_react = require("@modern-js-reduck/react");
 var import_store = require("@modern-js-reduck/store");
 var import_runtime = require("@modern-js/runtime");
 var import_merge = require("@modern-js/runtime-utils/merge");
+var import_react2 = require("react");
 var import_plugins = require("../plugins");
 __reExport(plugin_exports, require("../plugins"), module.exports);
 const StatePluginHandleMap = {
@@ -63,7 +62,7 @@ const statePlugin = (userConfig = {}) => ({
     return {
       wrapRoot(App) {
         const getStateApp = (props) => {
-          const context = (0, import_runtime.useRuntimeContext)();
+          const context = (0, import_react2.useContext)(import_runtime.RuntimeReactContext);
           return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react.Provider, {
             store: context.store,
             config: storeConfig,
@@ -90,8 +89,6 @@ const statePlugin = (userConfig = {}) => ({
 var plugin_default = statePlugin;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  Provider,
-  getStoreConfig,
   statePlugin,
   ...require("../plugins")
 });

package/dist/esm/cli/index.js

@@ -1,5 +1,6 @@
 import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import { createRuntimeExportsUtils, getEntryOptions } from "@modern-js/utils";
+import "./types";
 var PLUGIN_IDENTIFIER = "state";
 var statePlugin = function() {
   return {

package/dist/esm/runtime/plugin.js

@@ -3,8 +3,9 @@ import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Provider } from "@modern-js-reduck/react";
 import { createStore } from "@modern-js-reduck/store";
-import { isBrowser, useRuntimeContext } from "@modern-js/runtime";
+import { RuntimeReactContext, isBrowser } from "@modern-js/runtime";
 import { merge } from "@modern-js/runtime-utils/merge";
+import { useContext } from "react";
 import { autoActions, devtools, effects, immer } from "../plugins";
 var StatePluginHandleMap = {
   immer,
@@ -60,7 +61,7 @@ var statePlugin = function() {
       return {
         wrapRoot: function wrapRoot(App) {
           var getStateApp = function(props) {
-            var context = useRuntimeContext();
+            var context = useContext(RuntimeReactContext);
             return /* @__PURE__ */ _jsx(Provider, {
               store: context.store,
               config: storeConfig,
@@ -86,8 +87,6 @@ var statePlugin = function() {
 var plugin_default = statePlugin;
 export * from "../plugins";
 export {
-  Provider,
   plugin_default as default,
-  getStoreConfig,
   statePlugin
 };

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

@@ -1,4 +1,5 @@
 import { createRuntimeExportsUtils, getEntryOptions } from "@modern-js/utils";
+import "./types";
 const PLUGIN_IDENTIFIER = "state";
 const statePlugin = () => ({
   name: "@modern-js/plugin-state",

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

@@ -1,8 +1,9 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Provider } from "@modern-js-reduck/react";
 import { createStore } from "@modern-js-reduck/store";
-import { isBrowser, useRuntimeContext } from "@modern-js/runtime";
+import { RuntimeReactContext, isBrowser } from "@modern-js/runtime";
 import { merge } from "@modern-js/runtime-utils/merge";
+import { useContext } from "react";
 import { autoActions, devtools, effects, immer } from "../plugins";
 const StatePluginHandleMap = {
   immer,
@@ -35,7 +36,7 @@ const statePlugin = (userConfig = {}) => ({
     return {
       wrapRoot(App) {
         const getStateApp = (props) => {
-          const context = useRuntimeContext();
+          const context = useContext(RuntimeReactContext);
           return /* @__PURE__ */ _jsx(Provider, {
             store: context.store,
             config: storeConfig,
@@ -62,8 +63,6 @@ const statePlugin = (userConfig = {}) => ({
 var plugin_default = statePlugin;
 export * from "../plugins";
 export {
-  Provider,
   plugin_default as default,
-  getStoreConfig,
   statePlugin
 };

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

@@ -1,3 +1,4 @@
 import type { AppTools, CliPluginFuture } from '@modern-js/app-tools';
+import './types';
 export declare const statePlugin: () => CliPluginFuture<AppTools<"shared">>;
 export default statePlugin;

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

@@ -1,14 +1,11 @@
-import { Provider } from '@modern-js-reduck/react';
-import { type Model, type StoreConfig } from '@modern-js-reduck/store';
+import { type Model } from '@modern-js-reduck/store';
 import type { Plugin } from '@modern-js/runtime';
-export { Provider };
 type StatePluginType = 'immer' | 'effects' | 'autoActions' | 'devtools';
 type StateExtraType = {
     initialState: any;
     models: Array<Model>;
 };
 export type StateConfig = Partial<Record<StatePluginType, boolean> & StateExtraType>;
-export declare const getStoreConfig: (config: StateConfig) => StoreConfig;
 export declare const statePlugin: (userConfig?: StateConfig) => Plugin;
 export default statePlugin;
 export * from '../plugins';

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.65.5-alpha.2",
+  "version": "2.67.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/cli/index.d.ts",
   "main": "./dist/cjs/cli/index.js",
@@ -58,14 +58,14 @@
     "@modern-js-reduck/react": "^1.1.10",
     "@modern-js-reduck/store": "^1.1.10",
     "@swc/helpers": "0.5.13",
-    "@modern-js/types": "2.65.4",
-    "@modern-js/utils": "2.65.4",
-    "@modern-js/runtime-utils": "2.65.4"
+    "@modern-js/types": "2.67.0",
+    "@modern-js/runtime-utils": "2.67.0",
+    "@modern-js/utils": "2.67.0"
   },
   "peerDependencies": {
     "react": ">=17",
     "react-dom": ">=17",
-    "@modern-js/runtime": "^2.65.4"
+    "@modern-js/runtime": "^2.67.0"
   },
   "devDependencies": {
     "@testing-library/react": "^13.4.0",
@@ -78,10 +78,10 @@
     "react-dom": "^18.3.1",
     "ts-jest": "^29.1.0",
     "typescript": "^5",
-    "@modern-js/app-tools": "2.65.4",
-    "@scripts/build": "2.65.4",
-    "@modern-js/runtime": "2.65.4",
-    "@scripts/jest-config": "2.65.4"
+    "@modern-js/app-tools": "2.67.0",
+    "@modern-js/runtime": "2.67.0",
+    "@scripts/build": "2.66.0",
+    "@scripts/jest-config": "2.66.0"
   },
   "sideEffects": false,
   "publishConfig": {

package/types/index.d.ts

@@ -1,9 +1,15 @@
+import type { Store } from '@modern-js-reduck/store';
 import type { StateConfig } from '../dist/types';
 import '@modern-js-reduck/plugin-auto-actions';
 import '@modern-js-reduck/plugin-devtools';
 import '@modern-js-reduck/plugin-effects';
 import '@modern-js-reduck/plugin-immutable';
 
+/**
+ * This type file defines the runtime types for the runtime plugin, which will be referenced in the user's project at `src/modern-app-env.d.ts`.
+ * The CLI type definitions for the runtime plugin are located in cli/types, which are used for type hints in modern.config.ts.
+ * cli/types cannot be defined in this types file because the types from `src/modern-app-env.d.ts` cannot be used in `modern.config.ts`.
+ */
 export { default } from '../dist/types/runtime';
 export * from '../dist/types/runtime';
 
@@ -19,9 +25,8 @@ declare module '@modern-js/runtime' {
   interface RuntimeConfig {
     state?: StateConfig;
   }
-}
-declare module '@modern-js/app-tools' {
-  interface RuntimeUserConfig {
-    state?: StateConfig | boolean;
+
+  interface TRuntimeContext {
+    store?: Store;
   }
 }