Skip to content

Commit f49f9cb

Browse files
authored
test: update skeleton to latest (#351)
1 parent 7fc5047 commit f49f9cb

3 files changed

Lines changed: 24 additions & 11 deletions

File tree

.github/workflows/e2e-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
- name: skeleton
4949
node-version: 22
5050
command: |
51-
pnpm run --filter="@skeletonlabs/*" --sequential build
51+
pnpm run --filter="@skeletonlabs/*" --filter="!*skeleton.dev" --sequential build
5252
pnpm test
5353
steps:
5454
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

ecosystem-ci/patch-project.ts

Lines changed: 22 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -132,27 +132,40 @@ async function patchSkeleton() {
132132

133133
// Patch pnpm-workspace.yaml
134134
const pnpmWorkspacePath = join(projectDir, 'skeleton', 'pnpm-workspace.yaml');
135-
const pnpmWorkspaceContent = fs
135+
let pnpmWorkspaceContent = fs
136136
.readFileSync(pnpmWorkspacePath, 'utf8')
137137
.replace(`trustPolicy: no-downgrade`, '\n')
138138
.replace(
139139
/'@vitest\/browser-playwright': [\d.]+/,
140140
`'@vitest/browser-playwright': ${vitestVersion}`,
141141
);
142-
const appendContent = `
143-
minimumReleaseAgeExclude:
144-
- '@voidzero-dev/*'
145-
- '@vitest/*'
146-
- oxlint
147-
- oxfmt
148-
- oxlint-tsgolint
149142

143+
// Add entries to existing minimumReleaseAgeExclude if it exists, otherwise append new section
144+
const newExcludes = ["'@voidzero-dev/*'", "'@vitest/*'", 'oxlint', 'oxfmt', 'oxlint-tsgolint'];
145+
if (pnpmWorkspaceContent.includes('minimumReleaseAgeExclude:')) {
146+
// Find the minimumReleaseAgeExclude section and add new entries
147+
pnpmWorkspaceContent = pnpmWorkspaceContent.replace(
148+
/minimumReleaseAgeExclude:\n((?: - .+\n)+)/,
149+
(_, existingEntries) => {
150+
const newEntriesStr = newExcludes.map((e) => ` - ${e}\n`).join('');
151+
return `minimumReleaseAgeExclude:\n${existingEntries}${newEntriesStr}`;
152+
},
153+
);
154+
} else {
155+
pnpmWorkspaceContent += `\nminimumReleaseAgeExclude:\n${newExcludes.map((e) => ` - ${e}`).join('\n')}\n`;
156+
}
157+
158+
// Add peerDependencyRules if not present
159+
if (!pnpmWorkspaceContent.includes('peerDependencyRules:')) {
160+
pnpmWorkspaceContent += `
150161
peerDependencyRules:
151162
allowAny:
152163
- vite
153164
- vitest
154165
`;
155-
fs.writeFileSync(pnpmWorkspacePath, pnpmWorkspaceContent + appendContent);
166+
}
167+
168+
fs.writeFileSync(pnpmWorkspacePath, pnpmWorkspaceContent);
156169

157170
// Update vite.config.ts files to import from vitest/browser-playwright instead of @vitest/browser-playwright
158171
// This is needed because pnpm overrides don't affect Node.js module resolution at config load time

ecosystem-ci/repo.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"skeleton": {
33
"repository": "https://github.com/skeletonlabs/skeleton.git",
44
"branch": "main",
5-
"hash": "1d59e077dbf28d1931405864b06f06f9d3578903"
5+
"hash": "6f613fe3326ed483885e4acc6f49e2044aa9ab79"
66
},
77
"vibe-dashboard": {
88
"repository": "https://github.com/voidzero-dev/vibe-dashboard.git",

0 commit comments

Comments
 (0)