Skip to content

Commit 716da0f

Browse files
committed
chore(theme): migrate theme to pnpm
1 parent f6f879d commit 716da0f

6 files changed

Lines changed: 1868 additions & 2372 deletions

File tree

build.gradle.kts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* along with LiquidBounce. If not, see <https://www.gnu.org/licenses/>.
1818
*/
1919

20-
import com.github.gradle.node.npm.task.NpmTask
20+
import com.github.gradle.node.pnpm.task.PnpmTask
2121
import com.github.gradle.node.task.NodeTask
2222
import dev.detekt.gradle.DetektCreateBaselineTask
2323
import groovy.json.JsonOutput
@@ -223,18 +223,18 @@ node {
223223
version = file("src-theme/.nvmrc").readText().trim().removePrefix("v")
224224
}
225225

226-
tasks.register<NpmTask>("npmInstallTheme") {
226+
tasks.register<PnpmTask>("pnpmInstallTheme") {
227227
workingDir = file("src-theme")
228228
args.set(listOf("i"))
229229
doLast {
230230
logger.info("Successfully installed dependencies for theme")
231231
}
232-
inputs.files("src-theme/package.json", "src-theme/package-lock.json")
232+
inputs.files("src-theme/package.json", "src-theme/pnpm-lock.yaml")
233233
outputs.dir("src-theme/node_modules")
234234
}
235235

236-
tasks.register<NpmTask>("buildTheme") {
237-
dependsOn("npmInstallTheme")
236+
tasks.register<PnpmTask>("buildTheme") {
237+
dependsOn("pnpmInstallTheme")
238238
workingDir = file("src-theme")
239239
args.set(listOf("run", "build"))
240240
doLast {
@@ -243,7 +243,7 @@ tasks.register<NpmTask>("buildTheme") {
243243

244244
inputs.files(
245245
"src-theme/package.json",
246-
"src-theme/package-lock.json",
246+
"src-theme/pnpm-lock.yaml",
247247
"src-theme/bundle.cjs",
248248
"src-theme/rollup.config.js"
249249
)
@@ -262,7 +262,7 @@ tasks.register<NodeTask>("bundleTheme") {
262262
// Incremental stuff
263263
inputs.files(
264264
"src-theme/package.json",
265-
"src-theme/package-lock.json",
265+
"src-theme/pnpm-lock.yaml",
266266
"src-theme/bundle.cjs",
267267
"src-theme/rollup.config.js"
268268
)

src-theme/.github/workflows/build.yml

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,26 @@ jobs:
2424
uses: actions/setup-node@v6
2525
with:
2626
node-version-file: ".nvmrc"
27-
cache: 'npm'
27+
cache: 'pnpm'
28+
29+
- name: Install pnpm
30+
uses: pnpm/action-setup@v4
31+
32+
- name: Cache pnpm store
33+
uses: actions/cache@v5
34+
with:
35+
path: |
36+
~/.pnpm-store
37+
~/.local/share/pnpm/store
38+
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
39+
restore-keys: |
40+
${{ runner.os }}-pnpm-store-
2841
2942
- name: Install dependencies
30-
run: npm install
43+
run: pnpm install
3144

3245
- name: Build project
33-
run: npm run build
46+
run: pnpm run build
3447

3548
- name: Create dist archive
3649
run: zip -r ${{ env.ZIP_NAME }}.zip dist/

0 commit comments

Comments
 (0)