nuxt · pi0 · Jun 10, 2022 · May 18, 2022 · May 18, 2022 · May 18, 2022
diff --git a/packages/nuxt/src/auto-imports/module.ts b/packages/nuxt/src/auto-imports/module.ts
@@ -16,6 +16,7 @@ export default defineNuxtModule<Partial<AutoImportsOptions>>({
     imports: [],
     dirs: [],
     transform: {
+      include: [],
       exclude: undefined
     }
   },

diff --git a/packages/nuxt/src/auto-imports/transform.ts b/packages/nuxt/src/auto-imports/transform.ts
@@ -15,16 +15,16 @@ export const TransformPlugin = createUnplugin(({ ctx, options, sourcemap }: {ctx
       const exclude = options.transform?.exclude || [/[\\/]node_modules[\\/]/]
       const include = options.transform?.include || []
 
-      // Exclude node_modules by default
-      if (exclude.some(pattern => id.match(pattern))) {
-        return false
-      }
-
       // Custom includes
       if (include.some(pattern => id.match(pattern))) {
         return true
       }
 
+      // Exclude node_modules by default
+      if (exclude.some(pattern => id.match(pattern))) {
+        return false
+      }
+
       // vue files
       if (
         pathname.endsWith('.vue') &&

diff --git a/packages/nuxt/src/core/nuxt.ts b/packages/nuxt/src/core/nuxt.ts
@@ -4,6 +4,7 @@ import type { Nuxt, NuxtOptions, NuxtConfig, ModuleContainer, NuxtHooks } from '
 import { loadNuxtConfig, LoadNuxtOptions, nuxtCtx, installModule, addComponent, addVitePlugin, addWebpackPlugin, tryResolveModule } from '@nuxt/kit'
 // Temporary until finding better placement
 /* eslint-disable import/no-restricted-paths */
+import escapeRE from 'escape-string-regexp'
 import pagesModule from '../pages/module'
 import metaModule from '../head/module'
 import componentsModule from '../components/module'
@@ -66,6 +67,11 @@ async function initNuxt (nuxt: Nuxt) {
   addVitePlugin(UnctxTransformPlugin(nuxt).vite({ sourcemap: nuxt.options.sourcemap }))
   addWebpackPlugin(UnctxTransformPlugin(nuxt).webpack({ sourcemap: nuxt.options.sourcemap }))
 
+  // Transpile layers within node_modules
+  nuxt.options.build.transpile.push(
+    ...nuxt.options._layers.filter(i => i.cwd && i.cwd.includes('node_modules')).map(i => i.cwd)
+  )
+
   // Init user modules
   await nuxt.callHook('modules:before', { nuxt } as ModuleContainer)
   const modulesToInstall = [
@@ -133,7 +139,14 @@ export async function loadNuxt (opts: LoadNuxtOptions): Promise<Nuxt> {
   // Temporary until finding better placement for each
   options.appDir = options.alias['#app'] = resolve(distDir, 'app')
   options._majorVersion = 3
-  options._modules.push(pagesModule, metaModule, componentsModule, autoImportsModule)
+  options._modules.push(pagesModule, metaModule, componentsModule)
+  options._modules.push([autoImportsModule, {
+    transform: {
+      include: options._layers
+        .filter(i => i.cwd)
+        .map(i => new RegExp(`(^|\\/)${escapeRE(i.cwd.split('node_modules/').pop())}(\\/|$)(?!node_modules\\/)`))
+    }
+  }])
   options.modulesDir.push(resolve(pkgDir, 'node_modules'))
   options.build.transpile.push('@nuxt/ui-templates')
   options.alias['vue-demi'] = resolve(options.appDir, 'compat/vue-demi')

diff --git a/test/fixtures/basic/.gitignore b/test/fixtures/basic/.gitignore
@@ -0,0 +1 @@
+!extends/node_modules
diff --git a/test/fixtures/basic/extends/foo/server/middleware/foo.ts b/test/fixtures/basic/extends/foo/server/middleware/foo.ts
diff --git a/...s/basic/extends/foo/app/router.options.ts → ...ds/node_modules/foo/app/router.options.ts b/...s/basic/extends/foo/app/router.options.ts → ...ds/node_modules/foo/app/router.options.ts
diff --git a/...sic/extends/foo/components/ExtendsFoo.vue → ...ode_modules/foo/components/ExtendsFoo.vue b/...sic/extends/foo/components/ExtendsFoo.vue → ...ode_modules/foo/components/ExtendsFoo.vue
diff --git a/...xtends/foo/components/ExtendsOverride.vue → ...odules/foo/components/ExtendsOverride.vue b/...xtends/foo/components/ExtendsOverride.vue → ...odules/foo/components/ExtendsOverride.vue
diff --git a/...ures/basic/extends/foo/composables/foo.ts → ...tends/node_modules/foo/composables/foo.ts b/...ures/basic/extends/foo/composables/foo.ts → ...tends/node_modules/foo/composables/foo.ts
diff --git a/...res/basic/extends/foo/layouts/default.vue → ...ends/node_modules/foo/layouts/default.vue b/...res/basic/extends/foo/layouts/default.vue → ...ends/node_modules/foo/layouts/default.vue
diff --git a/...es/basic/extends/foo/layouts/override.vue → ...nds/node_modules/foo/layouts/override.vue b/...es/basic/extends/foo/layouts/override.vue → ...nds/node_modules/foo/layouts/override.vue
diff --git a/...tures/basic/extends/foo/middleware/foo.ts → ...xtends/node_modules/foo/middleware/foo.ts b/...tures/basic/extends/foo/middleware/foo.ts → ...xtends/node_modules/foo/middleware/foo.ts
diff --git a/.../basic/extends/foo/middleware/override.ts → ...s/node_modules/foo/middleware/override.ts b/.../basic/extends/foo/middleware/override.ts → ...s/node_modules/foo/middleware/override.ts
diff --git a/...fixtures/basic/extends/foo/nuxt.config.ts → ...c/extends/node_modules/foo/nuxt.config.ts b/...fixtures/basic/extends/foo/nuxt.config.ts → ...c/extends/node_modules/foo/nuxt.config.ts
diff --git a/.../fixtures/basic/extends/foo/pages/foo.vue → ...ic/extends/node_modules/foo/pages/foo.vue b/.../fixtures/basic/extends/foo/pages/foo.vue → ...ic/extends/node_modules/foo/pages/foo.vue
diff --git a/...ures/basic/extends/foo/pages/override.vue → ...tends/node_modules/foo/pages/override.vue b/...ures/basic/extends/foo/pages/override.vue → ...tends/node_modules/foo/pages/override.vue
diff --git a/...fixtures/basic/extends/foo/plugins/foo.ts → ...c/extends/node_modules/foo/plugins/foo.ts b/...fixtures/basic/extends/foo/plugins/foo.ts → ...c/extends/node_modules/foo/plugins/foo.ts
diff --git a/...tures/basic/extends/foo/server/api/foo.ts → ...xtends/node_modules/foo/server/api/foo.ts b/...tures/basic/extends/foo/server/api/foo.ts → ...xtends/node_modules/foo/server/api/foo.ts
diff --git a/test/fixtures/basic/extends/node_modules/foo/server/middleware/foo.ts b/test/fixtures/basic/extends/node_modules/foo/server/middleware/foo.ts
diff --git a/test/fixtures/basic/nuxt.config.ts b/test/fixtures/basic/nuxt.config.ts
@@ -6,7 +6,7 @@ export default defineNuxtConfig({
   builder: process.env.TEST_WITH_WEBPACK ? 'webpack' : 'vite',
   extends: [
     './extends/bar',
-    './extends/foo'
+    './extends/node_modules/foo'
   ],
   nitro: {
     output: { dir: process.env.NITRO_OUTPUT_DIR }