Skip to content

Commit c201360

Browse files
committed
MNT Use yarn 4
1 parent 2aa8381 commit c201360

8 files changed

Lines changed: 8549 additions & 6268 deletions

File tree

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ jobs:
1010
name: CI
1111
# Do not run if this is a pull-request from same repo i.e. not a fork repo
1212
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.repository
13-
uses: silverstripe/gha-ci/.github/workflows/ci.yml@v2
13+
uses: silverstripe/gha-ci/.github/workflows/ci.yml@v3

.github/workflows/merge-up.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ jobs:
1919
actions: write
2020
steps:
2121
- name: Merge-up
22-
uses: silverstripe/gha-merge-up@v2
22+
uses: silverstripe/gha-merge-up@v3

.github/workflows/update-js.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,6 @@ jobs:
3131
actions: write
3232
steps:
3333
- name: Update JS
34-
uses: silverstripe/gha-update-js@v1
34+
uses: silverstripe/gha-update-js@v2
3535
with:
3636
branch_type: ${{ github.event_name == 'schedule' && 'schedule' || github.event.inputs.branch_type }}

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
.DS_Store
22
.sass-cache/
33
node_modules/
4+
/.yarn/

.yarnrc.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
nodeLinker: node-modules
2+
enableScripts: false
3+
# Ignore npm versions published less than 7 days ago
4+
npmMinimalAgeGate: 10080

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
"require-dev": {
4343
"phpunit/phpunit": "^11.3",
4444
"squizlabs/php_codesniffer": "^3",
45-
"silverstripe/documentation-lint": "^1",
45+
"silverstripe/documentation-lint": "^2",
4646
"silverstripe/standards": "^1",
4747
"phpstan/extension-installer": "^1.3"
4848
},

package.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
"url": "https://github.com/silverstripe/silverstripe-userforms/issues"
2929
},
3030
"homepage": "https://github.com/silverstripe/silverstripe-userforms#readme",
31+
"packageManager": "yarn@4.18.0+sha512.fcb8716fe7cd0eece141ffc18b92193a9df9204c1ba83189c288835223fc0bbe64af473bab0d5e9927a7daeb5caf2bb07eb2787cc9338ca040ea125f2a1f2f7e",
3132
"dependencies": {
3233
"jquery": "^3.6.1",
3334
"jquery-validation": "^1.19.5",
@@ -37,9 +38,11 @@
3738
"react-dom": "^18.2.0"
3839
},
3940
"devDependencies": {
40-
"@silverstripe/eslint-config": "^1.3.0",
41+
"@silverstripe/eslint-config": "^2",
4142
"@silverstripe/webpack-config": "^3",
4243
"copy-webpack-plugin": "^11.0.0",
44+
"eslint": "^8.26.0",
45+
"stylelint": "~16.12.0",
4346
"webpack": "^5.74.0",
4447
"webpack-cli": "^5.0.0"
4548
},

yarn.lock

Lines changed: 8536 additions & 6263 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)