@shuvi/platform-shared 1.0.0-rc.3 → 1.0.0-rc.6

package/esm/shared/application.d.ts

@@ -1,78 +1,25 @@
-import { IRouter } from './routerTypes';
-import { IStoreManager, IApplication, IAppContext, IApplicationOptions, IRerenderConfig } from './applicationTypes';
+import { IRouter, IPageRouteRecord } from './routerTypes';
+import { RedoxStore, IApplication, IAppContext, IApplicationOptions, IRerenderConfig, IError } from './applicationTypes';
 export declare class Application {
-    private _error;
     private _router;
     private _appComponent;
     private _pluginManager;
     private _context;
-    private _storeManager;
+    private _store;
+    private _error;
+    private _loader;
     constructor(options: IApplicationOptions);
-    get router(): IRouter<any>;
+    get router(): IRouter<IPageRouteRecord>;
     get context(): IAppContext;
-    get pluginManager(): import("@shuvi/hook").HookManager<import("./lifecycle").BuiltInRuntimePluginHooks, void, import("@shuvi/runtime").CustomRuntimePluginHooks>;
+    get pluginManager(): import("@shuvi/hook").HookManager<import("./runtimPlugin").RuntimePluginHooks, void>;
     get appComponent(): any;
-    get error(): {
-        $state: import("./applicationTypes").IErrorState;
-        $set: (state: import("@shuvi/redox").State) => void;
-        $modify: (modifier: (state: import("./applicationTypes").IErrorState) => void) => void;
-        $patch: (partState: import("@shuvi/redox").ObjectState) => void;
-        $actions: {
-            setError: (payload?: import("./applicationTypes").IError | undefined) => import("@shuvi/redox").Action<import("./applicationTypes").IError | undefined>;
-        } & {
-            error: (payload?: import("./applicationTypes").IError | undefined) => void;
-            clear: () => void;
-        } & {
-            [X: string]: never;
-            [X: number]: never;
-            [X: symbol]: never;
-        };
-        $views: import("@shuvi/redox").RedoxViews<({
-            getError(): import("./applicationTypes").IError | undefined;
-            hasError(): boolean;
-        } & ThisType<import("./applicationTypes").IErrorState & {
-            $state: import("./applicationTypes").IErrorState;
-        } & import("@shuvi/redox").RedoxViews<{
-            getError(): import("./applicationTypes").IError | undefined;
-            hasError(): boolean;
-        }> & {
-            $dep: {} & {} & {};
-        }>) | undefined>;
-        $createSelector: <TReturn>(selector: import("@shuvi/redox").ISelector<import("@shuvi/redox").Model<"error", import("./applicationTypes").IErrorState, {}, {
-            setError(_state: import("./applicationTypes").IErrorState, error?: import("./applicationTypes").IError | undefined): {
-                error: import("./applicationTypes").IError | undefined;
-            };
-        }, {
-            error(payload?: import("./applicationTypes").IError | undefined): void;
-            clear(): void;
-        }, {
-            getError(): import("./applicationTypes").IError | undefined;
-            hasError(): boolean;
-        }>, TReturn>) => (() => TReturn) & {
-            clearCache: () => void;
-        };
-    } & import("@shuvi/redox").RedoxViews<{
-        getError(): import("./applicationTypes").IError | undefined;
-        hasError(): boolean;
-    } & ThisType<import("./applicationTypes").IErrorState & {
-        $state: import("./applicationTypes").IErrorState;
-    } & import("@shuvi/redox").RedoxViews<{
-        getError(): import("./applicationTypes").IError | undefined;
-        hasError(): boolean;
-    }> & {
-        $dep: {} & {} & {};
-    }>> & {
-        setError: (payload?: import("./applicationTypes").IError | undefined) => import("@shuvi/redox").Action<import("./applicationTypes").IError | undefined>;
-    } & {
-        error: (payload?: import("./applicationTypes").IError | undefined) => void;
-        clear: () => void;
-    } & {
-        [X: string]: never;
-        [X: number]: never;
-        [X: symbol]: never;
-    };
+    get error(): IError | undefined;
+    setError(err: IError): void;
+    clearError(): void;
+    getLoadersData(): Record<string, any>;
+    setLoadersData(datas: Record<string, any>): void;
     init(): Promise<void>;
-    get storeManager(): IStoreManager;
+    get store(): RedoxStore;
     updateComponents({ AppComponent }?: IRerenderConfig): Promise<void>;
     dispose(): Promise<void>;
     private _initPlugin;

package/esm/shared/application.js

@@ -7,16 +7,18 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { getManager } from './lifecycle';
-import { initPlugins } from './lifecycle';
+import { getManager } from './runtimPlugin';
+import { initPlugins } from './runtimPlugin';
 import { redox } from '@shuvi/redox';
 import { errorModel } from './models/error';
+import { loaderModel } from './models/loader';
 export class Application {
     constructor(options) {
         this._router = options.router;
         this._context = {};
-        this._storeManager = redox({ initialState: options.initialState });
-        this._error = this._storeManager.get(errorModel);
+        this._store = redox({ initialState: options.initialState });
+        this._error = this._store.getModel(errorModel);
+        this._loader = this._store.getModel(loaderModel);
         this._appComponent = options.AppComponent;
         this._pluginManager = getManager();
         initPlugins(this._pluginManager, options.plugins || []);
@@ -34,7 +36,19 @@ export class Application {
         return this._appComponent;
     }
     get error() {
-        return this._error;
+        return this._error.errorObject;
+    }
+    setError(err) {
+        this._error.set(err);
+    }
+    clearError() {
+        this._error.clear();
+    }
+    getLoadersData() {
+        return this._loader.getAllData;
+    }
+    setLoadersData(datas) {
+        this._loader.setDatas(datas);
     }
     init() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -44,8 +58,8 @@ export class Application {
             this._router.init();
         });
     }
-    get storeManager() {
-        return this._storeManager;
+    get store() {
+        return this._store;
     }
     updateComponents({ AppComponent } = {}) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -76,12 +90,27 @@ export class Application {
         });
     }
     getPublicAPI() {
+        const self = this;
         return {
-            context: this._context,
-            router: this._router,
-            appComponent: this._appComponent,
-            storeManager: this._storeManager,
-            error: this._error
+            context: self._context,
+            router: self._router,
+            appComponent: self._appComponent,
+            store: self._store,
+            get error() {
+                return self.error;
+            },
+            setError(err) {
+                self.setError(err);
+            },
+            clearError() {
+                self.clearError();
+            },
+            getLoadersData() {
+                return self.getLoadersData();
+            },
+            setLoadersData(datas) {
+                self.setLoadersData(datas);
+            }
         };
     }
 }

