[EC-236] Move dependencies to root package.json (#2720)

apps/browser/package.json

@@ -2,10 +2,6 @@
   "name": "@bitwarden/browser",
   "version": "0.0.0",
   "scripts": {
-    "sub:init": "git submodule update --init --recursive",
-    "sub:update": "git submodule update --remote",
-    "sub:pull": "git submodule foreach git pull origin master",
-    "preinstall": "npm run sub:init",
     "build": "webpack",
     "build:watch": "webpack --watch",
     "build:prod": "cross-env NODE_ENV=production webpack",
@@ -20,66 +16,5 @@
     "test": "jest",
     "test:watch": "jest --watch",
     "test:watch:all": "jest --watchAll"
-  },
-  "devDependencies": {
-    "@angular/compiler-cli": "^12.2.13",
-    "@ngtools/webpack": "^12.2.13",
-    "@types/chrome": "^0.0.139",
-    "@types/firefox-webext-browser": "^82.0.0",
-    "@types/jest": "^27.5.0",
-    "@types/mousetrap": "^1.6.8",
-    "@types/node": "^16.11.12",
-    "buffer": "^6.0.3",
-    "clean-webpack-plugin": "^4.0.0",
-    "copy-webpack-plugin": "^10.0.0",
-    "cross-env": "^7.0.3",
-    "css-loader": "^6.5.1",
-    "del": "^6.0.0",
-    "gulp": "^4.0.2",
-    "gulp-filter": "^7.0.0",
-    "gulp-if": "^3.0.0",
-    "gulp-json-editor": "^2.5.5",
-    "gulp-replace": "^1.1.0",
-    "gulp-zip": "^5.1.0",
-    "html-loader": "^3.0.1",
-    "html-webpack-plugin": "^5.5.0",
-    "jest-preset-angular": "^10.1.0",
-    "mini-css-extract-plugin": "^2.4.5",
-    "prettier": "^2.5.1",
-    "process": "^0.11.10",
-    "sass": "^1.34.1",
-    "sass-loader": "^12.4.0",
-    "style-loader": "^3.3.1",
-    "tapable": "^1.1.3",
-    "ts-loader": "^9.2.5",
-    "typescript": "4.3.5",
-    "url": "^0.11.0",
-    "util": "^0.12.4",
-    "webpack": "^5.64.4",
-    "webpack-cli": "^4.9.1"
-  },
-  "dependencies": {
-    "@angular/animations": "^12.2.13",
-    "@angular/cdk": "^12.2.13",
-    "@angular/common": "^12.2.13",
-    "@angular/compiler": "^12.2.13",
-    "@angular/core": "^12.2.13",
-    "@angular/forms": "^12.2.13",
-    "@angular/platform-browser": "^12.2.13",
-    "@angular/platform-browser-dynamic": "^12.2.13",
-    "@angular/router": "^12.2.13",
-    "@bitwarden/jslib-angular": "file:jslib/angular",
-    "@bitwarden/jslib-common": "file:jslib/common",
-    "core-js": "^3.11.0",
-    "date-input-polyfill": "^2.14.0",
-    "mousetrap": "^1.6.5",
-    "ngx-toastr": "14.1.4",
-    "nord": "^0.2.1",
-    "sweetalert2": "^10.16.6",
-    "web-animations-js": "^2.3.2"
-  },
-  "engines": {
-    "node": "~16",
-    "npm": "~8"
   }
 }

apps/browser/src/popup/scss/popup.scss

@@ -1,3 +1,6 @@
+$icomoon-font-path: "../../../jslib/angular/src/scss/bwicons/fonts/";
+$card-icons-base: "../../../jslib/angular/src/images/cards/";
+
 @import "../../../jslib/angular/src/scss/webfonts.css";
 @import "../../../jslib/angular/src/scss/bwicons/styles/style.scss";
 @import "variables.scss";

apps/browser/webpack.config.js

