Zengtudor/Nuxt
1
0
Fork 0
mirror of https://github.com/nuxt/nuxt.git synced 2024-11-26 23:52:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(bridge): do not resolve esm babel helpers (#1158)

Browse Source
This commit is contained in:
Daniel Roe 2021-10-18 11:12:01 +01:00 committed by GitHub
parent 870a62855c
commit adf497046b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/bridge/src/app.ts
View File

@ -9,9 +9,6 @@ export function setupAppBridge (_options: any) {
nuxt.options.alias['#app'] = resolve(distDir, 'runtime/index.mjs') nuxt.options.alias['#app'] = resolve(distDir, 'runtime/index.mjs')
nuxt.options.alias['#build'] = nuxt.options.buildDir nuxt.options.alias['#build'] = nuxt.options.buildDir
// Alias vuex to its esm version, as vuex.mjs currently exports cjs: https://github.com/vuejs/vuex/pull/2073
nuxt.options.alias.vuex = 'vuex/dist/vuex.esm.js'
// Alias vue to a vue3-compat version of vue2 // Alias vue to a vue3-compat version of vue2
nuxt.options.alias['#vue'] = nuxt.options.alias.vue || resolveModule('vue/dist/vue.runtime.esm.js', { paths: nuxt.options.modulesDir }) nuxt.options.alias['#vue'] = nuxt.options.alias.vue || resolveModule('vue/dist/vue.runtime.esm.js', { paths: nuxt.options.modulesDir })
for (const alias of [ for (const alias of [

4
packages/bridge/src/resolve.ts
View File

@ -43,6 +43,10 @@ class EnhancedResolverPlugin {
// Fall back to default webpack4 resolver if not a node_modules import // Fall back to default webpack4 resolver if not a node_modules import
if (!id || !defaultResolver.isModule(id)) { return } if (!id || !defaultResolver.isModule(id)) { return }
// Fall back to webpack4 resolver if resolving babel helpers
// https://github.com/nuxt/nuxt.js/blob/714249740690569eedf74aa7bca7ed31c01953d4/packages/babel-preset-app/src/index.js#L169
if (id.includes('/@babel/')) { return }
const importer = request.context?.issuer const importer = request.context?.issuer
try { try {
const result = await enhancedResolver.resolve(id, importer) const result = await enhancedResolver.resolve(id, importer)