From 9805cb0be63d5ea2b4cab76be0b81cd212f9fe7a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 11 Apr 2024 09:33:09 -0700 Subject: [PATCH 1/4] build(deps): bump typescript from 5.4.4 to 5.4.5 (#3989) Bumps [typescript](https://github.com/Microsoft/TypeScript) from 5.4.4 to 5.4.5. - [Release notes](https://github.com/Microsoft/TypeScript/releases) - [Changelog](https://github.com/microsoft/TypeScript/blob/main/azure-pipelines.release.yml) - [Commits](https://github.com/Microsoft/TypeScript/compare/v5.4.4...v5.4.5) --- updated-dependencies: - dependency-name: typescript dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 12 ++++++------ package.json | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index ebe5e93f1be..6a1aea168cb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,6 @@ "version": "2.7.0", "license": "SSPL", "dependencies": { - "@types/node": "^20.12.7", "debug": "^4.3.2", "del": "^7.0.0", "enjoi": "^9.0.1", @@ -24,7 +23,8 @@ "puppeteer-extra": "^3.3.6", "puppeteer-extra-plugin-stealth": "^2.11.2", "queue": "^7.0.0", - "systeminformation": "^5.22.7" + "systeminformation": "^5.22.7", + "typescript": "^5.4.5" }, "bin": { "browserless": "bin/browserless.js" @@ -55,7 +55,7 @@ "prettier": "^3.2.5", "sinon": "^17.0.1", "ts-node": "^10.9.2", - "typescript": "^5.4.4", + "typescript": "^5.4.5", "typescript-json-schema": "^0.63.0" } }, @@ -5590,9 +5590,9 @@ } }, "node_modules/typescript": { - "version": "5.4.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.4.tgz", - "integrity": "sha512-dGE2Vv8cpVvw28v8HCPqyb08EzbBURxDpuhJvTrusShUfGnhHBafDsLdS1EhhxyL6BJQE+2cT3dDPAv+MQ6oLw==", + "version": "5.4.5", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz", + "integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==", "optional": true, "bin": { "tsc": "bin/tsc", diff --git a/package.json b/package.json index 0fffc61f728..2bf1c7ea1bf 100644 --- a/package.json +++ b/package.json @@ -90,7 +90,7 @@ "prettier": "^3.2.5", "sinon": "^17.0.1", "ts-node": "^10.9.2", - "typescript": "^5.4.4", + "typescript": "^5.4.5", "typescript-json-schema": "^0.63.0" }, "eslintConfig": { From c959667d003323648996df4f18a6c1e678e87707 Mon Sep 17 00:00:00 2001 From: Joel Griffith Date: Thu, 11 Apr 2024 09:38:39 -0700 Subject: [PATCH 2/4] Fix if/then/fi in startup and mimic it in tests as well (#3993) --- scripts/start.sh | 3 ++- scripts/test.sh | 11 +++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/scripts/start.sh b/scripts/start.sh index 98a9b5916d5..db58d9e4661 100755 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -13,7 +13,8 @@ _kill_procs() { # Relay quit commands to processes trap _kill_procs SIGTERM SIGINT -if [ -z "$DISPLAY" ] then +if [ -z "$DISPLAY" ] +then Xvfb :99 -screen 0 1024x768x16 -nolisten tcp -nolisten unix & xvfb=$! export DISPLAY=:99 diff --git a/scripts/test.sh b/scripts/test.sh index c5dbb9878cb..293f018e806 100755 --- a/scripts/test.sh +++ b/scripts/test.sh @@ -4,14 +4,17 @@ set -e # Install all dependencies for tests npm i --production=false -# Setup env variables -export DISPLAY=:1 +# Setup Env Variables export DEBUG=-* export PUPPETEER_DISABLE_HEADLESS_WARNING=true export NODE_OPTIONS="--loader ts-node/esm" -Xvfb :1 -screen 0 1024x768x16 -nolisten tcp -nolisten unix & -xvfb=$! +if [ -z "$DISPLAY" ] +then + Xvfb :99 -screen 0 1024x768x16 -nolisten tcp -nolisten unix & + xvfb=$! + export DISPLAY=:99 +fi # Run the tests ./node_modules/.bin/_mocha --timeout 30000 --slow 10000 --exit $@ && kill -TERM $xvfb From 11935dd7b43071ef9a65edf1187adb08ce226cd0 Mon Sep 17 00:00:00 2001 From: Joel Griffith Date: Thu, 11 Apr 2024 11:26:44 -0700 Subject: [PATCH 3/4] 2.7.1 Changelog --- CHANGELOG.md | 7 ++++++- package-lock.json | 3 +-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d487b1bb565..31274993ab5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,9 @@ -# [Latest](https://github.com/browserless/chrome/compare/v2.7.0...main) +# [Latest](https://github.com/browserless/chrome/compare/v2.7.1...main) +- Dependency updates. + +# [v2.7.1](https://github.com/browserless/chrome/compare/v2.7.0...v2.7.1) +**April 11, 2024** +- Fixes a boot-looping issue due to bad startup script. Adds tests for this as well. - Dependency updates. # [v2.7.0](https://github.com/browserless/chrome/compare/v2.6.1...v2.7.0) diff --git a/package-lock.json b/package-lock.json index 6a1aea168cb..05de7b8c647 100644 --- a/package-lock.json +++ b/package-lock.json @@ -23,8 +23,7 @@ "puppeteer-extra": "^3.3.6", "puppeteer-extra-plugin-stealth": "^2.11.2", "queue": "^7.0.0", - "systeminformation": "^5.22.7", - "typescript": "^5.4.5" + "systeminformation": "^5.22.7" }, "bin": { "browserless": "bin/browserless.js" From 22817ad9ae3c7fd72c9ff3ea978212d10197597f Mon Sep 17 00:00:00 2001 From: Joel Griffith Date: Thu, 11 Apr 2024 11:26:56 -0700 Subject: [PATCH 4/4] 2.7.1 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 05de7b8c647..6bbe1da02db 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@browserless.io/browserless", - "version": "2.7.0", + "version": "2.7.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@browserless.io/browserless", - "version": "2.7.0", + "version": "2.7.1", "license": "SSPL", "dependencies": { "debug": "^4.3.2", diff --git a/package.json b/package.json index 2bf1c7ea1bf..728390b42e4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@browserless.io/browserless", - "version": "2.7.0", + "version": "2.7.1", "license": "SSPL", "description": "The browserless platform", "author": "browserless.io",