Skip to content

Commit 75b86de

Browse files
committed
Storybook to run using nodejs 22
1 parent 55c5d14 commit 75b86de

File tree

16 files changed

+3795
-9260
lines changed

16 files changed

+3795
-9260
lines changed

.github/workflows/ci-repo.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ jobs:
2828
run: npm clean-install --ignore-scripts
2929
# - name: Lint sources
3030
# run: npm run lint
31+
- name: Generate
32+
run: npm run generate
3133
- name: Build
3234
run: npm run build
3335
- name: Build storybook

.github/workflows/storybook-pr-build.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,11 @@ jobs:
1212
- uses: actions/checkout@v4
1313
- uses: actions/setup-node@v4
1414
with:
15-
node-version: 20
15+
node-version: 22
1616
- name: Install dependencies
1717
run: npm clean-install --ignore-scripts
18+
- name: Generate
19+
run: npm run generate
1820
- name: Build
1921
run: npm run build
2022
- name: Build storybook

.github/workflows/storybook.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,12 @@ jobs:
3131
- uses: actions/checkout@v4
3232
- uses: actions/setup-node@v4
3333
with:
34-
node-version: 20
34+
node-version: 22
3535
cache: npm
3636
- name: Install dependencies
3737
run: npm clean-install --ignore-scripts
38+
- name: Generate
39+
run: npm run generate
3840
- name: Build
3941
run: npm run build
4042
- name: Build storybook

.github/workflows/tag-dist.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ jobs:
2424
- name: Install
2525
working-directory: build
2626
run: npm clean-install --ignore-scripts
27+
- name: Generate
28+
run: npm run generate
2729
- name: Build
2830
working-directory: build
2931
run: npm run build

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ node_modules/
88
# testing
99
coverage/
1010

11+
# generated files
12+
client/src/app/client/
13+
1114
# production
1215
dist/
1316
/qa/build

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ FROM registry.access.redhat.com/ubi9/nodejs-22:latest AS builder
44
USER 1001
55
COPY --chown=1001 . .
66
RUN npm install -g
7-
RUN npm clean-install --ignore-scripts && npm run build && npm run dist
7+
RUN npm clean-install --ignore-scripts && npm run generate && npm run build && npm run dist
88

99
# Runner image
1010
FROM registry.access.redhat.com/ubi9/nodejs-22-minimal:latest

Dockerfile.server

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ FROM registry.access.redhat.com/ubi9/nodejs-22:latest AS ui-source
55
USER 1001
66
COPY --chown=1001 . .
77
RUN npm install -g npm@9
8-
RUN npm clean-install --ignore-scripts && npm run build && npm run dist
8+
RUN npm clean-install --ignore-scripts && npm run generate && npm run build && npm run dist
99

1010
######################################################################
1111
# Prepare server

client/config/openapi-ts.config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { defineConfig } from "@hey-api/openapi-ts";
22

33
export default defineConfig({
4-
client: "@hey-api/client-axios",
4+
plugins: ["@hey-api/client-axios"],
55
input: "./openapi/trustd.yaml",
66
output: {
77
path: "src/app/client",

client/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"*.{css,json,md,yaml,yml}": "prettier --write"
2121
},
2222
"dependencies": {
23-
"@hey-api/client-axios": "^0.2.7",
23+
"@hey-api/client-axios": "^0.5.3",
2424
"@hookform/resolvers": "^2.9.11",
2525
"@patternfly/patternfly": "^5.4.0",
2626
"@patternfly/react-charts": "^7.4.0",
@@ -55,7 +55,7 @@
5555
"yup": "^0.32.11"
5656
},
5757
"devDependencies": {
58-
"@hey-api/openapi-ts": "^0.53.5",
58+
"@hey-api/openapi-ts": "^0.63.2",
5959
"@pmmmwh/react-refresh-webpack-plugin": "^0.5.10",
6060
"@svgr/webpack": "^8.1.0",
6161
"@testing-library/jest-dom": "^6.4.6",

client/src/app/client/index.ts

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

0 commit comments

Comments
 (0)