Skip to content

Commit d113b97

Browse files
Merge pull request #1707 from Fryguy/yarn3
Upgrade to yarn 3
2 parents 273307c + 14d3f68 commit d113b97

File tree

6 files changed

+15329
-7
lines changed

6 files changed

+15329
-7
lines changed

.gitignore

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,16 @@
11
# yarn/npm
2-
node_modules/
32
npm-debug.log
43
package-lock.json
54
yarn-error.log
6-
yarn.lock
5+
6+
/node_modules/
7+
/.pnp.*
8+
/.yarn/*
9+
!/.yarn/patches
10+
!/.yarn/plugins
11+
!/.yarn/releases
12+
!/.yarn/sdks
13+
!/.yarn/versions
714

815
# coverage
916
reports/

.yarn/releases/yarn-3.0.2.cjs

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

.yarnrc.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
enableGlobalCache: true
2+
nodeLinker: node-modules
3+
yarnPath: .yarn/releases/yarn-3.0.2.cjs

config/webpack.dev.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ module.exports = {
190190
// noVNC doesn't package the vnc_lite viewer that we need, so we have to
191191
// fetch it separately.
192192
new SaveRemoteFilePlugin({
193-
url: `https://raw.githubusercontent.com/novnc/noVNC/v${execSync(`yarn list --silent --pattern @novnc/novnc | cut -d '@' -f 3 | tr -d '\n'`, {encoding: 'utf-8'})}/vnc_lite.html`,
193+
url: `https://raw.githubusercontent.com/novnc/noVNC/v${execSync(`yarn info --name-only @novnc/novnc | cut -d ':' -f 2 | tr -d '\n'`, {encoding: 'utf-8'})}/vnc_lite.html`,
194194
filepath: 'vendor/noVNC/vnc_lite.html',
195195
hash: false
196196
}),

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"gettext:validate-language-codes": "yarn node language/validate-language-codes.js",
2222
"start": "webpack serve --progress --config config/webpack.dev.js",
2323
"t": "yarn run build:test && yarn run test:karma",
24-
"test": "yarn run vet && yarn run gettext:extract && yarn run gettext:validate && yarn run gettext:validate-language-codes && yarn run t",
24+
"test": "yarn run gettext:extract && yarn run gettext:validate && yarn run gettext:validate-language-codes && yarn run t",
2525
"test:karma": "karma start karma.conf.js --single-run",
2626
"test:watch": "karma start --auto-watch --no-single-run",
2727
"update": "jq -r '.dependencies|keys|join(\"\n\")' package.json | grep -v patternfly-timeline | xargs yarn add",
@@ -134,7 +134,7 @@
134134
],
135135
"engines": {
136136
"node": ">= 12.0.0",
137-
"npm": ">= 6.0.0",
138-
"yarn": ">= 1.0.0"
139-
}
137+
"npm": ">= 6.0.0"
138+
},
139+
"packageManager": "[email protected]"
140140
}

0 commit comments

Comments
 (0)