Commit d294b32

committed

Merge branch 'btea-fix/component-ts-error' into v2

2 parents 040ebe5 + 255af91 commit d294b32Copy full SHA for d294b32

File tree

-3

lines changed

-3

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -270,9 +270,9 @@ async function init() {`
`270`	`270`	`// Supported package managers: pnpm > yarn > npm`
`271`	`271`	`// Note: until <https://github.com/pnpm/pnpm/issues/3505> is resolved,`
`272`	`272`	// it is not possible to tell if the command is called by `pnpm init`.
`273`		`- const packageManager = /pnpm/.test(process.env.npm_execpath)`
	`273`	`+ const packageManager = /pnpm/.test(process.env.npm_execpath??'')`
`274`	`274`	`? 'pnpm'`
`275`		`- : /yarn/.test(process.env.npm_execpath)`
	`275`	`+ : /yarn/.test(process.env.npm_execpath??'')`
`276`	`276`	`? 'yarn'`
`277`	`277`	`: 'npm'`
`278`	`278`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<script setup lang="ts">`
	`1`	`+<script setup>`
`2`	`2`	`import TheWelcome from '@/components/TheWelcome.vue'`
`3`	`3`	`</script>`
`4`	`4`

Comments

(0)