From 54a37fbd09c63e76591a635f8d789de58a4edfe4 Mon Sep 17 00:00:00 2001 From: MazOneTwoOne <76905544+MazOneTwoOne@users.noreply.github.com> Date: Wed, 23 Oct 2024 13:45:35 +0100 Subject: [PATCH] EL-1814: Manual upgrade of puppeteer to 23.6.0 (#1614) - manual upgrade of puppeteer to 23.6.0 - update `.circleci/config.yml` to reference the new image --- .circleci/config.yml | 2 +- .../workflows/browser_tools_docker_image.yml | 2 +- Dockerfile_browser_tools.dockerfile | 2 +- package.json | 2 +- yarn.lock | 30 +++++++++---------- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 85e54bf85..c0e9b33c4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -8,7 +8,7 @@ executors: test-executor: resource_class: medium docker: - - image: checkclientqualifiesdocker/circleci-image:puppeteer-2353 + - image: checkclientqualifiesdocker/circleci-image:puppeteer-2360 auth: username: $DOCKERHUB_USER_CCQ password: $DOCKERHUB_PAT_CCQ diff --git a/.github/workflows/browser_tools_docker_image.yml b/.github/workflows/browser_tools_docker_image.yml index b4169e384..fc68523ce 100644 --- a/.github/workflows/browser_tools_docker_image.yml +++ b/.github/workflows/browser_tools_docker_image.yml @@ -3,7 +3,7 @@ on: push: branches: - main - - puppeteer-2353 + - puppeteer-2360 jobs: build-push: diff --git a/Dockerfile_browser_tools.dockerfile b/Dockerfile_browser_tools.dockerfile index a6b119778..7ef03e81e 100644 --- a/Dockerfile_browser_tools.dockerfile +++ b/Dockerfile_browser_tools.dockerfile @@ -11,7 +11,7 @@ RUN sudo apt install pdftk --allow-unauthenticated # These 2 lines still need to mirror the actual version # used by the application (in yarn.lock, not package.json) -RUN yarn add puppeteer@23.5.3 +RUN yarn add puppeteer@23.6.0 RUN npx puppeteer browsers install chrome COPY . . diff --git a/package.json b/package.json index 78c70e104..2148304da 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "esbuild": "^0.24.0", "govuk-frontend": "^5.6.0", "jquery": "^3.7.1", - "puppeteer": "23.5.3", + "puppeteer": "23.6.0", "rails_admin": "3.2.0", "sass": "^1.79.4" }, diff --git a/yarn.lock b/yarn.lock index a31dc83ec..6e02276b3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -504,10 +504,10 @@ degenerator@^5.0.0: escodegen "^2.1.0" esprima "^4.0.1" -devtools-protocol@0.0.1342118: - version "0.0.1342118" - resolved "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.1342118.tgz#ea136fc1701572c0830233dcb414dc857e582e0a" - integrity sha512-75fMas7PkYNDTmDyb6PRJCH7ILmHLp+BhrZGeMsa4bCh40DTxgCz2NRy5UDzII4C5KuD0oBMZ9vXKhEl6UD/3w== +devtools-protocol@0.0.1354347: + version "0.0.1354347" + resolved "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.1354347.tgz#5cb509610b8f61fc69a31e5c810d5bed002d85ea" + integrity sha512-BlmkSqV0V84E2WnEnoPnwyix57rQxAM5SKJjf4TbYOCGLAWtz8CDH8RIaGOjPgPCXo2Mce3kxSY497OySidY3Q== emoji-regex@^8.0.0: version "8.0.0" @@ -898,28 +898,28 @@ pump@^3.0.0: end-of-stream "^1.1.0" once "^1.3.1" -puppeteer-core@23.5.3: - version "23.5.3" - resolved "https://registry.yarnpkg.com/puppeteer-core/-/puppeteer-core-23.5.3.tgz#f53af458d59d08ec256d56d17689818592d9166a" - integrity sha512-V58MZD/B3CwkYsqSEQlHKbavMJptF04fzhMdUpiCRCmUVhwZNwSGEPhaiZ1f8I3ABQUirg3VNhXVB6Z1ubHXtQ== +puppeteer-core@23.6.0: + version "23.6.0" + resolved "https://registry.yarnpkg.com/puppeteer-core/-/puppeteer-core-23.6.0.tgz#a3e1e09c05f47fb8ca2bc9d4ca200d18e3704303" + integrity sha512-se1bhgUpR9C529SgHGr/eyT92mYyQPAhA2S9pGtGrVG2xob9qE6Pbp7TlqiSPlnnY1lINqhn6/67EwkdzOmKqQ== dependencies: "@puppeteer/browsers" "2.4.0" chromium-bidi "0.8.0" debug "^4.3.7" - devtools-protocol "0.0.1342118" + devtools-protocol "0.0.1354347" typed-query-selector "^2.12.0" ws "^8.18.0" -puppeteer@23.5.3: - version "23.5.3" - resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-23.5.3.tgz#aba7fbf39d8d9bb0c8d48a78e26ef169ed812685" - integrity sha512-FghmfBsr/UUpe48OiCg1gV3W4vVfQJKjQehbF07SjnQvEpWcvPTah1nykfGWdOQQ1ydJPIXcajzWN7fliCU3zw== +puppeteer@23.6.0: + version "23.6.0" + resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-23.6.0.tgz#7a3c01e7b6a43a950f3e13eb48a335f78a358768" + integrity sha512-l+Fgo8SVFSd51STtq2crz8t1Y3VXowsuR4zfR64qDOn6oggz7YIZauWiNR4IJjczQ6nvFs3S4cgng55/nesxTQ== dependencies: "@puppeteer/browsers" "2.4.0" chromium-bidi "0.8.0" cosmiconfig "^9.0.0" - devtools-protocol "0.0.1342118" - puppeteer-core "23.5.3" + devtools-protocol "0.0.1354347" + puppeteer-core "23.6.0" typed-query-selector "^2.12.0" queue-tick@^1.0.1: