Skip to content

Commit

Permalink
fix: disable auto import include for scanDirs
Browse files Browse the repository at this point in the history
reverts #277
  • Loading branch information
pi0 committed Jun 15, 2022
1 parent 02883f0 commit 4c057cd
Showing 1 changed file with 10 additions and 9 deletions.
19 changes: 10 additions & 9 deletions src/options.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { loadConfig } from 'c12'
import { klona } from 'klona/full'
import { camelCase } from 'scule'
import defu from 'defu'
import escapeRE from 'escape-string-regexp'
// import escapeRE from 'escape-string-regexp'
import { withLeadingSlash, withoutTrailingSlash, withTrailingSlash } from 'ufo'
import { isTest } from 'std-env'
import { resolvePath as resovleModule } from 'mlly'
Expand Down Expand Up @@ -136,14 +136,15 @@ export async function loadOptions (userConfig: NitroConfig = {}): Promise<NitroO
options.scanDirs = [options.srcDir]
}

options.autoImport.include = [
...Array.isArray(options.autoImport.include)
? options.autoImport.include
: [options.autoImport.include].filter(Boolean),
...options.scanDirs
.filter(i => i.includes('node_modules'))
.map(i => new RegExp(`(^|\\/)${escapeRE(i.split('node_modules/').pop())}(\\/|$)(?!node_modules\\/)`))
]
// TODO: https://github.com/unjs/nitro/issues/294
// options.autoImport.include = [
// ...Array.isArray(options.autoImport.include)
// ? options.autoImport.include
// : [options.autoImport.include].filter(Boolean),
// ...options.scanDirs
// .filter(i => i.includes('node_modules'))
// .map(i => new RegExp(`(^|\\/)${escapeRE(i.split('node_modules/').pop())}(\\/|$)(?!node_modules\\/)`))
// ]

options.baseURL = withLeadingSlash(withTrailingSlash(options.baseURL))
options.runtimeConfig = defu(options.runtimeConfig, {
Expand Down

0 comments on commit 4c057cd

Please sign in to comment.