ER-466 change to govuk_markdown (#902)

Replace govspeak with govuk_markdown. Simplify use of markup with a single method called m which accepts markdown, locale keys, variables, arguments to govuk_markdown and also pulls from the CMS.
DFE-Digital · Oct 17, 2023 · 4cc9af8 · 4cc9af8
1 parent 414ce93
commit 4cc9af8
Show file tree

Hide file tree

Showing 107 changed files with 532 additions and 2,466 deletions.
diff --git a/.env.example b/.env.example
@@ -28,10 +28,6 @@ GOVUK_NOTIFY_API_KEY=example-12345678-1234-1234-1234-abcd12345678-12345678-1234-
 # [email protected]
 
 
-# https://github.com/alphagov/plek
-GOVUK_APP_DOMAIN=localhost
-GOVUK_WEBSITE_ROOT=www
-
 # postgres
 DATABASE_URL=postgres://postgres:password@localhost:5432/early_years_foundation_recovery_test
 POSTGRES_USER=

diff --git a/.github/workflows/azure-deploy-dev.yml b/.github/workflows/azure-deploy-dev.yml
@@ -103,4 +103,4 @@ jobs:
               --vnet ${{ secrets.AZURE_VNET }} \
               --subnet ${{ secrets.AZURE_WORKER_APP_SUBNET }} \
               --ip-address Private \
-              --environment-variables RAILS_ENV=${{ vars.WEBAPP_CONFIG_RAILS_ENV }} RAILS_MASTER_KEY=${{ secrets.WEBAPP_CONFIG_RAILS_MASTER_KEY }} RAILS_LOG_TO_STDOUT=${{ vars.WEBAPP_CONFIG_RAILS_LOG_TO_STDOUT }} GCS_CREDENTIALS=${{ secrets.GCS_CREDENTIALS }} GOOGLE_CLOUD_BUCKET=${{ vars.WEBAPP_CONFIG_GOOGLE_CLOUD_BUCKET }} DATABASE_URL=${{ secrets.WEBAPP_DATABASE_URL }} GOVUK_APP_DOMAIN=localhost GOVUK_WEBSITE_ROOT=www
+              --environment-variables RAILS_ENV=${{ vars.WEBAPP_CONFIG_RAILS_ENV }} RAILS_MASTER_KEY=${{ secrets.WEBAPP_CONFIG_RAILS_MASTER_KEY }} RAILS_LOG_TO_STDOUT=${{ vars.WEBAPP_CONFIG_RAILS_LOG_TO_STDOUT }} GCS_CREDENTIALS=${{ secrets.GCS_CREDENTIALS }} GOOGLE_CLOUD_BUCKET=${{ vars.WEBAPP_CONFIG_GOOGLE_CLOUD_BUCKET }} DATABASE_URL=${{ secrets.WEBAPP_DATABASE_URL }}
diff --git a/.github/workflows/azure-deploy-prod.yml b/.github/workflows/azure-deploy-prod.yml
@@ -111,4 +111,4 @@ jobs:
               --vnet ${{ secrets.AZURE_VNET }} \
               --subnet ${{ secrets.AZURE_WORKER_APP_SUBNET }} \
               --ip-address Private \
-              --environment-variables RAILS_ENV=${{ vars.WEBAPP_CONFIG_RAILS_ENV }} RAILS_MASTER_KEY=${{ secrets.WEBAPP_CONFIG_RAILS_MASTER_KEY }} RAILS_LOG_TO_STDOUT=${{ vars.WEBAPP_CONFIG_RAILS_LOG_TO_STDOUT }} GOOGLE_CLOUD_BUCKET=${{ vars.WEBAPP_CONFIG_GOOGLE_CLOUD_BUCKET }} DATABASE_URL=${{ secrets.WEBAPP_DATABASE_URL }} GOVUK_APP_DOMAIN=localhost GOVUK_WEBSITE_ROOT=www
+              --environment-variables RAILS_ENV=${{ vars.WEBAPP_CONFIG_RAILS_ENV }} RAILS_MASTER_KEY=${{ secrets.WEBAPP_CONFIG_RAILS_MASTER_KEY }} RAILS_LOG_TO_STDOUT=${{ vars.WEBAPP_CONFIG_RAILS_LOG_TO_STDOUT }} GOOGLE_CLOUD_BUCKET=${{ vars.WEBAPP_CONFIG_GOOGLE_CLOUD_BUCKET }} DATABASE_URL=${{ secrets.WEBAPP_DATABASE_URL }}
diff --git a/.github/workflows/azure-deploy-stage.yml b/.github/workflows/azure-deploy-stage.yml
@@ -111,4 +111,4 @@ jobs:
               --vnet ${{ secrets.AZURE_VNET }} \
               --subnet ${{ secrets.AZURE_WORKER_APP_SUBNET }} \
               --ip-address Private \
-              --environment-variables RAILS_ENV=${{ vars.WEBAPP_CONFIG_RAILS_ENV }} RAILS_MASTER_KEY=${{ secrets.WEBAPP_CONFIG_RAILS_MASTER_KEY }} RAILS_LOG_TO_STDOUT=${{ vars.WEBAPP_CONFIG_RAILS_LOG_TO_STDOUT }} GOOGLE_CLOUD_BUCKET=${{ vars.WEBAPP_CONFIG_GOOGLE_CLOUD_BUCKET }} DATABASE_URL=${{ secrets.WEBAPP_DATABASE_URL }} GOVUK_APP_DOMAIN=localhost GOVUK_WEBSITE_ROOT=www
+              --environment-variables RAILS_ENV=${{ vars.WEBAPP_CONFIG_RAILS_ENV }} RAILS_MASTER_KEY=${{ secrets.WEBAPP_CONFIG_RAILS_MASTER_KEY }} RAILS_LOG_TO_STDOUT=${{ vars.WEBAPP_CONFIG_RAILS_LOG_TO_STDOUT }} GOOGLE_CLOUD_BUCKET=${{ vars.WEBAPP_CONFIG_GOOGLE_CLOUD_BUCKET }} DATABASE_URL=${{ secrets.WEBAPP_DATABASE_URL }}
diff --git a/.github/workflows/content.yml b/.github/workflows/content.yml
@@ -40,7 +40,6 @@ jobs:
       PR_NUMBER: pr-${{ github.event.number }}
       # @see terraform/workspace-variables/app_config.yml[:content]
       DOMAIN: ey-recovery-pr-${{ github.event.number }}.london.cloudapps.digital
-      GOVUK_WEBSITE_ROOT: ey-recovery-pr-${{ github.event.number }}
     steps:
       -
         name: Checkout Code

diff --git a/Dockerfile b/Dockerfile
@@ -75,10 +75,7 @@ COPY .yarnrc.yml ${APP_HOME}/.yarnrc.yml
 COPY --from=deps /build/.yarn ${APP_HOME}/.yarn
 COPY --from=deps /build/node_modules ${APP_HOME}/node_modules
 
-RUN SECRET_KEY_BASE=x \
-    GOVUK_APP_DOMAIN=x \
-    GOVUK_WEBSITE_ROOT=x \
-    bundle exec rails assets:precompile
+RUN SECRET_KEY_BASE=x bundle exec rails assets:precompile
 
 COPY ./docker-entrypoint.sh /
 
@@ -94,7 +91,7 @@ CMD ["bundle", "exec", "rails", "server"]
 FROM app as dev
 
 RUN apk add --no-cache --no-progress --no-check-certificate postgresql-client npm graphviz
-# RUN npm install --global adr-log contentful-cli
+RUN npm install --global adr-log contentful-cli
 
 RUN bundle config unset without
 RUN bundle config set without test ui

diff --git a/Gemfile b/Gemfile
@@ -48,9 +48,8 @@ gem 'contentful_rails'
 gem 'govuk-components'
 gem 'govuk_design_system_formbuilder'
 
-# Markdown support
-gem 'govspeak'
-gem 'sassc' # govspeak assets
+# # Markdown support
+gem 'govuk_markdown'
 
 gem 'govuk_notify_rails'