Commit84efafe

committed

file path bug fixes

1 parent4c5eea3 commit84efafeCopy full SHA for 84efafe

File tree

+21

-21

lines changed

+21

-21

lines changed

Lines changed: 17 additions & 17 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,26 +10,26 @@`
`10`	`10`	`*/`
`11`	`11`	`constignore=['global','root','process','Buffer','clearImmediate','clearInterval','setTimeout','module','exports','require'];`
`12`	`12`
`13`		`-functiongetImportGlobalsSrc(ignore){`
`14`		`-varkey,`
`15`		`-value,`
`16`		`-src='',`
`17`		`-globalObj=typeofglobal==='undefined' ?window :global;`
	`13`	`+functiongetImportGlobalsSrc(){`
	`14`	`+varkey,`
	`15`	`+value,`
	`16`	`+src='\n',`
	`17`	`+globalObj=typeofglobal==='undefined' ?window :global;`
`18`	`18`
`19`		`-for(keyinglobalObj){/* jshint forin: false */`
`20`		`-if(ignore.indexOf(key)!==-1){`
`21`		`-continue;`
`22`		`-}`
`23`		`-// value = globalObj[key];`
`24`		`-`
`25`		`-// key may be an invalid variable name (e.g. 'a-b')`
`26`		`-try{`
`27`		`-// eval('var ' + key);`
`28`		-src+=`var${key} = global.${key}`;
`29`		`-}catch(e){}`
	`19`	`+for(keyinglobalObj){/* jshint forin: false */`
	`20`	`+if(ignore.indexOf(key)!==-1\|\|key.match(/^__/)){`
	`21`	`+continue;`
`30`	`22`	`}`
	`23`	`+// value = globalObj[key];`
	`24`	`+`
	`25`	`+// key may be an invalid variable name (e.g. 'a-b')`
	`26`	`+try{`
	`27`	`+// eval('var ' + key);`
	`28`	+src+=`var${key} = global.${key};`;
	`29`	`+}catch(e){}`
	`30`	`+}`
`31`	`31`
`32`		`-returnsrc;`
	`32`	`+returnsrc;`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`module.exports=getImportGlobalsSrc;`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ var fileExists = require('./fileExists');`
`11`	`11`	`*/`
`12`	`12`	`functionrewire(filename){`
`13`	`13`	`// is not a node_module path`
`14`		`-if(!filename.match(/^[a-zA-Z\_]/)){`
	`14`	`+if(!filename.match(/^[a-zA-Z\_]/)\|\|filename.match(/^[A-Z]:)){`
`15`	`15`	`if(!fileExists(filename)){`
`16`	`16`	`// create a __get__ mock to prevent tests breaking`
`17`	`17`	`// when file does not exist`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`'use strict';`
`2`	`2`	`constModule=require('module');`
`3`		`-const{ readFileSync, join}=require('fs');`
	`3`	`+const{ readFileSync}=require('fs');`
`4`	`4`	`constgetImportGlobalsSrc=require('./getImportGlobalsSrc');`
`5`	`5`	`constgetDefinePropertySrc=require('./getDefinePropertySrc');`
`6`	`6`	`constmoduleEnv=require('./moduleEnv');`
`@@ -21,7 +21,7 @@ function internalRewire(parentModulePath, targetPath) {`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`// Resolve full filename relative to the parent module`
`24`		`-targetPath=join(targetPath,parentModulePath);`
	`24`	`+targetPath=Module._resolveFilename(targetPath,parentModulePath);`
`25`	`25`
`26`	`26`	`src=readFileSync(targetPath,'utf8');`
`27`	`27`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name":"rewire-coderoad",`
`3`		`-"version":"3.1.3",`
	`3`	`+"version":"3.1.4",`
`4`	`4`	`"description":"CodeRoad implementation to override 'require' in order to test globals",`
`5`	`5`	`"keywords": [`
`6`	`6`	`"coderoad",`

Comments

(0)