Commitff4c928

authored

fix(commonjs): crawl dynamicRequireRoot outside cwd (#1859)

* test(commonjs): add failing test for dynamicRequireRoot outside cwd* fix(commonjs): dynamicRequireRoot outside cwd

1 parentbb54901 commitff4c928Copy full SHA for ff4c928

File tree

+32

-2

lines changed

+32

-2

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`import{existsSync,readFileSync,statSync}from'fs';`
`2`		`-import{join,resolve,dirname}from'path';`
	`2`	`+import{join,resolve,dirname,relative}from'path';`
`3`	`3`
`4`	`4`	`importgetCommonDirfrom'commondir';`
`5`	`5`
`@@ -46,7 +46,7 @@ export function getDynamicRequireModules(patterns, dynamicRequireRoot) {`
`46`	`46`	`.withBasePath()`
`47`	`47`	`.withDirs()`
`48`	`48`	`.glob(isNegated ?pattern.substr(1) :pattern)`
`49`		`-.crawl()`
	`49`	`+.crawl(relative('.',dynamicRequireRoot))`
`50`	`50`	`.sync()`
`51`	`51`	`.sort((a,b)=>a.localeCompare(b,'en'))){`
`52`	`52`	`constresolvedPath=resolve(path);`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,6 @@`
	`1`	`+functiontakeModule(path){`
	`2`	`+// eslint-disable-next-line global-require,import/no-dynamic-require`
	`3`	`+returnrequire(path);`
	`4`	`+}`
	`5`	`+`
	`6`	`+takeModule('../outer.js');`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+module.exports='outer_export_value';`

Lines changed: 23 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,23 @@`
	`1`	`+constpath=require('path');`
	`2`	`+`
	`3`	`+consttest=require('ava');`
	`4`	`+const{ rollup}=require('rollup');`
	`5`	`+`
	`6`	`+const{ commonjs}=require('./helpers/util.js');`
	`7`	`+`
	`8`	`+process.chdir(path.join(__dirname,'fixtures/samples/dynamic-require-root-outside-cwd/cwd'));`
	`9`	`+`
	`10`	`+test('crawls dynamicRequireRoot outside cwd',async(t)=>{`
	`11`	`+constbuild=awaitrollup({`
	`12`	`+input:'main.js',`
	`13`	`+plugins:[`
	`14`	`+commonjs({`
	`15`	`+dynamicRequireRoot:'..',`
	`16`	`+dynamicRequireTargets:['../outer.js']`
	`17`	`+})`
	`18`	`+]`
	`19`	`+});`
	`20`	`+constbundle=awaitbuild.generate({format:'cjs'});`
	`21`	`+const{ code}=bundle.output[0];`
	`22`	`+t.true(code.includes('outer_export_value'),'outer_export_value not found in the code');`
	`23`	`+});`

Comments

(0)