Skip to content

Commit

Permalink
Merge pull request #1707 from Fryguy/yarn3
Browse files Browse the repository at this point in the history
Upgrade to yarn 3
  • Loading branch information
kavyanekkalapu authored Oct 19, 2021
2 parents 273307c + 14d3f68 commit d113b97
Show file tree
Hide file tree
Showing 6 changed files with 15,329 additions and 7 deletions.
11 changes: 9 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,9 +1,16 @@
# yarn/npm
node_modules/
npm-debug.log
package-lock.json
yarn-error.log
yarn.lock

/node_modules/
/.pnp.*
/.yarn/*
!/.yarn/patches
!/.yarn/plugins
!/.yarn/releases
!/.yarn/sdks
!/.yarn/versions

# coverage
reports/
Expand Down
631 changes: 631 additions & 0 deletions .yarn/releases/yarn-3.0.2.cjs

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
enableGlobalCache: true
nodeLinker: node-modules
yarnPath: .yarn/releases/yarn-3.0.2.cjs
2 changes: 1 addition & 1 deletion config/webpack.dev.js
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ module.exports = {
// noVNC doesn't package the vnc_lite viewer that we need, so we have to
// fetch it separately.
new SaveRemoteFilePlugin({
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`,
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`,
filepath: 'vendor/noVNC/vnc_lite.html',
hash: false
}),
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"gettext:validate-language-codes": "yarn node language/validate-language-codes.js",
"start": "webpack serve --progress --config config/webpack.dev.js",
"t": "yarn run build:test && yarn run test:karma",
"test": "yarn run vet && yarn run gettext:extract && yarn run gettext:validate && yarn run gettext:validate-language-codes && yarn run t",
"test": "yarn run gettext:extract && yarn run gettext:validate && yarn run gettext:validate-language-codes && yarn run t",
"test:karma": "karma start karma.conf.js --single-run",
"test:watch": "karma start --auto-watch --no-single-run",
"update": "jq -r '.dependencies|keys|join(\"\n\")' package.json | grep -v patternfly-timeline | xargs yarn add",
Expand Down Expand Up @@ -134,7 +134,7 @@
],
"engines": {
"node": ">= 12.0.0",
"npm": ">= 6.0.0",
"yarn": ">= 1.0.0"
}
"npm": ">= 6.0.0"
},
"packageManager": "[email protected]"
}
Loading

0 comments on commit d113b97

Please sign in to comment.