Skip to content

Commit de6080d

Browse files
authored
Merge pull request #537 from Fryguy/update_yarn
Upgrade to yarn 4.11.0
2 parents 77ebb85 + 0f3a874 commit de6080d

File tree

8 files changed

+14602
-9763
lines changed

8 files changed

+14602
-9763
lines changed

.github/workflows/ci.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
---
21
name: CI
32
on:
43
push:
@@ -24,6 +23,6 @@ jobs:
2423
- name: Run tests
2524
run: bin/ci
2625
- name: Report code coverage
27-
if: "${{ github.ref == 'refs/heads/master' && matrix.node-version == '20' }}"
26+
if: "${{ github.ref == 'refs/heads/master' }}"
2827
continue-on-error: true
2928
run: scripts/.coverage.sh

.gitignore

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,26 @@ pids
77
*.pid
88
*.seed
99

10+
# yarn/npm
11+
npm-debug.log
12+
package-lock.json
13+
yarn-error.log
14+
15+
/node_modules/
16+
/.pnp.*
17+
/.yarn/*
18+
!/.yarn/patches
19+
!/.yarn/plugins
20+
!/.yarn/releases
21+
!/.yarn/sdks
22+
!/.yarn/versions
23+
1024
# Users Environment Variables
1125
.lock-wscript
1226

1327
/dist/
1428
.tmp/
1529
libs/
16-
node_modules/
1730
tsd/
1831
typings/
1932
vendor.js

.yarn/releases/yarn-4.11.0.cjs

Lines changed: 942 additions & 0 deletions
Large diffs are not rendered by default.

.yarnrc.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
compressionLevel: mixed
2+
3+
enableGlobalCache: true
4+
5+
nodeLinker: node-modules
6+
7+
yarnPath: .yarn/releases/yarn-4.11.0.cjs

bin/before_install

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22

33
set -e
44

5-
if [ -n "$CI" ]; then
6-
npm install --global yarn
5+
if [ -n "$ACT" ]; then
6+
# Install yarn
7+
curl -o- -L https://yarnpkg.com/install.sh | bash
8+
echo "$HOME/.yarn/bin" >> $GITHUB_PATH
9+
echo "$HOME/.config/yarn/global/node_modules/.bin" >> $GITHUB_PATH
710
fi

bin/setup

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,4 @@
22

33
set -e
44

5-
if [ -n "$CI" ]; then
6-
yarn global add typings webpack karma typescript
7-
fi
8-
95
yarn install

package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
"node": "^20.19.5",
2525
"npm": "^10.8.2"
2626
},
27+
"packageManager": "[email protected]",
2728
"devDependencies": {
2829
"@manageiq/font-fabulous": "^1.0.0",
2930
"@types/angular-mocks": "^1.7.0",
@@ -99,6 +100,7 @@
99100
"@types/jasmine": "3.10.0",
100101
"angular": "1.8.3",
101102
"angular-animate": "1.8.3",
102-
"angular-sanitize": "1.8.3"
103+
"angular-sanitize": "1.8.3",
104+
"get-intrinsic": "1.3.0"
103105
}
104106
}

yarn.lock

Lines changed: 13630 additions & 9753 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)