@shuvi/platform-shared 1.0.0-rc.1 → 1.0.0-rc.12

package/lib/shared/models/error.d.ts

@@ -1,13 +1,13 @@
 import { IErrorState, IError } from '../applicationTypes';
-export declare const errorModel: import("@shuvi/redox").Model<"error", IErrorState, {}, {
+export declare const errorModel: import("@shuvi/redox/esm/core/defineModel").DefineModel<"error", IErrorState, {
     setError(_state: IErrorState, error?: IError): {
         error: IError | undefined;
     };
 }, {
-    error(payload?: IError): void;
+    set(payload?: IError): void;
     clear(): void;
 }, {
-    getError(): IError | undefined;
+    errorObject(): IError | undefined;
     hasError(): boolean;
-}>;
+}, {}>;
 export declare type ErrorModel = typeof errorModel;

package/lib/shared/models/error.js

@@ -15,7 +15,7 @@ exports.errorModel = (0, redox_1.defineModel)({
         }
     },
     actions: {
-        error(payload) {
+        set(payload) {
             this.setError(payload || constants_1.SHUVI_ERROR.APP_ERROR);
         },
         clear() {
@@ -25,7 +25,7 @@ exports.errorModel = (0, redox_1.defineModel)({
         }
     },
     views: {
-        getError() {
+        errorObject() {
             return this.error;
         },
         hasError() {

package/lib/shared/models/loader.d.ts

@@ -0,0 +1,13 @@
+export interface LoaderState {
+    dataByRouteId: Record<string, any>;
+}
+export declare const loaderModel: import("@shuvi/redox/esm/core/defineModel").DefineModel<"loader", LoaderState, {
+    setDatas(state: LoaderState, newData: Record<string, any>): {
+        dataByRouteId: {
+            [x: string]: any;
+        };
+    };
+}, import("@shuvi/redox/esm/core/defineModel").ActionOptions, {
+    getAllData(): Record<string, any>;
+}, {}>;
+export declare type LoaderModel = typeof loaderModel;

package/lib/shared/models/loader.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.loaderModel = void 0;
+const redox_1 = require("@shuvi/redox");
+const initState = {
+    dataByRouteId: {}
+};
+exports.loaderModel = (0, redox_1.defineModel)({
+    name: 'loader',
+    state: initState,
+    reducers: {
+        setDatas(state, newData) {
+            return Object.assign(Object.assign({}, state), { dataByRouteId: Object.assign(Object.assign({}, state.dataByRouteId), newData) });
+        }
+        // clearDatas(state) {
+        //   return {
+        //     ...state,
+        //     dataByRouteId: {}
+        //   };
+        // }
+    },
+    views: {
+        getAllData() {
+            return this.dataByRouteId;
+        }
+    }
+});

package/lib/shared/routerTypes.d.ts

@@ -4,25 +4,38 @@ export declare type IURLQuery = ParsedQuery;
 export declare type IURLParams = IParams;
 export interface IPageRouteRecord extends IRouteRecord {
     id: string;
+    path: string;
     component?: any;
     children?: IPageRouteRecord[];
-    path: string;
-    fullPath?: string;
-    __componentSource__?: never;
-    __componentSourceWithAffix__?: string;
-    __import__?: never;
-    __resolveWeak__?: () => any;
+    __import__?: () => Promise<any>;
+    __resolveWeak__?: () => string[];
+    __componentSource__?: string;
+    __componentRawRequest__?: string;
     [x: string]: any;
 }
-export interface IRawPageRouteRecord extends IRouteRecord {
+export interface IPlatformConfig {
+    name: string;
+    framework?: string;
+    target?: string;
+    [index: string]: any;
+}
+export declare type IRouterHistoryMode = 'browser' | 'hash' | 'memory';
+export interface IPageRouteConfig {
+    children?: IPageRouteConfig[];
+    name?: string;
+    component?: string;
+    redirect?: string;
+    path: string;
+}
+export interface IPageRouteConfigWithId extends IPageRouteConfig {
     id: string;
-    component?: any;
-    children?: IRawPageRouteRecord[];
+    children?: IPageRouteConfigWithId[];
+}
+export interface IMiddlewareRouteConfig {
     path: string;
-    fullPath: string;
-    __componentSource__: string;
-    __componentSourceWithAffix__: string;
-    __import__: () => Promise<any>;
-    __resolveWeak__: () => any;
-    [x: string]: any;
+    middleware: string;
+}
+export interface IApiRouteConfig {
+    path: string;
+    api: string;
 }

package/lib/shared/{lifecycle.d.ts → runtimPlugin.d.ts}

@@ -14,10 +14,8 @@ export interface BuiltInRuntimePluginHooks extends HookMap {
 }
 export interface RuntimePluginHooks extends BuiltInRuntimePluginHooks, CustomRuntimePluginHooks {
 }
-export declare const getManager: () => import("@shuvi/hook").HookManager<BuiltInRuntimePluginHooks, void, CustomRuntimePluginHooks>;
-export declare const createRuntimePlugin: (pluginHandlers: Partial<import("@shuvi/hook").IPluginHandlersFullMap<BuiltInRuntimePluginHooks & CustomRuntimePluginHooks, void>> & {
-    setup?: import("@shuvi/hook").Setup<CustomRuntimePluginHooks> | undefined;
-}, options?: import("@shuvi/hook").PluginOptions | undefined) => IPluginInstance<BuiltInRuntimePluginHooks & CustomRuntimePluginHooks, void>;
+export declare const getManager: () => import("@shuvi/hook").HookManager<RuntimePluginHooks, void>;
+export declare const createRuntimePluginBefore: import("@shuvi/shared/lib/plugins").PluginFunc<RuntimePluginHooks, void>, createRuntimePlugin: import("@shuvi/shared/lib/plugins").PluginFunc<RuntimePluginHooks, void>, createRuntimePluginAfter: import("@shuvi/shared/lib/plugins").PluginFunc<RuntimePluginHooks, void>;
 export type { IPluginInstance, CustomRuntimePluginHooks };
 export declare type PluginManager = ReturnType<typeof getManager>;
 export declare type RuntimePluginInstance = IPluginInstance<RuntimePluginHooks, void>;

package/lib/shared/{lifecycle.js → runtimPlugin.js}

@@ -8,9 +8,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.initPlugins = exports.createRuntimePlugin = exports.getManager = void 0;
+exports.initPlugins = exports.createRuntimePluginAfter = exports.createRuntimePlugin = exports.createRuntimePluginBefore = exports.getManager = void 0;
 const hook_1 = require("@shuvi/hook");
+const plugins_1 = require("@shuvi/shared/lib/plugins");
 const init = (0, hook_1.createAsyncParallelHook)();
 const appContext = (0, hook_1.createAsyncSeriesWaterfallHook)();
 const appComponent = (0, hook_1.createAsyncSeriesWaterfallHook)();
@@ -23,7 +25,7 @@ const builtinRuntimePluginHooks = {
 };
 const getManager = () => (0, hook_1.createHookManager)(builtinRuntimePluginHooks, false);
 exports.getManager = getManager;
-exports.createRuntimePlugin = (0, exports.getManager)().createPlugin;
+_a = (0, plugins_1.createPluginCreator)((0, exports.getManager)()), exports.createRuntimePluginBefore = _a.createPluginBefore, exports.createRuntimePlugin = _a.createPlugin, exports.createRuntimePluginAfter = _a.createPluginAfter;
 const initPlugins = (pluginManager, plugins) => __awaiter(void 0, void 0, void 0, function* () {
     // clear plugin at development mode every time
     if (process.env.NODE_ENV === 'development') {

package/lib/shared/runtimeConfigTypes.d.ts

@@ -0,0 +1 @@
+export declare type IRuntimeConfig = Record<string, string>;

package/lib/shared/shuvi-singleton-runtimeConfig.d.ts

@@ -1,4 +1,4 @@
-import { IRuntimeConfig } from '@shuvi/service/lib/core';
+import { IRuntimeConfig } from './runtimeConfigTypes';
 /**
  * getRuntimeConfig function
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shuvi/platform-shared",
-  "version": "1.0.0-rc.1",
+  "version": "1.0.0-rc.12",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/shuvijs/shuvi.git",
@@ -10,11 +10,12 @@
   "license": "MIT",
   "sideEffects": false,
   "files": [
-    "lib",
     "esm",
-    "types",
+    "lib",
     "template",
-    "shuvi-app-extensions.d.ts"
+    "shuvi-type-extensions-node.d.js",
+    "shuvi-type-extensions-node.js",
+    "shuvi-type-extensions-runtime.d.ts"
   ],
   "exports": {
     "./shared": {
@@ -62,21 +63,11 @@
       "default": "./esm/shuvi-app/*.js"
     },
     "./template/*": "./template/*",
-    "./shuvi-app-extensions.d.ts": "./shuvi-app-extensions.d.ts"
-  },
-  "engines": {
-    "node": ">= 12.0.0"
-  },
-  "dependencies": {
-    "redux": "4.1.2",
-    "@shuvi/redox": "0.0.3",
-    "@shuvi/hook": "1.0.0-rc.1",
-    "@shuvi/service": "1.0.0-rc.1",
-    "@shuvi/toolpack": "1.0.0-rc.1",
-    "@shuvi/router": "1.0.0-rc.1",
-    "@shuvi/runtime": "1.0.0-rc.1",
-    "@shuvi/shared": "1.0.0-rc.1",
-    "@shuvi/utils": "1.0.0-rc.1"
+    "./shuvi-type-extensions-node": {
+      "types": "./shuvi-type-extensions-node.d.js",
+      "default": "./shuvi-type-extensions-node.js"
+    },
+    "./shuvi-type-extensions-runtime": "./shuvi-type-extensions-runtime.d.ts"
   },
   "scripts": {
     "dev": "run-p watch:*",
@@ -86,5 +77,25 @@
     "build": "run-p build:*",
     "build:esm": "tsc -p tsconfig.build.browser.json",
     "build:cjs": "tsc -p tsconfig.build.node.json"
+  },
+  "engines": {
+    "node": ">= 12.0.0"
+  },
+  "dependencies": {
+    "@shuvi/hook": "1.0.0-rc.12",
+    "@shuvi/redox": "0.0.6",
+    "@shuvi/router": "1.0.0-rc.12",
+    "@shuvi/runtime": "1.0.0-rc.12",
+    "@shuvi/service": "1.0.0-rc.12",
+    "@shuvi/shared": "1.0.0-rc.12",
+    "@shuvi/toolpack": "1.0.0-rc.12",
+    "@shuvi/utils": "1.0.0-rc.12",
+    "redux": "4.1.2"
+  },
+  "peerDependencies": {
+    "@shuvi/service": "1.0.0-rc.12"
+  },
+  "devDependencies": {
+    "@types/minimatch": "3.0.5"
   }
-}
+}

package/shuvi-type-extensions-node.js

@@ -0,0 +1 @@
+module.exports = {};

package/{shuvi-app-extensions.d.ts → shuvi-type-extensions-runtime.d.ts}

@@ -8,14 +8,10 @@ declare module '@shuvi/app/core/error' {
 }
 
 declare module '@shuvi/app/core/platform' {
-  import {
-    IPageRouteRecord,
-    IRawPageRouteRecord,
-    IViewClient
-  } from '@shuvi/platform-shared/shared';
+  import { IPageRouteRecord, IViewClient } from '@shuvi/platform-shared/shared';
 
   export interface IGetRoutes {
-    (routes: IRawPageRouteRecord[]): IPageRouteRecord[];
+    (routes: IPageRouteRecord[]): IPageRouteRecord[];
   }
 
   export const getRoutes: IGetRoutes;

package/esm/shared/loader/loaderManager.d.ts

@@ -1,16 +0,0 @@
-declare function createLoaderManager(): {
-    getAllData(): Record<string, any>;
-    getData(id: string): any;
-    setDatas(obj: Record<string, any>): void;
-    subscribe(cb: Function): () => void;
-    clearAllData(): void;
-};
-export declare const getLoaderManager: () => {
-    getAllData(): Record<string, any>;
-    getData(id: string): any;
-    setDatas(obj: Record<string, any>): void;
-    subscribe(cb: Function): () => void;
-    clearAllData(): void;
-};
-export declare type LoaderManager = ReturnType<typeof createLoaderManager>;
-export {};

package/esm/shared/loader/loaderManager.js

@@ -1,49 +0,0 @@
-let loaderManager;
-function createLoaderManager() {
-    const datas = new Map();
-    const subscribers = [];
-    return {
-        getAllData() {
-            let res = {};
-            for (const [id, data] of datas.entries()) {
-                res[id] = data;
-            }
-            return res;
-        },
-        getData(id) {
-            if (!datas.has(id)) {
-                return null;
-            }
-            return datas.get(id);
-        },
-        setDatas(obj) {
-            for (const [id, data] of Object.entries(obj)) {
-                datas.set(id, data);
-            }
-            subscribers.forEach(fn => fn());
-        },
-        // setData(id: string, data: any) {
-        //   datas.set(id, data);
-        //   subscribers.forEach(fn => fn());
-        // },
-        subscribe(cb) {
-            subscribers.push(cb);
-            return () => {
-                const index = subscribers.indexOf(cb);
-                if (index >= 0) {
-                    subscribers.splice(index, 1);
-                }
-            };
-        },
-        clearAllData() {
-            datas.clear();
-        }
-    };
-}
-export const getLoaderManager = () => {
-    if (loaderManager) {
-        return loaderManager;
-    }
-    loaderManager = createLoaderManager();
-    return loaderManager;
-};

package/lib/node/platform/plugins/main/shuvi-app.d.ts

@@ -1,8 +0,0 @@
-import { extendedHooks } from './hooks';
-declare module '@shuvi/runtime' {
-    interface CustomCorePluginHooks {
-        addEntryCode: typeof extendedHooks.addEntryCode;
-        addPolyfill: typeof extendedHooks.addPolyfill;
-        modifyRuntimeConfig: typeof extendedHooks.modifyRuntimeConfig;
-    }
-}

package/lib/shared/loader/loaderManager.d.ts

@@ -1,16 +0,0 @@
-declare function createLoaderManager(): {
-    getAllData(): Record<string, any>;
-    getData(id: string): any;
-    setDatas(obj: Record<string, any>): void;
-    subscribe(cb: Function): () => void;
-    clearAllData(): void;
-};
-export declare const getLoaderManager: () => {
-    getAllData(): Record<string, any>;
-    getData(id: string): any;
-    setDatas(obj: Record<string, any>): void;
-    subscribe(cb: Function): () => void;
-    clearAllData(): void;
-};
-export declare type LoaderManager = ReturnType<typeof createLoaderManager>;
-export {};

package/lib/shared/loader/loaderManager.js

@@ -1,53 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getLoaderManager = void 0;
-let loaderManager;
-function createLoaderManager() {
-    const datas = new Map();
-    const subscribers = [];
-    return {
-        getAllData() {
-            let res = {};
-            for (const [id, data] of datas.entries()) {
-                res[id] = data;
-            }
-            return res;
-        },
-        getData(id) {
-            if (!datas.has(id)) {
-                return null;
-            }
-            return datas.get(id);
-        },
-        setDatas(obj) {
-            for (const [id, data] of Object.entries(obj)) {
-                datas.set(id, data);
-            }
-            subscribers.forEach(fn => fn());
-        },
-        // setData(id: string, data: any) {
-        //   datas.set(id, data);
-        //   subscribers.forEach(fn => fn());
-        // },
-        subscribe(cb) {
-            subscribers.push(cb);
-            return () => {
-                const index = subscribers.indexOf(cb);
-                if (index >= 0) {
-                    subscribers.splice(index, 1);
-                }
-            };
-        },
-        clearAllData() {
-            datas.clear();
-        }
-    };
-}
-const getLoaderManager = () => {
-    if (loaderManager) {
-        return loaderManager;
-    }
-    loaderManager = createLoaderManager();
-    return loaderManager;
-};
-exports.getLoaderManager = getLoaderManager;