@shuvi/service 2.0.0-dev.23 → 2.0.0-dev.24

package/lib/core/api.d.ts

@@ -50,6 +50,7 @@ declare class Api {
     init(): Promise<void>;
     getBundler(): Promise<Bundler>;
     get assetPublicPath(): string;
+    private _getAssetPublicPath;
     buildApp(): Promise<void>;
     addRuntimeFile(option: FileOptionWithId<any>): void;
     addInternalRuntimeFile(option: FileOptionWithId<any>): void;

package/lib/core/api.js

@@ -119,6 +119,7 @@ class Api {
                 phase: this._phase,
                 pluginRunner: this._pluginManager.runner,
                 assetPublicPath: this.assetPublicPath,
+                getAssetPublicPath: this._getAssetPublicPath.bind(this),
                 resolveAppFile: this.resolveAppFile.bind(this),
                 resolveUserFile: this.resolveUserFile.bind(this),
                 resolveBuildFile: this.resolveBuildFile.bind(this),
@@ -193,12 +194,26 @@ class Api {
         });
     }
     get assetPublicPath() {
-        let publicPath = this._config.publicPath || constants_1.DEFAULT_PUBLIC_PATH;
+        const configPublicPath = this._config.publicPath;
+        let publicPath;
+        if (typeof configPublicPath === 'function') {
+            // 如果是函数，返回默认值，运行时会在 getAssetUrl 中动态计算
+            publicPath = constants_1.DEFAULT_PUBLIC_PATH;
+        }
+        else {
+            publicPath = configPublicPath || constants_1.DEFAULT_PUBLIC_PATH;
+        }
         if (!publicPath.endsWith('/')) {
             publicPath += '/';
         }
         return publicPath;
     }
+    _getAssetPublicPath(req) {
+        const { publicPath } = this._config;
+        return typeof publicPath === 'function'
+            ? publicPath(req)
+            : this.assetPublicPath;
+    }
     buildApp() {
         return __awaiter(this, void 0, void 0, function* () {
             yield Promise.all([this._removeLastArtifacts(), this._initArtifacts()]);

package/lib/core/apiTypes.d.ts

@@ -2,7 +2,7 @@ import { CompilerOptions } from '@shuvi/toolpack/lib/webpack/loaders/shuvi-swc-l
 import { CorePluginConstructor, CorePluginFactory, CorePluginInstance, PluginRunner } from './plugin';
 import { FileOptionWithId } from '../project';
 import { IProxyConfig } from '../server/middlewares/httpProxyMiddleware';
-import { IServerMiddleware, IServerPluginContext, ServerPluginInstance, ServerPluginConstructor, ServerPluginFactory } from '../server';
+import { IServerMiddleware, IServerPluginContext, ServerPluginInstance, ServerPluginConstructor, ServerPluginFactory, ShuviRequest } from '../server';
 import { DevMiddleware } from '../server/middlewares/dev';
 export type { IProxyConfig };
 export type DeepPartial<T> = {
@@ -82,7 +82,7 @@ export interface InternalConfig {
     plugins?: IPluginConfig[];
     env: Record<string, string>;
     outputPath: string;
-    publicPath: string;
+    publicPath: string | ((req: ShuviRequest) => string);
     proxy?: IProxyConfig;
     analyze: boolean;
     disposeInactivePage: boolean;
@@ -108,6 +108,7 @@ export interface IPluginContext {
     phase: IServicePhase;
     pluginRunner: PluginRunner;
     assetPublicPath: string;
+    getAssetPublicPath(req: ShuviRequest): string;
     resolveAppFile(...paths: string[]): string;
     resolveUserFile(...paths: string[]): string;
     resolveBuildFile(...paths: string[]): string;

package/lib/server/shuviServer.js

@@ -26,7 +26,11 @@ class ShuviServer {
     _normalizeReq(req) {
         const shuviReq = req;
         shuviReq.getAssetUrl = (assetPath) => {
-            const fullAssetPath = (0, string_1.joinPath)(this._serverContext.assetPublicPath, assetPath);
+            const { config } = this._serverContext;
+            const publicPath = typeof config.publicPath === 'function'
+                ? config.publicPath(shuviReq)
+                : this._serverContext.assetPublicPath;
+            const fullAssetPath = (0, string_1.joinPath)(publicPath, assetPath);
             return fullAssetPath;
         };
         // Parsing of cookies

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shuvi/service",
-  "version": "2.0.0-dev.23",
+  "version": "2.0.0-dev.24",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/shuvijs/shuvi.git",
@@ -29,14 +29,14 @@
     "@babel/generator": "7.14.5",
     "@babel/parser": "7.14.7",
     "@babel/traverse": "7.14.7",
-    "@shuvi/hook": "2.0.0-dev.23",
-    "@shuvi/router": "2.0.0-dev.23",
-    "@shuvi/runtime": "2.0.0-dev.23",
-    "@shuvi/shared": "2.0.0-dev.23",
-    "@shuvi/toolpack": "2.0.0-dev.23",
-    "@shuvi/utils": "2.0.0-dev.23",
-    "@shuvi/error-overlay": "2.0.0-dev.23",
-    "@shuvi/reporters": "2.0.0-dev.23",
+    "@shuvi/hook": "2.0.0-dev.24",
+    "@shuvi/router": "2.0.0-dev.24",
+    "@shuvi/runtime": "2.0.0-dev.24",
+    "@shuvi/shared": "2.0.0-dev.24",
+    "@shuvi/toolpack": "2.0.0-dev.24",
+    "@shuvi/utils": "2.0.0-dev.24",
+    "@shuvi/error-overlay": "2.0.0-dev.24",
+    "@shuvi/reporters": "2.0.0-dev.24",
     "commander": "5.1.0",
     "comment-json": "4.2.2",
     "cross-spawn": "7.0.3",