@@ -176,7 +176,7 @@ const config = {
   resolve: {
     extensions: [".ts", ".js"],
     symlinks: false,
-    modules: [path.resolve("node_modules")],
+    modules: [path.resolve("../../node_modules")],
     alias: {
       sweetalert2: require.resolve("sweetalert2/dist/sweetalert2.js"),
       "#sweetalert2": require.resolve("sweetalert2/src/sweetalert2.scss"),

apps/desktop/electron-builder.json

@@ -8,6 +8,7 @@
   "afterSign": "scripts/after-sign.js",
   "asarUnpack": ["**/*.node"],
   "files": ["**/*", "!**/node_modules/@bitwarden/desktop-native/**/*"],
+  "electronVersion": "16.2.7",
   "publish": {
     "provider": "generic",
     "url": "https://artifacts.bitwarden.com/desktop"

apps/desktop/package.json

@@ -17,10 +17,6 @@
   "license": "GPL-3.0",
   "scripts": {
     "start": "cross-env ELECTRON_IS_DEV=0 ELECTRON_NO_UPDATER=1 electron ./build",
-    "sub:init": "git submodule update --init --recursive",
-    "sub:update": "git submodule update --remote",
-    "sub:pull": "git submodule foreach git pull origin master",
-    "sub:commit": "npm run sub:pull && git commit -am \"update submodule\"",
     "preinstall": "npm run sub:init",
     "postinstall": "electron-rebuild",
     "build": "concurrently -n Main,Rend -c yellow,cyan \"npm run build:main\" \"npm run build:renderer\"",
@@ -54,64 +50,5 @@
     "publish:win": "npm run build && npm run clean:dist && electron-builder --win --x64 --arm64 --ia32 -p always -c.win.certificateSubjectName=\"8bit Solutions LLC\"",
     "publish:win:dev": "npm run build && npm run clean:dist && electron-builder --win --x64 --arm64 --ia32 -p always",
     "upload:mas": "xcrun altool --upload-app --type osx --file \"$(find ./dist/mas-universal/Bitwarden*.pkg)\" --username $APPLE_ID_USERNAME --password $APPLE_ID_PASSWORD"
-  },
-  "devDependencies": {
-    "@angular/compiler-cli": "^12.2.13",
-    "@ngtools/webpack": "^12.2.13",
-    "@types/node": "^16.11.12",
-    "@types/node-ipc": "^9.1.4",
-    "clean-webpack-plugin": "^4.0.0",
-    "concurrently": "^6.0.2",
-    "copy-webpack-plugin": "^10.0.0",
-    "cross-env": "^7.0.3",
-    "css-loader": "^6.5.1",
-    "electron-builder": "22.11.7",
-    "electron-notarize": "^1.1.1",
-    "electron-rebuild": "^3.2.5",
-    "electron-reload": "^1.5.0",
-    "html-loader": "^3.0.1",
-    "html-webpack-plugin": "^5.5.0",
-    "husky": "^7.0.4",
-    "lint-staged": "^12.1.3",
-    "mini-css-extract-plugin": "^2.4.5",
-    "node-loader": "^2.0.0",
-    "rimraf": "^3.0.2",
-    "sass": "^1.32.11",
-    "sass-loader": "^12.4.0",
-    "tapable": "^1.1.3",
-    "ts-loader": "^9.2.5",
-    "tsconfig-paths-webpack-plugin": "^3.5.1",
-    "typescript": "4.3.5",
-    "webpack": "^5.64.4",
-    "webpack-cli": "^4.9.1",
-    "webpack-merge": "^5.8.0"
-  },
-  "dependencies": {
-    "@angular/animations": "^12.2.13",
-    "@angular/cdk": "^12.2.13",
-    "@angular/common": "^12.2.13",
-    "@angular/compiler": "^12.2.13",
-    "@angular/core": "^12.2.13",
-    "@angular/forms": "^12.2.13",
-    "@angular/platform-browser": "^12.2.13",
-    "@angular/platform-browser-dynamic": "^12.2.13",
-    "@angular/router": "^12.2.13",
-    "@bitwarden/jslib-angular": "file:jslib/angular",
-    "@bitwarden/jslib-common": "file:jslib/common",
-    "@bitwarden/jslib-electron": "file:jslib/electron",
-    "@nodert-win10-rs4/windows.security.credentials.ui": "^0.4.4",
-    "forcefocus": "^1.1.0",
-    "keytar": "^7.9.0",
-    "ngx-toastr": "14.1.4",
-    "node-ipc": "^9.1.4",
-    "nord": "^0.2.1",
-    "regedit": "^3.0.3",
-    "rxjs": "^7.4.0",
-    "sweetalert2": "^10.16.6",
-    "zone.js": "0.11.4"
-  },
-  "engines": {
-    "node": "~16",
-    "npm": "~8"
   }
 }

apps/desktop/src/scss/styles.scss

@@ -1,3 +1,6 @@
+$icomoon-font-path: "../../jslib/angular/src/scss/bwicons/fonts/";
+$card-icons-base: "../../jslib/angular/src/images/cards/";
+
 @import "../../jslib/angular/src/scss/webfonts.css";
 @import "../../jslib/angular/src/scss/bwicons/styles/style.scss";
 @import "~@angular/cdk/overlay-prebuilt.css";

apps/desktop/webpack.renderer.js

@@ -32,7 +32,7 @@ const common = {
       jslib: path.join(__dirname, "jslib/src"),
     },
     symlinks: false,
-    modules: [path.resolve("node_modules")],
+    modules: [path.resolve("../../node_modules")],
   },
   output: {
     filename: "[name].js",