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

package/esm/shared/application.js

@@ -85,7 +85,7 @@ export class ApplicationImpl {
     }
     _initAppContext() {
         return __awaiter(this, void 0, void 0, function* () {
-            this._context = (yield this._pluginManager.runner.appContext(this._context));
+            yield this._pluginManager.runner.appContext(this._context);
         });
     }
     _initAppComponent() {

package/esm/shared/runtimPlugin.d.ts

@@ -3,7 +3,7 @@ import { CustomRuntimePluginHooks } from '@shuvi/runtime';
 import { IAppContext } from './applicationTypes';
 export declare type AppComponent = unknown;
 declare const init: import("@shuvi/hook").AsyncParallelHook<void, void, void>;
-declare const appContext: import("@shuvi/hook").AsyncSeriesWaterfallHook<IAppContext, void>;
+declare const appContext: import("@shuvi/hook").AsyncSeriesHook<IAppContext, void, void>;
 declare const appComponent: import("@shuvi/hook").AsyncSeriesWaterfallHook<unknown, IAppContext>;
 declare const dispose: import("@shuvi/hook").AsyncParallelHook<void, void, void>;
 export interface BuiltInRuntimePluginHooks extends HookMap {

package/esm/shared/runtimPlugin.js

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

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

@@ -2,11 +2,12 @@ import { IRuntimeConfig } from './runtimeConfigTypes';
 /**
  * getRuntimeConfig function
  *
- * @returns runtimeConfig
+ * @returns serverRuntimeConfig
  */
 export declare function getRuntimeConfig(): {
     [x: string]: string;
 };
-export declare function getPublicRuntimeConfig(): IRuntimeConfig | null;
-export declare function setRuntimeConfig(config: IRuntimeConfig): void;
-export declare function setPublicRuntimeConfig(config: IRuntimeConfig): void;
+export declare function getPublicRuntimeConfig(): IRuntimeConfig | undefined | null;
+export declare function setPublicRuntimeConfig(config: IRuntimeConfig | null): void;
+export declare function getServerRuntimeConfig(): IRuntimeConfig | undefined | null;
+export declare function setServerRuntimeConfig(config: IRuntimeConfig | null): void;

package/esm/shared/shuvi-singleton-runtimeConfig.js

@@ -1,19 +1,49 @@
-let runtimeConfig;
+const isServer = typeof window === 'undefined';
+/**
+ * use global this to store runtime config, so we can safely bundle this module
+ * and get rid of the multiple-module-instance problem.
+ * */
+const KEY_SERVER_RUNTIME_CONFIG = Symbol.for('shuvi_server_runtime_config');
+const KEY_PUBLIC_RUNTIME_CONFIG = Symbol.for('shuvi_client_runtime_config');
 let publicRuntimeConfig;
+let serverRuntimeConfig;
 /**
  * getRuntimeConfig function
  *
- * @returns runtimeConfig
+ * @returns serverRuntimeConfig
  */
 export function getRuntimeConfig() {
-    return Object.assign(Object.assign({}, (runtimeConfig || {})), (publicRuntimeConfig || {}));
+    return Object.assign(Object.assign({}, (getServerRuntimeConfig() || {})), (getPublicRuntimeConfig() || {}));
 }
 export function getPublicRuntimeConfig() {
-    return publicRuntimeConfig;
-}
-export function setRuntimeConfig(config) {
-    runtimeConfig = config;
+    if (isServer) {
+        return globalThis[KEY_PUBLIC_RUNTIME_CONFIG];
+    }
+    else {
+        return publicRuntimeConfig;
+    }
 }
 export function setPublicRuntimeConfig(config) {
-    publicRuntimeConfig = config;
+    if (isServer) {
+        globalThis[KEY_PUBLIC_RUNTIME_CONFIG] = config;
+    }
+    else {
+        publicRuntimeConfig = config;
+    }
+}
+export function getServerRuntimeConfig() {
+    if (isServer) {
+        return globalThis[KEY_SERVER_RUNTIME_CONFIG];
+    }
+    else {
+        return serverRuntimeConfig;
+    }
+}
+export function setServerRuntimeConfig(config) {
+    if (isServer) {
+        globalThis[KEY_SERVER_RUNTIME_CONFIG] = config;
+    }
+    else {
+        serverRuntimeConfig = config;
+    }
 }

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

@@ -9,9 +9,6 @@ const core = (0, service_1.createPlugin)({
     },
     addRuntimeService: () => [
         {
-            // must be export separately, we need the module path to always be the
-            // same as what we've defined in
-            // "packages/toolpack/src/webpack/config/parts/external.ts"
             source: (0, paths_1.resolvePkgFile)('lib/shared/shuvi-singleton-runtimeConfig'),
             exported: '{ getRuntimeConfig }'
         },

package/lib/node/platform/runtimeFiles.js

@@ -8,9 +8,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": 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 shuvi_singleton_runtimeConfig_1 = require("../../shared/shuvi-singleton-runtimeConfig");
 const projectContext_1 = require("../project/projectContext");
 const file_presets_1 = require("../project/file-presets");
@@ -32,16 +36,12 @@ const getPresetRuntimeFilesCreator = (platformModule) => (pluginContext) => __aw
         const key = serverKeys[index];
         const hasSameKey = publicKeys.includes(key);
         if (hasSameKey) {
-            console.warn(`Warning: key "${key}" exist in both "runtimeConfig" and "publicRuntimeConfig". Please rename the key, or the value from "publicRuntimeConfig" will be applied.\n`);
+            logger_1.default.warn(`Warning: key "${key}" exist in both "runtimeConfig" and "publicRuntimeConfig". Please rename the key, or the value from "publicRuntimeConfig" will be applied.\n`);
             break;
         }
     }
-    if (serverKeys) {
-        (0, shuvi_singleton_runtimeConfig_1.setRuntimeConfig)(serverRuntimeConfig);
-    }
-    if (publicKeys) {
-        (0, shuvi_singleton_runtimeConfig_1.setPublicRuntimeConfig)(publicRuntimeConfig);
-    }
+    (0, shuvi_singleton_runtimeConfig_1.setServerRuntimeConfig)(serverKeys ? serverRuntimeConfig : null);
+    (0, shuvi_singleton_runtimeConfig_1.setPublicRuntimeConfig)(publicKeys ? publicRuntimeConfig : null);
     const context = (0, projectContext_1.createProjectContext)();
     context.userModule = {
         error: getCandidates('error', 'nullish'),

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

@@ -3,5 +3,5 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const __1 = require("../../..");
 const paths_1 = require("../../../../../paths");
 exports.default = () => (0, __1.defineFile)({
-    content: () => `export { setRuntimeConfig as default } from '${(0, paths_1.resolvePkgFile)('lib/shared/shuvi-singleton-runtimeConfig')}'`
+    content: () => `export { setPublicRuntimeConfig as default } from '${(0, paths_1.resolvePkgFile)('lib/shared/shuvi-singleton-runtimeConfig')}'`
 });

package/lib/shared/application.js

@@ -88,7 +88,7 @@ class ApplicationImpl {
     }
     _initAppContext() {
         return __awaiter(this, void 0, void 0, function* () {
-            this._context = (yield this._pluginManager.runner.appContext(this._context));
+            yield this._pluginManager.runner.appContext(this._context);
         });
     }
     _initAppComponent() {

package/lib/shared/runtimPlugin.d.ts

@@ -3,7 +3,7 @@ import { CustomRuntimePluginHooks } from '@shuvi/runtime';
 import { IAppContext } from './applicationTypes';
 export declare type AppComponent = unknown;
 declare const init: import("@shuvi/hook").AsyncParallelHook<void, void, void>;
-declare const appContext: import("@shuvi/hook").AsyncSeriesWaterfallHook<IAppContext, void>;
+declare const appContext: import("@shuvi/hook").AsyncSeriesHook<IAppContext, void, void>;
 declare const appComponent: import("@shuvi/hook").AsyncSeriesWaterfallHook<unknown, IAppContext>;
 declare const dispose: import("@shuvi/hook").AsyncParallelHook<void, void, void>;
 export interface BuiltInRuntimePluginHooks extends HookMap {

package/lib/shared/runtimPlugin.js

@@ -14,7 +14,7 @@ exports.initPlugins = exports.createRuntimePluginAfter = exports.createRuntimePl
 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 appContext = (0, hook_1.createAsyncSeriesHook)();
 const appComponent = (0, hook_1.createAsyncSeriesWaterfallHook)();
 const dispose = (0, hook_1.createAsyncParallelHook)();
 const builtinRuntimePluginHooks = {

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

@@ -2,11 +2,12 @@ import { IRuntimeConfig } from './runtimeConfigTypes';
 /**
  * getRuntimeConfig function
  *
- * @returns runtimeConfig
+ * @returns serverRuntimeConfig
  */
 export declare function getRuntimeConfig(): {
     [x: string]: string;
 };
-export declare function getPublicRuntimeConfig(): IRuntimeConfig | null;
-export declare function setRuntimeConfig(config: IRuntimeConfig): void;
-export declare function setPublicRuntimeConfig(config: IRuntimeConfig): void;
+export declare function getPublicRuntimeConfig(): IRuntimeConfig | undefined | null;
+export declare function setPublicRuntimeConfig(config: IRuntimeConfig | null): void;
+export declare function getServerRuntimeConfig(): IRuntimeConfig | undefined | null;
+export declare function setServerRuntimeConfig(config: IRuntimeConfig | null): void;

package/lib/shared/shuvi-singleton-runtimeConfig.js

@@ -1,26 +1,57 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setPublicRuntimeConfig = exports.setRuntimeConfig = exports.getPublicRuntimeConfig = exports.getRuntimeConfig = void 0;
-let runtimeConfig;
+exports.setServerRuntimeConfig = exports.getServerRuntimeConfig = exports.setPublicRuntimeConfig = exports.getPublicRuntimeConfig = exports.getRuntimeConfig = void 0;
+const isServer = typeof window === 'undefined';
+/**
+ * use global this to store runtime config, so we can safely bundle this module
+ * and get rid of the multiple-module-instance problem.
+ * */
+const KEY_SERVER_RUNTIME_CONFIG = Symbol.for('shuvi_server_runtime_config');
+const KEY_PUBLIC_RUNTIME_CONFIG = Symbol.for('shuvi_client_runtime_config');
 let publicRuntimeConfig;
+let serverRuntimeConfig;
 /**
  * getRuntimeConfig function
  *
- * @returns runtimeConfig
+ * @returns serverRuntimeConfig
  */
 function getRuntimeConfig() {
-    return Object.assign(Object.assign({}, (runtimeConfig || {})), (publicRuntimeConfig || {}));
+    return Object.assign(Object.assign({}, (getServerRuntimeConfig() || {})), (getPublicRuntimeConfig() || {}));
 }
 exports.getRuntimeConfig = getRuntimeConfig;
 function getPublicRuntimeConfig() {
-    return publicRuntimeConfig;
+    if (isServer) {
+        return globalThis[KEY_PUBLIC_RUNTIME_CONFIG];
+    }
+    else {
+        return publicRuntimeConfig;
+    }
 }
 exports.getPublicRuntimeConfig = getPublicRuntimeConfig;
-function setRuntimeConfig(config) {
-    runtimeConfig = config;
-}
-exports.setRuntimeConfig = setRuntimeConfig;
 function setPublicRuntimeConfig(config) {
-    publicRuntimeConfig = config;
+    if (isServer) {
+        globalThis[KEY_PUBLIC_RUNTIME_CONFIG] = config;
+    }
+    else {
+        publicRuntimeConfig = config;
+    }
 }
 exports.setPublicRuntimeConfig = setPublicRuntimeConfig;
+function getServerRuntimeConfig() {
+    if (isServer) {
+        return globalThis[KEY_SERVER_RUNTIME_CONFIG];
+    }
+    else {
+        return serverRuntimeConfig;
+    }
+}
+exports.getServerRuntimeConfig = getServerRuntimeConfig;
+function setServerRuntimeConfig(config) {
+    if (isServer) {
+        globalThis[KEY_SERVER_RUNTIME_CONFIG] = config;
+    }
+    else {
+        serverRuntimeConfig = config;
+    }
+}
+exports.setServerRuntimeConfig = setServerRuntimeConfig;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shuvi/platform-shared",
-  "version": "1.0.0-rc.16",
+  "version": "1.0.0-rc.18",
   "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.16",
-    "@shuvi/redox": "0.0.6",
-    "@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",
+    "@shuvi/hook": "1.0.0-rc.18",
+    "@shuvi/redox": "0.0.7",
+    "@shuvi/router": "1.0.0-rc.18",
+    "@shuvi/runtime": "1.0.0-rc.18",
+    "@shuvi/service": "1.0.0-rc.18",
+    "@shuvi/shared": "1.0.0-rc.18",
+    "@shuvi/toolpack": "1.0.0-rc.18",
+    "@shuvi/utils": "1.0.0-rc.18",
     "redux": "4.1.2"
   },
   "peerDependencies": {
-    "@shuvi/service": "1.0.0-rc.16"
+    "@shuvi/service": "1.0.0-rc.18"
   },
   "devDependencies": {
     "@types/minimatch": "3.0.5"

package/shuvi-type-extensions-runtime.d.ts

@@ -35,11 +35,6 @@ declare module '@shuvi/app/core/setRuntimeConfig' {
   export default function setRuntimeConfig(config: IRuntimeConfig): void;
 }
 
-declare module '@shuvi/app/core/setPublicRuntimeConfig' {
-  import { IRuntimeConfig } from '@shuvi/platform-shared/shared';
-  export default function setPublicRuntimeConfig(config: IRuntimeConfig): void;
-}
-
 declare module '@shuvi/app/user/error' {
   const Error: any;
   export default Error;

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

@@ -1,2 +0,0 @@
-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/setPublicRuntimeConfig.js.js

@@ -1,7 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const __1 = require("../../..");
-const paths_1 = require("../../../../../paths");
-exports.default = () => (0, __1.defineFile)({
-    content: () => `export { setPublicRuntimeConfig as default } from '${(0, paths_1.resolvePkgFile)('lib/shared/shuvi-singleton-runtimeConfig')}'`
-});