From 343b33ce9daf5a01fac4ec71b829c4a5be7b48f5 Mon Sep 17 00:00:00 2001 From: ygj6 Date: Wed, 7 Apr 2021 14:19:03 +0800 Subject: [PATCH 1/3] fix(plugin): avoid duplicate import (#2640) --- packages/plugin-vue/src/main.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/plugin-vue/src/main.ts b/packages/plugin-vue/src/main.ts index 1d2f896e79cb2a..feb81d0d2b777f 100644 --- a/packages/plugin-vue/src/main.ts +++ b/packages/plugin-vue/src/main.ts @@ -143,10 +143,10 @@ export async function transformMain( // SSR module registration by wrapping user setup if (ssr) { output.push( - `import { useSSRContext } from 'vue'`, + `import { useSSRContext as _useSSRContext} from 'vue'`, `const _sfc_setup = _sfc_main.setup`, `_sfc_main.setup = (props, ctx) => {`, - ` const ssrContext = useSSRContext()`, + ` const ssrContext = _useSSRContext()`, ` ;(ssrContext.modules || (ssrContext.modules = new Set())).add(${JSON.stringify( filename )})`, From ece0572930bcd76e8dd144dbd1c874661c8da9ca Mon Sep 17 00:00:00 2001 From: ygj6 Date: Wed, 21 Apr 2021 19:16:45 +0800 Subject: [PATCH 2/3] fix(plugin-vue): use Vite internal convention --- packages/plugin-vue/src/main.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/plugin-vue/src/main.ts b/packages/plugin-vue/src/main.ts index feb81d0d2b777f..73039ac44b42b5 100644 --- a/packages/plugin-vue/src/main.ts +++ b/packages/plugin-vue/src/main.ts @@ -143,10 +143,10 @@ export async function transformMain( // SSR module registration by wrapping user setup if (ssr) { output.push( - `import { useSSRContext as _useSSRContext} from 'vue'`, + `import { useSSRContext as __vite_useSSRContext} from 'vue'`, `const _sfc_setup = _sfc_main.setup`, `_sfc_main.setup = (props, ctx) => {`, - ` const ssrContext = _useSSRContext()`, + ` const ssrContext = __vite_useSSRContext()`, ` ;(ssrContext.modules || (ssrContext.modules = new Set())).add(${JSON.stringify( filename )})`, From 9433dcd10b13ea02a476d81b9638cc3066ed7a61 Mon Sep 17 00:00:00 2001 From: patak Date: Thu, 22 Apr 2021 17:38:38 +0200 Subject: [PATCH 3/3] chore: fix spacing in import --- packages/plugin-vue/src/main.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/plugin-vue/src/main.ts b/packages/plugin-vue/src/main.ts index 73039ac44b42b5..c7464e24700b7b 100644 --- a/packages/plugin-vue/src/main.ts +++ b/packages/plugin-vue/src/main.ts @@ -143,7 +143,7 @@ export async function transformMain( // SSR module registration by wrapping user setup if (ssr) { output.push( - `import { useSSRContext as __vite_useSSRContext} from 'vue'`, + `import { useSSRContext as __vite_useSSRContext } from 'vue'`, `const _sfc_setup = _sfc_main.setup`, `_sfc_main.setup = (props, ctx) => {`, ` const ssrContext = __vite_useSSRContext()`,