Skip to content

Commit 4e140f6

Browse files
authored
fix: replace @std/yaml with yaml package to fix pnpm dedupe --check (#649)
The @jsr/std__yaml package was returning 404 from npm.jsr.io registry. Replaced with the `yaml` npm package which was already in the catalog and provides compatible parse/stringify functions.
1 parent 08a5993 commit 4e140f6

5 files changed

Lines changed: 14 additions & 24 deletions

File tree

.npmrc

Lines changed: 0 additions & 1 deletion
This file was deleted.

packages/tools/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
"devDependencies": {
1717
"@oxc-node/cli": "catalog:",
1818
"@oxc-node/core": "catalog:",
19-
"@std/yaml": "catalog:",
2019
"@types/semver": "catalog:",
2120
"@voidzero-dev/vite-plus-test": "workspace:*",
2221
"minimatch": "catalog:",
23-
"semver": "catalog:"
22+
"semver": "catalog:",
23+
"yaml": "catalog:"
2424
}
2525
}

packages/tools/src/sync-remote-deps.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -666,20 +666,20 @@ export async function syncRemote() {
666666
);
667667

668668
// Dynamically import dependencies after git clone
669-
let parseYaml: typeof import('@std/yaml').parse;
670-
let stringifyYaml: typeof import('@std/yaml').stringify;
669+
let parseYaml: typeof import('yaml').parse;
670+
let stringifyYaml: typeof import('yaml').stringify;
671671
let semver: typeof import('semver');
672672

673673
try {
674-
const yaml = await import('@std/yaml');
674+
const yaml = await import('yaml');
675675
parseYaml = yaml.parse;
676676
stringifyYaml = yaml.stringify;
677677
semver = await import('semver');
678678
} catch {
679679
log('Dependencies not found, running pnpm install...');
680680
execCommand('pnpm install --no-frozen-lockfile', rootDir);
681681
log('Retrying imports...');
682-
const yaml = await import('@std/yaml');
682+
const yaml = await import('yaml');
683683
parseYaml = yaml.parse;
684684
stringifyYaml = yaml.stringify;
685685
semver = await import('semver');

pnpm-lock.yaml

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

pnpm-workspace.yaml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ catalog:
2121
'@rollup/plugin-commonjs': ^29.0.0
2222
'@rollup/plugin-json': ^6.1.0
2323
'@rollup/plugin-node-resolve': ^16.0.0
24-
'@std/yaml': 'npm:@jsr/std__yaml@^1.0.10'
2524
'@types/babel__core': 7.20.5
2625
'@types/connect': ^3.4.38
2726
'@types/cross-spawn': ^6.0.6
@@ -153,11 +152,11 @@ minimumReleaseAgeExclude:
153152
- vitepress
154153
- vitest
155154
overrides:
156-
'@rolldown/pluginutils': 'workspace:@rolldown/pluginutils@*'
157-
rolldown: 'workspace:rolldown@*'
158-
vite: 'workspace:@voidzero-dev/vite-plus-core@*'
159-
vitest: 'workspace:@voidzero-dev/vite-plus-test@*'
160-
vitest-dev: 'npm:vitest@^4.0.18'
155+
'@rolldown/pluginutils': workspace:@rolldown/pluginutils@*
156+
rolldown: workspace:rolldown@*
157+
vite: workspace:@voidzero-dev/vite-plus-core@*
158+
vitest: workspace:@voidzero-dev/vite-plus-test@*
159+
vitest-dev: npm:vitest@^4.0.18
161160
packageExtensions:
162161
sass-embedded:
163162
peerDependencies:

0 commit comments

Comments
 (0)