@shuvi/platform-shared 1.0.8 → 1.0.10

package/esm/shared/helper/getAppData.js

@@ -1,5 +1,5 @@
 /// <reference lib="dom" />
-import { CLIENT_APPDATA_ID } from '@shuvi/shared/lib/constants';
+import { CLIENT_APPDATA_ID } from '@shuvi/shared/constants';
 let appData = null;
 export function getAppData() {
     if (appData) {

package/esm/shared/helper/router.js

@@ -7,7 +7,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import isEqual from '@shuvi/utils/lib/isEqual';
+import isEqual from '@shuvi/utils/isEqual';
 export function runPreload(to) {
     return __awaiter(this, void 0, void 0, function* () {
         const toMatches = to.matches;

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

@@ -5,5 +5,5 @@ interface Result<T> {
     result?: T;
 }
 export declare function runInParallerAndBail<T>(fns: Array<() => Promise<T> | T>): Promise<Result<T>[]>;
-export declare function runLoaders(matches: IRouteMatch<IPageRouteRecord>[], loadersByRouteId: Record<string, Loader>, { query, req, getAppContext }: LoaderContextOptions): Promise<LoaderDataRecord>;
+export declare function runLoaders(matches: IRouteMatch<IPageRouteRecord>[], loadersByRouteId: Record<string, Loader>, { pathname, query, params, req, getAppContext }: LoaderContextOptions): Promise<LoaderDataRecord>;
 export {};

package/esm/shared/loader/loader.js

@@ -7,7 +7,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import invariant from '@shuvi/utils/lib/invariant';
+import invariant from '@shuvi/utils/invariant';
 import { json as createJson, redirect as createRedirect, response, isResponse } from '../response';
 // todo: add unit tests
 export function runInParallerAndBail(fns) {
@@ -71,7 +71,7 @@ function errorHelper(msg, statusCode = 500) {
     invariant(statusCode >= 400 && statusCode < 600, 'status code should be 4xx and 5xx');
     throw response(msg, { status: statusCode });
 }
-export function runLoaders(matches, loadersByRouteId, { query, req, getAppContext }) {
+export function runLoaders(matches, loadersByRouteId, { pathname, query, params, req, getAppContext }) {
     return __awaiter(this, void 0, void 0, function* () {
         const loaderDatas = {};
         if (!matches.length) {
@@ -85,7 +85,9 @@ export function runLoaders(matches, loadersByRouteId, { query, req, getAppContex
             }
             let res;
             try {
-                const value = yield loaderFn(Object.assign({ pathname: match.pathname, params: match.params, query: query, redirect: redirectHelper, error: errorHelper, appContext }, (req ? { req } : {})));
+                const value = yield loaderFn(Object.assign({ pathname,
+                    params,
+                    query, redirect: redirectHelper, error: errorHelper, appContext }, (req ? { req } : {})));
                 if (value === undefined) {
                     throw new Error(`You defined a loader for route "${match.route.path}" but didn't return ` +
                         `anything from your \`loader\` function. Please return a value or \`null\`.`);

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

@@ -3,8 +3,10 @@ import { IURLQuery, IURLParams } from '../routerTypes';
 import { IAppContext } from '../applicationTypes';
 import { Response } from '../response';
 export interface LoaderContextOptions {
-    req?: ShuviRequest;
-    query: IURLQuery;
+    req?: IRouteLoaderContext['req'];
+    pathname: IRouteLoaderContext['pathname'];
+    query: IRouteLoaderContext['query'];
+    params: IRouteLoaderContext['params'];
     getAppContext: () => IAppContext;
 }
 export declare type RedirectFunction = (to: string, status?: number) => any;

package/esm/shared/models/error.js

@@ -1,5 +1,5 @@
 import { defineModel } from 'doura';
-import { SHUVI_ERROR } from '@shuvi/shared/lib/constants';
+import { SHUVI_ERROR } from '@shuvi/shared/constants';
 const DEFAULT_ERROR_STATE = {
     error: null
 };

package/esm/shared/routerTypes.d.ts

@@ -27,9 +27,9 @@ export interface IPageRouteConfig {
     redirect?: string;
     path: string;
 }
-export interface IPageRouteConfigWithId extends IPageRouteConfig {
+export interface INormalizedPageRouteConfig extends IPageRouteConfig {
     id: string;
-    children?: IPageRouteConfigWithId[];
+    children?: INormalizedPageRouteConfig[];
 }
 export interface IMiddlewareRouteConfig {
     path: string;

package/esm/shared/runtimPlugin.d.ts

@@ -15,7 +15,7 @@ export interface BuiltInRuntimePluginHooks extends HookMap {
 export interface RuntimePluginHooks extends BuiltInRuntimePluginHooks, CustomRuntimePluginHooks {
 }
 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 declare const createRuntimePluginBefore: import("@shuvi/shared/plugins").PluginFunc<RuntimePluginHooks, void>, createRuntimePlugin: import("@shuvi/shared/plugins").PluginFunc<RuntimePluginHooks, void>, createRuntimePluginAfter: import("@shuvi/shared/plugins").PluginFunc<RuntimePluginHooks, void>;
 export type { IPluginInstance, CustomRuntimePluginHooks };
 export declare type PluginManager = ReturnType<typeof getManager>;
 export declare type RuntimePluginInstance = IPluginInstance<RuntimePluginHooks, void>;

package/esm/shared/runtimPlugin.js

@@ -8,7 +8,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { createAsyncParallelHook, createAsyncSeriesHook, createAsyncSeriesWaterfallHook, createHookManager, isPluginInstance } from '@shuvi/hook';
-import { createPluginCreator } from '@shuvi/shared/lib/plugins';
+import { createPluginCreator } from '@shuvi/shared/plugins';
 const init = createAsyncParallelHook();
 const appContext = createAsyncSeriesHook();
 const appComponent = createAsyncSeriesWaterfallHook();

package/lib/node/platform/runtimeFiles.d.ts

@@ -4,4 +4,4 @@ import { IPluginContext } from '@shuvi/service';
  * `core/error`, `core/platform`, `core/plugins`, `core/polyfill`, `core/runtimeConfig`, `core/setRuntimeConfig`,
  * `user/error`, `user/runtime` and `entry`
  */
-export declare const getPresetRuntimeFilesCreator: (platformModule: string) => (pluginContext: IPluginContext) => Promise<import("@shuvi/service/lib/project").FileOption<any, any>[]>;
+export declare const getPresetRuntimeFilesCreator: (platformModule: string) => (pluginContext: IPluginContext) => Promise<import("@shuvi/service/lib/project").FileOptionWithId<any, any>[]>;

package/lib/node/platform/runtimeFiles.js

@@ -14,7 +14,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPresetRuntimeFilesCreator = void 0;
 const project_1 = require("@shuvi/service/lib/project");
-const logger_1 = __importDefault(require("@shuvi/utils/lib/logger"));
+const logger_1 = __importDefault(require("@shuvi/utils/logger"));
 const shuvi_singleton_runtimeConfig_1 = require("../../shared/shuvi-singleton-runtimeConfig");
 const projectContext_1 = require("../project/projectContext");
 const file_presets_1 = require("../project/file-presets");

package/lib/node/project/file-presets/files/app/core/entry.js.d.ts

@@ -1,3 +1,3 @@
 import { ProjectContext } from '../../../../projectContext';
-declare const _default: (context: ProjectContext) => Omit<import("@shuvi/service/lib/project").FileOptionWithoutId<string, any>, "name">;
+declare const _default: (context: ProjectContext) => Omit<import("@shuvi/service/lib/project").FileOption<string, any>, "name">;
 export default _default;

package/lib/node/project/file-presets/files/app/core/error.js.d.ts

@@ -1,2 +1,2 @@
-declare const _default: () => Omit<import("@shuvi/service/lib/project/index").FileOptionWithoutId<string, any>, "name">;
+declare const _default: () => Omit<import("@shuvi/service/lib/project/index").FileOption<string, any>, "name">;
 export default _default;

package/lib/node/project/file-presets/files/app/core/platform.js.d.ts

@@ -1,3 +1,3 @@
 import { ProjectContext } from '../../../../projectContext';
-declare const _default: (context: ProjectContext) => Omit<import("@shuvi/service/lib/project").FileOptionWithoutId<string, any>, "name">;
+declare const _default: (context: ProjectContext) => Omit<import("@shuvi/service/lib/project").FileOption<string, any>, "name">;
 export default _default;

package/lib/node/project/file-presets/files/app/core/runtimeConfig.js.d.ts

@@ -1,3 +1,3 @@
 import { ProjectContext } from '../../../../projectContext';
-declare const _default: (context: ProjectContext) => Omit<import("@shuvi/service/lib/project/index").FileOptionWithoutId<string, any>, "name">;
+declare const _default: (context: ProjectContext) => Omit<import("@shuvi/service/lib/project/index").FileOption<string, any>, "name">;
 export default _default;

package/lib/node/project/file-presets/files/app/core/setRuntimeConfig.js.d.ts

@@ -1,2 +1,2 @@
-declare const _default: () => Omit<import("@shuvi/service/lib/project/index").FileOptionWithoutId<string, any>, "name">;
+declare const _default: () => Omit<import("@shuvi/service/lib/project/index").FileOption<string, any>, "name">;
 export default _default;

package/lib/node/project/file-presets/files/app/user/app.js.d.ts

@@ -1,3 +1,3 @@
 import { ProjectContext } from '../../../../projectContext';
-declare const _default: (context: ProjectContext) => Omit<import("@shuvi/service/lib/project").FileOptionWithoutId<string, any>, "name">;
+declare const _default: (context: ProjectContext) => Omit<import("@shuvi/service/lib/project").FileOption<string, any>, "name">;
 export default _default;

package/lib/node/project/file-presets/files/app/user/error.js.d.ts

@@ -1,3 +1,3 @@
 import { ProjectContext } from '../../../../projectContext';
-declare const _default: (context: ProjectContext) => Omit<import("@shuvi/service/lib/project").FileOptionWithoutId<string, any>, "name">;
+declare const _default: (context: ProjectContext) => Omit<import("@shuvi/service/lib/project").FileOption<string, any>, "name">;
 export default _default;

package/lib/node/project/file-presets/files/app/user/error.js.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const project_1 = require("@shuvi/service/lib/project");
-const file_1 = require("@shuvi/utils/lib/file");
+const file_1 = require("@shuvi/utils/file");
 const __1 = require("../../..");
 const { getAllFiles, getFirstModuleExport } = project_1.fileUtils;
 exports.default = (context) => {

package/lib/node/project/file-presets/files/app/user/server.js.d.ts

@@ -1,3 +1,3 @@
 import { ProjectContext } from '../../../../projectContext';
-declare const _default: (context: ProjectContext) => Omit<import("@shuvi/service/lib/project").FileOptionWithoutId<string, any>, "name">;
+declare const _default: (context: ProjectContext) => Omit<import("@shuvi/service/lib/project").FileOption<string, any>, "name">;
 export default _default;

package/lib/node/project/file-presets/index.d.ts

@@ -1,4 +1,4 @@
-import { FileOption, FileOptionWithoutId } from '@shuvi/service/lib/project';
+import { FileOptionWithId, FileOption } from '@shuvi/service/lib/project';
 import { ProjectContext } from '../projectContext';
-export declare function getFilePresets(context: ProjectContext): FileOption<any>[];
-export declare const defineFile: (options: Omit<FileOptionWithoutId, 'name'>) => Omit<FileOptionWithoutId<string, any>, "name">;
+export declare function getFilePresets(context: ProjectContext): FileOptionWithId<any>[];
+export declare const defineFile: (options: Omit<FileOption, 'name'>) => Omit<FileOption<string, any>, "name">;

package/lib/node/route/helpers.js

@@ -15,8 +15,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.sortRoutes = exports.fileTypeChecker = exports.hasRouteChildren = exports.readDir = exports.getAllowFilesAndDirs = exports.isRouteFile = exports.combineComponents = exports.normalizeRoutePath = exports.parseDynamicPath = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = require("path");
-const file_1 = require("@shuvi/utils/lib/file");
-const invariant_1 = __importDefault(require("@shuvi/utils/lib/invariant"));
+const file_1 = require("@shuvi/utils/file");
+const invariant_1 = __importDefault(require("@shuvi/utils/invariant"));
 const router_1 = require("../../shared/router");
 const supportFileTypes = ['page', 'layout', 'middleware', 'api'];
 const allowReadFilExtList = ['ts', 'js', 'tsx', 'jsx'];

package/lib/node/route/route.js

@@ -11,7 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getMiddlewareRoutes = exports.getApiRoutes = exports.getPageRoutes = exports.getRawRoutesFromDir = void 0;
 const path_1 = require("path");
-const file_1 = require("@shuvi/utils/lib/file");
+const file_1 = require("@shuvi/utils/file");
 const helpers_1 = require("./helpers");
 const matchSpec_1 = require("./matchSpec");
 const getRawRoutesFromDir = (dirname, excludes) => __awaiter(void 0, void 0, void 0, function* () {

package/lib/shared/helper/getAppData.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAppData = void 0;
 /// <reference lib="dom" />
-const constants_1 = require("@shuvi/shared/lib/constants");
+const constants_1 = require("@shuvi/shared/constants");
 let appData = null;
 function getAppData() {
     if (appData) {

package/lib/shared/helper/router.js

@@ -13,7 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getRouteMatchesWithInvalidLoader = exports.runPreload = void 0;
-const isEqual_1 = __importDefault(require("@shuvi/utils/lib/isEqual"));
+const isEqual_1 = __importDefault(require("@shuvi/utils/isEqual"));
 function runPreload(to) {
     return __awaiter(this, void 0, void 0, function* () {
         const toMatches = to.matches;

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

@@ -5,5 +5,5 @@ interface Result<T> {
     result?: T;
 }
 export declare function runInParallerAndBail<T>(fns: Array<() => Promise<T> | T>): Promise<Result<T>[]>;
-export declare function runLoaders(matches: IRouteMatch<IPageRouteRecord>[], loadersByRouteId: Record<string, Loader>, { query, req, getAppContext }: LoaderContextOptions): Promise<LoaderDataRecord>;
+export declare function runLoaders(matches: IRouteMatch<IPageRouteRecord>[], loadersByRouteId: Record<string, Loader>, { pathname, query, params, req, getAppContext }: LoaderContextOptions): Promise<LoaderDataRecord>;
 export {};

package/lib/shared/loader/loader.js

@@ -13,7 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runLoaders = exports.runInParallerAndBail = void 0;
-const invariant_1 = __importDefault(require("@shuvi/utils/lib/invariant"));
+const invariant_1 = __importDefault(require("@shuvi/utils/invariant"));
 const response_1 = require("../response");
 // todo: add unit tests
 function runInParallerAndBail(fns) {
@@ -78,7 +78,7 @@ function errorHelper(msg, statusCode = 500) {
     (0, invariant_1.default)(statusCode >= 400 && statusCode < 600, 'status code should be 4xx and 5xx');
     throw (0, response_1.response)(msg, { status: statusCode });
 }
-function runLoaders(matches, loadersByRouteId, { query, req, getAppContext }) {
+function runLoaders(matches, loadersByRouteId, { pathname, query, params, req, getAppContext }) {
     return __awaiter(this, void 0, void 0, function* () {
         const loaderDatas = {};
         if (!matches.length) {
@@ -92,7 +92,9 @@ function runLoaders(matches, loadersByRouteId, { query, req, getAppContext }) {
             }
             let res;
             try {
-                const value = yield loaderFn(Object.assign({ pathname: match.pathname, params: match.params, query: query, redirect: redirectHelper, error: errorHelper, appContext }, (req ? { req } : {})));
+                const value = yield loaderFn(Object.assign({ pathname,
+                    params,
+                    query, redirect: redirectHelper, error: errorHelper, appContext }, (req ? { req } : {})));
                 if (value === undefined) {
                     throw new Error(`You defined a loader for route "${match.route.path}" but didn't return ` +
                         `anything from your \`loader\` function. Please return a value or \`null\`.`);

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

@@ -3,8 +3,10 @@ import { IURLQuery, IURLParams } from '../routerTypes';
 import { IAppContext } from '../applicationTypes';
 import { Response } from '../response';
 export interface LoaderContextOptions {
-    req?: ShuviRequest;
-    query: IURLQuery;
+    req?: IRouteLoaderContext['req'];
+    pathname: IRouteLoaderContext['pathname'];
+    query: IRouteLoaderContext['query'];
+    params: IRouteLoaderContext['params'];
     getAppContext: () => IAppContext;
 }
 export declare type RedirectFunction = (to: string, status?: number) => any;

package/lib/shared/models/error.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.errorModel = exports.errorModelName = void 0;
 const doura_1 = require("doura");
-const constants_1 = require("@shuvi/shared/lib/constants");
+const constants_1 = require("@shuvi/shared/constants");
 const DEFAULT_ERROR_STATE = {
     error: null
 };

package/lib/shared/routerTypes.d.ts

@@ -27,9 +27,9 @@ export interface IPageRouteConfig {
     redirect?: string;
     path: string;
 }
-export interface IPageRouteConfigWithId extends IPageRouteConfig {
+export interface INormalizedPageRouteConfig extends IPageRouteConfig {
     id: string;
-    children?: IPageRouteConfigWithId[];
+    children?: INormalizedPageRouteConfig[];
 }
 export interface IMiddlewareRouteConfig {
     path: string;

package/lib/shared/runtimPlugin.d.ts

@@ -15,7 +15,7 @@ export interface BuiltInRuntimePluginHooks extends HookMap {
 export interface RuntimePluginHooks extends BuiltInRuntimePluginHooks, CustomRuntimePluginHooks {
 }
 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 declare const createRuntimePluginBefore: import("@shuvi/shared/plugins").PluginFunc<RuntimePluginHooks, void>, createRuntimePlugin: import("@shuvi/shared/plugins").PluginFunc<RuntimePluginHooks, void>, createRuntimePluginAfter: import("@shuvi/shared/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/runtimPlugin.js

@@ -12,7 +12,7 @@ var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 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 plugins_1 = require("@shuvi/shared/plugins");
 const init = (0, hook_1.createAsyncParallelHook)();
 const appContext = (0, hook_1.createAsyncSeriesHook)();
 const appComponent = (0, hook_1.createAsyncSeriesWaterfallHook)();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shuvi/platform-shared",
-  "version": "1.0.8",
+  "version": "1.0.10",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/shuvijs/shuvi.git",
@@ -80,20 +80,20 @@
     "build:cjs": "tsc -p tsconfig.build.node.json"
   },
   "engines": {
-    "node": ">= 12.0.0"
+    "node": ">= 16.0.0"
   },
   "dependencies": {
-    "@shuvi/hook": "1.0.8",
-    "doura": "0.0.4",
-    "@shuvi/router": "1.0.8",
-    "@shuvi/runtime": "1.0.8",
-    "@shuvi/shared": "1.0.8",
-    "@shuvi/toolpack": "1.0.8",
-    "@shuvi/utils": "1.0.8",
+    "@shuvi/hook": "1.0.10",
+    "doura": "0.0.7",
+    "@shuvi/router": "1.0.10",
+    "@shuvi/runtime": "1.0.10",
+    "@shuvi/shared": "1.0.10",
+    "@shuvi/toolpack": "1.0.10",
+    "@shuvi/utils": "1.0.10",
     "redux": "4.1.2"
   },
   "peerDependencies": {
-    "@shuvi/service": "1.0.8"
+    "@shuvi/service": "1.0.10"
   },
   "devDependencies": {
     "@shuvi/service": "workspace:*",