@shuvi/platform-web 1.0.14 → 1.0.15

package/esm/shuvi-app/dev/websocket.js

@@ -36,7 +36,9 @@ export function connectHMR(options) {
             source.close();
         const { hostname, port } = window.location;
         const protocol = getSocketProtocol(options.assetPublicPath);
-        const assetPublicPath = options.assetPublicPath.replace(/^\/+/, '');
+        const assetPublicPath = options.assetPublicPath
+            .replace(/^\/+/, '')
+            .replace(/\/+$/, '');
         let url = `${protocol}://${hostname}:${port}${assetPublicPath ? `/${assetPublicPath}` : ''}`;
         if (assetPublicPath.startsWith('http')) {
             url = `${protocol}://${assetPublicPath.split('://')[1]}`;

package/lib/node/features/on-demand-compile-page/onDemandRouteManager.d.ts

@@ -2,7 +2,8 @@ import { ShuviRequestHandler, IServerPluginContext } from '@shuvi/service';
 import { DevMiddleware } from '@shuvi/service/lib/server/middlewares/dev';
 export default class OnDemandRouteManager {
     devMiddleware: DevMiddleware | null;
-    _serverPluginContext: IServerPluginContext;
+    private _serverPluginContext;
+    private _assetPathPrefix;
     constructor(serverPluginContext: IServerPluginContext);
     getServerMiddleware(): ShuviRequestHandler;
     ensureRoutesMiddleware(): ShuviRequestHandler;

package/lib/node/features/on-demand-compile-page/onDemandRouteManager.js

@@ -27,17 +27,25 @@ class OnDemandRouteManager {
     constructor(serverPluginContext) {
         this.devMiddleware = null;
         this._serverPluginContext = serverPluginContext;
+        const { assetPublicPath } = this._serverPluginContext;
+        if (assetPublicPath.startsWith('http')) {
+            const url = new URL(assetPublicPath);
+            this._assetPathPrefix = url.pathname;
+        }
+        else {
+            this._assetPathPrefix = assetPublicPath;
+        }
     }
     getServerMiddleware() {
         return (req, res, next) => __awaiter(this, void 0, void 0, function* () {
             const pathname = req.pathname;
-            if (!pathname.startsWith(this._serverPluginContext.assetPublicPath)) {
+            if (!pathname.startsWith(this._assetPathPrefix)) {
                 return next();
             }
             if (!this.devMiddleware) {
                 return next();
             }
-            const chunkName = pathname.replace(this._serverPluginContext.assetPublicPath, '');
+            const chunkName = pathname.replace(this._assetPathPrefix, '');
             const chunkInitiatorModule = resources_1.default.clientManifest.chunkRequest[chunkName];
             if (!chunkInitiatorModule) {
                 return next();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shuvi/platform-web",
-  "version": "1.0.14",
+  "version": "1.0.15",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/shuvijs/shuvi.git",
@@ -72,17 +72,17 @@
   },
   "dependencies": {
     "@next/react-refresh-utils": "12.1.6",
-    "@shuvi/error-overlay": "1.0.14",
-    "@shuvi/hook": "1.0.14",
-    "@shuvi/platform-shared": "1.0.14",
+    "@shuvi/error-overlay": "1.0.15",
+    "@shuvi/hook": "1.0.15",
+    "@shuvi/platform-shared": "1.0.15",
     "doura": "0.0.7",
     "react-doura": "0.0.7",
-    "@shuvi/router": "1.0.14",
-    "@shuvi/router-react": "1.0.14",
-    "@shuvi/runtime": "1.0.14",
-    "@shuvi/shared": "1.0.14",
-    "@shuvi/toolpack": "1.0.14",
-    "@shuvi/utils": "1.0.14",
+    "@shuvi/router": "1.0.15",
+    "@shuvi/router-react": "1.0.15",
+    "@shuvi/runtime": "1.0.15",
+    "@shuvi/shared": "1.0.15",
+    "@shuvi/toolpack": "1.0.15",
+    "@shuvi/utils": "1.0.15",
     "content-type": "1.0.4",
     "core-js": "3.6.5",
     "ejs": "3.1.5",
@@ -98,7 +98,7 @@
     "whatwg-fetch": "3.0.0"
   },
   "peerDependencies": {
-    "@shuvi/service": "1.0.14"
+    "@shuvi/service": "1.0.15"
   },
   "devDependencies": {
     "@shuvi/service": "workspace:*",