Merge pull request #120 from Shopify/issues/5179/live-reload-safari

Fix webSocket for liveReload in Safari
Shopify · May 31, 2021 · 9eddefa · 9eddefa
2 parents fcbaebd + 3f6f309
commit 9eddefa
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/packages/argo-run/src/dev.ts b/packages/argo-run/src/dev.ts
@@ -29,10 +29,8 @@ export async function dev(...args: string[]) {
   const publicUrl = namedArgument('publicUrl', args);
   const tunnelStarted = Boolean(publicUrl);
   const filename = 'extension.js';
-  const scriptUrl = new URL(
-    `${PUBLIC_PATH}${filename}`,
-    publicUrl || url,
-  ).toString();
+  const scriptUrl = new URL(`${PUBLIC_PATH}${filename}`, publicUrl || url);
+  const isHttps = scriptUrl.protocol === 'https:';
 
   const compiler = webpack(
     createWebpackConfiguration({
@@ -42,8 +40,12 @@ export async function dev(...args: string[]) {
         publicPath: PUBLIC_PATH,
       },
       hotOptions: {
-        https: false,
-        webSocket: {host: 'localhost', port, path: WEBSOCKET_PATH},
+        https: isHttps,
+        webSocket: {
+          host: scriptUrl.hostname,
+          port: Number(scriptUrl.port) || (isHttps ? 443 : 80),
+          path: WEBSOCKET_PATH,
+        },
       },
     }),
   );
@@ -205,7 +207,7 @@ export async function dev(...args: string[]) {
       // https://github.com/Shopify/post-purchase-devtools/blob/master/src/background/background.ts#L16-L35
       app.get(LEGACY_POST_PURCHASE_DATA_PATH, (_, res) => {
         res.set('Access-Control-Allow-Origin', '*');
-        res.json(getLegacyPostPurchaseData(scriptUrl, extension));
+        res.json(getLegacyPostPurchaseData(scriptUrl.toString(), extension));
       });
     },
 
@@ -251,7 +253,7 @@ export async function dev(...args: string[]) {
   if (isPostPurchaseExtension) {
     log(
       `You can append this query string: ${convertLegacyPostPurchaseDataToQueryString(
-        getLegacyPostPurchaseData(scriptUrl, extension),
+        getLegacyPostPurchaseData(scriptUrl.toString(), extension),
       )}`,
     );
   } else if (tunnelStarted) {