[EC-236] Add CLI dependencies to root package.json (#2816)

.github/workflows/build-cli.yml

@@ -80,8 +80,13 @@ jobs:
         uses: actions/setup-node@17f8bd926464a1afa4c6a11669539e9c1ba77048  # v3.2.0
         with:
           cache: 'npm'
-          cache-dependency-path: 'apps/cli/**/package-lock.json'
+          cache-dependency-path: '**/package-lock.json'
           node-version: '16'
+      
+      - name: Install node-gyp
+        run: |
+          npm install -g node-gyp
+          node-gyp install $(node -v)
 
       - name: Get pkg-fetch
         shell: pwsh
@@ -138,11 +143,9 @@ jobs:
           ResourceHacker -open version-info.rc -save version-info.res -action compile
           ResourceHacker -open %WIN_PKG_BUILT% -save %WIN_PKG_BUILT% -action addoverwrite -resource version-info.res
 
-      - name: Setup sub-module
-        run: npm run sub:init
-
       - name: Install
         run: npm ci
+        working-directory: ./
 
       - name: Run tests
         run: npm run test

apps/cli/package.json

@@ -17,13 +17,7 @@
   },
   "license": "GPL-3.0-only",
   "scripts": {
-    "sub:init": "git submodule update --init --recursive",
-    "sub:update": "git submodule update --remote",
-    "sub:pull": "git submodule foreach git pull origin master",
     "clean": "rimraf dist/**/*",
-    "symlink:win": "rmdir /S /Q ./jslib && cmd /c mklink /J .\\jslib ..\\jslib",
-    "symlink:mac": "npm run symlink:lin",
-    "symlink:lin": "rm -rf ./jslib && ln -s ../jslib ./jslib",
     "build": "webpack",
     "build:debug": "npm run build && node --inspect ./build/bw.js",
     "build:watch": "webpack --watch",
@@ -48,72 +42,5 @@
   },
   "pkg": {
     "assets": "./build/**/*"
-  },
-  "devDependencies": {
-    "@fluffy-spoon/substitute": "^1.208.0",
-    "@types/inquirer": "^7.3.1",
-    "@types/jest": "^27.5.1",
-    "@types/jsdom": "^16.2.10",
-    "@types/koa": "^2.13.4",
-    "@types/koa__multer": "^2.0.4",
-    "@types/koa__router": "^8.0.11",
-    "@types/koa-bodyparser": "^4.3.5",
-    "@types/koa-json": "^2.0.20",
-    "@types/lowdb": "^1.0.10",
-    "@types/lunr": "^2.3.3",
-    "@types/node": "^16.11.12",
-    "@types/node-fetch": "^2.5.10",
-    "@types/node-forge": "^1.0.1",
-    "@types/papaparse": "^5.2.5",
-    "@types/proper-lockfile": "^4.1.2",
-    "@types/retry": "^0.12.1",
-    "@types/tldjs": "^2.3.0",
-    "@types/zxcvbn": "^4.4.1",
-    "clean-webpack-plugin": "^4.0.0",
-    "copy-webpack-plugin": "^10.2.0",
-    "cross-env": "^7.0.3",
-    "jest": "^27.5.1",
-    "pkg": "5.7.0",
-    "rimraf": "^3.0.2",
-    "ts-jest": "^27.1.5",
-    "ts-loader": "^8.2.0",
-    "ts-node": "^10.4.0",
-    "tsconfig-paths": "^3.12.0",
-    "tsconfig-paths-webpack-plugin": "^3.5.2",
-    "typescript": "4.1.5",
-    "webpack": "^5.65.0",
-    "webpack-cli": "^4.9.1",
-    "webpack-node-externals": "^3.0.0"
-  },
-  "dependencies": {
-    "@koa/multer": "^3.0.0",
-    "@koa/router": "^10.1.1",
-    "big-integer": "1.6.48",
-    "browser-hrtime": "^1.1.8",
-    "chalk": "^4.1.1",
-    "commander": "7.2.0",
-    "form-data": "4.0.0",
-    "https-proxy-agent": "5.0.0",
-    "inquirer": "8.0.0",
-    "jsdom": "^16.5.3",
-    "jszip": "^3.7.1",
-    "koa": "^2.13.4",
-    "koa-bodyparser": "^4.3.0",
-    "koa-json": "^2.0.2",
-    "lowdb": "1.0.0",
-    "lunr": "^2.3.9",
-    "multer": "^1.4.4",
-    "node-fetch": "^2.6.1",
-    "node-forge": "1.3.1",
-    "open": "^8.0.8",
-    "papaparse": "^5.3.0",
-    "proper-lockfile": "^4.1.2",
-    "rxjs": "6.6.7",
-    "tldjs": "^2.3.1",
-    "zxcvbn": "^4.4.2"
-  },
-  "engines": {
-    "node": "~16",
-    "npm": ">=7 <=8"
   }
 }

apps/cli/webpack.config.js

@@ -42,6 +42,10 @@ const plugins = [
     BWCLI_ENV: ENV,
     FLAGS: envConfig.flags,
   }),
