Skip to content

Commit

Permalink
chore: migrate to Yarn v3
Browse files Browse the repository at this point in the history
  • Loading branch information
L2jLiga committed Oct 19, 2023
1 parent 3048e4d commit 0192439
Show file tree
Hide file tree
Showing 16 changed files with 7,992 additions and 4,831 deletions.
4 changes: 4 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,7 @@ package-lock.json text -diff merge=binary

# Husky
/.husky/* text eol=lf linguist-language=Shell

# Yarn Berry
/.yarn/releases/** binary
/.yarn/plugins/** binary
16 changes: 11 additions & 5 deletions .github/workflows/nodejs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,15 @@ jobs:
steps:
- name: Checkout branch
uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
- name: Install Yarn
run: corepack enable
- name: Setup NodeJS ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
cache: 'yarn'
- name: Install dependencies
run: yarn install --frozen-lockfile
run: yarn install --immutable
- name: Build projects
run: yarn build
- name: Run tests
Expand All @@ -62,12 +64,14 @@ jobs:
steps:
- name: Checkout branch
uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
- name: Install Yarn
run: corepack enable
- name: Setup NodeJS
uses: actions/setup-node@v3
with:
cache: 'yarn'
- name: Install dependencies
run: yarn install --frozen-lockfile
run: yarn install --immutable
- name: Check licenses
run: yarn license-checker
- name: Lint project
Expand All @@ -87,12 +91,14 @@ jobs:
uses: github/codeql-action/init@v2
with:
languages: javascript
- name: Install Yarn
run: corepack enable
- name: Setup NodeJS
uses: actions/setup-node@v3
with:
cache: 'yarn'
- name: Install dependencies
run: yarn install --frozen-lockfile
run: yarn install --immutable
- name: Build projects
run: yarn build
- name: Perform CodeQL Analysis
Expand Down
9 changes: 9 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,12 @@ node_modules
*.log
*.sarif
*.tsbuildinfo

# Yarn Berry
.pnp.*
.yarn/*
!.yarn/patches
!.yarn/plugins
!.yarn/releases
!.yarn/sdks
!.yarn/versions
28 changes: 28 additions & 0 deletions .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs

Large diffs are not rendered by default.

874 changes: 874 additions & 0 deletions .yarn/releases/yarn-3.6.4.cjs

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
nodeLinker: node-modules

plugins:
- path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
spec: '@yarnpkg/plugin-workspace-tools'

yarnPath: .yarn/releases/yarn-3.6.4.cjs
5 changes: 3 additions & 2 deletions examples/async-initializer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,15 @@
"test": "cross-env NODE_OPTIONS=\"--experimental-vm-modules --no-warnings\" jest"
},
"dependencies": {
"@fastify-decorators/simple-di": "^4.0.0-next.4",
"fastify": "^4.24.3",
"fastify-decorators": "^4.0.0-next.4",
"@fastify-decorators/simple-di": "^4.0.0-next.4"
"fastify-decorators": "^4.0.0-next.4"
},
"devDependencies": {
"@types/jest": "^29.5.6",
"@types/node": "~18.18.6",
"jest": "^29.7.0",
"jest-resolve": "^29.7.0",
"jest-ts-webcompat-resolver": "^1.0.0",
"ts-jest": "^29.1.1",
"typescript": "^5.2.2"
Expand Down
5 changes: 3 additions & 2 deletions examples/aws-lambda/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,18 @@
"test": "cross-env NODE_OPTIONS=\"--experimental-vm-modules --no-warnings\" jest"
},
"dependencies": {
"@fastify-decorators/simple-di": "^4.0.0-next.4",
"@fastify/aws-lambda": "^3.3.0",
"fastify": "^4.24.3",
"fastify-decorators": "^4.0.0-next.4",
"@fastify-decorators/simple-di": "^4.0.0-next.4"
"fastify-decorators": "^4.0.0-next.4"
},
"devDependencies": {
"@types/jest": "^29.5.6",
"@types/node": "~18.18.6",
"@vercel/ncc": "^0.38.0",
"cross-env": "^7.0.3",
"jest": "^29.7.0",
"jest-resolve": "^29.7.0",
"jest-ts-webcompat-resolver": "^1.0.0",
"ts-jest": "^29.1.1",
"tslib": "^2.6.2",
Expand Down
5 changes: 3 additions & 2 deletions examples/controllers/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,15 @@
"test": "cross-env NODE_OPTIONS=\"--experimental-vm-modules --no-warnings\" jest"
},
"dependencies": {
"@fastify-decorators/simple-di": "^4.0.0-next.4",
"fastify": "^4.24.3",
"fastify-decorators": "^4.0.0-next.4",
"@fastify-decorators/simple-di": "^4.0.0-next.4"
"fastify-decorators": "^4.0.0-next.4"
},
"devDependencies": {
"@types/jest": "^29.5.6",
"@types/node": "~18.18.6",
"jest": "^29.7.0",
"jest-resolve": "^29.7.0",
"jest-ts-webcompat-resolver": "^1.0.0",
"ts-jest": "^29.1.1",
"typescript": "^5.2.2",
Expand Down
5 changes: 3 additions & 2 deletions examples/injecting-requests-in-services/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,15 @@
"test": "cross-env NODE_OPTIONS=\"--experimental-vm-modules --no-warnings\" jest"
},
"dependencies": {
"@fastify-decorators/simple-di": "^4.0.0-next.4",
"fastify": "^4.24.3",
"fastify-decorators": "^4.0.0-next.4",
"@fastify-decorators/simple-di": "^4.0.0-next.4"
"fastify-decorators": "^4.0.0-next.4"
},
"devDependencies": {
"@types/jest": "^29.5.6",
"@types/node": "~18.18.6",
"jest": "^29.7.0",
"jest-resolve": "^29.7.0",
"jest-ts-webcompat-resolver": "^1.0.0",
"ts-jest": "^29.1.1",
"typescript": "^5.2.2"
Expand Down
1 change: 1 addition & 0 deletions examples/request-handlers/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
"@types/jest": "^29.5.6",
"@types/node": "~18.18.6",
"jest": "^29.7.0",
"jest-resolve": "^29.7.0",
"jest-ts-webcompat-resolver": "^1.0.0",
"ts-jest": "^29.1.1",
"typescript": "^5.2.2"
Expand Down
3 changes: 2 additions & 1 deletion examples/swagger/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
"test": "cross-env NODE_OPTIONS=\"--experimental-vm-modules --no-warnings\" jest"
},
"dependencies": {
"@fastify-decorators/simple-di": "^4.0.0-next.4",
"@fastify/swagger": "^8.12.0",
"@fastify/swagger-ui": "^1.10.1",
"@fastify-decorators/simple-di": "^4.0.0-next.4",
"@sinclair/typebox": "^0.31.17",
"fastify": "^4.24.3",
"fastify-decorators": "^4.0.0-next.4"
Expand All @@ -22,6 +22,7 @@
"@types/jest": "^29.5.6",
"@types/node": "~18.18.6",
"jest": "^29.7.0",
"jest-resolve": "^29.7.0",
"jest-ts-webcompat-resolver": "^1.0.0",
"ts-jest": "^29.1.1",
"typescript": "^5.2.2"
Expand Down
3 changes: 2 additions & 1 deletion examples/typedi/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,16 @@
"test": "cross-env NODE_OPTIONS=\"--experimental-vm-modules --no-warnings\" jest"
},
"dependencies": {
"@fastify-decorators/typedi": "^4.0.0-next.4",
"fastify": "^4.24.3",
"fastify-decorators": "^4.0.0-next.4",
"@fastify-decorators/typedi": "^4.0.0-next.4",
"typedi": "^0.10.0"
},
"devDependencies": {
"@types/jest": "^29.5.6",
"@types/node": "~18.18.6",
"jest": "^29.7.0",
"jest-resolve": "^29.7.0",
"jest-ts-webcompat-resolver": "^1.0.0",
"ts-jest": "^29.1.1",
"typescript": "^5.2.2"
Expand Down
3 changes: 2 additions & 1 deletion examples/typeorm/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,19 @@
"test": "cross-env NODE_OPTIONS=\"--experimental-vm-modules --no-warnings\" jest"
},
"dependencies": {
"@fastify-decorators/simple-di": "^4.0.0-next.4",
"@fastify/swagger": "^8.12.0",
"@fastify/swagger-ui": "^1.10.1",
"fastify": "^4.24.3",
"fastify-decorators": "^4.0.0-next.4",
"@fastify-decorators/simple-di": "^4.0.0-next.4",
"sqlite3": "^5.1.6",
"typeorm": "^0.3.17"
},
"devDependencies": {
"@types/jest": "^29.5.6",
"@types/node": "~18.18.6",
"jest": "^29.7.0",
"jest-resolve": "^29.7.0",
"jest-ts-webcompat-resolver": "^1.0.0",
"ts-jest": "^29.1.1",
"typescript": "^5.2.2"
Expand Down
7 changes: 4 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
"version": "1.0.0",
"private": true,
"scripts": {
"build": "yarn workspaces run build",
"build": "yarn workspaces foreach run build",
"lint": "eslint .",
"test": "yarn workspaces run test",
"test": "yarn workspaces foreach run test",
"license-checker": "license-checker --production --onlyAllow=\"MIT;ISC;BSD-3-Clause;BSD-2-Clause\" --excludePrivatePackages",
"prepare": "husky install"
},
Expand Down Expand Up @@ -66,5 +66,6 @@
"lib",
"plugins/*",
"examples/*"
]
],
"packageManager": "yarn@3.6.4"
}
Loading

0 comments on commit 0192439

Please sign in to comment.