-
-
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
Merged
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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', | ||
| 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'))}, | ||
| ], | ||
| }, | ||
| }, | ||
| }); | ||
| ` | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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 | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.