Fixed NodeJS wrapping fucks up require dependency (fixes #82)

lptr · lptr · commit b240c54e313d · 2014-05-08T11:12:26.000+02:00
diff --git a/spaghetti-core/src/main/groovy/com/prezi/spaghetti/Wrapper.groovy b/spaghetti-core/src/main/groovy/com/prezi/spaghetti/Wrapper.groovy
@@ -53,10 +53,10 @@ class Wrapper {
 	}
 
 	private static String wrapAsNodeJsModule(Iterable<String> moduleNames, String config, String contents) {
-		def requires = ["require", *moduleNames].collect { moduleName ->
+		def requires = moduleNames.collect { moduleName ->
 			""""${moduleName}": __requirejs("${moduleName}")"""
 		}
-		return """var __requirejs = require("requirejs"); ${config} var __modules = { ${requires.join(",")} }; ${contents}"""
+		return """var __requirejs = require("requirejs"); ${config} var __modules = { "require": __requirejs,${requires.join(",")} }; ${contents}"""
 	}
 
 	private static String config(Iterable<String> moduleNames, String modulesRoot, String requireName) {

Original file line number	Diff line number	Diff line change
`@@ -53,10 +53,10 @@ class Wrapper {`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`private static String wrapAsNodeJsModule(Iterable<String> moduleNames, String config, String contents) {`
`56`		`- def requires = ["require", *moduleNames].collect { moduleName ->`
	`56`	`+ def requires = moduleNames.collect { moduleName ->`
`57`	`57`	`""""${moduleName}": __requirejs("${moduleName}")"""`
`58`	`58`	`}`
`59`		`- return """var __requirejs = require("requirejs"); ${config} var __modules = { ${requires.join(",")} }; ${contents}"""`
	`59`	`+ return """var __requirejs = require("requirejs"); ${config} var __modules = { "require": __requirejs,${requires.join(",")} }; ${contents}"""`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`private static String config(Iterable<String> moduleNames, String modulesRoot, String requireName) {`