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.

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

fix: restore vue2-compat alias and de-default export #398

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 0 additions & 3 deletions src/module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,6 @@ export default defineNuxtModule({
if (opts.vite) {
const viteModule = await import('./vite/module').then(r => r.default || r) as NuxtModule
nuxt.hook('modules:done', () => installModule(viteModule))
} else {
// with webpack, we need to transpile vue to handle the default/named exports in Vue 2.7
nuxt.options.build.transpile.push('vue')
}
if (opts.postcss8) {
await installModule(_require.resolve('@nuxt/postcss8'))
Expand Down
12 changes: 12 additions & 0 deletions src/runtime/vue2-bridge.mjs
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
import Vue from 'vue'
export * from 'vue'

export const isFunction = fn => fn instanceof Function

// @ts-ignore
const defaultVue = Vue.default || Vue

export { defaultVue as default }

// mock for vue-demi
export const Vue2 = defaultVue
export const isVue2 = true
export const isVue3 = false
export const install = () => {}
37 changes: 32 additions & 5 deletions src/vue-compat.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import { pathToFileURL } from 'url'
import MagicString from 'magic-string'
import { findStaticImports } from 'mlly'
import { findExports, findStaticImports } from 'mlly'
import { parseQuery, parseURL } from 'ufo'
import { createUnplugin } from 'unplugin'
import escapeRE from 'escape-string-regexp'

export const VueCompat = createUnplugin((opts: { src?: string }) => {
return {
Expand All @@ -28,10 +29,15 @@ export const VueCompat = createUnplugin((opts: { src?: string }) => {
if (id.includes('vue2-bridge')) { return }

const s = new MagicString(code)
const imports = findStaticImports(code).filter(i => i.type === 'static' && vueAliases.includes(i.specifier))
const references = [
...findStaticImports(code).filter(i => i.type === 'static' && vueAliases.includes(i.specifier)),
...findExports(code).filter(i => vueAliases.includes(i.specifier))
]

for (const i of imports) {
s.overwrite(i.start, i.end, i.code.replace(`"${i.specifier}"`, `"${opts.src}"`).replace(`'${i.specifier}'`, `'${opts.src}'`))
for (const i of references) {
const escapedSpecifier = escapeRE(i.specifier)
const specifierRE = new RegExp(`"${escapedSpecifier}"|'${escapedSpecifier}'`, 'g')
s.overwrite(i.start, i.end, i.code.replace(specifierRE, r => r.replace(i.specifier, opts.src)))
}

if (s.hasChanged()) {
Expand All @@ -45,9 +51,30 @@ export const VueCompat = createUnplugin((opts: { src?: string }) => {
})

const vueAliases = [
// vue
'vue',
// vue 3 helper packages
'@vue/shared',
'@vue/reactivity',
'@vue/runtime-core',
'@vue/runtime-dom'
'@vue/runtime-dom',
// vue-demi
'vue-demi',
...[
// vue 2 dist files
'vue/dist/vue.common.dev',
'vue/dist/vue.common',
'vue/dist/vue.common.prod',
'vue/dist/vue.esm.browser',
'vue/dist/vue.esm.browser.min',
'vue/dist/vue.esm',
'vue/dist/vue',
'vue/dist/vue.min',
'vue/dist/vue.runtime.common.dev',
'vue/dist/vue.runtime.common',
'vue/dist/vue.runtime.common.prod',
'vue/dist/vue.runtime.esm',
'vue/dist/vue.runtime',
'vue/dist/vue.runtime.min'
].flatMap(m => [m, `${m}.js`])
]