Skip to content

Commit 1a7c758

Browse files
authored
Merge pull request #238 from collective/thet/js-deps
Update JavaScript dependencies.
2 parents b499d26 + 08ad141 commit 1a7c758

29 files changed

Lines changed: 11123 additions & 8983 deletions

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ local.cfg
4343
/instance/
4444
/.make-sentinels/
4545
/*-mxdev.txt
46+
/.mxdev_*
4647
/reports/
4748
/sources/
4849
/venv/

.meta.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ template = "default"
66
commit-id = "2.8.0"
77

88
[pyproject]
9-
codespell_skip = "*.js,*.min.js,*.min.js.map,*.css.map,yarn.lock,robot_*,test_*"
9+
codespell_skip = "*.js,*.min.js,*.min.js.map,*.css.map,pnpm-lock.yaml,robot_*,test_*"
1010

1111
[github]
1212
jobs = [

.npmrc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
shamefully-hoist=true
2+
public-hoist-pattern[]=*

DEVELOPMENT.md

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
## Install package manager
2+
3+
### pnpm
4+
5+
Using corepack:
6+
7+
```shell
8+
corepack prepare pnpm@latest --activate
9+
```
10+
11+
or using `npm`:
12+
13+
```shell
14+
npm install -g pnpm@latest
15+
```
16+
17+
Verify the latest version.
18+
19+
```shell
20+
pnpm --version
21+
```
22+
23+
### Install dependencies
24+
25+
In order to develop `collective.z3cform.datagridfield` JS/SCSS files you need to execute on the root of the package::
26+
27+
```shell
28+
pnpm install
29+
```
30+
31+
You can also updated dependencies with
32+
33+
```shell
34+
pnpm update
35+
```
36+
37+
or you can inspect latest versions of dependencies with
38+
39+
```shell
40+
pnpm update --interactive --latest
41+
```
42+
43+
After executing this you can run the following command to watch for any scss changes
44+
in the path `collective.z3cform.datagridfield/resources`::
45+
46+
```shell
47+
pnpm watch
48+
```
49+
50+
This will make sure that the many .scss files are compiled to .css on the fly
51+
and then copied over to the theme.
52+
53+
If you simply want to compile all resources before a release run::
54+
55+
```shell
56+
pnpm build
57+
```

MANIFEST.in

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,11 @@
11
include *.py
22
include *.rst
33
include *.txt
4-
include Makefile
5-
include package.json
6-
include webpack.config.js
7-
include yarn.lock
4+
exclude Makefile package.json webpack.config.js *.ini pnpm-lock.yaml *-mxdev.txt *.md .*
85
graft docs
96
graft resources
107
recursive-include src *
11-
exclude *.cfg
12-
exclude *.ini
13-
exclude .*
14-
exclude constraints-mxdev.txt
15-
exclude requirements-mxdev.txt
8+
exclude
169
global-exclude *.pyc
1710
global-exclude *.pyo
1811
recursive-exclude news *

news/+js-dep.internal.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Upgrade JS dependencies. @thet

news/+use_pnpm.internat.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Switch from yarn to pnpm.
2+
@petschki

package.json

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,14 @@
88
"yarn": "^1.22.19"
99
},
1010
"dependencies": {
11-
"@patternslib/patternslib": "^9.10.3",
12-
"@plone/mockup": "^5.5.0"
11+
"@patternslib/patternslib": "9.10.5",
12+
"@plone/mockup": "^5.6.1"
1313
},
1414
"devDependencies": {
15-
"@patternslib/dev": "^3.8.1"
15+
"@patternslib/dev": "^4.0.0"
16+
},
17+
"resolutions": {
18+
"@patternslib/patternslib": "9.10.5"
1619
},
1720
"scripts": {
1821
"build": "NODE_ENV=production webpack --config webpack.config.js",
@@ -30,5 +33,6 @@
3033
"repository": {
3134
"type": "git",
3235
"url": "https://github.com/collective/collective.z3cform.datagridfield.git"
33-
}
36+
},
37+
"packageManager": "pnpm@10.33.2+sha512.a90faf6feeab71ad6c6e57f94e0fe1a12f5dcc22cd754db40ae9593eb6a3e0b6b12e3540218bb37ae083404b1f2ce6db2a4121e979829b4aff94b99f49da1cf8"
3438
}

0 commit comments

Comments
 (0)