@shuvi/platform-shared 1.0.0-rc.13 → 1.0.0-rc.16

package/esm/shared/application.d.ts

@@ -1,15 +1,17 @@
 import { IRouter, IPageRouteRecord } from './routerTypes';
-import { RedoxStore, IApplication, IAppContext, IApplicationOptions, IRerenderConfig, IError } from './applicationTypes';
-export declare class Application {
+import { RedoxStore, Application, IAppContext, ApplicationOptions, IRerenderConfig, IError } from './applicationTypes';
+export declare class ApplicationImpl<Config extends {} = {}> {
     private _router;
     private _appComponent;
     private _pluginManager;
     private _context;
+    private _config;
     private _store;
     private _error;
     private _loader;
-    constructor(options: IApplicationOptions);
+    constructor(options: ApplicationOptions<Config>);
     get router(): IRouter<IPageRouteRecord>;
+    get config(): Config;
     get context(): IAppContext;
     get pluginManager(): import("@shuvi/hook").HookManager<import("./runtimPlugin").RuntimePluginHooks, void>;
     get appComponent(): any;
@@ -25,5 +27,5 @@ export declare class Application {
     private _initPlugin;
     private _initAppContext;
     private _initAppComponent;
-    getPublicAPI(): IApplication;
+    getPublicAPI(): Application<Config>;
 }

package/esm/shared/application.js

@@ -12,8 +12,9 @@ import { initPlugins } from './runtimPlugin';
 import { redox } from '@shuvi/redox';
 import { errorModel } from './models/error';
 import { loaderModel } from './models/loader';
-export class Application {
+export class ApplicationImpl {
     constructor(options) {
+        this._config = options.config;
         this._router = options.router;
         this._context = {};
         this._store = redox({ initialState: options.initialState });
@@ -26,6 +27,9 @@ export class Application {
     get router() {
         return this._router;
     }
+    get config() {
+        return this._config;
+    }
     get context() {
         return this._context;
     }
@@ -92,10 +96,21 @@ export class Application {
     getPublicAPI() {
         const self = this;
         return {
-            context: self._context,
-            router: self._router,
-            appComponent: self._appComponent,
-            store: self._store,
+            get config() {
+                return self._config;
+            },
+            get context() {
+                return self._context;
+            },
+            get router() {
+                return self._router;
+            },
+            get appComponent() {
+                return self._appComponent;
+            },
+            get store() {
+                return self._store;
+            },
             get error() {
                 return self.error;
             },

package/esm/shared/applicationTypes.d.ts

@@ -23,7 +23,8 @@ export interface IErrorState {
 export declare type IAppState = {
     error?: IErrorState;
 };
-export interface IApplication {
+export interface Application<Config extends {} = {}> {
+    readonly config: Config;
     readonly context: IAppContext;
     readonly router: IRouter<IPageRouteRecord>;
     readonly appComponent: any;
@@ -34,7 +35,8 @@ export interface IApplication {
     getLoadersData(): Record<string, any>;
     setLoadersData(datas: Record<string, any>): void;
 }
-export interface IApplicationOptions {
+export interface ApplicationOptions<C extends {}> {
+    config: C;
     router: IRouter;
     AppComponent: any;
     initialState?: IAppState;

package/esm/shared/index.d.ts

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

package/esm/shuvi-app/application.d.ts

@@ -1,4 +1,4 @@
-import { Application } from '../shared/application';
-import { IApplicationOptions } from './shared';
-export { Application };
-export default function application(options: IApplicationOptions): Application;
+import { ApplicationImpl } from '../shared/application';
+import { ApplicationOptions } from './shared';
+export { ApplicationImpl };
+export default function application<C extends {}>(options: ApplicationOptions<C>): ApplicationImpl<C>;

package/esm/shuvi-app/application.js

@@ -1,8 +1,8 @@
 import * as customApp from '@shuvi/app/user/app';
 import { pluginRecord } from '@shuvi/app/core/plugins';
-import { Application } from '../shared/application';
+import { ApplicationImpl } from '../shared/application';
 import { createRuntimePlugin } from './shared';
-export { Application };
+export { ApplicationImpl };
 function getPlugins(runtime, pluginRecords) {
     const plugins = [];
     const keys = Object.keys(pluginRecords);
@@ -29,6 +29,6 @@ function getPlugins(runtime, pluginRecords) {
     return plugins;
 }
 export default function application(options) {
-    const application = new Application(Object.assign(Object.assign({}, options), { plugins: getPlugins(customApp, pluginRecord) }));
+    const application = new ApplicationImpl(Object.assign(Object.assign({}, options), { plugins: getPlugins(customApp, pluginRecord) }));
     return application;
 }

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

@@ -2,7 +2,7 @@ import { IRuntimeConfig } from '../../../../shared';
 export declare const extendedHooks: {
     addEntryCode: import("@shuvi/hook").AsyncParallelHook<void, void, string | string[]>;
     modifyRuntimeConfig: import("@shuvi/hook").AsyncSeriesWaterfallHook<{
-        public: IRuntimeConfig;
-        server: IRuntimeConfig;
+        publicRuntimeConfig: IRuntimeConfig;
+        serverRuntimeConfig: IRuntimeConfig;
     }, void>;
 };

package/lib/node/platform/runtimeFiles.js

@@ -22,9 +22,9 @@ const file_presets_1 = require("../project/file-presets");
 const getPresetRuntimeFilesCreator = (platformModule) => (pluginContext) => __awaiter(void 0, void 0, void 0, function* () {
     const { pluginRunner, config } = pluginContext;
     const getCandidates = (fileName, fallbackType) => project_1.fileUtils.getUserCustomFileCandidates(pluginContext.paths.rootDir, fileName, fallbackType);
-    const { public: publicRuntimeConfig, server: serverRuntimeConfig } = yield pluginRunner.modifyRuntimeConfig({
-        public: config.publicRuntimeConfig || {},
-        server: config.runtimeConfig || {}
+    const { publicRuntimeConfig, serverRuntimeConfig } = yield pluginRunner.modifyRuntimeConfig({
+        publicRuntimeConfig: config.publicRuntimeConfig || {},
+        serverRuntimeConfig: config.serverRuntimeConfig || {}
     });
     const serverKeys = Object.keys(serverRuntimeConfig);
     const publicKeys = Object.keys(publicRuntimeConfig);

package/lib/shared/application.d.ts

@@ -1,15 +1,17 @@
 import { IRouter, IPageRouteRecord } from './routerTypes';
-import { RedoxStore, IApplication, IAppContext, IApplicationOptions, IRerenderConfig, IError } from './applicationTypes';
-export declare class Application {
+import { RedoxStore, Application, IAppContext, ApplicationOptions, IRerenderConfig, IError } from './applicationTypes';
+export declare class ApplicationImpl<Config extends {} = {}> {
     private _router;
     private _appComponent;
     private _pluginManager;
     private _context;
+    private _config;
     private _store;
     private _error;
     private _loader;
-    constructor(options: IApplicationOptions);
+    constructor(options: ApplicationOptions<Config>);
     get router(): IRouter<IPageRouteRecord>;
+    get config(): Config;
     get context(): IAppContext;
     get pluginManager(): import("@shuvi/hook").HookManager<import("./runtimPlugin").RuntimePluginHooks, void>;
     get appComponent(): any;
@@ -25,5 +27,5 @@ export declare class Application {
     private _initPlugin;
     private _initAppContext;
     private _initAppComponent;
-    getPublicAPI(): IApplication;
+    getPublicAPI(): Application<Config>;
 }

package/lib/shared/application.js

@@ -9,14 +9,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Application = void 0;
+exports.ApplicationImpl = void 0;
 const runtimPlugin_1 = require("./runtimPlugin");
 const runtimPlugin_2 = require("./runtimPlugin");
 const redox_1 = require("@shuvi/redox");
 const error_1 = require("./models/error");
 const loader_1 = require("./models/loader");
-class Application {
+class ApplicationImpl {
     constructor(options) {
+        this._config = options.config;
         this._router = options.router;
         this._context = {};
         this._store = (0, redox_1.redox)({ initialState: options.initialState });
@@ -29,6 +30,9 @@ class Application {
     get router() {
         return this._router;
     }
+    get config() {
+        return this._config;
+    }
     get context() {
         return this._context;
     }
@@ -95,10 +99,21 @@ class Application {
     getPublicAPI() {
         const self = this;
         return {
-            context: self._context,
-            router: self._router,
-            appComponent: self._appComponent,
-            store: self._store,
+            get config() {
+                return self._config;
+            },
+            get context() {
+                return self._context;
+            },
+            get router() {
+                return self._router;
+            },
+            get appComponent() {
+                return self._appComponent;
+            },
+            get store() {
+                return self._store;
+            },
             get error() {
                 return self.error;
             },
@@ -117,4 +132,4 @@ class Application {
         };
     }
 }
-exports.Application = Application;
+exports.ApplicationImpl = ApplicationImpl;

package/lib/shared/applicationTypes.d.ts

@@ -23,7 +23,8 @@ export interface IErrorState {
 export declare type IAppState = {
     error?: IErrorState;
 };
-export interface IApplication {
+export interface Application<Config extends {} = {}> {
+    readonly config: Config;
     readonly context: IAppContext;
     readonly router: IRouter<IPageRouteRecord>;
     readonly appComponent: any;
@@ -34,7 +35,8 @@ export interface IApplication {
     getLoadersData(): Record<string, any>;
     setLoadersData(datas: Record<string, any>): void;
 }
-export interface IApplicationOptions {
+export interface ApplicationOptions<C extends {}> {
+    config: C;
     router: IRouter;
     AppComponent: any;
     initialState?: IAppState;

package/lib/shared/index.d.ts

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shuvi/platform-shared",
-  "version": "1.0.0-rc.13",
+  "version": "1.0.0-rc.16",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/shuvijs/shuvi.git",
@@ -83,18 +83,18 @@
     "node": ">= 12.0.0"
   },
   "dependencies": {
-    "@shuvi/hook": "1.0.0-rc.13",
+    "@shuvi/hook": "1.0.0-rc.16",
     "@shuvi/redox": "0.0.6",
-    "@shuvi/router": "1.0.0-rc.13",
-    "@shuvi/runtime": "1.0.0-rc.13",
-    "@shuvi/service": "1.0.0-rc.13",
-    "@shuvi/shared": "1.0.0-rc.13",
-    "@shuvi/toolpack": "1.0.0-rc.13",
-    "@shuvi/utils": "1.0.0-rc.13",
+    "@shuvi/router": "1.0.0-rc.16",
+    "@shuvi/runtime": "1.0.0-rc.16",
+    "@shuvi/service": "1.0.0-rc.16",
+    "@shuvi/shared": "1.0.0-rc.16",
+    "@shuvi/toolpack": "1.0.0-rc.16",
+    "@shuvi/utils": "1.0.0-rc.16",
     "redux": "4.1.2"
   },
   "peerDependencies": {
-    "@shuvi/service": "1.0.0-rc.13"
+    "@shuvi/service": "1.0.0-rc.16"
   },
   "devDependencies": {
     "@types/minimatch": "3.0.5"