Skip to content

Commit 69e3f7a

Browse files
authored
Merge pull request #1845 from yamcodes/dev
Sync `dev` → `main`
2 parents d164500 + fbe714f commit 69e3f7a

11 files changed

Lines changed: 288 additions & 256 deletions

File tree

.github/renovate.json

Lines changed: 35 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"ignorePaths": ["**/node_modules/**"],
55
"schedule": ["on friday"],
66
"vulnerabilityAlerts": {
7-
"enabled": true
7+
"enabled": true,
88
},
99
"osvVulnerabilityAlerts": true,
1010
"updateInternalDeps": true,
@@ -13,7 +13,7 @@
1313
"enabled": true,
1414
"schedule": ["* 10 * * 5"], // Every Friday at 10:00 AM
1515
"automerge": true,
16-
"automergeType": "pr"
16+
"automergeType": "pr",
1717
},
1818
"automerge": false,
1919
"automergeType": "pr",
@@ -24,35 +24,55 @@
2424
// Do not edit peer dependency ranges in package manifests.
2525
{
2626
"matchDepTypes": ["peerDependencies"],
27-
"enabled": false
27+
"enabled": false,
2828
},
2929

3030
// By SemVer
3131
{
3232
"matchUpdateTypes": ["patch"],
33-
"minimumReleaseAge": "2 days"
33+
"minimumReleaseAge": "2 days",
3434
},
3535
{
3636
"matchUpdateTypes": ["minor"],
37-
"minimumReleaseAge": "7 days"
37+
"minimumReleaseAge": "7 days",
3838
},
3939
{
4040
"matchUpdateTypes": ["major"],
41-
"minimumReleaseAge": "14 days"
41+
"minimumReleaseAge": "14 days",
4242
},
4343
// By Package Type (App or Package)
4444
{
4545
// Note: Do not include examples in this group,
4646
// they are supposed to be able to run independently
4747
// and its conventions.
4848
"matchFileNames": ["apps/**"],
49-
"extends": ["config:js-app"]
49+
"extends": ["config:js-app"],
5050
},
5151
{
5252
"matchFileNames": ["packages/**", "tooling/**"],
53-
"extends": ["config:js-lib"]
53+
"extends": ["config:js-lib"],
5454
},
5555
// By Package Manager
56+
{
57+
// Generated from apps/playgrounds/*/package.json arkenvExamples metadata.
58+
// Hand-maintained examples, including StackBlitz, remain Renovate-managed.
59+
"description": "Disable sync-generated example apps",
60+
"matchFileNames": [
61+
// BEGIN GENERATED SYNC EXAMPLES
62+
"examples/basic/**",
63+
"examples/basic-js/**",
64+
"examples/with-bun/**",
65+
"examples/with-bun-react/**",
66+
"examples/with-nextjs/**",
67+
"examples/with-nextjs-strict/**",
68+
"examples/with-nuxt/**",
69+
"examples/with-solid-start/**",
70+
"examples/with-standard-schema/**",
71+
"examples/with-vite-react/**",
72+
// END GENERATED SYNC EXAMPLES
73+
],
74+
"enabled": false,
75+
},
5676
{
5777
// Group pnpm workspace updates (minor/patch) across selected dirs
5878
"groupName": "the pnpm group",
@@ -64,58 +84,39 @@
6484
"package.json", // Root package.json,
6585
"pnpm-workspace.yaml", // Catalog
6686
"examples/with-zod/**", // Hand-maintained (not sync-generated)
67-
"examples/with-valibot/**" // Hand-maintained (not sync-generated)
87+
"examples/with-valibot/**", // Hand-maintained (not sync-generated)
6888
],
6989
"matchUpdateTypes": ["minor", "patch"],
7090
"matchCurrentVersion": ">=1.0.0",
7191
"automerge": true,
72-
"automergeType": "pr"
92+
"automergeType": "pr",
7393
},
7494
{
7595
"groupName": "the Bun group",
7696
"matchManagers": ["bun"],
7797
"matchFileNames": [
7898
".github/actions/size-limit/package.json", // Bun script
7999
"apps/playgrounds/**/*bun*/**",
80-
"examples/**/*bun*/**"
100+
"examples/**/*bun*/**",
81101
],
82102
"matchUpdateTypes": ["minor", "patch"],
83103
"matchCurrentVersion": ">=1.0.0",
84104
"automerge": true,
85-
"automergeType": "pr"
105+
"automergeType": "pr",
86106
},
87107
{
88108
"groupName": "the GitHub Actions group",
89109
"matchManagers": ["github-actions"],
90110
"matchUpdateTypes": ["minor", "patch"],
91111
"automerge": true,
92-
"automergeType": "pr"
112+
"automergeType": "pr",
93113
},
94114
{
95115
"groupName": "arkenv packages",
96116
"matchPackageNames": ["arkenv"],
97117
"matchPackagePatterns": ["^@arkenv/"],
98118
"automerge": true,
99-
"automergeType": "pr"
119+
"automergeType": "pr",
100120
},
101-
{
102-
// Sync-generated examples only — packageManager comes from catalog + transform.js.
103-
// Hand-maintained examples (with-zod, with-valibot) stay Renovate-updatable via the pnpm group.
104-
"description": "Disable packageManager bumps for sync-generated examples; versions come from the catalog + transform.js",
105-
"matchPackageNames": ["npm", "pnpm", "bun"],
106-
"matchFileNames": [
107-
"examples/basic/**",
108-
"examples/basic-js/**",
109-
"examples/with-nextjs/**",
110-
"examples/with-nextjs-strict/**",
111-
"examples/with-nuxt/**",
112-
"examples/with-solid-start/**",
113-
"examples/with-standard-schema/**",
114-
"examples/with-vite-react/**",
115-
"examples/with-bun/**",
116-
"examples/with-bun-react/**"
117-
],
118-
"enabled": false
119-
}
120-
]
121+
],
121122
}

.github/workflows/sync-examples.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@ jobs:
8282
run: |
8383
git config --global user.email "237618717+arkenv-bot[bot]@users.noreply.github.com"
8484
git config --global user.name "arkenv-bot[bot]"
85-
if [ -n "$(git status --porcelain examples)" ]; then
86-
git add examples
85+
if [ -n "$(git status --porcelain examples .github/renovate.json)" ]; then
86+
git add examples .github/renovate.json
8787
git commit -m "chore(examples): sync generated examples"
8888
git push origin HEAD || {
8989
echo "❌ Failed to push example sync changes. Please re-run the workflow."

biome.jsonc

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@
3030
},
3131
"json": {
3232
"parser": {
33-
"allowComments": true
33+
"allowComments": true,
34+
"allowTrailingCommas": true
3435
}
3536
},
3637
"assist": { "actions": { "source": { "organizeImports": "on" } } },
@@ -98,6 +99,14 @@
9899
}
99100
},
100101
"overrides": [
102+
{
103+
"includes": [".github/renovate.json"],
104+
"json": {
105+
"formatter": {
106+
"trailingCommas": "all"
107+
}
108+
}
109+
},
101110
{
102111
"includes": ["**/examples/**/*", "**/playgrounds/**/*"],
103112
"linter": {

examples/stackblitz/package-lock.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)