-
-
Notifications
You must be signed in to change notification settings - Fork 75
fix(laravel): make mock work #421
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from 1 commit
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,36 @@ | ||
| 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', | ||
| build: 'build', | ||
| async beforeTest() { | ||
| const dir = path.resolve(options.workspace, 'vite-plugin') | ||
| const vitestConfigFile = path.join(dir, 'vitest.config.ts') | ||
| fs.writeFileSync(vitestConfigFile, vitestConfig, 'utf-8') | ||
| }, | ||
|
Comment on lines
14
to
25
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Added
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Maybe we can add this info as a comment in code |
||
| test: 'test', | ||
| agent: 'npm', | ||
| }) | ||
| } | ||
|
|
||
| const vitestConfig = /* ts */ ` | ||
| import { defineConfig } from "vitest/config"; | ||
| export default defineConfig({ | ||
| test: { | ||
| deps: { | ||
| moduleDirectories: [ | ||
| "/home/green/workspace/vite-ecosystem-ci/workspace/vite/packages", | ||
sapphi-red marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| ], | ||
| }, | ||
| }, | ||
| }); | ||
| ` | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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) { | ||
|
|
@@ -525,6 +525,7 @@ async function overridePackageManagerVersion( | |
| } | ||
|
|
||
| export async function applyPackageOverrides( | ||
| agent: (typeof AGENTS)[number], | ||
| dir: string, | ||
| pkg: any, | ||
| overrides: Overrides = {}, | ||
|
|
@@ -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
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This detection returned |
||
| // Remove version from agent string: | ||
| // yarn@berry => yarn | ||
| // pnpm@6, pnpm@7 => pnpm | ||
|
|
||
There was a problem hiding this comment.
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.