Skip to content
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
2 changes: 1 addition & 1 deletion .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
with:
main-branch-name: main
- name: Run Checks
run: pnpm run test:pr
run: pnpm run test:pr --outputStyle=stream
preview:
name: Preview
runs-on: ubuntu-latest
Expand Down
34 changes: 25 additions & 9 deletions packages/intent/tests/integration/scaffold.ts
Original file line number Diff line number Diff line change
Expand Up @@ -221,10 +221,6 @@ export function scaffoldProject(opts: {
'packages:\n - packages/*\n',
)
}
if (opts.pm === 'yarn' && !opts.pnp) {
writeFileSync(join(root, '.yarnrc.yml'), 'nodeLinker: node-modules\n')
}

const appDir = join(root, 'packages', 'app')
mkdirSync(appDir, { recursive: true })
writeJson(join(appDir, 'package.json'), {
Expand Down Expand Up @@ -264,11 +260,31 @@ function install(
runInstallCommand(`pnpm install ${reg} --no-frozen-lockfile`, dir, env)
break
case 'yarn':
runInstallCommand(
`yarn install ${reg}${opts.pnp ? ' --enable-pnp' : ''} --cache-folder ${yarnCache}`,
dir,
env,
)
if (isYarnClassic()) {
runInstallCommand(
`yarn install ${reg}${opts.pnp ? ' --enable-pnp' : ''} --cache-folder ${yarnCache}`,
dir,
env,
)
} else {
// Isolate registry metadata too: each fixture registry uses a new port.
writeFileSync(
join(dir, '.yarnrc.yml'),
[
`nodeLinker: ${opts.pnp ? 'pnp' : 'node-modules'}`,
`npmRegistryServer: ${JSON.stringify(registryUrl)}`,
'unsafeHttpWhitelist:',
` - ${JSON.stringify(new URL(registryUrl).hostname)}`,
'enableGlobalCache: false',
`globalFolder: ${JSON.stringify(join(dir, '.yarn-global'))}`,
// These local fixtures are published immediately before install.
'npmPreapprovedPackages:',
' - "@test-intent/*@1.0.0"',
].join('\n'),
)
// Fresh fixtures need a lockfile even when Yarn runs in CI.
runInstallCommand('yarn install --no-immutable', dir, env)
}
break
case 'bun':
runInstallCommand(`bun install ${reg}`, dir, env)
Expand Down
72 changes: 35 additions & 37 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions pnpm-workspace.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,15 @@ blockExoticSubdeps: true
trustPolicy: 'no-downgrade'

overrides:
# Security fixes for vulnerable transitive versions, including parent pins.
'brace-expansion@<1.1.21': 1.1.21
'brace-expansion@>=4.0.0 <5.0.12': 5.0.12
'fast-uri@>=3.0.0 <3.1.8': 3.1.8
'js-yaml@>=5.0.0 <5.4.1': 5.4.1
pino: 10.3.1
'qs@>=2.2.5 <6.16.0': 6.16.0
'smol-toml@<=1.7.0': 1.7.1
'undici@>=7.0.0 <7.29.1': 7.29.1
undici-types: 8.4.1

packageExtensions:
Expand Down
Loading