Skip to content

Commit

Permalink
refactor: Upgrade from yarn v1 to v3 (#2207)
Browse files Browse the repository at this point in the history
* refactor: Upgrade from yarn v1 to v3

* fix: move from deprecated yarn install flag to new

* fix: importHelpers functionality didn't exist before TS 3.4, not sure how this worked before yarn upgrade.

* fix: remove unneeded line in package.json

* experiment with CI

* Another experiment

* more experiments in CI

* more ci experiements

* ci

* ci testing

* ci testing. Downgrade to yarn 3.2.1

* get remaining files from last commit

* yarn.lock taken from apps package branch where it works. Reverted ts related changes.

* ci attempt to get closer to working branch

* ci experiment

* Revert "yarn.lock taken from apps package branch where it works. Reverted ts related changes."

This reverts commit d85e121.

* ci testing

* revert yarn install commands

* ci experiments

* test 3.2.1 again

* chore upgrade back to 3.3.1

* Update yarn.lock

* chore: move snyk to dev dependencies and run from there

* chore: tweak snyk and CI cacheing

* chore: removing testing line from ci.yml. Increase network install for all yarn installs

* chore: revert snyk changes.

* chore: add missing config to re-use yarn cache
  • Loading branch information
ryandagg committed Jan 24, 2023
1 parent d8711d5 commit 0589573
Show file tree
Hide file tree
Showing 8 changed files with 17,167 additions and 11,541 deletions.
17 changes: 9 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ jobs:
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
yarn: cache
- run: yarn --frozen-lockfile --network-timeout 1000000
cache: yarn
- run: yarn --immutable --network-timeout 1000000
- run: yarn test

acceptance:
Expand All @@ -36,7 +36,8 @@ jobs:
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
- run: yarn --frozen-lockfile
cache: yarn
- run: yarn --immutable --network-timeout 1000000
- run: ./bin/run whoami
- run: ./scripts/run-acceptance

Expand Down Expand Up @@ -64,7 +65,7 @@ jobs:
run: |
cp yarn.lock packages/cli
cd packages/cli
yarn --frozen-lockfile
yarn --immutable --network-timeout 1000000
- name: Building deb
run: ./scripts/pack/deb
- uses: actions/upload-artifact@v3
Expand All @@ -86,7 +87,7 @@ jobs:
run: |
cp yarn.lock packages/cli
cd packages/cli
yarn --frozen-lockfile
yarn --immutable --network-timeout 1000000
- name: Building tarballs
run: ./scripts/pack/tarballs
- uses: actions/upload-artifact@v3
Expand Down Expand Up @@ -154,7 +155,7 @@ jobs:
run: |
cp yarn.lock packages/cli
cd packages/cli
yarn --frozen-lockfile --prefer-offline
yarn --immutable --prefer-offline --network-timeout 1000000
- name: Upload production artifacts
run: |
cd packages/cli
Expand Down Expand Up @@ -206,7 +207,7 @@ jobs:
- run: |
cp yarn.lock packages/cli
cd packages/cli
yarn --frozen-lockfile
yarn --immutable --network-timeout 1000000
./scripts/release/homebrew.js
change-management:
Expand All @@ -223,5 +224,5 @@ jobs:
steps:
- uses: actions/checkout@v3
- run: |
yarn --frozen-lockfile
yarn --immutable --network-timeout 1000000
./scripts/postrelease/change_management
11 changes: 9 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,15 @@ node_modules
/tmp
/packages/cli/docs/*

.vscode

**/.DS_Store
./idea
.vscode

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


823 changes: 823 additions & 0 deletions .yarn/releases/yarn-3.3.1.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 @@
nodeLinker: node-modules

yarnPath: .yarn/releases/yarn-3.3.1.cjs
4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,10 @@
]
},
"engines": {
"node": ">=10.0.0"
"node": ">=10.0.0",
"yarn": ">=3.0.0"
},
"packageManager": "yarn@3.3.1",
"private": true,
"scripts": {
"test": "lerna run test --concurrency 4",
Expand Down
4 changes: 1 addition & 3 deletions packages/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@
"description": "CLI to interact with Heroku",
"version": "7.67.2",
"author": "Jeff Dickey @jdxcode",
"bin": {
"heroku": "./bin/run"
},
"bin": "./bin/run",
"bugs": "https://github.com/heroku/cli/issues",
"dependencies": {
"@heroku-cli/color": "1.1.14",
Expand Down
3 changes: 2 additions & 1 deletion packages/local/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@
"mocha": "^5",
"nyc": "^15.1.0",
"ts-node": "^10",
"typescript": "3.3.3333"
"tslib": "^1.9.3",
"typescript": "3.7.5"
},
"engines": {
"node": ">=10.0.0"
Expand Down
Loading

0 comments on commit 0589573

Please sign in to comment.