Dependabot clearout (#6561)

* Bump cypress from 12.17.4 to 13.6.6 (#6554) * Bump cypress from 12.17.4 to 13.6.6 Bumps [cypress](https://github.com/cypress-io/cypress) from 12.17.4 to 13.6.6. - [Release notes](https://github.com/cypress-io/cypress/releases) - [Changelog](https://github.com/cypress-io/cypress/blob/develop/CHANGELOG.md) - [Commits](cypress-io/cypress@v12.17.4...v13.6.6) --- updated-dependencies: - dependency-name: cypress dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> * Update Dependabot config --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Christopher Sunkel <[email protected]> * Bump storybook dependencies from 7.6.16 to 7.6.17 (#6538) Bumps [@storybook/addons](https://github.com/storybookjs/storybook/tree/HEAD/code/deprecated/addons) from 7.6.16 to 7.6.17. - [Release notes](https://github.com/storybookjs/storybook/releases) - [Changelog](https://github.com/storybookjs/storybook/blob/v7.6.17/CHANGELOG.md) - [Commits](https://github.com/storybookjs/storybook/commits/v7.6.17/code/deprecated/addons) --- updated-dependencies: - dependency-name: "@storybook/addons" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump connect-redis from 7.1.0 to 7.1.1 (#6536) Bumps [connect-redis](https://github.com/tj/connect-redis) from 7.1.0 to 7.1.1. - [Release notes](https://github.com/tj/connect-redis/releases) - [Commits](tj/connect-redis@v7.1.0...v7.1.1) --- updated-dependencies: - dependency-name: connect-redis dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump @reduxjs/toolkit from 1.9.7 to 2.2.1 (#6529) Bumps [@reduxjs/toolkit](https://github.com/reduxjs/redux-toolkit) from 1.9.7 to 2.2.1. - [Release notes](https://github.com/reduxjs/redux-toolkit/releases) - [Commits](reduxjs/redux-toolkit@v1.9.7...v2.2.1) --- updated-dependencies: - dependency-name: "@reduxjs/toolkit" dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump sass-loader from 13.3.3 to 14.1.1 (#6539) Bumps [sass-loader](https://github.com/webpack-contrib/sass-loader) from 13.3.3 to 14.1.1. - [Release notes](https://github.com/webpack-contrib/sass-loader/releases) - [Changelog](https://github.com/webpack-contrib/sass-loader/blob/master/CHANGELOG.md) - [Commits](webpack-contrib/sass-loader@v13.3.3...v14.1.1) --- updated-dependencies: - dependency-name: sass-loader dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Rebuild lockfile * Fixup! Use new Docker image --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
uktrade · Feb 28, 2024 · 0ceff11 · 0ceff11
1 parent 89e49f0
commit 0ceff11
Show file tree

Hide file tree

Showing 14 changed files with 663 additions and 633 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -22,6 +22,9 @@ updates:
   - dependency-name: formidable 
     versions:
       - "> 2.1.2"
+  - dependency-name: webpack-dev-server # Waiting for Cypress to add support
+    versions:
+      - "> 4.15.1"
 
   # These are part of dependency groups and should be updated via the relevant script.
   - dependency-name: "@storybook/addon-a11y"

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM gcr.io/sre-docker-registry/data-hub-frontend-dependencies:3.2.0
+FROM gcr.io/sre-docker-registry/data-hub-frontend-dependencies:3.3.0
 
 ARG CURRENT_UID
 ARG CURRENT_GID

diff --git a/Dockerfile.dependencies b/Dockerfile.dependencies
@@ -53,7 +53,7 @@ COPY --chown=node:node package*.json "$HOME/"
 WORKDIR $HOME
 
 # Install specific version of cypress
-RUN npm install -g cypress@12.17.4 \
+RUN npm install -g cypress@13.6.6 \
   && npx cypress verify \
   && npx cypress cache path \
   && npx cypress cache list \

diff --git a/Dockerfile.storybook b/Dockerfile.storybook
@@ -1,4 +1,4 @@
-FROM gcr.io/sre-docker-registry/data-hub-frontend-dependencies:3.2.0
+FROM gcr.io/sre-docker-registry/data-hub-frontend-dependencies:3.3.0
 
 ARG CURRENT_UID
 ARG CURRENT_GID

diff --git a/cypress.a11y.config.js b/cypress.a11y.config.js
@@ -2,7 +2,6 @@ const { defineConfig } = require('cypress')
 
 module.exports = defineConfig({
   video: true,
-  videoUploadOnPasses: false,
   screenshotOnRunFailure: false,
   defaultCommandTimeout: 5000,
   requestTimeout: 5000,

diff --git a/cypress.config.js b/cypress.config.js
@@ -1,31 +1,30 @@
-const { defineConfig } = require("cypress");
+const { defineConfig } = require('cypress')
 
 module.exports = defineConfig({
   video: true,
-  videoUploadOnPasses: false,
   screenshotOnRunFailure: false,
   defaultCommandTimeout: 5000,
   requestTimeout: 5000,
-  projectId: "w97se2",
+  projectId: 'w97se2',
 
   env: {
     codeCoverage: {
-      url: "http://localhost:3000/__coverage__",
+      url: 'http://localhost:3000/__coverage__',
     },
   },
   component: {
-    supportFile: "test/cypress/support/index.js",
+    supportFile: 'test/cypress/support/index.js',
     devServer: {
-      framework: "react",
-      bundler: "webpack",
+      framework: 'react',
+      bundler: 'webpack',
     },
   },
   e2e: {
     setupNodeEvents(on, config) {
-      return require("./test/cypress/plugins/index.js")(on, config);
+      return require('./test/cypress/plugins/index.js')(on, config)
     },
-    specPattern: "test/functional/cypress/specs/**/*.{js,jsx}",
-    baseUrl: "http://localhost:3000",
-    supportFile: "test/cypress/support/index.js",
+    specPattern: 'test/functional/cypress/specs/**/*.{js,jsx}',
+    baseUrl: 'http://localhost:3000',
+    supportFile: 'test/cypress/support/index.js',
   },
-});
+})
diff --git a/cypress.visual.config.js b/cypress.visual.config.js
@@ -3,7 +3,6 @@ require('dotenv').config()
 
 module.exports = defineConfig({
   video: true,
-  videoUploadOnPasses: false,
   screenshotOnRunFailure: false,
   defaultCommandTimeout: 5000,
   requestTimeout: 5000,

diff --git a/docs/Dependabot.md b/docs/Dependabot.md
@@ -24,7 +24,7 @@ The `@babel/core` and `@babel/preset-env` packages should, where possible, be ke
 
 ### Cypress
 
-When Cypress is updated, the version used in [`Dockerfile.dependencies`](https://github.com/uktrade/data-hub-frontend/blob/main/Dockerfile.dependencies#L69) needs to be updated as well.
+When Cypress is updated, the version used in [`Dockerfile.dependencies`](https://github.com/uktrade/data-hub-frontend/blob/main/Dockerfile.dependencies#L69) needs to be updated as well. You will need to create a new dependencies image and push it to Google Cloud ([follow the instructions in the Docker readme](./Docker.md)) before raising the main Dependabot PR.
 
 ### React
 

diff --git a/docs/Docker.md b/docs/Docker.md
@@ -26,7 +26,7 @@ Ensure you have [gcloud CLI installed](https://cloud.google.com/sdk/docs/install
 > If you have issues when building the dependencies image, especially if you are using a Mac with an Apple chip, this is most likely due to incompatibility with the `arm` architecture; instead you need to build on `amd` architecture. Please refer to [troubleshooting guide](./Troubleshooting.md) and follow the steps under the Visual & Visual Component Tests section, before retrying the build command below.
 
 ```bash
-export VERSION=3.2.0 # Increment this version each time when you edit Dockerfile.
+export VERSION=3.3.0 # Increment this version each time when you edit Dockerfile.
 
 docker build -f Dockerfile.dependencies -t data-hub-frontend-dependencies . --platform linux/amd64