feat(builder): ignore option to function the same as .nuxtignore (nuxt#7132)

Phara0h · web-flow · commit 51b5bf565b58 · 2020-03-27T11:53:23.000+01:00
diff --git a/packages/builder/src/builder.js b/packages/builder/src/builder.js
@@ -82,7 +82,8 @@ export default class Builder {
     this.bundleBuilder = this.getBundleBuilder(bundleBuilder)
 
     this.ignore = new Ignore({
-      rootDir: this.options.srcDir
+      rootDir: this.options.srcDir,
+      ignoreArray: this.options.ignore
     })
   }
 
@@ -312,7 +313,6 @@ export default class Builder {
   async resolveFiles (dir, cwd = this.options.srcDir) {
     return this.ignore.filter(await glob(this.globPathWithExtensions(dir), {
       cwd,
-      ignore: this.options.ignore,
       follow: this.options.build.followSymlinks
     }))
   }
diff --git a/packages/builder/src/ignore.js b/packages/builder/src/ignore.js
@@ -6,6 +6,7 @@ export default class Ignore {
   constructor (options) {
     this.rootDir = options.rootDir
     this.ignoreOptions = options.ignoreOptions
+    this.ignoreArray = options.ignoreArray
     this.addIgnoresRules()
   }
 
@@ -35,6 +36,12 @@ export default class Ignore {
     if (content) {
       this.ignore.add(content)
     }
+    if (this.ignoreArray && this.ignoreArray.length > 0) {
+      if (!this.ignore) {
+        this.ignore = ignore(this.ignoreOptions)
+      }
+      this.ignore.add(this.ignoreArray)
+    }
   }
 
   filter (paths) {
diff --git a/packages/builder/test/builder.generate.test.js b/packages/builder/test/builder.generate.test.js
@@ -102,7 +102,7 @@ describe('builder: builder generate', () => {
     expect(Glob).toBeCalledTimes(1)
     expect(Glob).toBeCalledWith(
       '/var/nuxt/dir/**/*.{vue,js}',
-      { cwd: '/var/nuxt/src', ignore: '/var/nuxt/ignore' }
+      { cwd: '/var/nuxt/src' }
     )
     expect(builder.ignore.filter).toBeCalledTimes(1)
     expect(builder.ignore.filter).toBeCalledWith('matched files')

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ export default class Ignore {`
`6`	`6`	`constructor (options) {`
`7`	`7`	`this.rootDir = options.rootDir`
`8`	`8`	`this.ignoreOptions = options.ignoreOptions`
	`9`	`+ this.ignoreArray = options.ignoreArray`
`9`	`10`	`this.addIgnoresRules()`
`10`	`11`	`}`
`11`	`12`
`@@ -35,6 +36,12 @@ export default class Ignore {`
`35`	`36`	`if (content) {`
`36`	`37`	`this.ignore.add(content)`
`37`	`38`	`}`
	`39`	`+ if (this.ignoreArray && this.ignoreArray.length > 0) {`
	`40`	`+ if (!this.ignore) {`
	`41`	`+ this.ignore = ignore(this.ignoreOptions)`
	`42`	`+ }`
	`43`	`+ this.ignore.add(this.ignoreArray)`
	`44`	`+ }`
`38`	`45`	`}`
`39`	`46`
`40`	`47`	`filter (paths) {`
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ describe('builder: builder generate', () => {`
`102`	`102`	`expect(Glob).toBeCalledTimes(1)`
`103`	`103`	`expect(Glob).toBeCalledWith(`
`104`	`104`	`'/var/nuxt/dir/*/.{vue,js}',`
`105`		`- { cwd: '/var/nuxt/src', ignore: '/var/nuxt/ignore' }`
	`105`	`+ { cwd: '/var/nuxt/src' }`
`106`	`106`	`)`
`107`	`107`	`expect(builder.ignore.filter).toBeCalledTimes(1)`
`108`	`108`	`expect(builder.ignore.filter).toBeCalledWith('matched files')`