Skip to content
Open
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
9 changes: 5 additions & 4 deletions .github/workflows/deploy-storybook.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,18 @@ jobs:
steps:
- uses: actions/checkout@v4

- uses: pnpm/action-setup@v4
with:
run_install: |
args: [ --force ]
- name: Setup pnpm
uses: pnpm/action-setup@v4

- name: Set Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
cache: pnpm

- name: Install dependencies
run: pnpm install --frozen-lockfile

- name: Build and publish
id: build-publish
uses: bitovi/github-actions-storybook-to-github-pages@v1.0.3
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/npm-publish-pre-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@ jobs:

- name: Setup pnpm
uses: pnpm/action-setup@v4
with:
run_install: |
args: [ --force ]

- name: Setup node
uses: actions/setup-node@v4
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/npm-publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,6 @@ jobs:

- name: Setup pnpm
uses: pnpm/action-setup@v4
with:
run_install: |
args: [ --force ]

- name: Setup node
uses: actions/setup-node@v4
Expand Down
9 changes: 4 additions & 5 deletions .github/workflows/test-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,16 @@ jobs:
steps:
- uses: actions/checkout@v4

- name: Install dependencies
- name: Setup pnpm
uses: pnpm/action-setup@v4
with:
run_install: |
args: [ --force ]

- name: Set Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
cache: pnpm

- name: Install dependencies
run: pnpm install --frozen-lockfile

- name: Audit packages, run Typescript tests and lint client code
run: |
Expand Down
1 change: 0 additions & 1 deletion .npmrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
publish-branch=main
access=public
ignore-scripts=true
9 changes: 5 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,10 @@
"storybook:publish": "gh-pages -b storybook/publish -d storybook-static"
},
"dependencies": {
"@mui/icons-material": "^7.0.0",
"keycloak-js": "^26.2.1",
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Guilherme mentioned moving this to peer. I'm in two minds about it. Do you have an opinion?

(I'm asking under this MR, because I assume it's better to move it to peer so that it is easier to overwrite downstream?)

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

Could move it to peerDependencies and put as an optionalDependency but would need some documentation to point out that it needs to be installed.

"react-icons": "^5.3.0",
"utif": "^3.1.0",
"@mui/icons-material": "^7.0.0"
"utif": "^3.1.0"
},
"peerDependencies": {
"@emotion/react": "^11.13.3",
Expand All @@ -61,7 +61,6 @@
"@jsonforms/material-renderers": "^3.7.0",
"@jsonforms/react": "^3.7.0",
"@mui/material": "^7.0.0",
"@mui/icons-material": "^7.0.0",
"react": "^18.3.1"
},
"devDependencies": {
Expand All @@ -71,6 +70,7 @@
"@babel/preset-typescript": "^7.26.10",
"@chromatic-com/storybook": "^3.2.2",
"@eslint/eslintrc": "^3.2.0",
"@eslint/js": "^10.0.1",
"@rollup/plugin-commonjs": "^28.0.1",
"@rollup/plugin-image": "^3.0.3",
"@rollup/plugin-json": "^6.1.0",
Expand Down Expand Up @@ -120,6 +120,7 @@
},
"pnpm": {
"overrides": {
"fast-uri": "^3.1.2",
"lodash": "^4.18.1",
"qs@>=6.13.0 <6.14.0": "6.14.1",
"js-yaml@^4.1.0": "4.1.1",
Expand All @@ -130,5 +131,5 @@
"webpack@^5.0.0": "5.104.1"
}
},
"packageManager": "pnpm@9.12.3+sha256.24235772cc4ac82a62627cd47f834c72667a2ce87799a846ec4e8e555e2d4b8b"
"packageManager": "pnpm@10.26.0"
}
54 changes: 48 additions & 6 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions pnpm-workspace.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
ignoreScripts: true
minimumReleaseAge: 10080 # 1 week
blockExoticSubdeps: true
trustPolicy: no-downgrade
Loading