cpvalente/ontime
1
0
Fork 0
mirror of https://github.com/cpvalente/ontime.git synced 2026-07-26 10:38:55 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

Merge pull request #1146 from cpvalente/chore/pnpm-catalogs

Browse Source 
convert shared dependencies to pnpm catalog
This commit is contained in:
Joel Wetzell
2024-07-17 22:23:47 -05:00
committed by GitHub
parent a53a1f87be a79fb4ecbb
commit dee6a67018
9 changed files with 113 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/cli/package.json
+3 -3
View File
@@ -20,8 +20,8 @@
"server"
],
"devDependencies": {
"eslint": "^8.53.0",
"eslint-config-prettier": "^9.0.0",
"prettier": "^3.0.3"
"eslint": "catalog:",
"eslint-config-prettier": "catalog:",
"prettier": "catalog:"
}
}
apps/client/package.json
+7 -7
View File
@@ -69,13 +69,13 @@
"@types/react": "^18.0.26",
"@types/react-dom": "^18.0.10",
"@types/testing-library__jest-dom": "^5.14.5",
"@typescript-eslint/eslint-plugin": "^v7.16.1",
"@typescript-eslint/parser": "^7.16.1",
"@typescript-eslint/eslint-plugin": "catalog:",
"@typescript-eslint/parser": "catalog:",
"@vitejs/plugin-react": "^4.2.1",
"eslint": "^8.56.0",
"eslint-config-prettier": "^9.1.0",
"eslint": "catalog:",
"eslint-config-prettier": "catalog:",
"eslint-plugin-jest": "^28.6.0",
"eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-prettier": "catalog:",
"eslint-plugin-react": "^7.32.0",
"eslint-plugin-react-hooks": "^4.6.0",
"eslint-plugin-simple-import-sort": "^8.0.0",
@@ -83,9 +83,9 @@
"jsdom": "^21.1.0",
"ontime-types": "workspace:*",
"ontime-utils": "workspace:*",
"prettier": "^3.3.1",
"prettier": "catalog:",
"sass": "^1.57.1",
"typescript": "^5.5.3",
"typescript": "catalog:",
"vite": "^5.2.11",
"vite-plugin-compression2": "^0.12.0",
"vite-plugin-svgr": "^4.2.0",
apps/electron/package.json
+3 -3
View File
@@ -14,9 +14,9 @@
"devDependencies": {
"electron": "^31.2.0",
"electron-builder": "^24.13.3",
"eslint": "^8.56.0",
"eslint-config-prettier": "^9.1.0",
"prettier": "^3.0.3",
"eslint": "catalog:",
"eslint-config-prettier": "catalog:",
"prettier": "catalog:",
"wait-on": "^7.2.0"
},
"scripts": {
apps/server/package.json
+7 -7
View File
@@ -27,22 +27,22 @@
"@types/cors": "^2.8.17",
"@types/express": "^4.17.17",
"@types/multer": "^1.4.11",
"@types/node": "^20.14.10",
"@types/node": "catalog:",
"@types/node-osc": "^6.0.2",
"@types/websocket": "^1.0.5",
"@types/ws": "^8.5.10",
"@typescript-eslint/eslint-plugin": "^v7.16.1",
"@typescript-eslint/parser": "^7.16.1",
"@typescript-eslint/eslint-plugin": "catalog:",
"@typescript-eslint/parser": "catalog:",
"esbuild": "^0.19.10",
"eslint": "^8.56.0",
"eslint-plugin-prettier": "^5.1.3",
"eslint": "catalog:",
"eslint-plugin-prettier": "catalog:",
"ontime-types": "workspace:*",
"prettier": "^3.3.1",
"prettier": "catalog:",
"server-timing": "^3.3.3",
"shx": "^0.3.4",
"ts-essentials": "^9.4.1",
"tsx": "^4.16.2",
"typescript": "^5.5.3",
"typescript": "catalog:",
"vitest": "^1.6.0"
},
"scripts": {
package.json
+7 -7
View File
@@ -39,16 +39,16 @@
},
"devDependencies": {
"@playwright/test": "^1.42.1",
"@types/node": "^20.14.10",
"@typescript-eslint/eslint-plugin": "^v7.16.1",
"@typescript-eslint/parser": "^7.16.1",
"@types/node": "catalog:",
"@typescript-eslint/eslint-plugin": "catalog:",
"@typescript-eslint/parser": "catalog:",
"cross-env": "^7.0.3",
"eslint": "^8.56.0",
"eslint-config-prettier": "^9.1.0",
"eslint": "catalog:",
"eslint-config-prettier": "catalog:",
"eslint-plugin-playwright": "^1.5.2",
"husky": "^8.0.3",
"prettier": "^3.3.1",
"prettier": "catalog:",
"turbo": "^1.11.2",
"typescript": "^5.5.3"
"typescript": "catalog:"
}
}
packages/types/package.json
+4 -4
View File
@@ -13,9 +13,9 @@
"author": "",
"license": "ISC",
"devDependencies": {
"@typescript-eslint/eslint-plugin": "^v7.16.1",
"@typescript-eslint/parser": "^7.16.1",
"eslint": "^8.56.0",
"typescript": "^5.5.3"
"@typescript-eslint/eslint-plugin": "catalog:",
"@typescript-eslint/parser": "catalog:",
"eslint": "catalog:",
"typescript": "catalog:"
}
}
packages/utils/package.json
+7 -7
View File
@@ -15,15 +15,15 @@
"nanoid": "^5.0.7"
},
"devDependencies": {
"@typescript-eslint/eslint-plugin": "^v7.16.1",
"@typescript-eslint/parser": "^7.16.1",
"eslint": "^8.56.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-prettier": "^5.1.3",
"@typescript-eslint/eslint-plugin": "catalog:",
"@typescript-eslint/parser": "catalog:",
"eslint": "catalog:",
"eslint-config-prettier": "catalog:",
"eslint-plugin-prettier": "catalog:",
"eslint-plugin-simple-import-sort": "^8.0.0",
"ontime-types": "workspace:*",
"prettier": "^3.3.1",
"typescript": "^5.5.3",
"prettier": "catalog:",
"typescript": "catalog:",
"vitest": "^1.6.0"
},
"sideEffects": false
pnpm-lock.yaml
Generated
+66 -46
View File
@@ -4,6 +4,33 @@ settings:
autoInstallPeers: true
excludeLinksFromLockfile: false
catalogs:
default:
'@types/node':
specifier: 20.14.10
version: 20.14.10
'@typescript-eslint/eslint-plugin':
specifier: 7.16.1
version: 7.16.1
'@typescript-eslint/parser':
specifier: 7.16.1
version: 7.16.1
eslint:
specifier: 8.56.0
version: 8.56.0
eslint-config-prettier:
specifier: 9.1.0
version: 9.1.0
eslint-plugin-prettier:
specifier: 5.1.3
version: 5.1.3
prettier:
specifier: 3.3.1
version: 3.3.1
typescript:
specifier: 5.5.3
version: 5.5.3
importers:
.:
@@ -12,22 +39,22 @@ importers:
specifier: ^1.42.1
version: 1.42.1
'@types/node':
specifier: ^20.14.10
specifier: 'catalog:'
version: 20.14.10
'@typescript-eslint/eslint-plugin':
specifier: ^v7.16.1
specifier: 'catalog:'
version: 7.16.1(@typescript-eslint/parser@7.16.1(eslint@8.56.0)(typescript@5.5.3))(eslint@8.56.0)(typescript@5.5.3)
'@typescript-eslint/parser':
specifier: ^7.16.1
specifier: 'catalog:'
version: 7.16.1(eslint@8.56.0)(typescript@5.5.3)
cross-env:
specifier: ^7.0.3
version: 7.0.3
eslint:
specifier: ^8.56.0
specifier: 'catalog:'
version: 8.56.0
eslint-config-prettier:
specifier: ^9.1.0
specifier: 'catalog:'
version: 9.1.0(eslint@8.56.0)
eslint-plugin-playwright:
specifier: ^1.5.2
@@ -36,25 +63,25 @@ importers:
specifier: ^8.0.3
version: 8.0.3
prettier:
specifier: ^3.3.1
specifier: 'catalog:'
version: 3.3.1
turbo:
specifier: ^1.11.2
version: 1.11.2
typescript:
specifier: ^5.5.3
specifier: 'catalog:'
version: 5.5.3
apps/cli:
devDependencies:
eslint:
specifier: ^8.53.0
specifier: 'catalog:'
version: 8.56.0
eslint-config-prettier:
specifier: ^9.0.0
specifier: 'catalog:'
version: 9.1.0(eslint@8.56.0)
prettier:
specifier: ^3.0.3
specifier: 'catalog:'
version: 3.3.1
apps/client:
@@ -169,25 +196,25 @@ importers:
specifier: ^5.14.5
version: 5.14.5
'@typescript-eslint/eslint-plugin':
specifier: ^v7.16.1
specifier: 'catalog:'
version: 7.16.1(@typescript-eslint/parser@7.16.1(eslint@8.56.0)(typescript@5.5.3))(eslint@8.56.0)(typescript@5.5.3)
'@typescript-eslint/parser':
specifier: ^7.16.1
specifier: 'catalog:'
version: 7.16.1(eslint@8.56.0)(typescript@5.5.3)
'@vitejs/plugin-react':
specifier: ^4.2.1
version: 4.2.1(vite@5.2.11(@types/node@20.14.10)(sass@1.57.1))
eslint:
specifier: ^8.56.0
specifier: 'catalog:'
version: 8.56.0
eslint-config-prettier:
specifier: ^9.1.0
specifier: 'catalog:'
version: 9.1.0(eslint@8.56.0)
eslint-plugin-jest:
specifier: ^28.6.0
version: 28.6.0(@typescript-eslint/eslint-plugin@7.16.1(@typescript-eslint/parser@7.16.1(eslint@8.56.0)(typescript@5.5.3))(eslint@8.56.0)(typescript@5.5.3))(eslint@8.56.0)(typescript@5.5.3)
eslint-plugin-prettier:
specifier: ^5.1.3
specifier: 'catalog:'
version: 5.1.3(eslint-config-prettier@9.1.0(eslint@8.56.0))(eslint@8.56.0)(prettier@3.3.1)
eslint-plugin-react:
specifier: ^7.32.0
@@ -211,13 +238,13 @@ importers:
specifier: workspace:*
version: link:../../packages/utils
prettier:
specifier: ^3.3.1
specifier: 'catalog:'
version: 3.3.1
sass:
specifier: ^1.57.1
version: 1.57.1
typescript:
specifier: ^5.5.3
specifier: 'catalog:'
version: 5.5.3
vite:
specifier: ^5.2.11
@@ -244,14 +271,14 @@ importers:
specifier: ^24.13.3
version: 24.13.3(electron-builder-squirrel-windows@24.13.3(dmg-builder@24.13.3))
eslint:
specifier: ^8.56.0
specifier: 'catalog:'
version: 8.56.0
eslint-config-prettier:
specifier: ^9.1.0
specifier: 'catalog:'
version: 9.1.0(eslint@8.56.0)
prettier:
specifier: ^3.0.3
version: 3.0.3
specifier: 'catalog:'
version: 3.3.1
wait-on:
specifier: ^7.2.0
version: 7.2.0
@@ -320,7 +347,7 @@ importers:
specifier: ^1.4.11
version: 1.4.11
'@types/node':
specifier: ^20.14.10
specifier: 'catalog:'
version: 20.14.10
'@types/node-osc':
specifier: ^6.0.2
@@ -332,25 +359,25 @@ importers:
specifier: ^8.5.10
version: 8.5.10
'@typescript-eslint/eslint-plugin':
specifier: ^v7.16.1
specifier: 'catalog:'
version: 7.16.1(@typescript-eslint/parser@7.16.1(eslint@8.56.0)(typescript@5.5.3))(eslint@8.56.0)(typescript@5.5.3)
'@typescript-eslint/parser':
specifier: ^7.16.1
specifier: 'catalog:'
version: 7.16.1(eslint@8.56.0)(typescript@5.5.3)
esbuild:
specifier: ^0.19.10
version: 0.19.10
eslint:
specifier: ^8.56.0
specifier: 'catalog:'
version: 8.56.0
eslint-plugin-prettier:
specifier: ^5.1.3
specifier: 'catalog:'
version: 5.1.3(eslint-config-prettier@9.1.0(eslint@8.56.0))(eslint@8.56.0)(prettier@3.3.1)
ontime-types:
specifier: workspace:*
version: link:../../packages/types
prettier:
specifier: ^3.3.1
specifier: 'catalog:'
version: 3.3.1
server-timing:
specifier: ^3.3.3
@@ -365,7 +392,7 @@ importers:
specifier: ^4.16.2
version: 4.16.2
typescript:
specifier: ^5.5.3
specifier: 'catalog:'
version: 5.5.3
vitest:
specifier: ^1.6.0
@@ -374,16 +401,16 @@ importers:
packages/types:
devDependencies:
'@typescript-eslint/eslint-plugin':
specifier: ^v7.16.1
specifier: 'catalog:'
version: 7.16.1(@typescript-eslint/parser@7.16.1(eslint@8.56.0)(typescript@5.5.3))(eslint@8.56.0)(typescript@5.5.3)
'@typescript-eslint/parser':
specifier: ^7.16.1
specifier: 'catalog:'
version: 7.16.1(eslint@8.56.0)(typescript@5.5.3)
eslint:
specifier: ^8.56.0
specifier: 'catalog:'
version: 8.56.0
typescript:
specifier: ^5.5.3
specifier: 'catalog:'
version: 5.5.3
packages/utils:
@@ -396,19 +423,19 @@ importers:
version: 5.0.7
devDependencies:
'@typescript-eslint/eslint-plugin':
specifier: ^v7.16.1
specifier: 'catalog:'
version: 7.16.1(@typescript-eslint/parser@7.16.1(eslint@8.56.0)(typescript@5.5.3))(eslint@8.56.0)(typescript@5.5.3)
'@typescript-eslint/parser':
specifier: ^7.16.1
specifier: 'catalog:'
version: 7.16.1(eslint@8.56.0)(typescript@5.5.3)
eslint:
specifier: ^8.56.0
specifier: 'catalog:'
version: 8.56.0
eslint-config-prettier:
specifier: ^9.1.0
specifier: 'catalog:'
version: 9.1.0(eslint@8.56.0)
eslint-plugin-prettier:
specifier: ^5.1.3
specifier: 'catalog:'
version: 5.1.3(eslint-config-prettier@9.1.0(eslint@8.56.0))(eslint@8.56.0)(prettier@3.3.1)
eslint-plugin-simple-import-sort:
specifier: ^8.0.0
@@ -417,10 +444,10 @@ importers:
specifier: workspace:*
version: link:../types
prettier:
specifier: ^3.3.1
specifier: 'catalog:'
version: 3.3.1
typescript:
specifier: ^5.5.3
specifier: 'catalog:'
version: 5.5.3
vitest:
specifier: ^1.6.0
@@ -4384,11 +4411,6 @@ packages:
resolution: {integrity: sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==}
engines: {node: '>=6.0.0'}
prettier@3.0.3:
resolution: {integrity: sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg==}
engines: {node: '>=14'}
hasBin: true
prettier@3.3.1:
resolution: {integrity: sha512-7CAwy5dRsxs8PHXT3twixW9/OEll8MLE0VRPCJyl7CkS6VHGPSlsVaWTiASPTyGyYRyApxlaWTzwUxVNrhcwDg==}
engines: {node: '>=14'}
@@ -9975,8 +9997,6 @@ snapshots:
dependencies:
fast-diff: 1.3.0
prettier@3.0.3: {}
prettier@3.3.1: {}
pretty-format@27.5.1:
pnpm-workspace.yaml
+9
View File
@@ -2,3 +2,12 @@
packages:
- "apps/*"
- "packages/*"
catalog:
typescript: 5.5.3
"@typescript-eslint/eslint-plugin": 7.16.1
"@typescript-eslint/parser": 7.16.1
"@types/node": 20.14.10
prettier: 3.3.1
eslint: 8.56.0
eslint-config-prettier: 9.1.0
eslint-plugin-prettier: 5.1.3