Create workspace package.json and move osv-scanner.toml

5 files changed, 187 insertions, 84 deletions

diff --git a/desktop/.gitignore b/desktop/.gitignore
new file mode 100644
index 0000000000..3c3629e647
--- /dev/null
+++ b/desktop/.gitignore
@@ -0,0 +1 @@
+node_modules
diff --git a/desktop/packages/mullvad-vpn/osv-scanner.toml b/desktop/osv-scanner.toml
index 3689a56c17..3689a56c17 100644
--- a/desktop/packages/mullvad-vpn/osv-scanner.toml
+++ b/desktop/osv-scanner.toml
diff --git a/desktop/package-lock.json b/desktop/package-lock.json
index e5c9a0294b..614f82d3ca 100644
--- a/desktop/package-lock.json
+++ b/desktop/package-lock.json
@@ -1,91 +1,19 @@
 {
-  "name": "mullvad-vpn",
+  "name": "desktop",
   "version": "0.0.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
-      "name": "mullvad-vpn",
+      "name": "desktop",
       "version": "0.0.0",
-      "hasInstallScript": true,
       "license": "GPL-3.0",
-      "dependencies": {
-        "@grpc/grpc-js": "^1.9.6",
-        "argv-split": "^2.0.1",
-        "gettext-parser": "^6.0.0",
-        "gl-matrix": "^3.4.3",
-        "google-protobuf": "^3.21.0",
-        "node-gettext": "^3.0.0",
-        "react": "^18.3.1",
-        "react-dom": "^18.3.1",
-        "react-redux": "^7.2.9",
-        "react-router": "^5.3.4",
-        "redux": "^4.2.0",
-        "simple-plist": "^1.3.1",
-        "sprintf-js": "^1.1.2",
-        "styled-components": "^6.1.0"
-      },
-      "devDependencies": {
-        "@eslint/js": "^9.10.0",
-        "@playwright/test": "^1.41.1",
-        "@types/chai": "^4.3.3",
-        "@types/chai-as-promised": "^7.1.5",
-        "@types/chai-spies": "^1.0.3",
-        "@types/eslint__js": "^8.42.3",
-        "@types/gettext-parser": "^4.0.1",
-        "@types/google-protobuf": "^3.15.6",
-        "@types/history": "^4.7.11",
-        "@types/mocha": "^10.0.0",
-        "@types/node": "^20.12.11",
-        "@types/node-gettext": "^3.0.3",
-        "@types/react": "^18.3.3",
-        "@types/react-dom": "^18.3.0",
-        "@types/react-router": "^5.1.19",
-        "@types/sinon": "^10.0.13",
-        "@types/sprintf-js": "^1.1.2",
-        "@types/topojson-specification": "^1.0.2",
-        "browserify": "^17.0.0",
-        "chai": "^4.3.6",
-        "chai-as-promised": "^7.1.1",
-        "chai-spies": "^1.0.0",
-        "cross-env": "^7.0.3",
-        "electron": "^30.0.4",
-        "electron-builder": "^24.13.3",
-        "electron-devtools-installer": "^3.2.0",
-        "eslint": "^9.10.0",
-        "eslint-config-prettier": "^9.1.0",
-        "eslint-plugin-prettier": "^5.2.1",
-        "eslint-plugin-react": "^7.36.1",
-        "eslint-plugin-react-compiler": "^0.0.0-experimental-42acc6a-20241001",
-        "eslint-plugin-react-hooks": "^0.0.0-experimental-2d16326d-20240930",
-        "eslint-plugin-simple-import-sort": "^12.1.1",
-        "gettext-extractor": "^3.5.4",
-        "globals": "^15.9.0",
-        "grpc_tools_node_protoc_ts": "^5.3.2",
-        "gulp": "^4.0.2",
-        "gulp-inject-string": "^1.1.2",
-        "gulp-sourcemaps": "^3.0.0",
-        "gulp-typescript": "^6.0.0-alpha.1",
-        "mocha": "^10.2.0",
-        "playwright": "^1.41.1",
-        "postject": "^1.0.0-alpha.6",
-        "prettier": "^3.3.3",
-        "sinon": "^14.0.1",
-        "ts-node": "^10.9.2",
-        "tsc-watch": "^5.0.3",
-        "typescript": "^5.4.5",
-        "typescript-eslint": "^8.6.0",
-        "vinyl-buffer": "^1.0.1",
-        "vinyl-source-stream": "^2.0.0",
-        "xvfb-maybe": "^0.2.1"
-      },
+      "workspaces": [
+        "packages/*"
+      ],
       "engines": {
         "node": ">=16",
         "npm": ">=8.3"
-      },
-      "optionalDependencies": {
-        "grpc-tools": "^1.12.4",
-        "nseventmonitor": "^1.0.5"
       }
     },
     "node_modules/@ampproject/remapping": {
@@ -10047,6 +9975,10 @@
       "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
       "dev": true
     },
