Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dependabot clearout #6561

Merged
merged 7 commits into from
Feb 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Comment on lines +25 to +27
Copy link
Contributor Author

@cgsunkel cgsunkel Feb 28, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can't upgrade this dependency until Cypress start supporting v5 - cypress-io/cypress#28924


# These are part of dependency groups and should be updated via the relevant script.
- dependency-name: "@storybook/addon-a11y"
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.dependencies
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
cgsunkel marked this conversation as resolved.
Show resolved Hide resolved
&& npx cypress verify \
&& npx cypress cache path \
&& npx cypress cache list \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.storybook
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 0 additions & 1 deletion cypress.a11y.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ const { defineConfig } = require('cypress')

module.exports = defineConfig({
video: true,
videoUploadOnPasses: false,
screenshotOnRunFailure: false,
defaultCommandTimeout: 5000,
requestTimeout: 5000,
Expand Down
23 changes: 11 additions & 12 deletions cypress.config.js
Original file line number Diff line number Diff line change
@@ -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',
},
});
})
1 change: 0 additions & 1 deletion cypress.visual.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ require('dotenv').config()

module.exports = defineConfig({
video: true,
videoUploadOnPasses: false,
Copy link
Contributor Author

@cgsunkel cgsunkel Feb 28, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This videoUploadOnPasses option was deprecated by Cypress in v13

screenshotOnRunFailure: false,
defaultCommandTimeout: 5000,
requestTimeout: 5000,
Expand Down
2 changes: 1 addition & 1 deletion docs/Dependabot.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion docs/Docker.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Loading
Loading