From ef608c3d00e55b5d5eb7a00db35afe0fb42f0bd3 Mon Sep 17 00:00:00 2001 From: Victor Berchet Date: Fri, 20 Sep 2024 09:39:17 +0200 Subject: [PATCH] Use catalog versions for the examples --- examples/api/package.json | 12 ++-- examples/create-next-app/package.json | 22 +++---- pnpm-lock.yaml | 90 +++++++++++++++++---------- 3 files changed, 74 insertions(+), 50 deletions(-) diff --git a/examples/api/package.json b/examples/api/package.json index 9480cd53..4fd7c7e1 100644 --- a/examples/api/package.json +++ b/examples/api/package.json @@ -13,14 +13,14 @@ "e2e": "playwright test" }, "dependencies": { - "next": "14.2.5", - "react": "^18", - "react-dom": "^18" + "next": "catalog:", + "react": "catalog:", + "react-dom": "catalog:" }, "devDependencies": { "@flarelabs-net/builder": "workspace:*", - "@playwright/test": "1.47.0", - "@types/node": "^22.2.0", - "wrangler": "3.78.6" + "@playwright/test": "catalog:", + "@types/node": "catalog:", + "wrangler": "catalog:" } } diff --git a/examples/create-next-app/package.json b/examples/create-next-app/package.json index 9f4bf2e7..fde85c8f 100644 --- a/examples/create-next-app/package.json +++ b/examples/create-next-app/package.json @@ -13,21 +13,21 @@ "e2e": "playwright test -c e2e/playwright.config.ts" }, "dependencies": { - "react": "^18", - "react-dom": "^18", - "next": "14.2.11" + "react": "catalog:", + "react-dom": "catalog:", + "next": "catalog:" }, "devDependencies": { "@flarelabs-net/builder": "workspace:*", - "@playwright/test": "1.47.0", - "@types/node": "^20", - "@types/react": "^18", - "@types/react-dom": "^18", - "eslint": "^8", - "eslint-config-next": "14.2.11", + "@playwright/test": "catalog:", + "@types/node": "catalog:", + "@types/react": "catalog:", + "@types/react-dom": "catalog:", + "eslint": "catalog:", + "eslint-config-next": "catalog:", "postcss": "^8", "tailwindcss": "^3.4.1", - "typescript": "^5", - "wrangler": "^3.78.6" + "typescript": "catalog:", + "wrangler": "catalog:" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 98ea4714..1618718f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -4,6 +4,42 @@ settings: autoInstallPeers: true excludeLinksFromLockfile: false +catalogs: + default: + '@playwright/test': + specifier: 1.47.0 + version: 1.47.0 + '@types/node': + specifier: ^22.2.0 + version: 22.2.0 + '@types/react': + specifier: ^18 + version: 18.3.5 + '@types/react-dom': + specifier: ^18 + version: 18.3.0 + eslint: + specifier: ^8 + version: 8.57.0 + eslint-config-next: + specifier: 14.2.11 + version: 14.2.11 + next: + specifier: 14.2.11 + version: 14.2.11 + react: + specifier: ^18 + version: 18.3.1 + react-dom: + specifier: ^18 + version: 18.3.1 + typescript: + specifier: ^5.5.4 + version: 5.5.4 + wrangler: + specifier: ^3.78.6 + version: 3.78.6 + importers: .: @@ -42,60 +78,60 @@ importers: examples/api: dependencies: next: - specifier: 14.2.5 - version: 14.2.5(@playwright/test@1.47.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + specifier: 'catalog:' + version: 14.2.11(@playwright/test@1.47.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) react: - specifier: ^18 + specifier: 'catalog:' version: 18.3.1 react-dom: - specifier: ^18 + specifier: 'catalog:' version: 18.3.1(react@18.3.1) devDependencies: '@flarelabs-net/builder': specifier: workspace:* version: link:../../builder '@playwright/test': - specifier: 1.47.0 + specifier: 'catalog:' version: 1.47.0 '@types/node': - specifier: ^22.2.0 + specifier: 'catalog:' version: 22.2.0 wrangler: - specifier: 3.78.6 + specifier: 'catalog:' version: 3.78.6(@cloudflare/workers-types@4.20240909.0) examples/create-next-app: dependencies: next: - specifier: 14.2.11 + specifier: 'catalog:' version: 14.2.11(@playwright/test@1.47.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) react: - specifier: ^18 + specifier: 'catalog:' version: 18.3.1 react-dom: - specifier: ^18 + specifier: 'catalog:' version: 18.3.1(react@18.3.1) devDependencies: '@flarelabs-net/builder': specifier: workspace:* version: link:../../builder '@playwright/test': - specifier: 1.47.0 + specifier: 'catalog:' version: 1.47.0 '@types/node': - specifier: ^20 - version: 20.16.5 + specifier: 'catalog:' + version: 22.2.0 '@types/react': - specifier: ^18 + specifier: 'catalog:' version: 18.3.5 '@types/react-dom': - specifier: ^18 + specifier: 'catalog:' version: 18.3.0 eslint: - specifier: ^8 + specifier: 'catalog:' version: 8.57.0 eslint-config-next: - specifier: 14.2.11 + specifier: 'catalog:' version: 14.2.11(eslint@8.57.0)(typescript@5.5.4) postcss: specifier: ^8 @@ -104,10 +140,10 @@ importers: specifier: ^3.4.1 version: 3.4.11 typescript: - specifier: ^5 + specifier: 'catalog:' version: 5.5.4 wrangler: - specifier: ^3.78.6 + specifier: 'catalog:' version: 3.78.6(@cloudflare/workers-types@4.20240909.0) packages: @@ -753,9 +789,6 @@ packages: '@types/node-forge@1.3.11': resolution: {integrity: sha512-FQx220y22OKNTqaByeBGqHWYz4cl94tpcxeFdvBo3wjG6XPBuZ0BNgNZRV5J5TFmmcsJ4IzsLkmGRiQbnYsBEQ==} - '@types/node@20.16.5': - resolution: {integrity: sha512-VwYCweNo3ERajwy0IUlqqcyZ8/A7Zwa9ZP3MnENWcB11AejO+tLy3pu850goUW2FC/IJMdZUfKpX/yxL1gymCA==} - '@types/node@22.2.0': resolution: {integrity: sha512-bm6EG6/pCpkxDf/0gDNDdtDILMOHgaQBVOJGdwsqClnxA3xL6jtMv76rLBc006RVMWbmaf0xbmom4Z/5o2nRkQ==} @@ -2370,9 +2403,6 @@ packages: undici-types@6.13.0: resolution: {integrity: sha512-xtFJHudx8S2DSoujjMd1WeWvn7KKWFRESZTMeL1RptAYERu29D6jphMjjY+vn96jvN3kVPDNxU/E13VTaXj6jg==} - undici-types@6.19.8: - resolution: {integrity: sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==} - undici@5.28.4: resolution: {integrity: sha512-72RFADWFqKmUb2hmmvNODKL3p9hcB6Gt2DOQMis1SEBaV6a4MH8soBvzg+95CYhCKPFedut2JY9bMfrDl9D23g==} engines: {node: '>=14.0'} @@ -2874,10 +2904,6 @@ snapshots: dependencies: '@types/node': 22.2.0 - '@types/node@20.16.5': - dependencies: - undici-types: 6.19.8 - '@types/node@22.2.0': dependencies: undici-types: 6.13.0 @@ -3477,7 +3503,7 @@ snapshots: eslint-import-resolver-node@0.3.9: dependencies: debug: 3.2.7 - is-core-module: 2.15.0 + is-core-module: 2.15.1 resolve: 1.22.8 transitivePeerDependencies: - supports-color @@ -4451,7 +4477,7 @@ snapshots: resolve@2.0.0-next.5: dependencies: - is-core-module: 2.15.0 + is-core-module: 2.15.1 path-parse: 1.0.7 supports-preserve-symlinks-flag: 1.0.0 @@ -4826,8 +4852,6 @@ snapshots: undici-types@6.13.0: {} - undici-types@6.19.8: {} - undici@5.28.4: dependencies: '@fastify/busboy': 2.1.1