Skip to content

Commit 7b09d8a

Browse files
committed
[release-4.19] OCPBUGS-78059: Bump to 4.19.0 SDK
- Bump eslint to v9 - More dep bumps - Bump to yarn berry
1 parent a00b905 commit 7b09d8a

17 files changed

Lines changed: 16150 additions & 10645 deletions

.eslintrc.yml

Lines changed: 0 additions & 26 deletions
This file was deleted.

.gitignore

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,12 @@
44
.devcontainer/dev.env
55
integration-tests/videos
66
integration-tests/screenshots
7+
8+
# Yarn v4 (Berry)
9+
.yarn/*
10+
install-state.gz
11+
!.yarn/patches
12+
!.yarn/plugins
13+
!.yarn/releases
14+
!.yarn/sdks
15+
!.yarn/versions

.yarn/releases/yarn-4.13.0.cjs

Lines changed: 940 additions & 0 deletions
Large diffs are not rendered by default.

.yarnrc.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
nodeLinker: node-modules
2+
3+
yarnPath: .yarn/releases/yarn-4.13.0.cjs

Dockerfile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
FROM registry.access.redhat.com/ubi9/nodejs-18:latest AS build
1+
FROM registry.access.redhat.com/ubi9/nodejs-22:latest AS build
22
USER root
3-
RUN command -v yarn || npm i -g yarn
3+
ENV COREPACK_ENABLE_DOWNLOAD_PROMPT=0
4+
RUN command -v yarn || (npm i -g corepack && corepack enable)
45

56
ADD . /usr/src/app
67
WORKDIR /usr/src/app
@@ -11,4 +12,4 @@ FROM registry.access.redhat.com/ubi9/nginx-120:latest
1112
COPY --from=build /usr/src/app/dist /usr/share/nginx/html
1213
USER 1001
1314

14-
ENTRYPOINT ["nginx", "-g", "daemon off;"]
15+
ENTRYPOINT ["nginx", "-g", "daemon off;"]

OWNERS

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
approvers:
22
- christianvogt
33
- florkbr
4-
- spadgett
5-
- vojtechszocs
64
- jhadvig
7-
- TheRealJon
5+
- logonoff
86
- rhamilto
7+
- spadgett
8+
- TheRealJon
9+
- vojtechszocs
910
component: Management Console

eslint.config.mjs

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
import eslint from '@eslint/js';
2+
import tseslint from 'typescript-eslint';
3+
import react from 'eslint-plugin-react';
4+
import prettier from 'eslint-plugin-prettier/recommended';
5+
import reactHooks from 'eslint-plugin-react-hooks';
6+
import cypress from 'eslint-plugin-cypress';
7+
import globals from 'globals';
8+
9+
export default tseslint.config(
10+
{
11+
ignores: ['dist/', 'node_modules/'],
12+
},
13+
eslint.configs.recommended,
14+
tseslint.configs.recommended,
15+
reactHooks.configs.flat.recommended,
16+
{
17+
files: ['src/**/*.{ts,tsx}'],
18+
plugins: {
19+
react,
20+
},
21+
rules: {
22+
...eslint.configs.recommended.rules,
23+
...tseslint.configs.recommended.rules,
24+
...react.configs.recommended.rules,
25+
...react.configs['jsx-runtime'].rules,
26+
},
27+
languageOptions: {
28+
globals: globals.browser,
29+
parserOptions: {
30+
ecmaFeatures: {
31+
jsx: true,
32+
},
33+
}
34+
},
35+
settings: {
36+
react: {
37+
version: 'detect',
38+
},
39+
}
40+
},
41+
{
42+
files: ['integration-tests/**/*.{ts,tsx,js}'],
43+
...cypress.configs.recommended,
44+
languageOptions: {
45+
globals: {
46+
require: 'readonly',
47+
module: 'writable',
48+
},
49+
},
50+
rules: {
51+
...cypress.configs.recommended.rules,
52+
'no-console': 'off',
53+
'@typescript-eslint/no-namespace': 'off',
54+
'@typescript-eslint/no-require-imports': 'off',
55+
'@typescript-eslint/no-unused-expressions': 'off',
56+
},
57+
},
58+
prettier,
59+
);

integration-tests/.eslintrc

Lines changed: 0 additions & 17 deletions
This file was deleted.

integration-tests/cypress.config.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ const { defineConfig } = require('cypress');
33
module.exports = defineConfig({
44
viewportWidth: 1920,
55
viewportHeight: 1080,
6-
screenshotsFolder: './screenshots',
7-
videosFolder: './videos',
6+
screenshotsFolder: './screenshots/screenshots',
7+
videosFolder: './screenshots/videos',
88
video: true,
99
reporter: '../../node_modules/cypress-multi-reporters',
1010
reporterOptions: {
@@ -22,5 +22,7 @@ module.exports = defineConfig({
2222
},
2323
specPattern: 'tests/**/*.cy.{js,jsx,ts,tsx}',
2424
supportFile: 'support/index.ts',
25+
testIsolation: false,
26+
injectDocumentDomain: true,
2527
},
2628
});

integration-tests/plugins/index.ts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
1-
import * as wp from '@cypress/webpack-preprocessor';
1+
const wp = require('@cypress/webpack-preprocessor');
22

3-
module.exports = (
4-
on: Cypress.PluginEvents,
5-
config: Cypress.PluginConfigOptions,
6-
): Cypress.PluginConfigOptions => {
3+
const config: Cypress.PluginConfig = (on, config) => {
74
const options = {
85
webpackOptions: {
96
resolve: {
@@ -26,3 +23,5 @@ module.exports = (
2623
config.env.BRIDGE_KUBEADMIN_PASSWORD = process.env.BRIDGE_KUBEADMIN_PASSWORD;
2724
return config;
2825
};
26+
27+
module.exports = config;

0 commit comments

Comments
 (0)