From 1fa51a478da2c654215aca143d7d914353823985 Mon Sep 17 00:00:00 2001 From: sapphi-red Date: Tue, 7 Jun 2022 22:56:43 +0900 Subject: [PATCH 1/2] refactor: remove hooks ssr param support --- packages/plugin-react/src/index.ts | 4 ++-- packages/plugin-vue-jsx/src/index.ts | 2 +- packages/plugin-vue/src/index.ts | 12 ++---------- 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/packages/plugin-react/src/index.ts b/packages/plugin-react/src/index.ts index 562b8291112297..763534ca2ef182 100644 --- a/packages/plugin-react/src/index.ts +++ b/packages/plugin-react/src/index.ts @@ -165,7 +165,7 @@ export default function viteReact(opts: Options = {}): PluginOption[] { } }, async transform(code, id, options) { - const ssr = typeof options === 'boolean' ? options : options?.ssr === true + const ssr = options?.ssr === true // File extension could be mocked/overridden in querystring. const [filepath, querystring = ''] = id.split('?') const [extension = ''] = @@ -379,7 +379,7 @@ export default function viteReact(opts: Options = {}): PluginOption[] { /* resolveId(id: string) { return id === runtimeId ? id : null - }, + }, load(id: string) { if (id === runtimeId) { const runtimePath = resolve.sync(runtimeId, { diff --git a/packages/plugin-vue-jsx/src/index.ts b/packages/plugin-vue-jsx/src/index.ts index 302cb323849ad6..a215a8b1cb95b8 100644 --- a/packages/plugin-vue-jsx/src/index.ts +++ b/packages/plugin-vue-jsx/src/index.ts @@ -74,7 +74,7 @@ function vueJsxPlugin(options: Options = {}): Plugin { }, async transform(code, id, opt) { - const ssr = typeof opt === 'boolean' ? opt : (opt && opt.ssr) === true + const ssr = opt?.ssr const { include, exclude, diff --git a/packages/plugin-vue/src/index.ts b/packages/plugin-vue/src/index.ts index 805df6fec674d0..6ccbe7bf06da80 100644 --- a/packages/plugin-vue/src/index.ts +++ b/packages/plugin-vue/src/index.ts @@ -107,14 +107,6 @@ export default function vuePlugin(rawOptions: Options = {}): Plugin { devToolsEnabled: process.env.NODE_ENV !== 'production' } - // Temporal handling for 2.7 breaking change - const isSSR = (opt: { ssr?: boolean } | boolean | undefined) => - opt === undefined - ? false - : typeof opt === 'boolean' - ? opt - : opt?.ssr === true - return { name: 'vite:vue', @@ -169,7 +161,7 @@ export default function vuePlugin(rawOptions: Options = {}): Plugin { }, load(id, opt) { - const ssr = isSSR(opt) + const ssr = opt?.ssr === true if (id === EXPORT_HELPER_ID) { return helperCode } @@ -202,7 +194,7 @@ export default function vuePlugin(rawOptions: Options = {}): Plugin { }, transform(code, id, opt) { - const ssr = isSSR(opt) + const ssr = opt?.ssr === true const { filename, query } = parseVueRequest(id) if (query.raw) { return From db075b7a367b1fdf4618e5b5b21b0b66d553ffee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BF=A0=20/=20green?= Date: Wed, 8 Jun 2022 17:06:16 +0900 Subject: [PATCH 2/2] chore: apply suggestion Co-authored-by: Bjorn Lu --- packages/plugin-vue-jsx/src/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/plugin-vue-jsx/src/index.ts b/packages/plugin-vue-jsx/src/index.ts index a215a8b1cb95b8..c3edb77c5b0e6e 100644 --- a/packages/plugin-vue-jsx/src/index.ts +++ b/packages/plugin-vue-jsx/src/index.ts @@ -74,7 +74,7 @@ function vueJsxPlugin(options: Options = {}): Plugin { }, async transform(code, id, opt) { - const ssr = opt?.ssr + const ssr = opt?.ssr === true const { include, exclude,