Merge pull request #97 from dkamburov/master

Change module loader to commonjs

Author: kdinev

tests/karma-test-shim.js

@@ -75,11 +75,6 @@ System.config({
     'rxjs': {
       defaultExtension: 'js'
     }
-  },
-  meta: {
-    'src/*': {
-    format: 'register'
-    }
   }
 });
 

tests/karma.conf.js

@@ -13,19 +13,17 @@ module.exports = function(config){
             'http://cdn-na.infragistics.com/igniteui/latest/js/infragistics.dv.js',
             'https://cdnjs.cloudflare.com/ajax/libs/modernizr/2.8.3/modernizr.js',
 
-            // System.js for module loading
+
             { pattern: 'node_modules/traceur/bin/traceur.js', included: true, watched: false },
             { pattern: 'node_modules/traceur/bin/traceur.js.map', included: false, watched: false },
+            // System.js for module loading
             'node_modules/systemjs/dist/system.src.js',
-            { pattern: 'node_modules/systemjs/dist/system-polyfills.js', included: true, watched: false },
-            { pattern: 'node_modules/systemjs/dist/system-polyfills.js.map', included: false, watched: false },
 
             // Polyfills
-            'node_modules/es6-shim/es6-shim.js',
+            'node_modules/core-js/client/shim.js',
+            'node_modules/reflect-metadata/Reflect.js',
 
-            // Reflect and Zone.js
-            { pattern: 'node_modules/reflect-metadata/Reflect.js', included: true, watched: false },
-            { pattern: 'node_modules/reflect-metadata/Reflect.js.map', included: false, watched: false },
+            // zone.js
             'node_modules/zone.js/dist/zone.js',
             'node_modules/zone.js/dist/long-stack-trace-zone.js',
             'node_modules/zone.js/dist/proxy.js',
@@ -34,21 +32,27 @@ module.exports = function(config){
             'node_modules/zone.js/dist/async-test.js',
             'node_modules/zone.js/dist/fake-async-test.js',
 
+            // RxJs
+            { pattern: 'node_modules/rxjs/**/*.js', included: false, watched: false },
+            { pattern: 'node_modules/rxjs/**/*.js.map', included: false, watched: false },
+
+            // Paths loaded via module imports:
+            // Angular itself
+            {pattern: 'node_modules/@angular/**/*.js', included: false, watched: false},
+            {pattern: 'node_modules/@angular/**/*.js.map', included: false, watched: false},
+
             // Angular and RxJS
-            'node_modules/rxjs/bundles/Rx.js',
 
             'tests/karma-test-shim.js',
 
             { pattern: 'samples/data/*.js', included: false, watched: false },
             { pattern: 'samples/data/*.js.map', included: false, watched: false },
-            { pattern: 'node_modules/rxjs/**/*.js', included: false, watched: false },
-            { pattern: 'node_modules/rxjs/**/*.js.map', included: false, watched: false },
 
             { pattern: 'node_modules/@angular/**/*.js', included: false, watched: false },
             { pattern: 'node_modules/@angular/**/*.js.map', included: false, watched: false },
 
             // paths loaded via module imports
-            {pattern: 'src/*', included: false, watched: true},
+            { pattern: 'src/*', included: false, watched: true },
 
             // spec files need to be loaded in the shim file IN CONTEXT of the main module, don't include:            
             { pattern: 'tests/unit/**/*.js', included: false, watched: false },

tsconfig.json

@@ -1,7 +1,7 @@
 {
   "compilerOptions": {
     "target": "es5",
-    "module": "system",
+    "module": "commonjs",
     "moduleResolution": "node", 
     "sourceMap": true,
     "emitDecoratorMetadata": true,