Commit09dc5be

committed

Fix shadowing of internalmodule,exports andrequire when a global counterpart exists

1 parent1eede09 commit09dc5beCopy full SHA for 09dc5be

File tree

+19

-2

lines changed

+19

-2

lines changed

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,10 @@ function getImportGlobalsSrc(ignore) {`
`16`	`16`	`ignore=ignore\|\|[];`
`17`	`17`	`// global itself can't be overridden because it's the only reference to our real global objects`
`18`	`18`	`ignore.push("global");`
	`19`	`+// ignore 'module', 'exports' and 'require' on the global scope, because otherwise our code would`
	`20`	`+// shadow the module-internal variables`
	`21`	`+//@see https://github.com/jhnns/rewire-webpack/pull/6`
	`22`	`+ignore.push("module","exports","require");`
`19`	`23`
`20`	`24`	`for(keyinglobalObj){/* jshint forin: false */`
`21`	`25`	`if(ignore.indexOf(key)!==-1){`

Lines changed: 15 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,11 +7,24 @@ describe("getImportGlobalsSrc", function () {`
`7`	`7`	`varcontext={`
`8`	`8`	`global:global`
`9`	`9`	`},`
	`10`	`+expectedGlobals,`
`10`	`11`	`src,`
`11`		`-actualGlobals,`
`12`		`-expectedGlobals=Object.keys(global);`
	`12`	`+actualGlobals;`
	`13`	`+`
	`14`	`+// Temporarily set module-internal variables on the global scope to check if getImportGlobalsSrc()`
	`15`	`+// ignores them properly`
	`16`	`+global.module=module;`
	`17`	`+global.exports=exports;`
	`18`	`+global.require=require;`
`13`	`19`
`14`	`20`	`src=getImportGlobalsSrc();`
	`21`	`+`
	`22`	`+deleteglobal.module;`
	`23`	`+deleteglobal.exports;`
	`24`	`+deleteglobal.require;`
	`25`	`+`
	`26`	`+expectedGlobals=Object.keys(global);`
	`27`	`+`
`15`	`28`	`vm.runInNewContext(src,context);`
`16`	`29`	`actualGlobals=Object.keys(context).filter(function(key){`
`17`	`30`	`// node v0.10 does not set a constructor property on the context`

Comments

(0)