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

Update syncpack configs, adopt pnpm, add react-router template config #193

Merged
merged 2 commits into from
Feb 3, 2025
Merged
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
7 changes: 5 additions & 2 deletions .github/workflows/branches.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,12 @@ jobs:
cancel-in-progress: true
steps:
- uses: actions/checkout@v4
- name: Install pnpm
uses: pnpm/action-setup@v4
- name: Use Node.js
uses: actions/setup-node@v4
with:
node-version: "20.x"
- run: npm ci
- run: npm run check:ci
cache: "pnpm"
- run: pnpm install --frozen-lockfile
- run: pnpm -w check:ci
13 changes: 8 additions & 5 deletions .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,17 @@ jobs:
TEMPLATES_API_CLIENT_SECRET: ${{ secrets.TEMPLATES_API_CLIENT_SECRET }}
steps:
- uses: actions/checkout@v4
- name: Install pnpm
uses: pnpm/action-setup@v4
- name: Use Node.js
uses: actions/setup-node@v4
with:
node-version: "20.x"
- run: npm ci
- run: npm run check:ci
- run: npm run deploy
cache: "pnpm"
- run: pnpm install --frozen-lockfile
- run: pnpm -w check:ci
- run: pnpm run deploy
# Upload to both staging and production, so our staging catalog stays up
# to date with production.
- run: npm run upload -- --staging
- run: npm run upload
- run: pnpm run upload -- --staging
- run: pnpm run upload
37 changes: 37 additions & 0 deletions .syncpackrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,43 @@
"packages": ["next-starter-template"],
"dependencies": ["eslint"],
"pinVersion": "8.56.0"
},
{
"label": "Allow vite 5 for Remix templates",
"packages": ["remix-starter-template", "to-do-list-kv-template"],
"dependencies": ["vite"],
"pinVersion": "5.4.14"
},
{
"label": "Allow React 19 for specific templates",
"packages": [
"react-router-starter-template",
"saas-admin-starter-template"
],
"dependencies": [
"react",
"react-dom",
"@types/react",
"@types/react-dom"
],
"range": "^19.0.0"
},
{
"label": "Keep React 18 for other templates",
"packages": [
"durable-chat-template",
"multiplayer-globe-template",
"next-starter-template",
"remix-starter-template",
"to-do-list-kv-template"
],
"dependencies": [
"react",
"react-dom",
"@types/react",
"@types/react-dom"
],
"range": "^18.0.0"
}
]
}
2 changes: 1 addition & 1 deletion astro-blog-starter-template/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
},
"devDependencies": {
"@cloudflare/workers-types": "4.20250129.0",
"wrangler": "3.100.0"
"wrangler": "3.107.2"
},
"scripts": {
"astro": "astro",
Expand Down
2 changes: 1 addition & 1 deletion cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
},
"devDependencies": {
"@types/node": "22.9.1",
"typescript": "5.6.3"
"typescript": "5.7.2"
},
"scripts": {
"check": "tsc"
Expand Down
4 changes: 2 additions & 2 deletions d1-template/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
},
"devDependencies": {
"@cloudflare/workers-types": "4.20250129.0",
"typescript": "5.6.3",
"wrangler": "3.100.0"
"typescript": "5.7.2",
"wrangler": "3.107.2"
},
"scripts": {
"check": "tsc && wrangler --experimental-json-config deploy --dry-run",
Expand Down
6 changes: 3 additions & 3 deletions durable-chat-template/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@
"partysocket": "1.0.2",
"react": "18.3.1",
"react-dom": "18.3.1",
"react-router": "7.0.2"
"react-router": "7.1.3"
},
"devDependencies": {
"@cloudflare/workers-types": "4.20250129.0",
"@types/react": "18.3.12",
"@types/react-dom": "18.3.1",
"esbuild": "0.24.0",
"typescript": "5.6.3",
"wrangler": "3.100.0"
"typescript": "5.7.2",
"wrangler": "3.107.2"
},
"scripts": {
"check": "tsc --project src/client && tsc --project src/server && wrangler --experimental-json-config deploy --dry-run",
Expand Down
4 changes: 2 additions & 2 deletions multiplayer-globe-template/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
"@types/react": "18.3.12",
"@types/react-dom": "18.3.1",
"esbuild": "0.24.0",
"typescript": "5.6.3",
"wrangler": "3.100.0"
"typescript": "5.7.2",
"wrangler": "3.107.2"
},
"scripts": {
"check": "tsc --project src/client && tsc --project src/server && wrangler --experimental-json-config deploy --dry-run",
Expand Down
10 changes: 5 additions & 5 deletions next-starter-template/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"preview_image_url": "https://imagedelivery.net/wSMYJvS3Xw-n339CbDyDIA/e42eec61-db86-49c8-7b29-c3ed4783e400/public"
},
"dependencies": {
"next": "14.2.5",
"next": "14.2.23",
"react": "18.3.1",
"react-dom": "18.3.1"
},
Expand All @@ -25,10 +25,10 @@
"@types/react-dom": "18.3.1",
"eslint": "8.56.0",
"eslint-config-next": "14.2.5",
"postcss": "8.4.38",
"tailwindcss": "3.4.4",
"typescript": "5.6.3",
"wrangler": "3.100.0"
"postcss": "8.4.49",
"tailwindcss": "3.4.17",
"typescript": "5.7.2",
"wrangler": "3.107.2"
},
"scripts": {
"build": "next build",
Expand Down
4 changes: 2 additions & 2 deletions openauth-template/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
},
"devDependencies": {
"@cloudflare/workers-types": "4.20250129.0",
"typescript": "5.6.3",
"wrangler": "3.100.0"
"typescript": "5.7.2",
"wrangler": "3.107.2"
},
"scripts": {
"check": "tsc && wrangler --experimental-json-config deploy --dry-run",
Expand Down
Loading