Skip to content

Commit

Permalink
Merge branch 'main' into edison/fix/languageTools
Browse files Browse the repository at this point in the history
  • Loading branch information
edison1105 authored Sep 10, 2024
2 parents 1731d99 + a3b829f commit e56dcaa
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 2 deletions.
3 changes: 2 additions & 1 deletion tests/vue-macros.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@ import { RunOptions } from '../types.ts'
export async function test(options: RunOptions) {
await runInRepo({
...options,
repo: 'sxzz/unplugin-vue-macros',
repo: 'vue-macros/vue-macros',
branch: 'main',
build: 'build',
test: ['test:ecosystem'],
overrideVueVersion: '@^3',
})
}
1 change: 1 addition & 0 deletions types.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ export interface RunOptions {
root: string
vuePath: string
vueVersion: string
overrideVueVersion?: string
verify?: boolean
skipGit?: boolean
release?: string
Expand Down
3 changes: 2 additions & 1 deletion utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,7 @@ export async function runInRepo(options: RunOptions & RepoOptions) {
beforeBuild,
beforeTest,
patchFiles,
overrideVueVersion = '',
} = options
const dir = path.resolve(
options.workspace,
Expand Down Expand Up @@ -316,7 +317,7 @@ export async function runInRepo(options: RunOptions & RepoOptions) {
} config. Use either one or the other`,
)
} else {
overrides[pkg.name] = version
overrides[`${pkg.name}${overrideVueVersion}`] = version
}
}
} else {
Expand Down

0 comments on commit e56dcaa

Please sign in to comment.