package/esm/shared/applicationTypes.d.ts

@@ -1,22 +1,21 @@
-/// <reference types="node" />
-import type { IncomingMessage } from 'http';
-import { IStoreManager } from '@shuvi/redox';
+import { RedoxStore } from '@shuvi/redox';
 import { CustomAppContext } from '@shuvi/runtime';
-import { IRouter } from './routerTypes';
-import { IPluginList } from './lifecycle';
-export declare type IRequest = IncomingMessage & {
-    [x: string]: any;
-};
+import { IRouter, IPageRouteRecord } from './routerTypes';
+import { IPluginList } from './runtimPlugin';
 export interface IAppContext extends CustomAppContext {
     [x: string]: unknown;
 }
 export declare type IRerenderConfig = {
     AppComponent?: any;
 };
-export type { IStoreManager };
+export type { RedoxStore };
+export declare type ErrorSource = 'server';
 export interface IError {
     code?: number;
     message?: string;
+    stack?: string;
+    name?: string;
+    source?: ErrorSource;
 }
 export interface IErrorState {
     error?: IError;
@@ -24,18 +23,16 @@ export interface IErrorState {
 export declare type IAppState = {
     error?: IErrorState;
 };
-export interface IErrorManager {
-    getError: IError | undefined;
-    error: (err: IError) => void;
-    clear: () => void;
-    hasError: boolean;
-}
 export interface IApplication {
     readonly context: IAppContext;
-    readonly router: IRouter;
+    readonly router: IRouter<IPageRouteRecord>;
     readonly appComponent: any;
-    readonly error: IErrorManager;
-    readonly storeManager: IStoreManager;
+    readonly store: RedoxStore;
+    readonly error: IError | undefined;
+    setError(err: IError): void;
+    clearError(): void;
+    getLoadersData(): Record<string, any>;
+    setLoadersData(datas: Record<string, any>): void;
 }
 export interface IApplicationOptions {
     router: IRouter;

package/esm/shared/helper/getAppData.d.ts

@@ -5,13 +5,10 @@ export declare type IData = {
 export declare type IAppData<Data = {}, appState = any> = {
     ssr: boolean;
     runtimeConfig?: Record<string, string>;
+    appState?: appState;
     pageData?: {
         [key: string]: any;
     };
-    loadersData?: {
-        [x: string]: any;
-    };
-    appState?: appState;
     filesByRoutId: Record<string, string[]>;
     publicPath: string;
 } & {

package/esm/shared/helper/getAppData.js

@@ -17,7 +17,6 @@ export function getAppData() {
         return {
             ssr: false,
             pageData: {},
-            loadersData: {},
             filesByRoutId: {},
             publicPath: ''
         };

package/esm/shared/index.d.ts

@@ -4,7 +4,8 @@ export * from './router';
 export * from './response';
 export * from './loader';
 export { errorModel } from './models/error';
+export { loaderModel } from './models/loader';
 export * from './applicationTypes';
 export type { Application } from './application';
 export type { IRuntimeConfig } from './runtimeConfigTypes';
-export { IAppModule, IPluginInstance, BuiltInRuntimePluginHooks, CustomRuntimePluginHooks, RuntimePluginHooks, createRuntimePlugin, RuntimePluginInstance } from './lifecycle';
+export { IAppModule, IPluginInstance, BuiltInRuntimePluginHooks, CustomRuntimePluginHooks, RuntimePluginHooks, createRuntimePlugin, createRuntimePluginBefore, createRuntimePluginAfter, RuntimePluginInstance } from './runtimPlugin';

package/esm/shared/index.js

@@ -4,7 +4,6 @@ export * from './router';
 export * from './response';
 export * from './loader';
 export { errorModel } from './models/error';
+export { loaderModel } from './models/loader';
 export * from './applicationTypes';
-export { 
-// fix createRuntimePlugin is not portable end
-createRuntimePlugin } from './lifecycle';
+export { createRuntimePlugin, createRuntimePluginBefore, createRuntimePluginAfter } from './runtimPlugin';

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

@@ -1,3 +1,2 @@
 export * from './loader';
-export * from './loaderManager';
 export * from './types';

package/esm/shared/loader/index.js

@@ -1,3 +1,2 @@
 export * from './loader';
-export * from './loaderManager';
 export * from './types';

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>, { isServer, query, req, getAppContext }: LoaderContextOptions): Promise<LoaderDataRecord>;
+export declare function runLoaders(matches: IRouteMatch<IPageRouteRecord>[], loadersByRouteId: Record<string, Loader>, { query, req, getAppContext }: LoaderContextOptions): Promise<LoaderDataRecord>;
 export {};

package/esm/shared/loader/loader.js

@@ -68,7 +68,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, { isServer, query, req, getAppContext }) {
+export function runLoaders(matches, loadersByRouteId, { query, req, getAppContext }) {
     return __awaiter(this, void 0, void 0, function* () {
         if (!matches.length) {
             return [];
@@ -78,7 +78,7 @@ export function runLoaders(matches, loadersByRouteId, { isServer, query, req, ge
             const loaderFn = loadersByRouteId[match.route.id];
             let res;
             try {
-                const value = yield loaderFn(Object.assign({ isServer, pathname: match.pathname, params: match.params, query: query, redirect: redirectHelper, error: errorHelper, appContext }, (req ? { req } : {})));
+                const value = yield loaderFn(Object.assign({ pathname: match.pathname, params: match.params, query: query, redirect: redirectHelper, error: errorHelper, appContext }, (req ? { req } : {})));
                 if (value) {
                     res = createJson(value);
                 }

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

@@ -1,9 +1,9 @@
+import type { ShuviRequest } from '@shuvi/service';
 import { IURLQuery, IURLParams } from '../routerTypes';
-import { IAppContext, IRequest } from '../applicationTypes';
+import { IAppContext } from '../applicationTypes';
 import { Response } from '../response';
 export interface LoaderContextOptions {
-    isServer: boolean;
-    req?: IRequest;
+    req?: ShuviRequest;
     query: IURLQuery;
     getAppContext: () => IAppContext;
 }
@@ -17,10 +17,6 @@ export interface ErrorFunction {
  * route component getInitialProps params `context`
  */
 export interface IRouteLoaderContext {
-    /**
-     * is running on server, if server is true, client will be false
-     */
-    isServer: boolean;
     /**
      * current url path
      */
@@ -62,7 +58,7 @@ export interface IRouteLoaderContext {
     /**
      * server only
      */
-    req?: IRequest;
+    req?: ShuviRequest;
     /**
      * Application context object, which is accessiable during the entire lifecycle of application
      */

package/esm/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/esm/shared/models/error.js

@@ -12,7 +12,7 @@ export const errorModel = defineModel({
         }
     },
     actions: {
-        error(payload) {
+        set(payload) {
             this.setError(payload || SHUVI_ERROR.APP_ERROR);
         },
         clear() {
@@ -22,7 +22,7 @@ export const errorModel = defineModel({
         }
     },
     views: {
-        getError() {
+        errorObject() {
             return this.error;
         },
         hasError() {

package/esm/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/esm/shared/models/loader.js

@@ -0,0 +1,24 @@
+import { defineModel } from '@shuvi/redox';
+const initState = {
+    dataByRouteId: {}
+};
+export const loaderModel = 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/esm/shared/routerTypes.d.ts

@@ -7,18 +7,10 @@ export interface IPageRouteRecord extends IRouteRecord {
     path: string;
     component?: any;
     children?: IPageRouteRecord[];
-    [x: string]: any;
-}
-export interface IRawPageRouteRecord extends IRouteRecord {
-    id: string;
-    path: string;
-    component?: any;
-    children?: IRawPageRouteRecord[];
-    fullPath: string;
-    __componentSource__: string;
-    __componentSourceWithAffix__: string;
-    __import__: () => Promise<any>;
-    __resolveWeak__: () => any;
+    __import__?: () => Promise<any>;
+    __resolveWeak__?: () => string[];
+    __componentSource__?: string;
+    __componentRawRequest__?: string;
     [x: string]: any;
 }
 export interface IPlatformConfig {
@@ -34,7 +26,6 @@ export interface IPageRouteConfig {
     component?: string;
     redirect?: string;
     path: string;
-    fullPath?: string;
 }
 export interface IPageRouteConfigWithId extends IPageRouteConfig {
     id: string;

package/esm/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/esm/shared/{lifecycle.js → runtimPlugin.js}

@@ -8,6 +8,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { createAsyncParallelHook, createAsyncSeriesWaterfallHook, createHookManager, isPluginInstance } from '@shuvi/hook';
+import { createPluginCreator } from '@shuvi/shared/lib/plugins';
 const init = createAsyncParallelHook();
 const appContext = createAsyncSeriesWaterfallHook();
 const appComponent = createAsyncSeriesWaterfallHook();
@@ -19,7 +20,7 @@ const builtinRuntimePluginHooks = {
     dispose
 };
 export const getManager = () => createHookManager(builtinRuntimePluginHooks, false);
-export const { createPlugin: createRuntimePlugin } = getManager();
+export const { createPluginBefore: createRuntimePluginBefore, createPlugin: createRuntimePlugin, createPluginAfter: createRuntimePluginAfter } = createPluginCreator(getManager());
 export 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/esm/shuvi-app/shuvi-runtime-app.d.ts

@@ -5,7 +5,7 @@
  *  import {} from '@shuvi/runtime/app'
  *
  */
-import { IAppModule as _IAppModule } from '../shared/lifecycle';
+import { IAppModule as _IAppModule } from '../shared/runtimPlugin';
 declare type AppModule = Required<_IAppModule>;
 export declare type InitFunction = AppModule['init'];
 export declare type AppComponentFunction = AppModule['appComponent'];

package/esm/shuvi-app/shuvi-runtime-index.d.ts

@@ -5,6 +5,6 @@
  *  import {} from '@shuvi/runtime'
  *
  */
-export { createRuntimePlugin } from '../shared/lifecycle';
+export { createRuntimePlugin } from '../shared/runtimPlugin';
 export { getPageData } from '../shared/helper/getPageData';
 export type { Loader } from '../shared/loader';

package/esm/shuvi-app/shuvi-runtime-index.js

@@ -5,5 +5,5 @@
  *  import {} from '@shuvi/runtime'
  *
  */
-export { createRuntimePlugin } from '../shared/lifecycle';
+export { createRuntimePlugin } from '../shared/runtimPlugin';
 export { getPageData } from '../shared/helper/getPageData';

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

@@ -1,17 +1,4 @@
 export * from './runtimeFiles';
 export declare const SharedPlugins: {
-    core: import("@shuvi/hook").IPluginInstance<{
-        extendConfig: import("@shuvi/hook").SyncWaterfallHook<import("@shuvi/service").Config, void>;
-        afterInit: import("@shuvi/hook").AsyncParallelHook<void, void, void>;
-        afterBuild: import("@shuvi/hook").AsyncParallelHook<void, void, void>;
-        afterDestroy: import("@shuvi/hook").AsyncParallelHook<void, void, void>;
-        afterBundlerDone: import("@shuvi/hook").AsyncParallelHook<import("@shuvi/service/lib/core/lifecycleTypes").BundlerDoneExtra, void, void>;
-        afterBundlerTargetDone: import("@shuvi/hook").AsyncParallelHook<import("@shuvi/service/lib/core/lifecycleTypes").BundlerTargetDoneExtra, void, void>;
-        configWebpack: import("@shuvi/hook").AsyncSeriesWaterfallHook<import("@shuvi/service/lib/core/lifecycleTypes").WebpackChainType, import("@shuvi/service/lib/core/lifecycleTypes").ConfigWebpackAssistant>;
-        addExtraTarget: import("@shuvi/hook").AsyncParallelHook<import("@shuvi/service/lib/core/lifecycleTypes").ExtraTargetAssistant, void, import("@shuvi/service/lib/core/lifecycleTypes").TargetChain>;
-        addResource: import("@shuvi/hook").AsyncParallelHook<void, void, import("@shuvi/service/lib/core/lifecycleTypes").Resources | import("@shuvi/service/lib/core/lifecycleTypes").Resources[]>;
-        addRuntimeFile: import("@shuvi/hook").AsyncParallelHook<void, import("@shuvi/service/lib/core/lifecycleTypes").AddRuntimeFileUtils, import("@shuvi/service/lib/project/index").FileOptions<any, any> | import("@shuvi/service/lib/project/index").FileOptions<any, any>[]>;
-        addRuntimeService: import("@shuvi/hook").AsyncParallelHook<void, void, import("@shuvi/service/lib/core/lifecycleTypes").RuntimeService | import("@shuvi/service/lib/core/lifecycleTypes").RuntimeService[]>;
-    } & import("@shuvi/service/lib/core/apiTypes").CustomCorePluginHooks, import("@shuvi/service").IPluginContext>;
-    types: string;
+    core: import("@shuvi/hook").IPluginInstance<import("@shuvi/service/lib/core/plugin").PluginHooks, import("@shuvi/service").IPluginContext>;
 }[];

package/lib/node/platform/plugins/main/index.d.ts

@@ -1,17 +1,4 @@
 declare const _default: {
-    core: import("@shuvi/hook").IPluginInstance<{
-        extendConfig: import("@shuvi/hook").SyncWaterfallHook<import("@shuvi/service").Config, void>;
-        afterInit: import("@shuvi/hook").AsyncParallelHook<void, void, void>;
-        afterBuild: import("@shuvi/hook").AsyncParallelHook<void, void, void>;
-        afterDestroy: import("@shuvi/hook").AsyncParallelHook<void, void, void>;
-        afterBundlerDone: import("@shuvi/hook").AsyncParallelHook<import("@shuvi/service/lib/core/lifecycleTypes").BundlerDoneExtra, void, void>;
-        afterBundlerTargetDone: import("@shuvi/hook").AsyncParallelHook<import("@shuvi/service/lib/core/lifecycleTypes").BundlerTargetDoneExtra, void, void>;
-        configWebpack: import("@shuvi/hook").AsyncSeriesWaterfallHook<import("@shuvi/service/lib/core/lifecycleTypes").WebpackChainType, import("@shuvi/service/lib/core/lifecycleTypes").ConfigWebpackAssistant>;
-        addExtraTarget: import("@shuvi/hook").AsyncParallelHook<import("@shuvi/service/lib/core/lifecycleTypes").ExtraTargetAssistant, void, import("@shuvi/service/lib/core/lifecycleTypes").TargetChain>;
-        addResource: import("@shuvi/hook").AsyncParallelHook<void, void, import("@shuvi/service/lib/core/lifecycleTypes").Resources | import("@shuvi/service/lib/core/lifecycleTypes").Resources[]>;
-        addRuntimeFile: import("@shuvi/hook").AsyncParallelHook<void, import("@shuvi/service/lib/core/lifecycleTypes").AddRuntimeFileUtils, import("@shuvi/service/lib/project/index").FileOptions<any, any> | import("@shuvi/service/lib/project/index").FileOptions<any, any>[]>;
-        addRuntimeService: import("@shuvi/hook").AsyncParallelHook<void, void, import("@shuvi/service/lib/core/lifecycleTypes").RuntimeService | import("@shuvi/service/lib/core/lifecycleTypes").RuntimeService[]>;
-    } & import("@shuvi/service/lib/core/apiTypes").CustomCorePluginHooks, import("@shuvi/service").IPluginContext>;
-    types: string;
+    core: import("@shuvi/hook").IPluginInstance<import("@shuvi/service/lib/core/plugin").PluginHooks, import("@shuvi/service").IPluginContext>;
 };
 export default _default;

package/lib/node/platform/plugins/main/index.js

@@ -27,6 +27,5 @@ const core = (0, service_1.createPlugin)({
     ]
 });
 exports.default = {
-    core,
-    types: (0, paths_1.resolvePkgFile)('lib/node/platform/plugins/main/shuvi-app.d.ts')
+    core
 };

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, polyfills: string[]) => (pluginContext: IPluginContext) => Promise<import("@shuvi/service/lib/project").FileOptions<any, any>[]>;
+export declare const getPresetRuntimeFilesCreator: (platformModule: string, polyfills: string[]) => (pluginContext: IPluginContext) => Promise<import("@shuvi/service/lib/project").FileOption<any, any>[]>;

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").DefineFileOption, "name">;
+declare const _default: (context: ProjectContext) => Omit<import("@shuvi/service/lib/project").FileOptionWithoutId<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").DefineFileOption, "name">;
+declare const _default: () => Omit<import("@shuvi/service/lib/project/index").FileOptionWithoutId<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").DefineFileOption, "name">;
+declare const _default: (context: ProjectContext) => Omit<import("@shuvi/service/lib/project").FileOptionWithoutId<string, any>, "name">;
 export default _default;

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

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

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

@@ -1,2 +1,2 @@
-declare const _default: () => Omit<import("@shuvi/service/lib/project/index").DefineFileOption, "name">;
+declare const _default: () => Omit<import("@shuvi/service/lib/project/index").FileOptionWithoutId<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").DefineFileOption, "name">;
+declare const _default: () => Omit<import("@shuvi/service/lib/project/index").FileOptionWithoutId<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").DefineFileOption, "name">;
+declare const _default: (context: ProjectContext) => Omit<import("@shuvi/service/lib/project").FileOptionWithoutId<string, any>, "name">;
 export default _default;