Merge branch 'master' into feat-negative-des

Author: snitin315

.github/workflows/nodejs.yml

@@ -37,9 +37,6 @@ jobs:
           node-version: ${{ matrix.node-version }}
           cache: "npm"
 
-      - name: Use latest NPM
-        run: sudo npm i -g npm
-
       - name: Install dependencies
         run: npm ci
 
@@ -76,21 +73,13 @@ jobs:
           node-version: ${{ matrix.node-version }}
           cache: "npm"
 
-      - name: Use latest NPM on ubuntu/macos
-        if: matrix.os == 'ubuntu-latest' || matrix.os == 'macos-latest'
-        run: sudo npm i -g npm
-
-      - name: Use latest NPM on windows
-        if: matrix.os == 'windows-latest'
-        run: npm i -g npm
-
-      - name: Use latest NPM on windows
-        if: matrix.webpack-version == 4
-        run: sed -i'.original' 's/"build:types"/"_unused"/g' package.json
-
       - name: Install dependencies
         run: npm ci
 
+      - name: Update package.json for webpack@4
+        if: matrix.webpack-version == '4'
+        run: echo "`jq '.scripts.build="npm run build:client"' package.json`" > package.json
+
       - name: Install webpack ${{ matrix.webpack-version }}
         if: matrix.webpack-version == '4'
         run: npm i webpack@${{ matrix.webpack-version }} --save-dev --ignore-scripts

package-lock.json

@@ -37,6 +37,7 @@
   "dependencies": {
     "@types/bonjour": "^3.5.9",
     "@types/connect-history-api-fallback": "^1.3.5",
+    "@types/express": "^4.17.13",
     "@types/serve-index": "^1.9.1",
     "@types/sockjs": "^0.3.33",
     "@types/ws": "^8.2.2",
@@ -62,7 +63,7 @@
     "sockjs": "^0.3.21",
     "spdy": "^4.0.2",
     "strip-ansi": "^7.0.0",
-    "webpack-dev-middleware": "^5.3.0",
+    "webpack-dev-middleware": "^5.3.1",
     "ws": "^8.4.2"
   },
   "devDependencies": {
@@ -82,9 +83,9 @@
     "babel-jest": "^27.4.4",
     "babel-loader": "^8.2.2",
     "body-parser": "^1.19.1",
-    "core-js": "^3.20.3",
+    "core-js": "^3.21.0",
     "css-loader": "^5.2.4",
-    "eslint": "^8.7.0",
+    "eslint": "^8.8.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-config-webpack": "^1.2.5",
     "eslint-plugin-import": "^2.23.2",
@@ -97,12 +98,12 @@
     "klona": "^2.0.4",
     "less": "^4.1.1",
     "less-loader": "^7.3.0",
-    "lint-staged": "^12.0.2",
+    "lint-staged": "^12.3.3",
     "marked": "^3.0.0",
     "memfs": "^3.2.2",
     "npm-run-all": "^4.1.5",
     "prettier": "^2.3.1",
-    "puppeteer": "^13.1.1",
+    "puppeteer": "^13.1.3",
     "require-from-string": "^2.0.2",
     "rimraf": "^3.0.2",
     "sockjs-client": "^1.5.1",
@@ -113,7 +114,7 @@
     "tcp-port-used": "^1.0.2",
     "typescript": "^4.2.4",
     "url-loader": "^4.1.1",
-    "webpack": "^5.67.0",
+    "webpack": "^5.68.0",
     "webpack-cli": "^4.7.2",
     "webpack-merge": "^5.8.0"
   },