+    "node_modules/mullvad-vpn": {
+      "resolved": "packages/mullvad-vpn",
+      "link": true
+    },
     "node_modules/mute-stdout": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/mute-stdout/-/mute-stdout-1.0.1.tgz",
@@ -14657,6 +14589,85 @@
       "peerDependencies": {
         "zod": "^3.18.0"
       }
+    },
+    "packages/mullvad-vpn": {
+      "version": "0.0.0",
+      "hasInstallScript": true,
+      "license": "GPL-3.0",
+      "dependencies": {
+        "@grpc/grpc-js": "^1.9.6",
+        "argv-split": "^2.0.1",
+        "gettext-parser": "^6.0.0",
+        "gl-matrix": "^3.4.3",
+        "google-protobuf": "^3.21.0",
+        "node-gettext": "^3.0.0",
+        "react": "^18.3.1",
+        "react-dom": "^18.3.1",
+        "react-redux": "^7.2.9",
+        "react-router": "^5.3.4",
+        "redux": "^4.2.0",
+        "simple-plist": "^1.3.1",
+        "sprintf-js": "^1.1.2",
+        "styled-components": "^6.1.0"
+      },
+      "devDependencies": {
+        "@eslint/js": "^9.10.0",
+        "@playwright/test": "^1.41.1",
+        "@types/chai": "^4.3.3",
+        "@types/chai-as-promised": "^7.1.5",
+        "@types/chai-spies": "^1.0.3",
+        "@types/eslint__js": "^8.42.3",
+        "@types/gettext-parser": "^4.0.1",
+        "@types/google-protobuf": "^3.15.6",
+        "@types/history": "^4.7.11",
+        "@types/mocha": "^10.0.0",
+        "@types/node": "^20.12.11",
+        "@types/node-gettext": "^3.0.3",
+        "@types/react": "^18.3.3",
+        "@types/react-dom": "^18.3.0",
+        "@types/react-router": "^5.1.19",
+        "@types/sinon": "^10.0.13",
+        "@types/sprintf-js": "^1.1.2",
+        "@types/topojson-specification": "^1.0.2",
+        "browserify": "^17.0.0",
+        "chai": "^4.3.6",
+        "chai-as-promised": "^7.1.1",
+        "chai-spies": "^1.0.0",
+        "cross-env": "^7.0.3",
+        "electron": "30.0.4",
+        "electron-builder": "^24.13.3",
+        "electron-devtools-installer": "^3.2.0",
+        "eslint": "^9.10.0",
+        "eslint-config-prettier": "^9.1.0",
+        "eslint-plugin-prettier": "^5.2.1",
+        "eslint-plugin-react": "^7.36.1",
+        "eslint-plugin-react-compiler": "^0.0.0-experimental-42acc6a-20241001",
+        "eslint-plugin-react-hooks": "^0.0.0-experimental-2d16326d-20240930",
+        "eslint-plugin-simple-import-sort": "^12.1.1",
+        "gettext-extractor": "^3.5.4",
+        "globals": "^15.9.0",
+        "grpc_tools_node_protoc_ts": "^5.3.2",
+        "gulp": "^4.0.2",
+        "gulp-inject-string": "^1.1.2",
+        "gulp-sourcemaps": "^3.0.0",
+        "gulp-typescript": "^6.0.0-alpha.1",
+        "mocha": "^10.2.0",
+        "playwright": "^1.41.1",
+        "postject": "^1.0.0-alpha.6",
+        "prettier": "^3.3.3",
+        "sinon": "^14.0.1",
+        "ts-node": "^10.9.2",
+        "tsc-watch": "^5.0.3",
+        "typescript": "^5.4.5",
+        "typescript-eslint": "^8.6.0",
+        "vinyl-buffer": "^1.0.1",
+        "vinyl-source-stream": "^2.0.0",
+        "xvfb-maybe": "^0.2.1"
+      },
+      "optionalDependencies": {
+        "grpc-tools": "^1.12.4",
+        "nseventmonitor": "^1.0.5"
+      }
     }
   },
   "dependencies": {
@@ -22459,6 +22470,79 @@
       "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
       "dev": true
     },
