8000 upgrade pnpm version by shawkins · Pull Request #48975 · keycloak/keycloak · GitHub
[go: up one dir, main page]

Skip to content
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
1 change: 0 additions & 1 deletion .github/actions/pnpm-store-cache/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ runs:
- uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
name: Cache PNPM store
with:
# See: https://pnpm.io/npmrc#store-dir
path: |
~/.local/share/pnpm/store
~/AppData/Local/pnpm/store
Expand Down
16 changes: 2 additions & 14 deletions js/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "root",
"private": true,
"type": "module",
"packageManager": "pnpm@10.14.0+sha512.ad27a79641b49c3e481a16a805baa71817a04bbe06a38d17e60e2eaee83f6a146c6a688125f5792e48dd5ba30e7da52a5cda4c3992b9ccf333f9ce223af84748",
"packageManager": "pnpm@11.1.1",
"scripts": {
"prepare": "cd .. && husky js/.husky",
"build": "wireit"
Expand Down Expand Up @@ -52,17 +52,5 @@
"url": "https://github.com/keycloak/keycloak.git",
"directory": "js/"
},
"homepage": "https://www.keycloak.org/",
"pnpm": {
"overrides": {
"picomatch@^2": "^2.3.2",
"flatted": "^3.4.2",
"minimatch@~3": "^3.1.4",
"minimatch@~9": "^9.0.7",
"@isaacs/brace-expansion@^5": "^5.0.1",
"serialize-javascript": "^7.0.3",
"diff@^4": "^4.0.4",
"diff@^7": "^8.0.3"
Comment thread
edewit marked this conversation as resolved.
Resolved
}
}
"homepage": "https://www.keycloak.org/"
}
16 changes: 12 additions & 4 deletions js/pnpm-workspace.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,6 @@ packages:
- libs/*
- themes-vendor

onlyBuiltDependencies:
- '@swc/core'
- esbuild

ignoredOptionalDependencies:
- '@types/c3'
- bootstrap-datepicker
Expand All @@ -30,3 +26,15 @@ ignoredOptionalDependencies:
- moment-timezone
- patternfly-bootstrap-combobox
- patternfly-bootstrap-treeview
overrides:
picomatch@^2: ^2.3.2
flatted: ^3.4.2
minimatch@~3: ^3.1.4
minimatch@~9: ^9.0.7
'@isaacs/brace-expansion@^5': ^5.0.1
serialize-javascript: ^7.0.3
diff@^4: ^4.0.4
diff@^7: ^8.0.3
allowBuilds:
'@swc/core': true
esbuild: true
23 changes: 20 additions & 3 deletions js/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@

<properties>
<node.version>v24.9.0</node.version>
<pnpm.version>10.14.0</pnpm.version>
<pnpm.version>11.1.1</pnpm.version>
<!-- The JavaScript projects use non-standard folders for their sources, therefore, name it here explicitly -->
<maven.build.cache.input.1>src</maven.build.cache.input.1>
<maven.build.cache.input.2>public</maven.build.cache.input.2>
Expand Down Expand Up @@ -98,21 +98,21 @@
<plugin>
<groupId>com.github.eirslett</groupId>
<artifactId>frontend-maven-plugin</artifactId>
<version>${frontend.plugin.version}</version>
<inherited>false</inherited>
<executions>
<execution>
<goals>
<goal>install-node-and-pnpm</goal>
</goals>
<phase>initialize</phase>
</execution>
<execution>
<id>pnpm-install</id>
<goals>
<goal>pnpm</goal>
</goals>
<configuration>
<arguments>install --prefer-offline --frozen-lockfile --ignore-scripts</arguments>
<arguments>install --prefer-offline --frozen-lockfile --ignore-scripts --config.confirmModulesPurge=false</arguments>
</configuration>
</execution>
<execution>
Expand All @@ -126,6 +126,23 @@
</execution>
</executions>
</plugin>
<!-- newer versions of pnpm do not have an executable cjs file, see https://github.com/eirslett/frontend-maven-plugin/issues/1224 -->
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<phase>initialize</phase>
<configuration>
<target>
<chmod file="${maven.multiModuleProjectDirectory}/js/node/node_modules/pnpm/bin/pnpm.cjs" perm="755"/>
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
Loading
0