Add full Node.js 15.x support

juice-shop · Feb 22, 2021 · 4201a98 · 4201a98
1 parent fb6c31a
commit 4201a98
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 11 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -53,7 +53,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
-        node-version: [10, 12, 14]
+        node-version: [10, 12, 14, 15]
     steps:
       - name: "Check out Git repository"
         uses: actions/checkout@v2

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -9,7 +9,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
-        node-version: [10, 12, 14]
+        node-version: [10, 12, 14, 15]
     steps:
       - name: "Check out Git repository"
         uses: actions/checkout@v2

diff --git a/Dockerfile b/Dockerfile
@@ -15,7 +15,7 @@ LABEL maintainer="Bjoern Kimminich <bjoern.kimminich@owasp.org>" \
     org.opencontainers.image.vendor="Open Web Application Security Project" \
     org.opencontainers.image.documentation="https://help.owasp-juice.shop" \
     org.opencontainers.image.licenses="MIT" \
-    org.opencontainers.image.version="12.6.1" \
+    org.opencontainers.image.version="12.7.0-SNAPSHOT" \
     org.opencontainers.image.url="https://owasp-juice.shop" \
     org.opencontainers.image.source="https://github.com/bkimminich/juice-shop" \
     org.opencontainers.image.revision=$VCS_REF \

diff --git a/README.md b/README.md
@@ -219,7 +219,8 @@ accordingly.
 
 | node.js | Supported            | Tested             | [Packaged Distributions](#packaged-distributions) | [Docker images](#docker-container) from `master`        | [Docker images](#docker-container) from `develop`         |
 |:--------|:---------------------|:-------------------|:--------------------------------------------------|:--------------------------------------------------------|:----------------------------------------------------------|
-| 15.x    | :x:                  | :x:                |                                                   |                                                         |                                                           |
+| 16.x    | :x:                  | :x:                |                                                   |                                                         |                                                           |
+| 15.x    | :heavy_check_mark:   | :heavy_check_mark: | Windows (`x64`), MacOS (`x64`), Linux (`x64`)     |                                                         |                                                           |
 | 14.x    | :heavy_check_mark:   | :heavy_check_mark: | Windows (`x64`), MacOS (`x64`), Linux (`x64`)     |                                                         |                                                           |
 | 13.x    | (:heavy_check_mark:) | :x:                |                                                   |                                                         |                                                           |
 | 12.x    | :heavy_check_mark:   | :heavy_check_mark: | Windows (`x64`), MacOS (`x64`), Linux (`x64`)     | `latest` (`linux/amd64`, `linux/arm/v7`, `linux/arm64`) | `snapshot` (`linux/amd64`, `linux/arm/v7`, `linux/arm64`) |

diff --git a/frontend/package.json b/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "frontend",
-  "version": "12.6.1",
+  "version": "12.7.0-SNAPSHOT",
   "scripts": {
     "ng": "ng",
     "start": "ng serve",

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "juice-shop",
-  "version": "12.6.1",
+  "version": "12.7.0-SNAPSHOT",
   "private": true,
   "description": "Probably the most modern and sophisticated insecure web application",
   "keywords": [
@@ -55,7 +55,7 @@
     "build": "cd frontend && node ./node_modules/@angular/cli/bin/ng build --aot --prod --output-hashing=none --vendor-chunk=true --source-map=false",
     "e2e": "node test/e2eTests.js",
     "frisby": "nyc --report-dir=./build/reports/coverage/api-tests jest --silent --runInBand --forceExit",
-    "postinstall": "cd frontend && npm install && cd .. && npm run build",
+    "postinstall": "cd frontend && npm install --legacy-peer-deps && cd .. && npm run build",
     "lint": "eslint *.js data lib models routes test views && cd frontend && ng lint && npx stylelint \"**/*.scss\" && cd ..",
     "lint:config": "schema validate -s config.schema.yml",
     "lint:fix": "eslint *.js data lib models routes test views --fix && cd frontend && ng lint --fix && npx stylelint \"**/*.scss\" --fix && cd ..",
@@ -191,7 +191,7 @@
     "webdriver-manager": "^12.1.7"
   },
   "engines": {
-    "node": "10 - 14"
+    "node": "10 - 15"
   },
   "os": [
     "win32",

diff --git a/test/server/preconditionValidationSpec.js b/test/server/preconditionValidationSpec.js
@@ -16,12 +16,13 @@ describe('preconditionValidation', () => {
   describe('checkIfRunningOnSupportedNodeVersion', () => {
     const supportedVersion = require('./../../package.json').engines.node
 
-    it('should define the supported semver range as 10 - 14', () => {
-      expect(supportedVersion).to.equal('10 - 14')
+    it('should define the supported semver range as 10 - 15', () => {
+      expect(supportedVersion).to.equal('10 - 15')
       expect(semver.validRange(supportedVersion)).to.not.equal(null)
     })
 
     it('should accept a supported version', () => {
+      expect(checkIfRunningOnSupportedNodeVersion('15.9.0')).to.equal(true)
       expect(checkIfRunningOnSupportedNodeVersion('14.0.0')).to.equal(true)
       expect(checkIfRunningOnSupportedNodeVersion('13.13.0')).to.equal(true)
       expect(checkIfRunningOnSupportedNodeVersion('12.16.2')).to.equal(true)
@@ -30,7 +31,7 @@ describe('preconditionValidation', () => {
     })
 
     it('should fail for an unsupported version', () => {
-      expect(checkIfRunningOnSupportedNodeVersion('15.0.0')).to.equal(false)
+      expect(checkIfRunningOnSupportedNodeVersion('16.0.0')).to.equal(false)
       expect(checkIfRunningOnSupportedNodeVersion('9.11.2')).to.equal(false)
       expect(checkIfRunningOnSupportedNodeVersion('8.12.0')).to.equal(false)
       expect(checkIfRunningOnSupportedNodeVersion('7.10.1')).to.equal(false)