Merge branch 'master' into dependabot/npm_and_yarn/it-pipe-2.0.4

.prettierignore

@@ -1,3 +1,2 @@
 # package.json is formatted by package managers, so we ignore it here
 package.json
-build

packages/daemon/src/server/index.ts

@@ -67,8 +67,8 @@ function registerWebsocketEndpoints(
   ).reduce((acc, [path, factory]) => ({ ...acc, [path]: factory(controlAuthToken) }), {});
 
   server.server.on('upgrade', (request, socket, headers) => {
-    const url = new URL(request.url!, 'https://127.0.0.0.1');
-    const wsServer: WSServer | undefined = serversByPath[url.pathname];
+    const path = cleanPath(request.url!);
+    const wsServer: WSServer | undefined = serversByPath[path];
     if (wsServer) {
       wsServer.handleUpgrade(request, socket, headers, (websocket) => {
         wsServer.emit('connection', websocket, request);
@@ -78,3 +78,9 @@ function registerWebsocketEndpoints(
     }
   });
 }
+
+function cleanPath(path: string): string {
+  // Suddenly `new URL(path, base).pathname` no longer works on macOS, so we have to manually
+  // remove the query string and fragment.
+  return path.split('?')[0].split('#')[0];
+}

packages/ui/electron-builder.yml

@@ -2,8 +2,8 @@ appId: tech.relaycorp.gateway
 directories:
   buildResources: "./buildResources"
 extraResources:
-  - from: app/daemon/node_modules
-    to: app/daemon/node_modules/
+  - from: app/node_modules/daemon
+    to: app/node_modules/daemon/
     filter:
       - "**/*"
 linux:

packages/ui/webpack.config.js

@@ -1,44 +1,46 @@
 const HtmlWebpackPlugin = require('html-webpack-plugin');
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
-const CopyPlugin = require("copy-webpack-plugin");
+const CopyPlugin = require('copy-webpack-plugin');
 
 const rendererBaseConfig = {
   mode: 'development',
   target: 'electron-renderer',
   devtool: 'source-map',
-  module: { rules: [
-    {
-      test: /\.ts(x?)$/,
-      include: /src/,
-      use: [{ loader: 'ts-loader' }]
-    },
-    {
-      test: /\.css$/i,
-      use: [ MiniCssExtractPlugin.loader, 'css-loader' ],
-    },
-    {
-      test: /\.(svg|png)$/i,
-      type: 'asset/resource'
-    },
-    {
-      test: /\.(woff|woff2|eot|ttf|otf)$/i,
-      type: 'asset/resource',
-    },
-  ] },
+  module: {
+    rules: [
+      {
+        test: /\.ts(x?)$/,
+        include: /src/,
+        use: [{ loader: 'ts-loader' }],
+      },
+      {
+        test: /\.css$/i,
+        use: [MiniCssExtractPlugin.loader, 'css-loader'],
+      },
+      {
+        test: /\.(svg|png)$/i,
+        type: 'asset/resource',
+      },
+      {
+        test: /\.(woff|woff2|eot|ttf|otf)$/i,
+        type: 'asset/resource',
+      },
+    ],
+  },
   resolve: {
-    extensions: ['.js', '.jsx', '.ts', '.tsx']
+    extensions: ['.js', '.jsx', '.ts', '.tsx'],
   },
   output: {
     path: __dirname + '/app',
-    filename: '[name].js'
+    filename: '[name].js',
   },
   plugins: [
     new HtmlWebpackPlugin({
       template: './src/electron/index.html',
-      filename: '[name].html'
+      filename: '[name].html',
     }),
-    new MiniCssExtractPlugin({filename: "styles.[hash].css"})
-  ]
+    new MiniCssExtractPlugin({ filename: 'styles.[hash].css' }),
+  ],
 };
 
 module.exports = [
@@ -51,16 +53,16 @@ module.exports = [
         {
           test: /\.ts$/,
           include: /src/,
-          use: [{ loader: 'ts-loader' }]
+          use: [{ loader: 'ts-loader' }],
         },
         {
           test: /\.(png)$/i,
-          type: 'asset/resource'
+          type: 'asset/resource',
         },
-      ]
+      ],
     },
     resolve: {
-      extensions: ['.js', '.ts']
+      extensions: ['.js', '.ts'],
     },
     output: {
       path: __dirname + '/app',
@@ -74,34 +76,33 @@ module.exports = [
             from: './node_modules/daemon/**/*',
             to: '.',
             globOptions: {
-              gitignore: true,
               ignore: [
-                '**/coverage/**',
-                '**/src/**',
-                '**/README.md',
-                '**/jest.*.js',
-                '**/tsconfig.json',
+                'coverage/**',
+                'src/**',
+                'README.md',
+                'jest.*.js',
+                'tsconfig.json',
+                'build/**/*.spec.js',
                 '**/*.d.ts',
                 '**/*.map.js',
-              ],
+              ].map(path => `**/daemon/${path}`),
             },
           },
-          { from: './node_modules/daemon/ormconfig.json', to: '.' }
+          { from: './node_modules/daemon/ormconfig.json', to: '.' },
         ],
       }),
-    ]
+    ],
   },
   {
     ...rendererBaseConfig,
-    entry: { app: './src/electron/app.tsx', },
+    entry: { app: './src/electron/app.tsx' },
   },
   {
     ...rendererBaseConfig,
-    entry: { about: './src/electron/about.tsx', },
+    entry: { about: './src/electron/about.tsx' },
   },
   {
     ...rendererBaseConfig,
-    entry: { libraries: './src/electron/libraries.tsx', },
-  }
+    entry: { libraries: './src/electron/libraries.tsx' },
+  },
 ];
-