Skip to content

Commit 1411b33

Browse files
committed
test: support pnpm e2e migration project
1 parent 2aef050 commit 1411b33

5 files changed

Lines changed: 52 additions & 11 deletions

File tree

.github/workflows/e2e-test.yml

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ on:
77
push:
88
branches:
99
- main
10+
# should be removed before merging
11+
- more-migration-e2e-projects
1012
paths-ignore:
1113
- '**/*.md'
1214

@@ -49,10 +51,14 @@ jobs:
4951
node-version: 24
5052
command: vite run ready
5153
- name: skeleton
52-
node-version: 22
54+
node-version: 24
5355
command: |
54-
pnpm run --filter="@skeletonlabs/*" --filter="!*skeleton.dev" --sequential build
55-
pnpm test
56+
vite install --no-frozen-lockfile
57+
vite run format
58+
vite run lint:check
59+
vite run check
60+
pnpm exec playwright install chromium
61+
vite run test
5662
- name: rollipop
5763
node-version: 22
5864
skip-install: true
@@ -65,6 +71,16 @@ jobs:
6571
vite run @rollipop/common#test
6672
vite run @rollipop/core#test
6773
vite run @rollipop/dev-server#test
74+
- name: frm-stack
75+
node-version: 24
76+
skip-install: true
77+
command: |
78+
vite install --no-frozen-lockfile
79+
vite run lint:check
80+
vite run format:check
81+
vite run typecheck
82+
vite run @yourcompany/api#test
83+
vite run @yourcompany/backend-core#test
6884
6985
steps:
7086
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

ecosystem-ci/.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
vibe-dashboard
22
skeleton
3-
rollipop
3+
rollipop
4+
frm-stack

ecosystem-ci/patch-project.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,11 +233,15 @@ switch (project) {
233233
await patchVibeDashboard();
234234
break;
235235
case 'skeleton':
236-
await patchSkeleton();
236+
// await patchSkeleton();
237+
await migrateProject(project);
237238
break;
238239
case 'rollipop':
239240
await migrateProject(project);
240241
break;
242+
case 'frm-stack':
243+
await migrateProject(project);
244+
break;
241245
default:
242246
console.error(`Project ${project} is not supported`);
243247
process.exit(1);

ecosystem-ci/repo.json

Lines changed: 6 additions & 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": "6f613fe3326ed483885e4acc6f49e2044aa9ab79"
5+
"hash": "6d57f29b823275c6e3fb267c6834da5d39558fb6"
66
},
77
"vibe-dashboard": {
88
"repository": "https://github.com/voidzero-dev/vibe-dashboard.git",
@@ -13,5 +13,10 @@
1313
"repository": "https://github.com/leegeunhyeok/rollipop.git",
1414
"branch": "main",
1515
"hash": "9beb8dd8fb70ef298b3a18703a831d6d4d3c01a1"
16+
},
17+
"frm-stack": {
18+
"repository": "https://github.com/Nikola-Milovic/frm-stack.git",
19+
"branch": "main",
20+
"hash": "e9e344125d8476ed6f34880036c0b1aef8dc0bb5"
1621
}
1722
}

packages/global/src/migration/migrator.ts

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,11 @@ function rewritePnpmWorkspaceYaml(projectPath: string): void {
218218

219219
// overrides
220220
for (const key of Object.keys(VITE_PLUS_OVERRIDE_PACKAGES)) {
221-
doc.setIn(['overrides', scalarString(key)], scalarString('catalog:'));
221+
let version = VITE_PLUS_OVERRIDE_PACKAGES[key];
222+
if (!version.startsWith('file:')) {
223+
version = 'catalog:';
224+
}
225+
doc.setIn(['overrides', scalarString(key)], scalarString(version));
222226
}
223227
// remove dependency selector from vite, e.g. "vite-plugin-svgr>vite": "npm:rolldown-vite@7.0.12"
224228
const overrides = doc.getIn(['overrides']) as YAMLMap<Scalar<string>, Scalar<string>>;
@@ -323,9 +327,16 @@ function rewriteYarnrcYml(projectPath: string): void {
323327
*/
324328
function rewriteCatalog(doc: YamlDocument): void {
325329
for (const [key, value] of Object.entries(VITE_PLUS_OVERRIDE_PACKAGES)) {
330+
// ERR_PNPM_CATALOG_IN_OVERRIDES  Could not resolve a catalog in the overrides: The entry for 'vite' in catalog 'default' declares a dependency using the 'file' protocol
331+
// ignore setting catalog if value starts with 'file:'
332+
if (value.startsWith('file:')) {
333+
continue;
334+
}
326335
doc.setIn(['catalog', key], scalarString(value));
327336
}
328-
doc.setIn(['catalog', VITE_PLUS_NAME], scalarString(VITE_PLUS_VERSION));
337+
if (!VITE_PLUS_VERSION.startsWith('file:')) {
338+
doc.setIn(['catalog', VITE_PLUS_NAME], scalarString(VITE_PLUS_VERSION));
339+
}
329340
for (const name of REMOVE_PACKAGES) {
330341
doc.deleteIn(['catalog', name]);
331342
}
@@ -394,7 +405,10 @@ function rewriteRootWorkspacePackageJson(
394405
if (!pkg.devDependencies?.[VITE_PLUS_NAME]) {
395406
pkg.devDependencies = {
396407
...pkg.devDependencies,
397-
[VITE_PLUS_NAME]: packageManager === PackageManager.npm ? VITE_PLUS_VERSION : 'catalog:',
408+
[VITE_PLUS_NAME]:
409+
packageManager === PackageManager.npm || VITE_PLUS_VERSION.startsWith('file:')
410+
? VITE_PLUS_VERSION
411+
: 'catalog:',
398412
};
399413
}
400414
return pkg;
@@ -437,7 +451,7 @@ export function rewritePackageJson(
437451
const supportCatalog = isMonorepo && packageManager !== PackageManager.npm;
438452
let needVitePlus = false;
439453
for (const [key, version] of Object.entries(VITE_PLUS_OVERRIDE_PACKAGES)) {
440-
const value = supportCatalog ? 'catalog:' : version;
454+
const value = supportCatalog && !version.startsWith('file:') ? 'catalog:' : version;
441455
if (pkg.devDependencies?.[key]) {
442456
pkg.devDependencies[key] = value;
443457
needVitePlus = true;
@@ -460,7 +474,8 @@ export function rewritePackageJson(
460474
}
461475
if (needVitePlus) {
462476
// add vite-plus to devDependencies
463-
const version = supportCatalog ? 'catalog:' : VITE_PLUS_VERSION;
477+
const version =
478+
supportCatalog && !VITE_PLUS_VERSION.startsWith('file:') ? 'catalog:' : VITE_PLUS_VERSION;
464479
pkg.devDependencies = {
465480
...pkg.devDependencies,
466481
[VITE_PLUS_NAME]: version,

0 commit comments

Comments
 (0)