From 0c30552239f573b6606ddc6d5b0952c240546092 Mon Sep 17 00:00:00 2001 From: Peter Hamilton Date: Fri, 3 Nov 2023 13:34:00 +0000 Subject: [PATCH 1/8] Mobile finessing (#942) * Mobile finessing * round 2 --- app/assets/stylesheets/application.scss | 6 + app/assets/stylesheets/card.scss | 163 ++---------------- app/assets/stylesheets/dfe-header.scss | 5 + app/assets/stylesheets/prompt.scss | 7 +- app/assets/stylesheets/section-intro.scss | 5 + .../training/modules_controller.rb | 2 +- 6 files changed, 36 insertions(+), 152 deletions(-) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index cbcbc48a2a..2cff9ff76d 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -114,6 +114,12 @@ pre.code-tip { font-weight: normal; } +.govuk-fieldset__legend { + @include govuk-media-query($until: tablet) { + display: none; + } +} + .light-grey-box { padding: govuk-spacing(5); margin-bottom: govuk-spacing(5); diff --git a/app/assets/stylesheets/card.scss b/app/assets/stylesheets/card.scss index 348077aea4..bf0f79117d 100644 --- a/app/assets/stylesheets/card.scss +++ b/app/assets/stylesheets/card.scss @@ -1,140 +1,3 @@ -.govuk-card__flex-container { - display: flex; - flex-wrap: wrap; - width:100%; -} - -.govuk-card__flex-item { - display: flex; - overflow: hidden; -} - -.govuk-card { - border-bottom: govuk-colour("blue") 3px solid; - box-sizing: border-box; - padding: 20px; - max-width: 300px; - - &--contained { - background-color: govuk-colour("light-grey"); - } - - &--contained--on-background { - background-color: govuk-colour("white"); - } -} - -.card-container img { - max-width: 100%; -} - -.govuk-card--borderless { - border: 0; - padding-bottom: 0; -} - -.govuk-card--selectable { - position: relative; - - h3 { - color: govuk-colour("blue"); - } -} - -.govuk-card--selectable > a { - position: absolute; - top: 0; - left: 0; - height: 100%; - width: 100%; -} - -.govuk-card--selectable:hover { - background-color: govuk-colour("blue"); -} - -.govuk-card--selectable:hover > .govuk-card__content > h3, -.govuk-card--selectable:hover > .govuk-card__content > p, -.govuk-card--selectable:hover > .govuk-card__content > h3 > a, -.govuk-card--selectable:hover > .govuk-card__actions > ul > li > a { - color: govuk-colour("white") !important; -} - -.govuk-card--selectable:hover .govuk-card__content a, -.govuk-card--selectable:hover .govuk-card__actions ul > li > a:hover { - color: lighten(#fff, 30%) !important; -} - -.govuk-card--selectable > a:focus { - background-color: initial !important; -} - -.govuk-card__hero { - line-height: 0; -} - -.gov-card__img{ - display: block; - width: 100% -} - -.govuk-card__content { - padding-bottom: 0; - - p { - margin-bottom: 0; - } -} - -.govuk-card__actions { - padding-top:10px; - padding-bottom: 0; -} - -.govuk-card__actions > .govuk-c-button { - margin-bottom: 0; -} - -.govuk-card__height{ - min-height:300px; -} - -@media screen and (max-width:1320px) { - .govuk-card__height{ - min-height:375px; - } -} - -@media screen and (max-width:1037px) { - .govuk-card__height{ - min-height:410px; - } -} - -@media screen and (max-width:912px) { - .govuk-card__height{ - min-height:430px; - } -} - -@media screen and (max-width:885px) { - .govuk-card__height{ - min-height:500px; - } -} - -@media screen and (max-width:812px) { - .govuk-card__height{ - min-height:530px; - } -} - -@media screen and (max-width:812px) { - .govuk-card__height{ - min-height:220px; - } -} - .grid-container { display: flex; flex-direction: column; @@ -145,32 +8,40 @@ grid-template-columns: repeat(auto-fill, minmax(250px, 1fr)); grid-gap: 30px; } + +} + +.card-container img { + max-width: 100%; } .card { position: relative; - background-color: govuk-colour("light-grey"); - border-bottom: 3px solid govuk-colour("blue"); - max-width: 300px; + background-color: govuk-colour('light-grey'); + border-bottom: 3px solid govuk-colour('blue'); + + @include govuk-media-query($from: tablet) { + max-width: 300px; + } &-container { padding: 20px; } &:hover, &:focus-within { - background-color: govuk-colour("blue"); + background-color: govuk-colour('blue'); a { - color: govuk-colour("white"); + color: govuk-colour('white'); } } &:hover &-link--retake { &:hover { - color: govuk-colour("light-grey"); + color: govuk-colour('light-grey'); } &:focus { - color: govuk-colour("black"); + color: govuk-colour('black'); } } @@ -188,7 +59,7 @@ box-shadow: none; .card-container & { - color: govuk-colour("black"); + color: govuk-colour('black'); } } } @@ -200,7 +71,7 @@ &-link--header { text-decoration: none; - color: govuk-colour("blue"); + color: govuk-colour('blue'); &:after { position: absolute; diff --git a/app/assets/stylesheets/dfe-header.scss b/app/assets/stylesheets/dfe-header.scss index 77bcc0298c..d0df9000c5 100644 --- a/app/assets/stylesheets/dfe-header.scss +++ b/app/assets/stylesheets/dfe-header.scss @@ -11,6 +11,11 @@ margin: 0 auto; max-width: $govuk-page-width; + @include govuk-media-query($until: tablet) { + padding-left: govuk-spacing(3); + padding-right: govuk-spacing(3); + } + &.dfe-header__container.dfe-header-f-header-flex { display: flex; flex-wrap: wrap; diff --git a/app/assets/stylesheets/prompt.scss b/app/assets/stylesheets/prompt.scss index 1ba5e50bd2..e994c3cd65 100644 --- a/app/assets/stylesheets/prompt.scss +++ b/app/assets/stylesheets/prompt.scss @@ -11,6 +11,7 @@ $prompt-hue: govuk-colour('turquoise'); border-top: $prompt-hue solid 10px; margin: govuk-spacing(5) govuk-spacing(0); padding-left: govuk-spacing(4); + padding-right: govuk-spacing(4); .svg-inline--fa { position: relative; @@ -25,12 +26,8 @@ $prompt-hue: govuk-colour('turquoise'); } .govuk-grid-column-three-quarters { - padding: govuk-spacing(3) govuk-spacing(0); + padding: govuk-spacing(3); - @media (max-width: 40em) { - padding-left: govuk-spacing(3); - } - @media(min-width: 40em) and (max-width: 61.5em) { padding-left: govuk-spacing(7); } diff --git a/app/assets/stylesheets/section-intro.scss b/app/assets/stylesheets/section-intro.scss index 06ceac3731..5c938ae267 100644 --- a/app/assets/stylesheets/section-intro.scss +++ b/app/assets/stylesheets/section-intro.scss @@ -1,5 +1,10 @@ #section-intro-panel { padding: govuk-spacing(7); + + @include govuk-media-query($until: tablet) { + padding: govuk-spacing(6); + } + background-color: govuk-colour('light-grey'); border-radius: 6px; diff --git a/app/controllers/training/modules_controller.rb b/app/controllers/training/modules_controller.rb index 4b74af9717..60d9b1e80b 100644 --- a/app/controllers/training/modules_controller.rb +++ b/app/controllers/training/modules_controller.rb @@ -10,7 +10,7 @@ class ModulesController < ApplicationController :mods, :module_table - layout 'hero' + layout 'hero', only: :show def index track('course_overview_page', cms: true) From 9a9f63600d325ceb9f0ceb5767f83755b3693c2f Mon Sep 17 00:00:00 2001 From: Peter Hamilton Date: Fri, 3 Nov 2023 14:08:53 +0000 Subject: [PATCH 2/8] Refactor docker entrypoint (#922) * Revert "Test without entrypoint changes" This reverts commit 1c9eb670ebfa16fcafbe32f7f22fc0a4276086b2. * Fix guard clause for apps in prod * Test default envs * Export defaults only * Evaluate printed envs for export * Improve env var preparation --- .docker-profile | 4 --- Dockerfile | 2 -- docker-entrypoint.sh | 76 +++++++++++++++++++++++++++----------------- 3 files changed, 47 insertions(+), 35 deletions(-) delete mode 100644 .docker-profile diff --git a/.docker-profile b/.docker-profile deleted file mode 100644 index 5980f702ea..0000000000 --- a/.docker-profile +++ /dev/null @@ -1,4 +0,0 @@ -export PATH=$PATH:/usr/local/bin:/usr/local/bundle/bin -export GEM_HOME=/usr/local/bundle -export BUNDLE_APP_CONFIG=/usr/local/bundle -export RAILS_ENV=production diff --git a/Dockerfile b/Dockerfile index a349fdb284..223dbc7da3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -53,8 +53,6 @@ ENV PUPPETEER_EXECUTABLE_PATH /usr/bin/chromium-browser ENV APP_HOME /srv ENV RAILS_ENV ${RAILS_ENV:-production} -COPY .docker-profile /root/.profile - RUN mkdir -p ${APP_HOME}/tmp/pids ${APP_HOME}/log WORKDIR ${APP_HOME} diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 2e9d8e4245..7de9e4bc0e 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -2,8 +2,21 @@ # ------------------------------------------------------------------------------ set -e -if [ !${RAILS_ENV}=="production" ] +if [ ${RAILS_ENV} != "production" ] then + + if [ -z ${PROXY_CERT} ] + then + echo "No proxy certificate to append" + else + echo "Appending proxy certificate" + cat $PROXY_CERT >> /etc/ssl/certs/ca-certificates.crt + fi + +# +# Development & Test +# +# ------------------------------------------------------------------------------ if bundle check then echo "$RAILS_ENV gems already bundled" @@ -11,48 +24,53 @@ then bundle fi - if [ ! -d "node_modules" ]; then + if [ ! -d "node_modules" ] + then bundle exec rails yarn:install fi - rm -f tmp/pids/server.pid - - if [ -z ${PROXY_CERT} ] + if [ -z ${DATABASE_URL} ] then - echo "No proxy certificate to append" + echo "DATABASE_URL is not defined and cannot be prepared" else - echo "Appending proxy certificate" - cat $PROXY_CERT >> /etc/ssl/certs/ca-certificates.crt + bundle exec rails db:create db:migrate fi -fi -if [ -z ${DATABASE_URL} ] -then - echo "DATABASE_URL is not defined and cannot be prepared" -else - bundle exec rails db:create db:migrate -fi + rm -f tmp/pids/server.pid -if [ -z ${ENVIRONMENT} ] -then - echo "ENVIRONMENT is not defined so the app may not startup as intended" +# ------------------------------------------------------------------------------ else - /usr/sbin/sshd - if [ !${ENVIRONMENT}=="development" ] +# +# Production +# +# ------------------------------------------------------------------------------ + if [ -z ${ENVIRONMENT} ] then - bundle exec rails db:prepare assets:precompile db:seed eyfs:bot sitemap:refresh:no_ping - fi + echo "Azure ENVIRONMENT is not defined" + else + # Azure WebSSH + /usr/sbin/sshd + eval $(printenv | xargs 2>/dev/null | export > /root/.profile) - if [ !${ENVIRONMENT}=="staging" ] - then - bundle exec rails db:prepare assets:precompile - fi + bundle exec rails db:prepare - if [ !${ENVIRONMENT}=="production" ] - then - rm public/robots.txt && touch public/robots.txt && bundle exec rails db:prepare assets:precompile + case ${ENVIRONMENT} in + "development" ) + bundle exec rails db:seed eyfs:bot sitemap:refresh:no_ping + ;; + "staging" ) + # no op + ;; + "production" ) + rm public/robots.txt && touch public/robots.txt + ;; + * ) + echo "Azure ENVIRONMENT ${ENVIRONMENT} is not supported" + esac fi + +# ------------------------------------------------------------------------------ fi exec bundle exec "$@" From fe4b68488b9f568397edcd4ff6b0cc017529fdaa Mon Sep 17 00:00:00 2001 From: Peter Hamilton Date: Mon, 6 Nov 2023 10:06:04 +0000 Subject: [PATCH 3/8] Use aria labels on change links instead of hiding text on account page (#938) --- app/views/user/show.html.slim | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/app/views/user/show.html.slim b/app/views/user/show.html.slim index cac6e28899..cc7a3ba368 100644 --- a/app/views/user/show.html.slim +++ b/app/views/user/show.html.slim @@ -12,31 +12,31 @@ = govuk_summary_list do |your_details| - your_details.with_row do |row| - row.with_key { 'Name' } - - row.with_value(text: current_user.name, classes: ['data-hj-suppress']) - - row.with_action(text: t('links.change'), href: edit_registration_name_path, visually_hidden_text: 'name', html_attributes: { id: :edit_name_registration }) + - row.with_value(text: current_user.name, classes: %w[data-hj-suppress]) + - row.with_action(text: t('links.change'), href: edit_registration_name_path, html_attributes: { id: :edit_name_registration, aria: { label: 'Change name' } }) - your_details.with_row do |row| - row.with_key { 'Email' } - - row.with_value(text:current_user.email, classes: ['data-hj-suppress']) - - row.with_action(text: t('links.change'), href: edit_email_user_path, visually_hidden_text: 'email', html_attributes: { id: :edit_email_user }) + - row.with_value(text:current_user.email, classes: %w[data-hj-suppress]) + - row.with_action(text: t('links.change'), href: edit_email_user_path, html_attributes: { id: :edit_email_user, aria: { label: 'Change email' } }) - your_details.with_row do |row| - row.with_key { 'Password' } - row.with_value { t('my_account.password_changed', date: current_user.password_last_changed) } - - row.with_action(text: t('links.change'), href: edit_password_user_path, visually_hidden_text: 'password', html_attributes: { id: :edit_password_user }) + - row.with_action(text: t('links.change'), href: edit_password_user_path, html_attributes: { id: :edit_password_user, aria: { label: 'Change password' } }) = govuk_summary_list do |other_details| - other_details.with_row do |row| - row.with_key { m('my_account.setting_details') } - row.with_value { nil } - - row.with_action(text: t('links.change'), href: edit_registration_setting_type_path, visually_hidden_text: 'setting_type', html_attributes: { id: :edit_setting_type_registration }) + - row.with_action(text: t('links.change'), href: edit_registration_setting_type_path, html_attributes: { id: :edit_setting_type_registration, aria: { label: 'Change setting details' } }) - other_details.with_row do |row| - row.with_key { 'Setting type' } - - row.with_value(text: current_user.setting_name, classes: ['data-hj-suppress']) + - row.with_value(text: current_user.setting_name, classes: %w[data-hj-suppress]) - other_details.with_row do |row| - row.with_key { 'Local authority' } - - row.with_value(text: current_user.authority_name, classes: ['data-hj-suppress']) + - row.with_value(text: current_user.authority_name, classes: %w[data-hj-suppress]) - other_details.with_row do |row| - row.with_key { 'Role' } - - row.with_value(text: current_user.role_name, classes: ['data-hj-suppress']) + - row.with_value(text: current_user.role_name, classes: %w[data-hj-suppress]) = govuk_summary_list do |email_preferences| - email_preferences.with_row do |row| @@ -45,7 +45,7 @@ - email_preferences.with_row do |row| - row.with_key { 'Email updates about this training course' } - row.with_value(text: t(current_user.training_emails_recipient?, scope: 'my_account.training_emails'), classes: %w[data-hj-suppress]) - - row.with_action(text: t('links.change'), href: edit_training_emails_user_path, visually_hidden_text: 'training_emails', html_attributes: { id: :edit_training_emails_user }) + - row.with_action(text: t('links.change'), href: edit_training_emails_user_path, html_attributes: { id: :edit_training_emails_user, aria: { label: 'Change email preferences' } }) = m('my_account.closing.information') = govuk_button_link_to t('my_account.closing.button'), new_user_close_account_path From 520775247a15ec37c4dabba205c300f4da5e51cd Mon Sep 17 00:00:00 2001 From: Peter Hamilton Date: Mon, 6 Nov 2023 10:19:59 +0000 Subject: [PATCH 4/8] Change label text for audit and move to locales (#936) --- app/helpers/link_helper.rb | 4 ++-- config/locales/en.yml | 2 ++ spec/lib/seed_snippets_spec.rb | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/helpers/link_helper.rb b/app/helpers/link_helper.rb index a74f1f6a80..d83ae34882 100644 --- a/app/helpers/link_helper.rb +++ b/app/helpers/link_helper.rb @@ -32,7 +32,7 @@ def link_to_next govuk_button_link_to content.next_button_text, training_module_page_path(mod.name, page.name), id: 'next-action', - aria: { label: 'Go to the next page' } + aria: { label: t('pagination.next') } end # @return [String] previous page or module overview @@ -48,7 +48,7 @@ def link_to_previous govuk_button_link_to 'Previous', path, class: style, - aria: { label: 'Go to the previous page' } + aria: { label: t('pagination.previous') } end # Bottom of my-modules card component diff --git a/config/locales/en.yml b/config/locales/en.yml index 033df49ec9..03ae958ea0 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -101,6 +101,8 @@ en: pagination: section: Section %{current} of %{total} page: Page %{current} of %{total} + previous: Previous Page + next: Next Page na: Not applicable diff --git a/spec/lib/seed_snippets_spec.rb b/spec/lib/seed_snippets_spec.rb index 3a295cefd0..6091c47883 100644 --- a/spec/lib/seed_snippets_spec.rb +++ b/spec/lib/seed_snippets_spec.rb @@ -5,7 +5,7 @@ subject(:locales) { described_class.new.call } it 'converts all translations' do - expect(locales.count).to be 174 + expect(locales.count).to be 176 end it 'dot separated key -> Page::Resource#name' do From 5cdb20cb62f5380c18726acc3bf3d565b30e004b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Nov 2023 10:27:52 +0000 Subject: [PATCH 5/8] Bump hashicorp/setup-terraform from 2 to 3 (#935) Bumps [hashicorp/setup-terraform](https://github.com/hashicorp/setup-terraform) from 2 to 3. - [Release notes](https://github.com/hashicorp/setup-terraform/releases) - [Changelog](https://github.com/hashicorp/setup-terraform/blob/main/CHANGELOG.md) - [Commits](https://github.com/hashicorp/setup-terraform/compare/v2...v3) --- updated-dependencies: - dependency-name: hashicorp/setup-terraform dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/content.yml | 2 +- .github/workflows/development.yml | 2 +- .github/workflows/production.yml | 2 +- .github/workflows/staging.yml | 2 +- .github/workflows/teardown.yml | 2 +- .github/workflows/tf-azure-deploy.yml | 4 ++-- .github/workflows/tf-azure-unit-tests.yml | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/content.yml b/.github/workflows/content.yml index 5f9914f223..e3c829f97b 100644 --- a/.github/workflows/content.yml +++ b/.github/workflows/content.yml @@ -48,7 +48,7 @@ jobs: ref: ${{ github.event.pull_request.head.sha }} - name: Pin Terraform version - uses: hashicorp/setup-terraform@v2.0.3 + uses: hashicorp/setup-terraform@v3 with: terraform_version: 1.1.7 - diff --git a/.github/workflows/development.yml b/.github/workflows/development.yml index 04900b9880..59a6adbed9 100644 --- a/.github/workflows/development.yml +++ b/.github/workflows/development.yml @@ -39,7 +39,7 @@ jobs: # ref: ${{ github.sha }} - name: Pin Terraform version - uses: hashicorp/setup-terraform@v2.0.3 + uses: hashicorp/setup-terraform@v3 with: terraform_version: 1.1.7 - diff --git a/.github/workflows/production.yml b/.github/workflows/production.yml index aad462265a..d64e985c1b 100644 --- a/.github/workflows/production.yml +++ b/.github/workflows/production.yml @@ -47,7 +47,7 @@ jobs: echo "HEAD=$(git rev-parse ${{ inputs.version }})" >> $GITHUB_ENV - name: Pin Terraform version - uses: hashicorp/setup-terraform@v2.0.3 + uses: hashicorp/setup-terraform@v3 with: terraform_version: 1.1.7 - diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index 856dee0321..d4ce5f9751 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -48,7 +48,7 @@ jobs: echo "HEAD=$(git rev-parse ${{ inputs.candidate }})" >> $GITHUB_ENV - name: Pin Terraform version - uses: hashicorp/setup-terraform@v2.0.3 + uses: hashicorp/setup-terraform@v3 with: terraform_version: 1.1.7 - diff --git a/.github/workflows/teardown.yml b/.github/workflows/teardown.yml index b396c41e72..77b7911189 100644 --- a/.github/workflows/teardown.yml +++ b/.github/workflows/teardown.yml @@ -22,7 +22,7 @@ jobs: ref: ${{ github.event.pull_request.head.sha }} - name: Pin Terraform version - uses: hashicorp/setup-terraform@v2.0.3 + uses: hashicorp/setup-terraform@v3 with: terraform_version: 1.1.7 - diff --git a/.github/workflows/tf-azure-deploy.yml b/.github/workflows/tf-azure-deploy.yml index b2543cfad2..59499dcfbc 100644 --- a/.github/workflows/tf-azure-deploy.yml +++ b/.github/workflows/tf-azure-deploy.yml @@ -45,7 +45,7 @@ jobs: # Install the latest version of the Terraform CLI - name: Setup Terraform - uses: hashicorp/setup-terraform@v2 + uses: hashicorp/setup-terraform@v3 with: terraform_version: 1.5.6 terraform_wrapper: false @@ -148,7 +148,7 @@ jobs: # Install the latest version of Terraform CLI and configure the Terraform CLI configuration file with a Terraform Cloud user API token - name: Setup Terraform - uses: hashicorp/setup-terraform@v2 + uses: hashicorp/setup-terraform@v3 with: terraform_version: 1.5.6 diff --git a/.github/workflows/tf-azure-unit-tests.yml b/.github/workflows/tf-azure-unit-tests.yml index f28e534336..f4597d41c2 100644 --- a/.github/workflows/tf-azure-unit-tests.yml +++ b/.github/workflows/tf-azure-unit-tests.yml @@ -24,7 +24,7 @@ jobs: # Install the latest version of Terraform CLI and configure the Terraform CLI configuration file with a Terraform Cloud user API token - name: Setup Terraform - uses: hashicorp/setup-terraform@v2 + uses: hashicorp/setup-terraform@v3 # Initialise a new or existing Terraform working directory by creating initial files, loading any remote state, downloading modules, etc. - name: Terraform Init From 5423940f6d252b60c569a48f029129b273a0f63e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Nov 2023 10:28:23 +0000 Subject: [PATCH 6/8] Bump browserify-sign from 4.2.1 to 4.2.2 (#930) Bumps [browserify-sign](https://github.com/crypto-browserify/browserify-sign) from 4.2.1 to 4.2.2. - [Changelog](https://github.com/browserify/browserify-sign/blob/main/CHANGELOG.md) - [Commits](https://github.com/crypto-browserify/browserify-sign/compare/v4.2.1...v4.2.2) --- updated-dependencies: - dependency-name: browserify-sign dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/yarn.lock b/yarn.lock index 85796b4b59..2325e15a4e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3353,7 +3353,7 @@ __metadata: languageName: node linkType: hard -"bn.js@npm:^5.0.0, bn.js@npm:^5.1.1": +"bn.js@npm:^5.0.0, bn.js@npm:^5.2.1": version: 5.2.1 resolution: "bn.js@npm:5.2.1" checksum: 3dd8c8d38055fedfa95c1d5fc3c99f8dd547b36287b37768db0abab3c239711f88ff58d18d155dd8ad902b0b0cee973747b7ae20ea12a09473272b0201c9edd3 @@ -3469,7 +3469,7 @@ __metadata: languageName: node linkType: hard -"browserify-rsa@npm:^4.0.0, browserify-rsa@npm:^4.0.1": +"browserify-rsa@npm:^4.0.0, browserify-rsa@npm:^4.1.0": version: 4.1.0 resolution: "browserify-rsa@npm:4.1.0" dependencies: @@ -3480,19 +3480,19 @@ __metadata: linkType: hard "browserify-sign@npm:^4.0.0": - version: 4.2.1 - resolution: "browserify-sign@npm:4.2.1" + version: 4.2.2 + resolution: "browserify-sign@npm:4.2.2" dependencies: - bn.js: ^5.1.1 - browserify-rsa: ^4.0.1 + bn.js: ^5.2.1 + browserify-rsa: ^4.1.0 create-hash: ^1.2.0 create-hmac: ^1.1.7 - elliptic: ^6.5.3 + elliptic: ^6.5.4 inherits: ^2.0.4 - parse-asn1: ^5.1.5 - readable-stream: ^3.6.0 - safe-buffer: ^5.2.0 - checksum: 0221f190e3f5b2d40183fa51621be7e838d9caa329fe1ba773406b7637855f37b30f5d83e52ff8f244ed12ffe6278dd9983638609ed88c841ce547e603855707 + parse-asn1: ^5.1.6 + readable-stream: ^3.6.2 + safe-buffer: ^5.2.1 + checksum: b622730c0fc183328c3a1c9fdaaaa5118821ed6822b266fa6b0375db7e20061ebec87301d61931d79b9da9a96ada1cab317fce3c68f233e5e93ed02dbb35544c languageName: node linkType: hard @@ -4767,7 +4767,7 @@ __metadata: languageName: node linkType: hard -"elliptic@npm:^6.5.3": +"elliptic@npm:^6.5.3, elliptic@npm:^6.5.4": version: 6.5.4 resolution: "elliptic@npm:6.5.4" dependencies: @@ -9182,7 +9182,7 @@ __metadata: languageName: node linkType: hard -"parse-asn1@npm:^5.0.0, parse-asn1@npm:^5.1.5": +"parse-asn1@npm:^5.0.0, parse-asn1@npm:^5.1.6": version: 5.1.6 resolution: "parse-asn1@npm:5.1.6" dependencies: @@ -9894,7 +9894,7 @@ __metadata: languageName: node linkType: hard -"readable-stream@npm:2 || 3, readable-stream@npm:^3.1.1, readable-stream@npm:^3.6.0": +"readable-stream@npm:2 || 3, readable-stream@npm:^3.1.1, readable-stream@npm:^3.6.0, readable-stream@npm:^3.6.2": version: 3.6.2 resolution: "readable-stream@npm:3.6.2" dependencies: @@ -10253,7 +10253,7 @@ __metadata: languageName: node linkType: hard -"safe-buffer@npm:>=5.1.0, safe-buffer@npm:^5.0.1, safe-buffer@npm:^5.1.0, safe-buffer@npm:^5.1.1, safe-buffer@npm:^5.1.2, safe-buffer@npm:^5.2.0, safe-buffer@npm:~5.2.0": +"safe-buffer@npm:>=5.1.0, safe-buffer@npm:^5.0.1, safe-buffer@npm:^5.1.0, safe-buffer@npm:^5.1.1, safe-buffer@npm:^5.1.2, safe-buffer@npm:^5.2.0, safe-buffer@npm:^5.2.1, safe-buffer@npm:~5.2.0": version: 5.2.1 resolution: "safe-buffer@npm:5.2.1" checksum: b99c4b41fdd67a6aaf280fcd05e9ffb0813654894223afb78a31f14a19ad220bba8aba1cb14eddce1fcfb037155fe6de4e861784eb434f7d11ed58d1e70dd491 From b5b97869fd788fc11d73f202f59cd8ddfe310ea0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Nov 2023 11:21:31 +0000 Subject: [PATCH 7/8] Bump esbuild from 0.18.20 to 0.19.5 (#910) Bumps [esbuild](https://github.com/evanw/esbuild) from 0.18.20 to 0.19.5. - [Release notes](https://github.com/evanw/esbuild/releases) - [Changelog](https://github.com/evanw/esbuild/blob/main/CHANGELOG.md) - [Commits](https://github.com/evanw/esbuild/compare/v0.18.20...v0.19.5) --- updated-dependencies: - dependency-name: esbuild dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 188 +++++++++++++++++++++++++-------------------------- 2 files changed, 95 insertions(+), 95 deletions(-) diff --git a/package.json b/package.json index 0c75432f47..ab5c27a9ae 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "accessible-autocomplete": "^2.0.4", "axios": "^1.4.0", "dfe-frontend-alpha": "^1.0.1", - "esbuild": "^0.18.19", + "esbuild": "^0.19.5", "govuk-frontend": "^4.7.0", "puppeteer": "^21.0.1", "sass": "^1.64.2", diff --git a/yarn.lock b/yarn.lock index 2325e15a4e..fca730ece8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1353,156 +1353,156 @@ __metadata: languageName: node linkType: hard -"@esbuild/android-arm64@npm:0.18.20": - version: 0.18.20 - resolution: "@esbuild/android-arm64@npm:0.18.20" +"@esbuild/android-arm64@npm:0.19.5": + version: 0.19.5 + resolution: "@esbuild/android-arm64@npm:0.19.5" conditions: os=android & cpu=arm64 languageName: node linkType: hard -"@esbuild/android-arm@npm:0.18.20": - version: 0.18.20 - resolution: "@esbuild/android-arm@npm:0.18.20" +"@esbuild/android-arm@npm:0.19.5": + version: 0.19.5 + resolution: "@esbuild/android-arm@npm:0.19.5" conditions: os=android & cpu=arm languageName: node linkType: hard -"@esbuild/android-x64@npm:0.18.20": - version: 0.18.20 - resolution: "@esbuild/android-x64@npm:0.18.20" +"@esbuild/android-x64@npm:0.19.5": + version: 0.19.5 + resolution: "@esbuild/android-x64@npm:0.19.5" conditions: os=android & cpu=x64 languageName: node linkType: hard -"@esbuild/darwin-arm64@npm:0.18.20": - version: 0.18.20 - resolution: "@esbuild/darwin-arm64@npm:0.18.20" +"@esbuild/darwin-arm64@npm:0.19.5": + version: 0.19.5 + resolution: "@esbuild/darwin-arm64@npm:0.19.5" conditions: os=darwin & cpu=arm64 languageName: node linkType: hard -"@esbuild/darwin-x64@npm:0.18.20": - version: 0.18.20 - resolution: "@esbuild/darwin-x64@npm:0.18.20" +"@esbuild/darwin-x64@npm:0.19.5": + version: 0.19.5 + resolution: "@esbuild/darwin-x64@npm:0.19.5" conditions: os=darwin & cpu=x64 languageName: node linkType: hard -"@esbuild/freebsd-arm64@npm:0.18.20": - version: 0.18.20 - resolution: "@esbuild/freebsd-arm64@npm:0.18.20" +"@esbuild/freebsd-arm64@npm:0.19.5": + version: 0.19.5 + resolution: "@esbuild/freebsd-arm64@npm:0.19.5" conditions: os=freebsd & cpu=arm64 languageName: node linkType: hard -"@esbuild/freebsd-x64@npm:0.18.20": - version: 0.18.20 - resolution: "@esbuild/freebsd-x64@npm:0.18.20" +"@esbuild/freebsd-x64@npm:0.19.5": + version: 0.19.5 + resolution: "@esbuild/freebsd-x64@npm:0.19.5" conditions: os=freebsd & cpu=x64 languageName: node linkType: hard -"@esbuild/linux-arm64@npm:0.18.20": - version: 0.18.20 - resolution: "@esbuild/linux-arm64@npm:0.18.20" +"@esbuild/linux-arm64@npm:0.19.5": + version: 0.19.5 + resolution: "@esbuild/linux-arm64@npm:0.19.5" conditions: os=linux & cpu=arm64 languageName: node linkType: hard -"@esbuild/linux-arm@npm:0.18.20": - version: 0.18.20 - resolution: "@esbuild/linux-arm@npm:0.18.20" +"@esbuild/linux-arm@npm:0.19.5": + version: 0.19.5 + resolution: "@esbuild/linux-arm@npm:0.19.5" conditions: os=linux & cpu=arm languageName: node linkType: hard -"@esbuild/linux-ia32@npm:0.18.20": - version: 0.18.20 - resolution: "@esbuild/linux-ia32@npm:0.18.20" +"@esbuild/linux-ia32@npm:0.19.5": + version: 0.19.5 + resolution: "@esbuild/linux-ia32@npm:0.19.5" conditions: os=linux & cpu=ia32 languageName: node linkType: hard -"@esbuild/linux-loong64@npm:0.18.20": - version: 0.18.20 - resolution: "@esbuild/linux-loong64@npm:0.18.20" +"@esbuild/linux-loong64@npm:0.19.5": + version: 0.19.5 + resolution: "@esbuild/linux-loong64@npm:0.19.5" conditions: os=linux & cpu=loong64 languageName: node linkType: hard -"@esbuild/linux-mips64el@npm:0.18.20": - version: 0.18.20 - resolution: "@esbuild/linux-mips64el@npm:0.18.20" +"@esbuild/linux-mips64el@npm:0.19.5": + version: 0.19.5 + resolution: "@esbuild/linux-mips64el@npm:0.19.5" conditions: os=linux & cpu=mips64el languageName: node linkType: hard -"@esbuild/linux-ppc64@npm:0.18.20": - version: 0.18.20 - resolution: "@esbuild/linux-ppc64@npm:0.18.20" +"@esbuild/linux-ppc64@npm:0.19.5": + version: 0.19.5 + resolution: "@esbuild/linux-ppc64@npm:0.19.5" conditions: os=linux & cpu=ppc64 languageName: node linkType: hard -"@esbuild/linux-riscv64@npm:0.18.20": - version: 0.18.20 - resolution: "@esbuild/linux-riscv64@npm:0.18.20" +"@esbuild/linux-riscv64@npm:0.19.5": + version: 0.19.5 + resolution: "@esbuild/linux-riscv64@npm:0.19.5" conditions: os=linux & cpu=riscv64 languageName: node linkType: hard -"@esbuild/linux-s390x@npm:0.18.20": - version: 0.18.20 - resolution: "@esbuild/linux-s390x@npm:0.18.20" +"@esbuild/linux-s390x@npm:0.19.5": + version: 0.19.5 + resolution: "@esbuild/linux-s390x@npm:0.19.5" conditions: os=linux & cpu=s390x languageName: node linkType: hard -"@esbuild/linux-x64@npm:0.18.20": - version: 0.18.20 - resolution: "@esbuild/linux-x64@npm:0.18.20" +"@esbuild/linux-x64@npm:0.19.5": + version: 0.19.5 + resolution: "@esbuild/linux-x64@npm:0.19.5" conditions: os=linux & cpu=x64 languageName: node linkType: hard -"@esbuild/netbsd-x64@npm:0.18.20": - version: 0.18.20 - resolution: "@esbuild/netbsd-x64@npm:0.18.20" +"@esbuild/netbsd-x64@npm:0.19.5": + version: 0.19.5 + resolution: "@esbuild/netbsd-x64@npm:0.19.5" conditions: os=netbsd & cpu=x64 languageName: node linkType: hard -"@esbuild/openbsd-x64@npm:0.18.20": - version: 0.18.20 - resolution: "@esbuild/openbsd-x64@npm:0.18.20" +"@esbuild/openbsd-x64@npm:0.19.5": + version: 0.19.5 + resolution: "@esbuild/openbsd-x64@npm:0.19.5" conditions: os=openbsd & cpu=x64 languageName: node linkType: hard -"@esbuild/sunos-x64@npm:0.18.20": - version: 0.18.20 - resolution: "@esbuild/sunos-x64@npm:0.18.20" +"@esbuild/sunos-x64@npm:0.19.5": + version: 0.19.5 + resolution: "@esbuild/sunos-x64@npm:0.19.5" conditions: os=sunos & cpu=x64 languageName: node linkType: hard -"@esbuild/win32-arm64@npm:0.18.20": - version: 0.18.20 - resolution: "@esbuild/win32-arm64@npm:0.18.20" +"@esbuild/win32-arm64@npm:0.19.5": + version: 0.19.5 + resolution: "@esbuild/win32-arm64@npm:0.19.5" conditions: os=win32 & cpu=arm64 languageName: node linkType: hard -"@esbuild/win32-ia32@npm:0.18.20": - version: 0.18.20 - resolution: "@esbuild/win32-ia32@npm:0.18.20" +"@esbuild/win32-ia32@npm:0.19.5": + version: 0.19.5 + resolution: "@esbuild/win32-ia32@npm:0.19.5" conditions: os=win32 & cpu=ia32 languageName: node linkType: hard -"@esbuild/win32-x64@npm:0.18.20": - version: 0.18.20 - resolution: "@esbuild/win32-x64@npm:0.18.20" +"@esbuild/win32-x64@npm:0.19.5": + version: 0.19.5 + resolution: "@esbuild/win32-x64@npm:0.19.5" conditions: os=win32 & cpu=x64 languageName: node linkType: hard @@ -4930,32 +4930,32 @@ __metadata: languageName: node linkType: hard -"esbuild@npm:^0.18.19": - version: 0.18.20 - resolution: "esbuild@npm:0.18.20" - dependencies: - "@esbuild/android-arm": 0.18.20 - "@esbuild/android-arm64": 0.18.20 - "@esbuild/android-x64": 0.18.20 - "@esbuild/darwin-arm64": 0.18.20 - "@esbuild/darwin-x64": 0.18.20 - "@esbuild/freebsd-arm64": 0.18.20 - "@esbuild/freebsd-x64": 0.18.20 - "@esbuild/linux-arm": 0.18.20 - "@esbuild/linux-arm64": 0.18.20 - "@esbuild/linux-ia32": 0.18.20 - "@esbuild/linux-loong64": 0.18.20 - "@esbuild/linux-mips64el": 0.18.20 - "@esbuild/linux-ppc64": 0.18.20 - "@esbuild/linux-riscv64": 0.18.20 - "@esbuild/linux-s390x": 0.18.20 - "@esbuild/linux-x64": 0.18.20 - "@esbuild/netbsd-x64": 0.18.20 - "@esbuild/openbsd-x64": 0.18.20 - "@esbuild/sunos-x64": 0.18.20 - "@esbuild/win32-arm64": 0.18.20 - "@esbuild/win32-ia32": 0.18.20 - "@esbuild/win32-x64": 0.18.20 +"esbuild@npm:^0.19.5": + version: 0.19.5 + resolution: "esbuild@npm:0.19.5" + dependencies: + "@esbuild/android-arm": 0.19.5 + "@esbuild/android-arm64": 0.19.5 + "@esbuild/android-x64": 0.19.5 + "@esbuild/darwin-arm64": 0.19.5 + "@esbuild/darwin-x64": 0.19.5 + "@esbuild/freebsd-arm64": 0.19.5 + "@esbuild/freebsd-x64": 0.19.5 + "@esbuild/linux-arm": 0.19.5 + "@esbuild/linux-arm64": 0.19.5 + "@esbuild/linux-ia32": 0.19.5 + "@esbuild/linux-loong64": 0.19.5 + "@esbuild/linux-mips64el": 0.19.5 + "@esbuild/linux-ppc64": 0.19.5 + "@esbuild/linux-riscv64": 0.19.5 + "@esbuild/linux-s390x": 0.19.5 + "@esbuild/linux-x64": 0.19.5 + "@esbuild/netbsd-x64": 0.19.5 + "@esbuild/openbsd-x64": 0.19.5 + "@esbuild/sunos-x64": 0.19.5 + "@esbuild/win32-arm64": 0.19.5 + "@esbuild/win32-ia32": 0.19.5 + "@esbuild/win32-x64": 0.19.5 dependenciesMeta: "@esbuild/android-arm": optional: true @@ -5003,7 +5003,7 @@ __metadata: optional: true bin: esbuild: bin/esbuild - checksum: 5d253614e50cdb6ec22095afd0c414f15688e7278a7eb4f3720a6dd1306b0909cf431e7b9437a90d065a31b1c57be60130f63fe3e8d0083b588571f31ee6ec7b + checksum: 5a0227cf6ffffa3076714d88230af1dfdd2fc363d91bd712a81fb91230c315a395e2c9b7588eee62986aeebf4999804b9b1b59eeab8e2457184eb0056bfe20c8 languageName: node linkType: hard @@ -5439,7 +5439,7 @@ __metadata: accessible-autocomplete: ^2.0.4 axios: ^1.4.0 dfe-frontend-alpha: ^1.0.1 - esbuild: ^0.18.19 + esbuild: ^0.19.5 govuk-frontend: ^4.7.0 puppeteer: ^21.0.1 sass: ^1.64.2 From ea80f70de07315e516e468c5c7ab00d0e025a6f6 Mon Sep 17 00:00:00 2001 From: Peter Hamilton Date: Mon, 6 Nov 2023 11:51:36 +0000 Subject: [PATCH 8/8] Comment out workflow triggers for old platform (#945) --- .github/workflows/content.yml | 38 +++++++++++++++---------------- .github/workflows/development.yml | 32 +++++++++++++------------- .github/workflows/staging.yml | 30 ++++++++++++------------ 3 files changed, 50 insertions(+), 50 deletions(-) diff --git a/.github/workflows/content.yml b/.github/workflows/content.yml index e3c829f97b..86436cbc20 100644 --- a/.github/workflows/content.yml +++ b/.github/workflows/content.yml @@ -9,25 +9,25 @@ # https://ey-recovery-pr-123.london.cloudapps.digital # name: Deploy Content App -on: - pull_request: - # branches: - # - main - types: - - labeled - - synchronize - paths-ignore: - - '**/*.md' - - .docker* - - .env.example - - .gitignore - - .pa11yci - - .tool-versions - - .yardopts - - bin/* - - docker-compose.* - - Dockerfile - - terraform +# on: +# pull_request: +# # branches: +# # - main +# types: +# - labeled +# - synchronize +# paths-ignore: +# - '**/*.md' +# - .docker* +# - .env.example +# - .gitignore +# - .pa11yci +# - .tool-versions +# - .yardopts +# - bin/* +# - docker-compose.* +# - Dockerfile +# - terraform jobs: deploy: diff --git a/.github/workflows/development.yml b/.github/workflows/development.yml index 59a6adbed9..1f0fd639ab 100644 --- a/.github/workflows/development.yml +++ b/.github/workflows/development.yml @@ -7,22 +7,22 @@ # https://ey-recovery-dev.london.cloudapps.digital # name: Deploy Development App -on: - workflow_dispatch: - push: - branches: - - main - paths-ignore: - - '**/*.md' - - .docker* - - .env.example - - .gitignore - - .pa11yci - - .tool-versions - - .yardopts - - bin/* - - docker-compose.* - - uml/* +# on: +# workflow_dispatch: +# push: +# branches: +# - main +# paths-ignore: +# - '**/*.md' +# - .docker* +# - .env.example +# - .gitignore +# - .pa11yci +# - .tool-versions +# - .yardopts +# - bin/* +# - docker-compose.* +# - uml/* jobs: deploy: diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index d4ce5f9751..3d292eef31 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -10,21 +10,21 @@ # https://ey-recovery-staging.london.cloudapps.digital # name: Deploy Staging App -on: - workflow_dispatch: - inputs: - candidate: - description: Create release candidate version ("rcx.x.x") - type: string - required: true - ref: - description: Git ref or branch to deploy - type: string - required: true - default: main - push: - tags: - - rc* +# on: +# workflow_dispatch: +# inputs: +# candidate: +# description: Create release candidate version ("rcx.x.x") +# type: string +# required: true +# ref: +# description: Git ref or branch to deploy +# type: string +# required: true +# default: main +# push: +# tags: +# - rc* jobs: deploy: