test(*): Remove karma-webpack. Hook up karma-systemjs.

chore(*): Fixed some grunt build stuff

Author: christopherthielen

Gruntfile.js

@@ -3,6 +3,8 @@ module.exports = function (grunt) {
 
   require('load-grunt-tasks')(grunt);
   var files = require('./files').files;
+  var systemjs = require('systemjs');
+  //var jspm = require('jspm');
 
   // Project configuration.
   grunt.initConfig({
@@ -19,29 +21,15 @@ module.exports = function (grunt) {
     },
     clean: [ '<%= builddir %>' ],
     ts: {
-      base: {
+      es5: {
         src: files.src,
-        outDir: '<%= builddir %>/ts2es5',
-        options: {
-		      //target: "es6"
-          //module: 'amd', //or commonjs
-           module: 'commonjs'
-        }
-      }
-    },
-    concat: {
-      options: {
-        banner: '<%= meta.banner %>\n\n'+
-                '/* commonjs package manager support (eg componentjs) */\n'+
-                'if (typeof module !== "undefined" && typeof exports !== "undefined" && module.exports === exports){\n'+
-                '  module.exports = \'ui.router\';\n'+
-                '}\n\n'+
-                '(function (window, angular, undefined) {\n',
-        footer: '})(window, window.angular);'
+        outDir: '<%= builddir %>/es5',
+        options: { module: 'commonjs'}
       },
-      build: {
+      es6: {
         src: files.src,
-        dest: '<%= builddir %>/<%= pkg.name %>.js'
+        outDir: '<%= builddir %>/es6',
+        options: { target: "es6"}
       }
     },
     uglify: {
@@ -56,7 +44,7 @@ module.exports = function (grunt) {
     },
     webpack: {
       build: {
-        entry: files.buildSrc,
+        entry: files.commonJsEntrypoint,
         output: {
           path: '<%= builddir %>',
           filename: '<%= pkg.name %>.js',
@@ -84,7 +72,7 @@ module.exports = function (grunt) {
     },
     watch: {
       files: ['src/**/*.ts', 'src/**/*.js', 'test/**/*.js'],
-      tasks: ['build', 'karma:unit']
+      tasks: ['build', 'karma']
     },
     connect: {
       server: {},
@@ -97,38 +85,53 @@ module.exports = function (grunt) {
     },
     karma: {
       options: {
-        configFile: 'config/karma-1.4.1.js',
+        configFile: 'config/karma.js',
         singleRun: true,
         exclude: [],
-        frameworks: ['jasmine'],
+        frameworks: ['systemjs', 'jasmine'],
         reporters: 'dots', // 'dots' || 'progress'
         port: 8080,
         colors: true,
         autoWatch: false,
         autoWatchInterval: 0,
+        // Serve and load angular files using regular Karma mode
+        files: files.karmaServedFiles('1.4.1'),
+        systemjs: {
+          configFile: 'config/system.config.js',
+          // These files are served by Karma, but loaded using SystemJS
+          files: ['src/**/*.ts'].concat(files.testUtils, files.test),
+          // This is turned into a regexp and used to load specs into Karma
+          testFileSuffix: "/test/\\S+.[tj]s"
+        },
         browsers: [ grunt.option('browser') || 'PhantomJS' ]
       },
+      // Same as karma:base
       unit: {
         browsers: [ grunt.option('browser') || 'PhantomJS' ]
       },
+      // Launch Karma in Chrome, click debug button, debug tests
       debug: {
         singleRun: false,
         background: false,
         browsers: [ grunt.option('browser') || 'Chrome' ]
       },
-      onetwo: {
-        configFile: 'config/karma-1.2.28.js'
+      // Test with angular 1.2
+      ng12: {
+        options: { files: files.karmaServedFiles('1.2.28') }
       },
-      onethree: {
-        configFile: 'config/karma-1.3.16.js'
+      // Test with angular 1.3
+      ng13: {
+        options: { files: files.karmaServedFiles('1.3.16') }
       },
-      onefour: {
-        configFile: 'config/karma-1.4.1.js'
+      // Test with angular 1.4
+      ng14: {
+        options: { files: files.karmaServedFiles('1.4.1') }
       },
       background: {
           background: true,
           browsers: [ grunt.option('browser') || 'PhantomJS' ]
       },
+      // PhantomJS in the console; watch for changes to tests/src
       watch: {
         configFile: 'config/karma.js',
         singleRun: false,
@@ -156,12 +159,11 @@ module.exports = function (grunt) {
     }
   });
 
-  grunt.registerTask('integrate', ['clean', 'build', 'karma:onetwo', 'karma:onethree', 'karma:onefour']);
+  grunt.registerTask('integrate', ['clean', 'build', 'karma:ng12', 'karma:ng13', 'karma:ng14']);
   grunt.registerTask('default', ['build', 'karma:unit']);
-  grunt.registerTask('build', 'Perform a normal build', ['ts', 'webpack', 'uglify']);
-  grunt.registerTask('dist', 'Perform a clean build', ['clean', 'build']);
-  grunt.registerTask('dist-docs', 'Perform a clean build and generate documentation', ['dist', 'ngdocs']);
-  grunt.registerTask('release', 'Tag and perform a release', ['prepare-release', 'dist', 'perform-release']);
+  grunt.registerTask('build', 'Perform a normal build', ['clean', 'ts', 'webpack', 'uglify']);
+  grunt.registerTask('dist-docs', 'Perform a clean build and generate documentation', ['build', 'ngdocs']);
+  grunt.registerTask('release', 'Tag and perform a release', ['prepare-release', 'build', 'perform-release']);
   grunt.registerTask('dev', 'Run dev server and watch for changes', ['build', 'connect:server', 'karma:background', 'watch']);
   grunt.registerTask('sample', 'Run connect server with keepalive:true for sample app development', ['connect:sample']);
 
@@ -216,7 +218,7 @@ module.exports = function (grunt) {
   });
 
   grunt.registerTask('perform-release', function () {
-    grunt.task.requires([ 'prepare-release', 'dist' ]);
+    grunt.task.requires([ 'prepare-release', 'build' ]);
 
     var version = grunt.config('pkg.version'), releasedir = grunt.config('builddir');
     promising(this,

config/karma-1.2.28.js

@@ -4,34 +4,20 @@ module.exports = {
   // base path, that will be used to resolve files and exclude
   basePath: '..',
 
-  // list of files / patterns to load in the browser
-  _files: [].concat(files.testUtils, files.buildDest, 'test/tests.js'),
-  preprocessors: {
-    'lib/angular*.js': ['webpack'],
-    'test/tests.js': ['webpack']
-  },
+  // Karma files available to serve is configured using files.karmaServeFiles() in each grunt task (e.g., karma:ng14)
+  // Actual tests to load is configured in karma.options.systemjs.files block
 
   // level of logging
   // possible values: LOG_DISABLE || LOG_ERROR || LOG_WARN || LOG_INFO || LOG_DEBUG
   //logLevel: karma.LOG_DEBUG,
   frameworks: ['jasmine'],
   plugins: [
-    require('karma-webpack'),
+    require('karma-systemjs'),
     require('karma-jasmine'),
     require('karma-phantomjs-launcher'),
     require('karma-chrome-launcher')
   ],
 
-  webpack: {
-    resolve: {
-      modulesDirectories: [
-        "",
-        "build/ts2es5",
-        "node_modules"
-      ]
-    }
-  },
-
   // Start these browsers, currently available:
   // - Chrome
   // - ChromeCanary

config/karma-1.3.16.js

@@ -1,9 +1,7 @@
 // Karma configuration file
-var files = require('../files').files;
 var config = require("./karma.base");
 
 module.exports = function (karma) {
-  config.files = files.angular('1.3.16').concat(config.files);
   config.logLevel = karma.LOG_DEBUG;
   karma.set(config)
 };

config/karma-1.4.1.js

@@ -0,0 +1,20 @@
+System.config({
+    transpiler: 'typescript',
+    paths: {
+        'babel': 'node_modules/babel-core/browser.js',
+        'typescript': 'node_modules/typescript/bin/typescript.js',
+        'systemjs': 'node_modules/systemjs/dist/system.src.js',
+        'system-polyfills': 'node_modules/systemjs/dist/system-polyfills.js',
+        'es6-module-loader': 'node_modules/es6-module-loader/dist/es6-module-loader.js',
+        'phantomjs-polyfill': 'node_modules/phantomjs-polyfill/bind-polyfill.js',
+        'ui-router': 'src/ui-router.ts'
+    },
+    packages: {
+        'build/es6': {
+            defaultExtension: 'js'
+        },
+        'src': {
+            defaultExtension: 'ts'
+        }
+    }
+});

config/karma.base.js

@@ -1,52 +1,52 @@
 routerFiles = {
-  buildSrc: [
-    './build/ts2es5/ui-router.js'
-  ],
-  buildDest: [
-    'build/angular-ui-router.js'
-  ],
-  src: [
-    'src/ui-router.ts',
-    'src/resolve.ts',
-    'src/templateFactory.ts',
-    'src/urlMatcherFactory.ts',
-    'src/transition.ts',
-    'src/urlRouter.ts',
-    'src/state.ts',
-    'src/view.ts',
-    'src/viewScroll.ts',
-    'src/viewDirective.ts',
-    'src/stateDirectives.ts',
-    'src/stateFilters.ts',
-    'src/stateEvents.ts',
-    'src/trace.ts'
-  ],
+  commonJsEntrypoint: ['./build/es5/ui-router.js'],
+  es6Entrypoint:      ['./build/es6/ui-router.js'],
+
+  buildDest:          ['build/angular-ui-router.js'], // The distribution file
+  src:                ['src/ui-router.ts'], // Main UI-Router module (imports everything else)
+
+  // Test helpers
   testUtils: [
     'test/testUtils.js',
     'test/compat/matchers.js'
   ],
+
+  // Tests to load
   test: [
     'test/commonSpec.js',
     'test/globSpec.js',
     'test/resolveSpec.js',
-    //'test/stateDirectivesSpec.js',
+    'test/stateDirectivesSpec.js',
     'test/stateEventsSpec.js',
     'test/stateFiltersSpec.js',
     'test/stateSpec.js',
     'test/templateFactorySpec.js',
     'test/transitionSpec.js',
     'test/urlMatcherFactorySpec.js',
     'test/urlRouterSpec.js',
-    //'test/viewDirectiveSpec.js',
-    //'test/viewScrollSpec.js',
+    'test/viewDirectiveSpec.js',
+    'test/viewScrollSpec.js',
     'test/compat/matchers.js'
   ],
+
+  // Returns necessary files for a specific version of angular
   angular: function(version) {
     return [
       'lib/angular-' + version + '/angular.js',
       'lib/angular-' + version + '/angular-mocks.js',
       'lib/angular-' + version + '/angular-animate.js'
     ];
+  },
+
+  // This returns a Karma 'files configuration' for the files served by the Karma web server
+  // http://karma-runner.github.io/0.8/config/files.html
+  karmaServedFiles: function(version) {
+    return [
+      routerFiles.angular(version),
+      { watched: true, included: false, nocache: true, pattern: 'src/**/*.ts' },
+      { watched: true, included: false, nocache: true, pattern: 'test/**/*.ts' },
+      { watched: true, included: false, nocache: true, pattern: 'test/**/*.js' }
+    ]
   }
 };
 

config/karma.js

@@ -45,30 +45,36 @@
     "angular": "^1.2"
   },
   "devDependencies": {
+    "babel-core": "^5.8.14",
+    "es6-module-loader": "^0.17.3",
+    "faithful-exec": "~0.1.0",
     "grunt": "~0.4.1",
+    "grunt-contrib-clean": "~0.5.0",
+    "grunt-contrib-connect": "~0.7.1",
     "grunt-contrib-uglify": "~0.4.0",
     "grunt-contrib-watch": "~0.5.3",
-    "grunt-contrib-connect": "~0.7.1",
-    "grunt-contrib-clean": "~0.5.0",
+    "grunt-conventional-changelog": "~1.1.0",
     "grunt-karma": "~0.11.2",
+    "grunt-ngdocs": "~0.1.7",
+    "grunt-shell": "^1.1.2",
+    "grunt-ts": "^4.2.0",
+    "grunt-webpack": "^1.0.10",
+    "jasmine-core": "~2.3.4",
     "jsdoc": "git://github.com/jsdoc3/jsdoc.git#v3.2.2",
-    "shelljs": "~0.2.6",
-    "faithful-exec": "~0.1.0",
-    "karma-firefox-launcher": "~0.1.0",
+    "karma": "~0.12.0",
     "karma-chrome-launcher": "~0.1.0",
+    "karma-coffee-preprocessor": "~0.1.0",
+    "karma-firefox-launcher": "~0.1.0",
     "karma-html2js-preprocessor": "~0.1.0",
     "karma-jasmine": "~0.3.6",
-    "karma-script-launcher": "~0.1.0",
-    "karma-coffee-preprocessor": "~0.1.0",
-    "karma": "~0.12.0",
     "karma-phantomjs-launcher": "~0.1.0",
-    "karma-webpack": "~1.5.1",
-    "jasmine-core": "~2.3.4",
+    "karma-script-launcher": "~0.1.0",
+    "karma-systemjs": "^0.7.2",
     "load-grunt-tasks": "~0.4.0",
-    "grunt-conventional-changelog": "~1.1.0",
-    "grunt-ngdocs": "~0.1.7",
-    "grunt-ts": "~4.2.0",
-    "grunt-webpack": "^1.0.10"
+    "phantomjs-polyfill": "0.0.1",
+    "shelljs": "~0.2.6",
+    "systemjs": "^0.18.4",
+    "typescript": "^1.5.3"
   },
   "main": "release/angular-ui-router"
 }

config/system.config.js

@@ -1,5 +1,5 @@
-import {isNull, isPromise, is, invoke, not, val, pattern, parse, objectKeys}  from "../common/common";
-import {isDefined, isObject, isString, isFunction, extend, forEach, isArray, identity} from "../common/common";
+import {isNull, isPromise, is, invoke, not, val, pattern, parse, objectKeys,
+    isDefined, isObject, isString, isFunction, extend, forEach, isArray, identity} from "../common/common";
 import Resolvable  from "../resolve/resolvable";
 import {Transition}  from "../transition/transition";
 import {TransitionRejection}  from "../transition/rejectFactory";