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
31 changes: 30 additions & 1 deletion tests/laravel.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,43 @@
import { runInRepo } from '../utils.ts'
import type { RunOptions } from '../types.d.ts'
import path from 'node:path'
import fs from 'node:fs'

export async function test(options: RunOptions) {
//see https://github.com/laravel/vite-plugin/blob/73466441b0c9eb0c1a5ce0a0e937bd83eaef4b70/.github/workflows/tests.yml#L10
process.env.LARAVEL_BYPASS_ENV_CHECK = '1'
await runInRepo({
...options,
repo: 'laravel/vite-plugin',
branch: '1.x',
branch: '2.x',
Comment on lines -10 to +12
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The latest version uses 2.x branch.

build: 'build',
async beforeTest() {
// Add `vitest.config.ts` to exclude Vite from inlined by Vitest.
// Otherwise the mock here doesn't work.
// https://github.com/laravel/vite-plugin/blob/3f7bf9eddc69580796c26890c99065d7259c785e/tests/index.test.ts#L7-L22
const dir = path.resolve(options.workspace, 'vite-plugin')
const vitestConfigFile = path.join(dir, 'vitest.config.ts')
fs.writeFileSync(
vitestConfigFile,
getVitestConfig(options.vitePath),
'utf-8',
)
},
test: 'test',
agent: 'npm',
})
}

const getVitestConfig = (viteRepoPath: string) => /* ts */ `
import { defineConfig } from "vitest/config";

export default defineConfig({
test: {
deps: {
moduleDirectories: [
${JSON.stringify(path.resolve(viteRepoPath, 'packages'))},
],
},
},
});
`
7 changes: 2 additions & 5 deletions utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ export async function runInRepo(options: RunOptions & RepoOptions) {
...localOverrides,
}
}
await applyPackageOverrides(dir, pkg, overrides)
await applyPackageOverrides(agent, dir, pkg, overrides)
await beforeBuildCommand?.(pkg.scripts)
await buildCommand?.(pkg.scripts)
if (test) {
Expand Down Expand Up @@ -525,6 +525,7 @@ async function overridePackageManagerVersion(
}

export async function applyPackageOverrides(
agent: (typeof AGENTS)[number],
dir: string,
pkg: any,
overrides: Overrides = {},
Expand All @@ -540,10 +541,6 @@ export async function applyPackageOverrides(
)
await $`git clean -fdxq` // remove current install

const agent = await detect({ cwd: dir, autoInstall: false })
if (!agent) {
throw new Error(`failed to detect packageManager in ${dir}`)
}
Comment on lines -543 to -546
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This detection returned pnpm, but we should use the agent variable so that options.agent is respected.

// Remove version from agent string:
// yarn@berry => yarn
// pnpm@6, pnpm@7 => pnpm
Expand Down