+  new webpack.IgnorePlugin({
+    resourceRegExp: /canvas/,
+    contextRegExp: /jsdom$/,
+  }),
 ];
 
 const webpackConfig = {
@@ -61,7 +65,7 @@ const webpackConfig = {
   resolve: {
     extensions: [".ts", ".js"],
     symlinks: false,
-    modules: [path.resolve("node_modules")],
+    modules: [path.resolve("../../node_modules")],
     plugins: [new TsconfigPathsPlugin({ configFile: "./tsconfig.json" })],
   },
   output: {
@@ -70,7 +74,6 @@ const webpackConfig = {
   },
   module: { rules: moduleRules },
   plugins: plugins,
-  externals: [nodeExternals()],
 };
 
 module.exports = webpackConfig;

package.json

@@ -26,14 +26,25 @@
     "@types/chrome": "^0.0.139",
     "@types/duo_web_sdk": "^2.7.1",
     "@types/firefox-webext-browser": "^82.0.0",
+    "@types/inquirer": "^8.2.1",
     "@types/jest": "^27.5.0",
     "@types/jquery": "^3.5.14",
+    "@types/jsdom": "^16.2.14",
+    "@types/koa": "^2.13.4",
+    "@types/koa__multer": "^2.0.4",
+    "@types/koa__router": "^8.0.11",
+    "@types/koa-bodyparser": "^4.3.7",
+    "@types/koa-json": "^2.0.20",
+    "@types/lowdb": "^1.0.11",
     "@types/lunr": "^2.3.4",
     "@types/mousetrap": "^1.6.8",
     "@types/node": "^16.11.12",
+    "@types/node-fetch": "^2.6.1",
     "@types/node-forge": "^1.0.2",
     "@types/node-ipc": "^9.2.0",
     "@types/papaparse": "^5.3.2",
+    "@types/proper-lockfile": "^4.1.2",
+    "@types/retry": "^0.12.2",
     "@types/tldjs": "^2.3.1",
     "@types/webcrypto": "^0.0.28",
     "@types/zxcvbn": "^4.4.1",
@@ -77,6 +88,7 @@
     "lint-staged": "^12.4.1",
     "mini-css-extract-plugin": "^2.4.5",
     "node-ipc": "^9.2.1",
+    "pkg": "5.7.0",
     "postcss": "^8.4.14",
     "postcss-loader": "^6.2.1",
     "prettier": "^2.6.2",
@@ -96,7 +108,8 @@
     "webcrypto-shim": "^0.1.7",
     "webpack": "^5.64.4",
     "webpack-cli": "^4.9.1",
-    "webpack-dev-server": "4.6"
+    "webpack-dev-server": "4.6",
+    "webpack-node-externals": "^3.0.0"
   },
   "dependencies": {
     "@angular/animations": "^12.2.13",
@@ -108,29 +121,46 @@
     "@angular/platform-browser": "^12.2.13",
     "@angular/platform-browser-dynamic": "^12.2.13",
     "@angular/router": "^12.2.13",
+    "@koa/multer": "^3.0.0",
+    "@koa/router": "^10.1.1",
     "@microsoft/signalr": "^5.0.17",
     "@microsoft/signalr-protocol-msgpack": "^5.0.17",
     "big-integer": "^1.6.51",
     "bootstrap": "4.6.0",
     "braintree-web-drop-in": "^1.33.1",
     "browser-hrtime": "^1.1.8",
+    "bufferutil": "^4.0.6",
+    "chalk": "^4.1.0",
+    "commander": "^7.2.0",
     "core-js": "^3.11.0",
     "date-input-polyfill": "^2.14.0",
     "duo_web_sdk": "github:duosecurity/duo_web_sdk",
+    "https-proxy-agent": "^5.0.0",
+    "inquirer": "^8.2.4",
     "jquery": "3.6.0",
+    "jsdom": "^16.7.0",
     "jszip": "^3.10.0",
+    "koa": "^2.13.4",
+    "koa-bodyparser": "^4.3.0",
+    "koa-json": "^2.0.2",
+    "lowdb": "^1.0.0",
     "lunr": "^2.3.9",
     "mousetrap": "^1.6.5",
+    "multer": "^1.4.5-lts.1",
     "ngx-infinite-scroll": "^10.0.1",
     "ngx-toastr": "14.1.4",
+    "node-fetch": "^2.6.7",
     "node-forge": "^1.3.1",
     "nord": "^0.2.1",
+    "open": "^8.4.0",
     "papaparse": "^5.3.2",
     "popper.js": "^1.16.1",
+    "proper-lockfile": "^4.1.2",
     "qrious": "4.0.2",
     "rxjs": "^7.5.5",
     "sweetalert2": "^10.16.6",
     "tldjs": "^2.3.1",
+    "utf-8-validate": "^5.0.9",
     "web-animations-js": "^2.3.2",
     "whatwg-fetch": "^3.6.2",
     "zone.js": "^0.11.4",