Merge pull request #212 from Softpagehomeware/master

added support for compiling without module option

Author: basarat

.gitignore

@@ -26,3 +26,5 @@ bin/
 obj/
 *.user
 *.suo
+.project
+.settings/

Gruntfile.js

@@ -464,6 +464,22 @@ module.exports = function (grunt) {
                 options: {
                     fast: 'never'
                 }
+            },
+            withemptymodule: {
+                test: true,
+                options: {
+                    module: ''
+                },
+                src: 'test/withemptymodule/ts/Main.ts',
+                out: 'test/withemptymodule/js/Main.js'
+            },
+            withwrongmodule: {
+                fail: true,
+                options: {
+                    module: 'nothing'
+                },
+                src: 'test/withwrongmodule/ts/*.ts',
+                outDir: 'test/withwrongmodule/js'
             }
         }
     });

README.md

@@ -84,7 +84,7 @@ For file ordering, look at [JavaScript Generation](#javascript-generation).
 |[htmlModuleTemplate](#htmlmoduletemplate)|option|`string` - HTML template namespace|
 |[htmlVarTemplate](#htmlvartemplate)|option|`string` - HTML property name|
 |[mapRoot](#maproot)|option|`string` - root for referencing `.js.map` files in JS|
-|[module](#module)|option|`'amd'` (default) or `'commonjs'` - specifies external module style|
+|[module](#module)|option|default to be nothing, If you want to set it you set it to either `'amd'` or `'commonjs'`|
 |[noImplicitAny](#noimplicitany)|option|`true`, `false` (default) - enable for stricter type checking|
 |[noResolve](#noresolve)|option|`true`, `false` (default) - for deprecated version of TypeScript|
 |[options](#grunt-ts-target-options)|target||

tasks/modules/compile.js

@@ -184,7 +184,16 @@ export function compileAllFiles(targetFiles: string[], target: ITargetOptions, t
 
     // string options
     args.push('--target', task.target.toUpperCase());
-    args.push('--module', task.module.toLowerCase());
+
+    // check the module compile option
+    if (task.module) {
+   	    var moduleOptionString: string = task.module.toLowerCase();
+    	if (moduleOptionString === 'amd' || moduleOptionString === 'commonjs') {
+            args.push('--module', moduleOptionString);
+    	} else {
+	        console.warn('WARNING: Option "module" does only support "amd" | "commonjs"'.magenta);
+    	}
+    }
 
     // Target options:
     if (target.out) {

tasks/modules/compile.ts

@@ -99,7 +99,7 @@ function pluginFn(grunt: IGrunt) {
             compile: true,
             declaration: false,
             mapRoot: '',
-            module: 'amd', // amd, commonjs
+            module: null, // amd, commonjs
             noImplicitAny: false,
             noResolve: false,
             comments: null, // false to remove comments

tasks/ts.js

@@ -0,0 +1,11 @@
+class Bar {
+	public value:string;
+	
+	constructor() {
+		this.value = 'bar';
+	}
+	
+	public getValue() {
+		return this.value;
+	}
+}

tasks/ts.ts

@@ -0,0 +1,10 @@
+/// <reference path="Bar.ts" />
+	
+class Foo extends Bar {
+		
+	constructor() {
+		super();
+		this.value = 'foo ' + this.value;
+	}
+	
+}

test/withemptymodule/ts/Bar.ts

@@ -0,0 +1,9 @@
+/// <reference path="Foo.ts" />
+
+class Main {
+	constructor() {
+		
+	}
+}
+
+new Main();