@shuvi/platform-web 1.0.4 → 1.0.6

package/esm/shuvi-app/react/AppContainer.jsx

@@ -1,13 +1,14 @@
 import * as React from 'react';
-import { errorModel } from '@shuvi/platform-shared/shared';
+import { errorModel, errorModelName } from '@shuvi/platform-shared/shared';
 import { AppProvider } from './ApplicationContext';
 import ErrorPage from './ErrorPage';
 import { ErrorBoundary } from './ErrorBoundary';
 import { Provider, useSharedModel } from './store';
 function ErrorGuard({ children = null }) {
-    const [errorState] = useSharedModel(errorModel);
-    if (errorState.error !== undefined) {
-        return (<ErrorPage code={errorState.error.code} message={errorState.error.message}/>);
+    var _a, _b;
+    const errorState = useSharedModel(errorModelName, errorModel);
+    if (errorState.hasError) {
+        return (<ErrorPage code={(_a = errorState.error) === null || _a === void 0 ? void 0 : _a.code} message={(_b = errorState.error) === null || _b === void 0 ? void 0 : _b.message}/>);
     }
     return <>{children}</>;
 }

package/esm/shuvi-app/react/model/Wrapper.d.ts

@@ -0,0 +1,8 @@
+/// <reference types="react" />
+import type { Doura } from 'doura';
+export declare const DouraWrapper: (App: any, appContext: {
+    store: Doura;
+}) => {
+    (): JSX.Element;
+    displayName: string;
+};

package/esm/shuvi-app/react/model/Wrapper.jsx

@@ -0,0 +1,11 @@
+import * as React from 'react';
+import { DouraRoot } from 'react-doura';
+export const DouraWrapper = (App, appContext) => {
+    function DouraAppWrapper() {
+        return (<DouraRoot store={appContext.store}>
+        <App />
+      </DouraRoot>);
+    }
+    DouraAppWrapper.displayName = 'DouraAppWrapper';
+    return DouraAppWrapper;
+};

package/esm/shuvi-app/react/model/runtime.d.ts

@@ -1,7 +1,7 @@
-import { RedoxStore } from '@shuvi/redox';
+import { Doura } from 'doura';
 declare module '@shuvi/runtime' {
     interface CustomAppContext {
-        store: RedoxStore;
+        store: Doura;
     }
 }
 declare const _default: import("@shuvi/platform-shared/shared").IPluginInstance<import("@shuvi/platform-shared/shared").RuntimePluginHooks, void>;

package/esm/shuvi-app/react/model/runtime.js

@@ -8,11 +8,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { createRuntimePluginAfter } from '@shuvi/platform-shared/shared';
-import { RedoxWrapper } from './RedoxWrapper';
+import { DouraWrapper } from './Wrapper';
 // this needs to be run last
 export default createRuntimePluginAfter({
     appComponent: (App, appContext) => __awaiter(void 0, void 0, void 0, function* () {
-        return RedoxWrapper(App, {
+        return DouraWrapper(App, {
             store: appContext.store
         });
     })

package/esm/shuvi-app/react/store.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
 declare const Provider: (props: import("react").PropsWithChildren<{
-    store?: import("@shuvi/redox").RedoxStore | undefined;
-}>) => JSX.Element, useSharedModel: import("@shuvi/redox-react/esm/types").IUseModel, useStaticModel: import("@shuvi/redox-react/esm/types").IUseStaticModel;
+    store?: import("doura").Doura | undefined;
+}>) => JSX.Element, useSharedModel: import("react-doura").UseNamedModel, useStaticModel: import("react-doura").UseNamedStaticModel;
 export { Provider, useSharedModel, useStaticModel };

package/esm/shuvi-app/react/store.js

@@ -1,3 +1,3 @@
-import { createContainer } from '@shuvi/redox-react';
+import { createContainer } from 'react-doura';
 const { Provider, useSharedModel, useStaticModel } = createContainer();
 export { Provider, useSharedModel, useStaticModel };

package/esm/shuvi-app/react/useLoaderData.js

@@ -1,5 +1,5 @@
 import { useMatchedRoute } from '@shuvi/router-react';
-import { loaderModel } from '@shuvi/platform-shared/shared';
+import { loaderModel, loaderModelName } from '@shuvi/platform-shared/shared';
 import { useStaticModel } from './store';
 export const noLoaderMessage = 'Warning: no loader found. Please make sure the page component where `useLoaderData` is called has a `loader` export.';
 const hasOwn = Object.prototype.hasOwnProperty;
@@ -8,9 +8,9 @@ export const useLoaderData = () => {
     const id = currentMatch.route.id;
     // we don't need to watch the model change, cause it always change with
     // matched route
-    const [state] = useStaticModel(loaderModel);
-    if (!hasOwn.call(state.current.dataByRouteId, id)) {
+    const loaderData = useStaticModel(loaderModelName, loaderModel);
+    if (!hasOwn.call(loaderData.dataByRouteId, id)) {
         throw Error(noLoaderMessage);
     }
-    return state.current.dataByRouteId[id];
+    return loaderData.dataByRouteId[id];
 };

package/lib/node/features/model/index.js

@@ -6,17 +6,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const service_1 = require("@shuvi/service");
 const paths_1 = require("../../paths");
 const server_1 = __importDefault(require("./server"));
-const redoxSource = (0, paths_1.resolveLib)('@shuvi/redox');
+const douraSource = (0, paths_1.resolveLib)('doura');
 const core = (0, service_1.createPlugin)({
     addRuntimeService: () => [
         {
-            source: redoxSource,
+            source: douraSource,
             exported: '*',
             filepath: 'model.ts'
         }
     ],
     configWebpack: config => {
-        config.resolve.alias.set('@shuvi/redox', redoxSource);
+        config.resolve.alias.set('doura', douraSource);
         return config;
     }
 });

package/lib/node/features/model/runtime.d.ts

@@ -1,8 +1,8 @@
-import { RedoxStore } from '@shuvi/redox';
+import { Doura } from 'doura';
 import { IAppContext } from '@shuvi/platform-shared/shared';
-export declare type InitRedox = (params: {
+export declare type InitDoura = (params: {
     initialState: any;
     ctx: IAppContext;
-}) => RedoxStore;
+}) => Doura;
 declare const _default: import("@shuvi/platform-shared/shared").IPluginInstance<import("@shuvi/platform-shared/shared").RuntimePluginHooks, void>;
 export default _default;

package/lib/node/features/model/runtime.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const redox_1 = require("@shuvi/redox");
+const doura_1 = require("doura");
 const shared_1 = require("@shuvi/platform-shared/shared");
 let currentStore;
 const isServer = typeof window === 'undefined';
@@ -8,11 +8,11 @@ const isServer = typeof window === 'undefined';
 // for server, return new store
 const initStore = ({ initialState, ctx }) => {
     const createStoreInstance = () => {
-        // return createRedox(initialState, {
+        // return createDoura(initialState, {
         //   ...ctx,
         //   isServer
         // });
-        return (0, redox_1.redox)({
+        return (0, doura_1.doura)({
             initialState
         });
     };

package/lib/node/features/model/shuvi-app.d.ts

@@ -1,6 +1,6 @@
-import type { RedoxStore } from '@shuvi/redox';
+import type { Doura } from 'doura';
 declare module '@shuvi/runtime' {
     interface CustomAppContext {
-        store: RedoxStore;
+        store: Doura;
     }
 }

package/lib/node/targets/react/model/index.js

@@ -3,17 +3,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ModelReactPlugin = void 0;
 const service_1 = require("@shuvi/service");
 const paths_1 = require("../../../paths");
-const redoxReactSource = (0, paths_1.resolveLib)('@shuvi/redox-react');
+const reactDouraSource = (0, paths_1.resolveLib)('react-doura');
 const core = (0, service_1.createPluginAfter)({
     addRuntimeService: () => [
         {
-            source: redoxReactSource,
+            source: reactDouraSource,
             exported: '*',
             filepath: 'model.ts'
         }
     ],
     configWebpack: config => {
-        config.resolve.alias.set('@shuvi/redox-react', redoxReactSource);
+        config.resolve.alias.set('react-doura', reactDouraSource);
         return config;
     }
 }, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shuvi/platform-web",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/shuvijs/shuvi.git",
@@ -72,17 +72,17 @@
   },
   "dependencies": {
     "@next/react-refresh-utils": "12.1.6",
-    "@shuvi/error-overlay": "1.0.4",
-    "@shuvi/hook": "1.0.4",
-    "@shuvi/platform-shared": "1.0.4",
-    "@shuvi/redox": "0.0.7",
-    "@shuvi/redox-react": "0.0.7",
-    "@shuvi/router": "1.0.4",
-    "@shuvi/router-react": "1.0.4",
-    "@shuvi/runtime": "1.0.4",
-    "@shuvi/shared": "1.0.4",
-    "@shuvi/toolpack": "1.0.4",
-    "@shuvi/utils": "1.0.4",
+    "@shuvi/error-overlay": "1.0.6",
+    "@shuvi/hook": "1.0.6",
+    "@shuvi/platform-shared": "1.0.6",
+    "doura": "0.0.3",
+    "react-doura": "0.0.3",
+    "@shuvi/router": "1.0.6",
+    "@shuvi/router-react": "1.0.6",
+    "@shuvi/runtime": "1.0.6",
+    "@shuvi/shared": "1.0.6",
+    "@shuvi/toolpack": "1.0.6",
+    "@shuvi/utils": "1.0.6",
     "content-type": "1.0.4",
     "core-js": "3.6.5",
     "ejs": "3.1.5",
@@ -98,7 +98,7 @@
     "whatwg-fetch": "3.0.0"
   },
   "peerDependencies": {
-    "@shuvi/service": "1.0.4"
+    "@shuvi/service": "1.0.6"
   },
   "devDependencies": {
     "@shuvi/service": "workspace:*",

package/esm/shuvi-app/react/model/RedoxWrapper.d.ts

@@ -1,8 +0,0 @@
-/// <reference types="react" />
-import type { RedoxStore } from '@shuvi/redox';
-export declare const RedoxWrapper: (App: any, appContext: {
-    store: RedoxStore;
-}) => {
-    (): JSX.Element;
-    displayName: string;
-};

package/esm/shuvi-app/react/model/RedoxWrapper.jsx

@@ -1,11 +0,0 @@
-import * as React from 'react';
-import { RedoxRoot } from '@shuvi/redox-react';
-export const RedoxWrapper = (App, appContext) => {
-    function RedoxAppWrapper() {
-        return (<RedoxRoot store={appContext.store}>
-        <App />
-      </RedoxRoot>);
-    }
-    RedoxAppWrapper.displayName = 'RedoxAppWrapper';
-    return RedoxAppWrapper;
-};