Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(yarn): upgrade Yarn to v4 #1215

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ jobs:
node_modules
packages/*/node_modules
key: ${{ runner.os }}-modules-${{ hashFiles('yarn.lock') }}-${{ hashFiles('packages/*/package.json') }}
- name: Install & Bootstrap
run: yarn && yarn bootstrap --ci
- name: Install
run: yarn
- name: Build
run: yarn build
- uses: actions/cache/save@v3
Expand Down Expand Up @@ -162,12 +162,12 @@ jobs:
runs-on: ubuntu-latest
needs: [build-api-reference, send-coverage, lint]
if: |
github.event_name == 'push'
github.event_name == 'push'
&& (
github.ref == 'refs/heads/main'
|| github.ref == 'refs/heads/beta'
|| github.ref == 'refs/heads/alpha'
|| startsWith(github.ref, 'refs/heads/alpha-')
github.ref == 'refs/heads/main'
|| github.ref == 'refs/heads/beta'
|| github.ref == 'refs/heads/alpha'
|| startsWith(github.ref, 'refs/heads/alpha-')
|| startsWith(github.ref, 'refs/heads/beta-')
)
steps:
Expand Down Expand Up @@ -218,7 +218,7 @@ jobs:
environment:
name: github-pages
url: ${{ steps.deployment.outputs.page_url }}
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
needs: [build-api-reference, send-coverage, lint]
steps:
- name: Setup Pages
Expand Down
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,9 @@ lerna-debug.log
# yarn
yarn-error.log
.vscode/settings.json
.yarn/*
!.yarn/patches
!.yarn/plugins
!.yarn/releases
!.yarn/sdks
!.yarn/versions
934 changes: 934 additions & 0 deletions .yarn/releases/yarn-4.5.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 @@
nodeLinker: node-modules

yarnPath: .yarn/releases/yarn-4.5.2.cjs
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ This project has been designed with scalability in mind to fit requirements from
## Installation

```
yarn install && yarn bootstrap
yarn install
```

## Who Uses Forest Admin
Expand Down
3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "root",
"private": true,
"packageManager": "yarn@1.22.19",
"packageManager": "yarn@4.5.2",
"devDependencies": {
"@commitlint/cli": "^17.4.2",
"@commitlint/config-conventional": "^17.4.2",
Expand Down Expand Up @@ -37,7 +37,6 @@
"typescript": "^4.9.4"
},
"scripts": {
"bootstrap": "lerna bootstrap",
"build:watch": "lerna run --parallel --no-bail --no-prefix build:watch",
"build": "lerna run build",
"clean": "lerna run clean && rm -rf coverage api-reference/",
Expand Down
3 changes: 1 addition & 2 deletions packages/datasource-mongo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,5 @@
"clean": "rm -rf coverage dist",
"lint": "eslint src test",
"test": "jest"
},
"devDependencies": {}
}
}
4 changes: 2 additions & 2 deletions packages/datasource-sql/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
"dependencies": {
"@forestadmin/datasource-sequelize": "1.10.5",
"@forestadmin/datasource-toolkit": "1.43.0",
"@types/ssh2": "^1.11.11",
"pluralize": "^8.0.0",
"sequelize": "^6.37.5",
"socks": "^2.7.1",
"ssh2": "^1.14.0",
"@types/ssh2": "^1.11.11"
"ssh2": "^1.14.0"
},
"files": [
"dist/**/*.js",
Expand Down
4 changes: 1 addition & 3 deletions packages/forest-cloud/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,7 @@
"url": "git+https://github.com/ForestAdmin/agent-nodejs.git",
"directory": "packages/forest-cloud"
},
"bin": {
"forest-cloud": "dist/command.js"
},
"bin": "dist/command.js",
"scripts": {
"build": "tsc && yarn build:copy",
"build:watch": "tsc --watch & nodemon --watch 'src/templates/*' --ext txt --exec yarn build:copy",
Expand Down
Loading
Loading