Merge pull request #207 from PG-Devs/master

Chuck Dumont · web-flow · commit 676e388672b0 · 2019-02-22T08:20:43.000-05:00
Thanks for the fixes!
diff --git a/lib/DojoLoaderPlugin.js b/lib/DojoLoaderPlugin.js
@@ -114,7 +114,7 @@ module.exports = class DojoLoaderPlugin {
 					}
 				}
 				child_process.execFile(
-					"node", // the executable to run
+					process.execPath, // the executable to run
 					[	// The arguments
 						path.resolve(__dirname, "../buildDojo", "buildRunner.js"),
 						"load=build",
diff --git a/runtime/DojoAMDMainTemplate.runtime.js b/runtime/DojoAMDMainTemplate.runtime.js
@@ -20,7 +20,7 @@ module.exports = {
 	main: function() {
 		function mix(dest, src) { // eslint-disable-line no-unused-vars
 			for(var n in src) dest[n] = src[n];
-			return src;
+			return dest;
 		}
 
 		function toUrl(name, referenceModule) {

Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ module.exports = class DojoLoaderPlugin {`
`114`	`114`	`}`
`115`	`115`	`}`
`116`	`116`	`child_process.execFile(`
`117`		`- "node", // the executable to run`
	`117`	`+ process.execPath, // the executable to run`
`118`	`118`	`[ // The arguments`
`119`	`119`	`path.resolve(__dirname, "../buildDojo", "buildRunner.js"),`
`120`	`120`	`"load=build",`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ module.exports = {`
`20`	`20`	`main: function() {`
`21`	`21`	`function mix(dest, src) { // eslint-disable-line no-unused-vars`
`22`	`22`	`for(var n in src) dest[n] = src[n];`
`23`		`- return src;`
	`23`	`+ return dest;`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`function toUrl(name, referenceModule) {`