Merge branch 'master' of github.com:Jigsaw-Code/outline-server into daniellacosse/linter-and-build-updates

package.json

@@ -7,6 +7,7 @@
     "@typescript-eslint/eslint-plugin": "^5.14.0",
     "@typescript-eslint/parser": "^5.14.0",
     "browserslist": "^4.20.3",
+    "@webpack-cli/serve": "^1.6.1",
     "eslint": "^8.10.0",
     "eslint-plugin-compat": "^4.0.2",
     "generate-license-file": "^1.2.0",

src/server_manager/README.md

@@ -5,15 +5,17 @@
 To run the Outline Manager Electron app:
 
 ```
-npm run action server_manager/electron_app/start
+npm run action server_manager/electron_app/start ${PLATFORM}
 ```
 
 To run the Outline Manager Electron app with a development build (code not minified):
 
 ```
-BUILD_ENV=development npm run action server_manager/electron_app/start
+BUILD_ENV=development npm run action server_manager/electron_app/start ${PLATFORM}
 ```
 
+Where `${PLATFORM}` is one of `linux`, `mac`, `windows`.
+
 ## Development Server
 
 To run the Outline Manager as a web app on the browser and listen for changes:

src/server_manager/base.webpack.js

@@ -36,7 +36,9 @@ exports.makeConfig = (options) => {
     devtool: 'inline-source-map',
     // Run the dev server with `npm run webpack-dev-server --workspace=outline-manager --open`
     devServer: {
-      overlay: true,
+      client: {
+        overlay: true,
+      },
     },
     output: {path: OUTPUT_BASE, filename: 'main.js'},
     module: {

src/server_manager/package.json

@@ -79,7 +79,7 @@
     "copy-webpack-plugin": "^5.1.1",
     "css-loader": "^3.5.3",
     "electron": "18.1.0",
-    "electron-builder": "~22.10.5",
+    "electron-builder": "~23.0.3",
     "electron-icon-maker": "^0.0.4",
     "electron-notarize": "^0.2.1",
     "electron-to-chromium": "^1.4.122",
@@ -99,7 +99,7 @@
     "style-loader": "^1.2.1",
     "ts-loader": "^7.0.1",
     "webpack": "^4.43.0",
-    "webpack-cli": "^3.3.11",
+    "webpack-cli": "^4.9.2",
     "webpack-dev-server": "^4.9.0"
   },
   "resolutions": {