@shuvi/platform-web 1.0.62 → 1.0.63

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

@@ -1,3 +1,4 @@
+import { getAppData } from '@shuvi/platform-shared/shared';
 let source;
 const eventCallbacks = [];
 let lastActivity = Date.now();
@@ -9,7 +10,8 @@ function getSocketProtocol(assetPublicPath) {
         protocol = new URL(assetPublicPath).protocol;
     }
     catch (_) { }
-    return protocol === 'http:' ? 'ws' : 'wss';
+    // use ws by default
+    return protocol === 'https:' ? 'wss' : 'ws';
 }
 export function addMessageListener(cb) {
     eventCallbacks.push(cb);
@@ -34,12 +36,17 @@ export function connectHMR(options) {
     function init() {
         if (source)
             source.close();
-        const { hostname, port } = window.location;
+        let { devServer } = getAppData();
+        if (!devServer) {
+            // fallback case
+            const { hostname, port } = window.location;
+            devServer = `${hostname}:${port}`;
+        }
         const protocol = getSocketProtocol(options.assetPublicPath);
         const assetPublicPath = options.assetPublicPath
             .replace(/^\/+/, '')
             .replace(/\/+$/, '');
-        let url = `${protocol}://${hostname}:${port}${assetPublicPath ? `/${assetPublicPath}` : ''}`;
+        let url = `${protocol}://${devServer}${assetPublicPath ? `/${assetPublicPath}` : ''}`;
         if (assetPublicPath.startsWith('http')) {
             url = `${protocol}://${assetPublicPath.split('://')[1]}`;
         }

package/lib/node/features/html-render/lib/renderer/base.js

@@ -68,7 +68,9 @@ class BaseRenderer {
     }
     _getInlineAppData(app, appData) {
         const routes = app.router.routes || [];
-        const data = JSON.stringify(Object.assign(Object.assign({}, appData), { filesByRoutId: (0, generateFilesByRoutId_1.default)(resources_1.default.clientManifest, routes), publicPath: this._serverPluginContext.assetPublicPath }));
+        const data = JSON.stringify(Object.assign(Object.assign({}, appData), { filesByRoutId: (0, generateFilesByRoutId_1.default)(resources_1.default.clientManifest, routes), publicPath: this._serverPluginContext.assetPublicPath, 
+            // process.env.DEV_SERVER is undefined in production, and the key devServer will be removed
+            devServer: process.env.DEV_SERVER }));
         return (0, htmlTag_1.tag)('script', {
             id: constants_1.CLIENT_APPDATA_ID,
             type: 'application/json'

package/package.json

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