From acc1ee90df002178a98b646595eecc3ca6ff3b59 Mon Sep 17 00:00:00 2001 From: SevenWaysDP Date: Thu, 14 Dec 2023 14:16:26 +0100 Subject: [PATCH 01/12] BC-6035 - add dev deps --- package-lock.json | 18 +++++++++++++++--- package.json | 2 +- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index ee61a4faf7..c291362109 100644 --- a/package-lock.json +++ b/package-lock.json @@ -47,7 +47,6 @@ "compression": "^1.6.2", "connect-redis": "^4.0.3", "cookie-parser": "~1.4.3", - "cross-env": "^7.0.3", "csurf": "^1.10.0", "csv-parse": "^4.16.0", "debug": "~2.6.0", @@ -126,6 +125,7 @@ "browser-sync": "^2.27.11", "chai": "^4.3.4", "chai-http": "^4.3.0", + "cross-env": "^7.0.3", "env2": "^2.2.0", "eslint": "^7.32.0", "eslint-config-airbnb-base": "^14.2.1", @@ -6334,6 +6334,7 @@ "version": "7.0.3", "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz", "integrity": "sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==", + "dev": true, "dependencies": { "cross-spawn": "^7.0.1" }, @@ -6351,6 +6352,7 @@ "version": "7.0.3", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "dev": true, "dependencies": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", @@ -17224,6 +17226,7 @@ "version": "3.1.1", "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "dev": true, "engines": { "node": ">=8" } @@ -20764,6 +20767,7 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "dev": true, "dependencies": { "shebang-regex": "^3.0.0" }, @@ -20775,6 +20779,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "dev": true, "engines": { "node": ">=8" } @@ -24495,6 +24500,7 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "dev": true, "dependencies": { "isexe": "^2.0.0" }, @@ -29577,6 +29583,7 @@ "version": "7.0.3", "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz", "integrity": "sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==", + "dev": true, "requires": { "cross-spawn": "^7.0.1" } @@ -29585,6 +29592,7 @@ "version": "7.0.3", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "dev": true, "requires": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", @@ -38025,7 +38033,8 @@ "path-key": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", - "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==" + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "dev": true }, "path-parse": { "version": "1.0.7", @@ -40728,6 +40737,7 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "dev": true, "requires": { "shebang-regex": "^3.0.0" } @@ -40735,7 +40745,8 @@ "shebang-regex": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", - "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==" + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "dev": true }, "shelljs": { "version": "0.8.5", @@ -43737,6 +43748,7 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "dev": true, "requires": { "isexe": "^2.0.0" } diff --git a/package.json b/package.json index 91c4b5322c..33d43e304a 100644 --- a/package.json +++ b/package.json @@ -69,7 +69,6 @@ "compression": "^1.6.2", "connect-redis": "^4.0.3", "cookie-parser": "~1.4.3", - "cross-env": "^7.0.3", "csurf": "^1.10.0", "csv-parse": "^4.16.0", "debug": "~2.6.0", @@ -148,6 +147,7 @@ "browser-sync": "^2.27.11", "chai": "^4.3.4", "chai-http": "^4.3.0", + "cross-env": "^7.0.3", "env2": "^2.2.0", "eslint": "^7.32.0", "eslint-config-airbnb-base": "^14.2.1", From 4ee23f4236ac9258758e49993835bc9d55dc359e Mon Sep 17 00:00:00 2001 From: SevenWaysDP Date: Thu, 14 Dec 2023 14:19:37 +0100 Subject: [PATCH 02/12] Revert "BC-6035 - add dev deps" This reverts commit acc1ee90df002178a98b646595eecc3ca6ff3b59. --- package-lock.json | 18 +++--------------- package.json | 2 +- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/package-lock.json b/package-lock.json index c291362109..ee61a4faf7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -47,6 +47,7 @@ "compression": "^1.6.2", "connect-redis": "^4.0.3", "cookie-parser": "~1.4.3", + "cross-env": "^7.0.3", "csurf": "^1.10.0", "csv-parse": "^4.16.0", "debug": "~2.6.0", @@ -125,7 +126,6 @@ "browser-sync": "^2.27.11", "chai": "^4.3.4", "chai-http": "^4.3.0", - "cross-env": "^7.0.3", "env2": "^2.2.0", "eslint": "^7.32.0", "eslint-config-airbnb-base": "^14.2.1", @@ -6334,7 +6334,6 @@ "version": "7.0.3", "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz", "integrity": "sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==", - "dev": true, "dependencies": { "cross-spawn": "^7.0.1" }, @@ -6352,7 +6351,6 @@ "version": "7.0.3", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", - "dev": true, "dependencies": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", @@ -17226,7 +17224,6 @@ "version": "3.1.1", "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", - "dev": true, "engines": { "node": ">=8" } @@ -20767,7 +20764,6 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", - "dev": true, "dependencies": { "shebang-regex": "^3.0.0" }, @@ -20779,7 +20775,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", - "dev": true, "engines": { "node": ">=8" } @@ -24500,7 +24495,6 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", - "dev": true, "dependencies": { "isexe": "^2.0.0" }, @@ -29583,7 +29577,6 @@ "version": "7.0.3", "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz", "integrity": "sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==", - "dev": true, "requires": { "cross-spawn": "^7.0.1" } @@ -29592,7 +29585,6 @@ "version": "7.0.3", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", - "dev": true, "requires": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", @@ -38033,8 +38025,7 @@ "path-key": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", - "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", - "dev": true + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==" }, "path-parse": { "version": "1.0.7", @@ -40737,7 +40728,6 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", - "dev": true, "requires": { "shebang-regex": "^3.0.0" } @@ -40745,8 +40735,7 @@ "shebang-regex": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", - "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", - "dev": true + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==" }, "shelljs": { "version": "0.8.5", @@ -43748,7 +43737,6 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", - "dev": true, "requires": { "isexe": "^2.0.0" } diff --git a/package.json b/package.json index 33d43e304a..91c4b5322c 100644 --- a/package.json +++ b/package.json @@ -69,6 +69,7 @@ "compression": "^1.6.2", "connect-redis": "^4.0.3", "cookie-parser": "~1.4.3", + "cross-env": "^7.0.3", "csurf": "^1.10.0", "csv-parse": "^4.16.0", "debug": "~2.6.0", @@ -147,7 +148,6 @@ "browser-sync": "^2.27.11", "chai": "^4.3.4", "chai-http": "^4.3.0", - "cross-env": "^7.0.3", "env2": "^2.2.0", "eslint": "^7.32.0", "eslint-config-airbnb-base": "^14.2.1", From 2bf4f6fa61abe4611ff0cc3475dd62f5e524c35c Mon Sep 17 00:00:00 2001 From: SevenWaysDP Date: Thu, 14 Dec 2023 14:22:22 +0100 Subject: [PATCH 03/12] BC-6035 - add npx --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 91c4b5322c..75d4f514fa 100644 --- a/package.json +++ b/package.json @@ -8,9 +8,9 @@ "debug:container": "nodemon --inspect=0.0.0.0:9310 --config nodemon.json", "lint": "eslint --ext .json --fix . && eslint ./controllers ./helpers ./test/mocha ./api.js ./app.js --ext .js --fix", "startd": "echo 'Do you mean 'npm run watch'?'", - "mocha": "cross-env NODE_ENV=test mocha test/mocha/ --exit --recursive", - "build": "gulp clear && cross-env NODE_OPTIONS=--openssl-legacy-provider gulp", - "dev": "gulp clear && cross-env NODE_OPTIONS=--openssl-legacy-provider gulp watch-reload", + "mocha": "npx cross-env NODE_ENV=test mocha test/mocha/ --exit --recursive", + "build": "gulp clear && npx cross-env NODE_OPTIONS=--openssl-legacy-provider gulp", + "dev": "gulp clear && npx cross-env NODE_OPTIONS=--openssl-legacy-provider gulp watch-reload", "coverage": "nyc npm run mocha" }, "engines": { From afc0a34e51feb55bb0ff76d1e14aff73dfd462bd Mon Sep 17 00:00:00 2001 From: SevenWaysDP Date: Thu, 14 Dec 2023 14:35:54 +0100 Subject: [PATCH 04/12] fixup! BC-6035 - add npx --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 75d4f514fa..86bc9573b8 100644 --- a/package.json +++ b/package.json @@ -8,9 +8,9 @@ "debug:container": "nodemon --inspect=0.0.0.0:9310 --config nodemon.json", "lint": "eslint --ext .json --fix . && eslint ./controllers ./helpers ./test/mocha ./api.js ./app.js --ext .js --fix", "startd": "echo 'Do you mean 'npm run watch'?'", - "mocha": "npx cross-env NODE_ENV=test mocha test/mocha/ --exit --recursive", - "build": "gulp clear && npx cross-env NODE_OPTIONS=--openssl-legacy-provider gulp", - "dev": "gulp clear && npx cross-env NODE_OPTIONS=--openssl-legacy-provider gulp watch-reload", + "mocha": "./node_modules/.bin/cross-env NODE_ENV=test mocha test/mocha/ --exit --recursive", + "build": "gulp clear && ./node_modules/.bin/cross-env NODE_OPTIONS=--openssl-legacy-provider gulp", + "dev": "gulp clear && ./node_modules/.bin/cross-env NODE_OPTIONS=--openssl-legacy-provider gulp watch-reload", "coverage": "nyc npm run mocha" }, "engines": { From 7369c0098d673335916e272fdd573ae2653ab7eb Mon Sep 17 00:00:00 2001 From: SevenWaysDP Date: Thu, 14 Dec 2023 14:44:19 +0100 Subject: [PATCH 05/12] fixup! fixup! BC-6035 - add npx --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 86bc9573b8..e9ccdc3c16 100644 --- a/package.json +++ b/package.json @@ -8,9 +8,9 @@ "debug:container": "nodemon --inspect=0.0.0.0:9310 --config nodemon.json", "lint": "eslint --ext .json --fix . && eslint ./controllers ./helpers ./test/mocha ./api.js ./app.js --ext .js --fix", "startd": "echo 'Do you mean 'npm run watch'?'", - "mocha": "./node_modules/.bin/cross-env NODE_ENV=test mocha test/mocha/ --exit --recursive", - "build": "gulp clear && ./node_modules/.bin/cross-env NODE_OPTIONS=--openssl-legacy-provider gulp", - "dev": "gulp clear && ./node_modules/.bin/cross-env NODE_OPTIONS=--openssl-legacy-provider gulp watch-reload", + "mocha": "node_modules/.bin/cross-env NODE_ENV=test mocha test/mocha/ --exit --recursive", + "build": "gulp clear && node_modules/.bin/cross-env NODE_OPTIONS=--openssl-legacy-provider gulp", + "dev": "gulp clear && node_modules/.bin/cross-env NODE_OPTIONS=--openssl-legacy-provider gulp watch-reload", "coverage": "nyc npm run mocha" }, "engines": { From 71ae0dbe26df42488cb7fbeee0982e03809f06ee Mon Sep 17 00:00:00 2001 From: SevenWaysDP Date: Thu, 14 Dec 2023 15:05:56 +0100 Subject: [PATCH 06/12] fixup! fixup! fixup! BC-6035 - add npx --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 98f8b6e9f7..94fe38e71a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -34,4 +34,4 @@ jobs: run: echo "BRANCH_NAME=$(echo ${GITHUB_HEAD_REF})" >> $GITHUB_ENV - name: setup environment and execute mocha tests - run: bash scripts/unitTest.sh + run: npm ci && npm run build && npm run mocha From cdb3a1a21a8b6e03583a530d72f5ccfa718e6d40 Mon Sep 17 00:00:00 2001 From: SevenWaysDP Date: Thu, 14 Dec 2023 15:08:08 +0100 Subject: [PATCH 07/12] fixup! fixup! fixup! fixup! BC-6035 - add npx --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 94fe38e71a..7ec95b8e93 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -17,7 +17,7 @@ jobs: uses: actions/checkout@v3 - name: Setup node - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: 18 From 78587e931f819a18e45b0202dae8c6a15b006e97 Mon Sep 17 00:00:00 2001 From: SevenWaysDP Date: Thu, 14 Dec 2023 15:20:08 +0100 Subject: [PATCH 08/12] fixup! fixup! fixup! fixup! fixup! BC-6035 - add npx --- .github/workflows/test.yml | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 7ec95b8e93..d82b91cb7e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -14,24 +14,12 @@ jobs: runs-on: ubuntu-latest steps: - name: checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup node uses: actions/setup-node@v4 with: - node-version: 18 - - # extract branch name - - name: Extract branch name - if: github.event_name != 'pull_request' - shell: bash - run: echo "BRANCH_NAME=$(echo ${GITHUB_REF#refs/heads/})" >> $GITHUB_ENV - id: extract_branch - - # extract branch name on pull request - - name: Print branch name - if: github.event_name == 'pull_request' - run: echo "BRANCH_NAME=$(echo ${GITHUB_HEAD_REF})" >> $GITHUB_ENV + node-version: '18' - name: setup environment and execute mocha tests run: npm ci && npm run build && npm run mocha From 56c0441af232d2a257081fa3d082f7f14deeffc9 Mon Sep 17 00:00:00 2001 From: SevenWaysDP Date: Thu, 14 Dec 2023 15:29:50 +0100 Subject: [PATCH 09/12] BC-6035 - update npm version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e9ccdc3c16..d63d9dd85c 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ }, "engines": { "node": "18", - "npm": "9" + "npm": "10" }, "lint-staged": { "static/images/**/*.{png,jpeg,jpg,gif,svg}": [ From ee5448da2914d5dbcd0e07e6c640e811837c9f8b Mon Sep 17 00:00:00 2001 From: SevenWaysDP Date: Thu, 14 Dec 2023 15:33:39 +0100 Subject: [PATCH 10/12] BC-6035 - revert changes --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index d63d9dd85c..861d69b068 100644 --- a/package.json +++ b/package.json @@ -8,9 +8,9 @@ "debug:container": "nodemon --inspect=0.0.0.0:9310 --config nodemon.json", "lint": "eslint --ext .json --fix . && eslint ./controllers ./helpers ./test/mocha ./api.js ./app.js --ext .js --fix", "startd": "echo 'Do you mean 'npm run watch'?'", - "mocha": "node_modules/.bin/cross-env NODE_ENV=test mocha test/mocha/ --exit --recursive", - "build": "gulp clear && node_modules/.bin/cross-env NODE_OPTIONS=--openssl-legacy-provider gulp", - "dev": "gulp clear && node_modules/.bin/cross-env NODE_OPTIONS=--openssl-legacy-provider gulp watch-reload", + "mocha": "cross-env NODE_ENV=test mocha test/mocha/ --exit --recursive", + "build": "gulp clear && cross-env NODE_OPTIONS=--openssl-legacy-provider gulp", + "dev": "gulp clear && cross-env NODE_OPTIONS=--openssl-legacy-provider gulp watch-reload", "coverage": "nyc npm run mocha" }, "engines": { From af00b0c44bd7138ca71885423dbe0c4d2ad115fc Mon Sep 17 00:00:00 2001 From: SevenWaysDP Date: Thu, 14 Dec 2023 16:01:54 +0100 Subject: [PATCH 11/12] fixup! BC-6035 - revert changes --- package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package.json b/package.json index 861d69b068..e811037ffc 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,5 @@ { "name": "schulcloud-client", - "private": true, "scripts": { "start": "node --unhandled-rejections=warn ./bin/www", "watch": "nodemon --config nodemon.json", @@ -15,7 +14,7 @@ }, "engines": { "node": "18", - "npm": "10" + "npm": ">=9" }, "lint-staged": { "static/images/**/*.{png,jpeg,jpg,gif,svg}": [ From 2bad237b5df713e4bc902b30182b539a12fca50b Mon Sep 17 00:00:00 2001 From: SevenWaysDP Date: Thu, 14 Dec 2023 16:05:56 +0100 Subject: [PATCH 12/12] BC-6035 - remove unused file --- scripts/unitTest.sh | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 scripts/unitTest.sh diff --git a/scripts/unitTest.sh b/scripts/unitTest.sh deleted file mode 100644 index 710aeb5abc..0000000000 --- a/scripts/unitTest.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -e - -npm ci -npm run build -npm run mocha