+    "mullvad-vpn": {
+      "version": "file:packages/mullvad-vpn",
+      "requires": {
+        "@eslint/js": "^9.10.0",
+        "@grpc/grpc-js": "^1.9.6",
+        "@playwright/test": "^1.41.1",
+        "@types/chai": "^4.3.3",
+        "@types/chai-as-promised": "^7.1.5",
+        "@types/chai-spies": "^1.0.3",
+        "@types/eslint__js": "^8.42.3",
+        "@types/gettext-parser": "^4.0.1",
+        "@types/google-protobuf": "^3.15.6",
+        "@types/history": "^4.7.11",
+        "@types/mocha": "^10.0.0",
+        "@types/node": "^20.12.11",
+        "@types/node-gettext": "^3.0.3",
+        "@types/react": "^18.3.3",
+        "@types/react-dom": "^18.3.0",
+        "@types/react-router": "^5.1.19",
+        "@types/sinon": "^10.0.13",
+        "@types/sprintf-js": "^1.1.2",
+        "@types/topojson-specification": "^1.0.2",
+        "argv-split": "^2.0.1",
+        "browserify": "^17.0.0",
+        "chai": "^4.3.6",
+        "chai-as-promised": "^7.1.1",
+        "chai-spies": "^1.0.0",
+        "cross-env": "^7.0.3",
+        "electron": "30.0.4",
+        "electron-builder": "^24.13.3",
+        "electron-devtools-installer": "^3.2.0",
+        "eslint": "^9.10.0",
+        "eslint-config-prettier": "^9.1.0",
+        "eslint-plugin-prettier": "^5.2.1",
+        "eslint-plugin-react": "^7.36.1",
+        "eslint-plugin-react-compiler": "^0.0.0-experimental-42acc6a-20241001",
+        "eslint-plugin-react-hooks": "^0.0.0-experimental-2d16326d-20240930",
+        "eslint-plugin-simple-import-sort": "^12.1.1",
+        "gettext-extractor": "^3.5.4",
+        "gettext-parser": "^6.0.0",
+        "gl-matrix": "^3.4.3",
+        "globals": "^15.9.0",
+        "google-protobuf": "^3.21.0",
+        "grpc_tools_node_protoc_ts": "^5.3.2",
+        "grpc-tools": "^1.12.4",
+        "gulp": "^4.0.2",
+        "gulp-inject-string": "^1.1.2",
+        "gulp-sourcemaps": "^3.0.0",
+        "gulp-typescript": "^6.0.0-alpha.1",
+        "mocha": "^10.2.0",
+        "node-gettext": "^3.0.0",
+        "nseventmonitor": "^1.0.5",
+        "playwright": "^1.41.1",
+        "postject": "^1.0.0-alpha.6",
+        "prettier": "^3.3.3",
+        "react": "^18.3.1",
+        "react-dom": "^18.3.1",
+        "react-redux": "^7.2.9",
+        "react-router": "^5.3.4",
+        "redux": "^4.2.0",
+        "simple-plist": "^1.3.1",
+        "sinon": "^14.0.1",
+        "sprintf-js": "^1.1.2",
+        "styled-components": "^6.1.0",
+        "ts-node": "^10.9.2",
+        "tsc-watch": "^5.0.3",
+        "typescript": "^5.4.5",
+        "typescript-eslint": "^8.6.0",
+        "vinyl-buffer": "^1.0.1",
+        "vinyl-source-stream": "^2.0.0",
+        "xvfb-maybe": "^0.2.1"
+      }
+    },
     "mute-stdout": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/mute-stdout/-/mute-stdout-1.0.1.tgz",
diff --git a/desktop/package.json b/desktop/package.json
new file mode 100644
index 0000000000..8bf1f1b3ac
--- /dev/null
+++ b/desktop/package.json
@@ -0,0 +1,22 @@
+{
+  "name": "desktop",
+  "version": "0.0.0",
+  "private": true,
+  "workspaces": [
+    "packages/*"
+  ],
+  "author": {
+    "name": "Mullvad VPN",
+    "email": "support@mullvadvpn.net"
+  },
+  "repository": "https://github.com/mullvad/mullvadvpn-app",
+  "license": "GPL-3.0",
+  "engines": {
+    "node": ">=16",
+    "npm": ">=8.3"
+  },
+  "volta": {
+    "node": "20.13.0",
+    "npm": "9.9.0"
+  }
+}
diff --git a/desktop/packages/mullvad-vpn/package.json b/desktop/packages/mullvad-vpn/package.json
index c078ade972..9c2a7e999b 100644
--- a/desktop/packages/mullvad-vpn/package.json
+++ b/desktop/packages/mullvad-vpn/package.json
@@ -55,7 +55,7 @@
     "chai-as-promised": "^7.1.1",
     "chai-spies": "^1.0.0",
     "cross-env": "^7.0.3",
-    "electron": "^30.0.4",
+    "electron": "30.0.4",
     "electron-builder": "^24.13.3",
     "electron-devtools-installer": "^3.2.0",
     "eslint": "^9.10.0",
@@ -86,6 +86,7 @@
     "xvfb-maybe": "^0.2.1"
   },
   "scripts": {
+    "preinstall": "test -d node_modules || mkdir node_modules",
     "postinstall": "cross-env ELECTRON_BUILDER_ALLOW_UNRESOLVED_DEPENDENCIES=true electron-builder install-app-deps",
     "build": "gulp build",
     "build-proto": "gulp build-proto",
@@ -106,12 +107,7 @@
     "pack:win": "gulp pack-win",
     "pack:linux": "gulp pack-linux"
   },
-  "engines": {
-    "node": ">=16",
-    "npm": ">=8.3"
-  },
   "volta": {
-    "node": "20.13.0",
-    "npm": "9.9.0"
+    "extends": "../../package.json"
   }
 }