Skip to content

Commit 3ea479a

Browse files
authored
Merge pull request #1292 from Patternslib/thet/pnpm
maint: Switch to pnpm.
2 parents 86f38c2 + 368d10c commit 3ea479a

7 files changed

Lines changed: 11592 additions & 8997 deletions

File tree

‎.github/workflows/test.yml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,12 @@ jobs:
1111
name: test
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@v4
15-
- uses: actions/setup-node@v4
14+
- uses: actions/checkout@v7
15+
- uses: pnpm/action-setup@v6
16+
- uses: actions/setup-node@v7
1617
with:
17-
node-version: '22'
18-
cache: 'yarn'
18+
node-version: '24'
19+
cache: 'pnpm'
1920
- run: |
2021
make install
2122
make check

‎.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
.sass-cache
1010
/paternslib.sublime-project
1111
/paternslib.sublime-workspace
12-
/stamp-yarn
1312
Gemfile.lock
1413
Patterns-site/
1514
cache/

‎Makefile‎

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,28 @@ export
2020

2121
PEGJS ?= npx pegjs
2222
SASS ?= npx sass
23-
YARN ?= npx yarn
23+
PNPM ?= npx pnpm
2424

2525
PACKAGE_NAME = "patternslib"
2626

2727
all:: bundle css
2828

2929

30-
yarn.lock install:
31-
$(YARN) install
30+
# Keep this here. On fresh installs we don't yet have @patternslib/dev
31+
# available and therefore cannot use it's install target.
32+
.PHONY: install
33+
pnpm-lock.yaml install: .git/hooks/commit-msg
34+
$(PNPM) install
35+
36+
37+
.git/hooks/commit-msg:
38+
echo "npx commitlint --edit" > .git/hooks/commit-msg
39+
chmod u+x .git/hooks/commit-msg
3240

3341

3442
.PHONY: watch
3543
watch: install
36-
$(YARN) watch
44+
$(PNPM) run watch
3745

3846

3947
.PHONY: build
@@ -48,14 +56,8 @@ depends-parser: install
4856
# Unlink any linked dependencies before building a bundle.
4957
# Also run parent @patternslib/dev `bundle-pre` (double colon `::`)
5058
bundle-pre::
51-
-$(YARN) unlink @patternslib/dev
52-
-$(YARN) unlink @patternslib/pat-content-mirror
53-
-$(YARN) unlink @patternslib/pat-doclock
54-
-$(YARN) unlink @patternslib/pat-shopping-cart
55-
-$(YARN) unlink @patternslib/pat-sortable-table
56-
-$(YARN) unlink @patternslib/pat-tiptap
57-
-$(YARN) unlink @patternslib/pat-upload
58-
$(YARN) install --force
59+
-$(PNPM) unlink --recursive
60+
$(MAKE) install
5961

6062

6163
.PHONY: css
@@ -73,25 +75,25 @@ Patterns-site/Makefile:
7375
.PHONY: update-patternslib-site
7476
update-patternslib-site: Patterns-site/Makefile
7577
# something
76-
cd Patterns-site && git pull && make update-patternslib && git push
78+
cd Patterns-site && git pull && $(MAKE) update-patternslib && git push
7779

7880

7981
# Overrides release + Update https://patternslib.com
8082

8183

8284
.PHONY: release-major
8385
release-major:
84-
make LEVEL=major release
85-
make update-patternslib-site
86+
$(MAKE) LEVEL=major release
87+
$(MAKE) update-patternslib-site
8688

8789

8890
.PHONY: release-minor
8991
release-minor:
90-
make LEVEL=minor release
91-
make update-patternslib-site
92+
$(MAKE) LEVEL=minor release
93+
$(MAKE) update-patternslib-site
9294

9395

9496
.PHONY: release-patch
9597
release-patch:
96-
make LEVEL=patch release
97-
make update-patternslib-site
98+
$(MAKE) LEVEL=patch release
99+
$(MAKE) update-patternslib-site

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
"title": "Markup patterns to drive behaviour.",
55
"description": "Patternslib is a JavaScript library that enables designers to build rich interactive prototypes without the need for writing any Javascript. All events are triggered by classes and other attributes in the HTML, without abusing the HTML as a programming language. Accessibility, SEO and well structured HTML are core values of Patterns.",
66
"license": "BSD-3-Clause",
7+
"packageManager": "pnpm@12.3.4",
78
"dependencies": {
89
"@fullcalendar/adaptive": "^5.11.3",
910
"@fullcalendar/core": "^5.11.3",
@@ -31,12 +32,11 @@
3132
"showdown": "^2.1.0",
3233
"showdown-prettify": "^1.3.0",
3334
"slick-carousel": "git+https://github.com/kenwheeler/slick.git#d0716f19aa730006ee80ab026625fb1107816a97",
34-
"slides": "git+https://github.com/Patternslib/slides.git",
3535
"spectrum-colorpicker": "^1.8.0",
3636
"tippy.js": "^6.3.7"
3737
},
3838
"devDependencies": {
39-
"@patternslib/dev": "^4.2.1",
39+
"@patternslib/dev": "^4.3.0",
4040
"@patternslib/pat-content-mirror": "^4.0.1",
4141
"@patternslib/pat-doclock": "^3.0.0",
4242
"@patternslib/pat-shopping-cart": "^3.0.0",

0 commit comments

Comments
 (0)