Skip to content
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.

Sign up for GitHub

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

Jump to bottom

refactor: remove hooks ssr param support #8491

Merged
merged 2 commits into from Jun 8, 2022
Merged

refactor: remove hooks ssr param support #8491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1fa51a4
refactor: remove hooks ssr param support
sapphi-red Jun 7, 2022
db075b7
chore: apply suggestion
sapphi-red Jun 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/plugin-react/src/index.ts
View file
Open in desktop
Expand Up @@ -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 = ''] =
Expand Down Expand Up @@ -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, {
Expand Down
2 changes: 1 addition & 1 deletion packages/plugin-vue-jsx/src/index.ts
View file
Open in desktop
Expand Up @@ -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 === true
const {
include,
exclude,
Expand Down
12 changes: 2 additions & 10 deletions packages/plugin-vue/src/index.ts
View file
Open in desktop
Expand Up @@ -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',

Expand Down Expand Up @@ -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
}
Expand Down Expand Up @@ -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
Expand Down