ops: Updated browser-sync

It ended up being a thing: BrowserSync/browser-sync#1978
the0neWhoKnocks · Dec 21, 2022 · 0c74ef9 · 0c74ef9
1 parent 47a4111
commit 0c74ef9
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/scaffold.js b/scaffold.js
@@ -687,7 +687,7 @@ async function scaffold() {
         packageJSON.devDependencies['nodemon'] = '2.0.15';
       }
 
-      if (addClient) packageJSON.devDependencies['browser-sync'] = '2.27.7';
+      if (addClient) packageJSON.devDependencies['browser-sync'] = '2.27.11';
 
       addParsedFiles([{
         executable: true,
@@ -698,6 +698,7 @@ async function scaffold() {
           { token: 'WATCHER__CLIENT', remove: !addClient },
           { token: 'WATCHER__LOGGER', remove: !logger },
           { token: 'WATCHER__SERVER', remove: !addServer },
+          { token: 'WATCHER__WEB_SOCKET', remove: !webSocket },
         ],
       }]);
     }
@@ -847,6 +848,7 @@ async function scaffold() {
         to: '',
         tokens: [
           { token: 'DC__APP_NAME', replacement: kebabAppName },
+          { token: 'DC__BSYNC', remove: !(hasWatcher && addClient) },
           { token: 'DC__DEV_APP_NAME', replacement: kebabAppNameDev },
           { token: 'DC__E2E', remove: !e2eTests },
           { token: 'DC__MULTI_USER', remove: !multiUser },
@@ -856,6 +858,7 @@ async function scaffold() {
           { token: 'DC__VHOST', remove: !vHost },
           { token: 'DC__VHOST_NON_SECURE', remove: secure },
           { token: 'DC__VHOST_SECURE', remove: !secure },
+          { token: 'DC__WEB_SOCKET', remove: !webSocket },
         ],
       },
     ];

diff --git a/static/docker/docker-compose.yml b/static/docker/docker-compose.yml
@@ -68,6 +68,9 @@ services:
       # browserSync
       - "3001:3001"
       - "3002:3002"
+      #TOKEN:^DC__WEB_SOCKET
+      - "3003:3003"
+      #TOKEN:$DC__WEB_SOCKET
       #TOKEN:$DC__BSYNC
       # inspector
       - "9229:9229"

diff --git a/static/node/watcher.js b/static/node/watcher.js
@@ -210,15 +210,25 @@ fileGate
       port: SERVER__PORT + 1,
       proxy: {
         target: `${protocol}://localhost:${SERVER__PORT}`,
+        //TOKEN:^WATCHER__WEB_SOCKET
         ws: true,
+        //TOKEN:$WATCHER__WEB_SOCKET
       },
-      reloadDebounce: 300, // Wait for a specified window of event-silence before sending any reload events.
+      reloadDebounce: 1000, // Wait for a specified window of event-silence before sending any reload events.
+      serveStatic: ['dist/public'], // now required when using `proxy` otherwise automatic-reloads don't work.
       snippetOptions: {
+        async: true,
         rule: {
           match: /<\/body>/i,
           fn: (snippet) => snippet,
         },
       },
+      //TOKEN:^WATCHER__WEB_SOCKET
+      socket: {
+        domain: `localhost:${SERVER__PORT + 3}`,
+        port: SERVER__PORT + 3,
+      },
+      //TOKEN:$WATCHER__WEB_SOCKET
       ui: {
         port: SERVER__PORT + 2,
       },