Merge feature-1.0 into master

Author: christopherthielen

.gitignore

@@ -7,9 +7,15 @@ node_modules
 bower_components
 .DS_Store
 *~
+.tscache
+.baseDir.ts
 
 # webstorm files
 .idea
+idea-out
 *.iml
 *.ipr
 *.iws
+
+# generate doc to _doc; copy to proper gh-pages dir
+_doc

.travis.yml

@@ -7,6 +7,8 @@ before_script:
   - sh -e /etc/init.d/xvfb start
   - npm install -g karma
   - npm install -g grunt-cli
+  - npm install -g bower
+  - bower install
   - ./nodeserver.sh > /dev/null &
 
 script:
@@ -16,3 +18,6 @@ sudo: false
 
 git:
   depth: 10
+
+notifications:
+  slack: angularbuddies:b6leQM9gkBCW0S7MNDsELpqU

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({
@@ -18,28 +20,63 @@ module.exports = function (grunt) {
         ' */'
     },
     clean: [ '<%= builddir %>' ],
-    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);'
+    ts: {
+      es5: {
+        src: files.src,
+        outDir: '<%= builddir %>/es5',
+        options: { module: 'commonjs'}
       },
-      build: {
+      es6: {
         src: files.src,
-        dest: '<%= builddir %>/<%= pkg.name %>.js'
+        outDir: '<%= builddir %>/es6',
+        options: { target: "es6"}
       }
     },
     uglify: {
       options: {
-        banner: '<%= meta.banner %>\n'
+        banner: '<%= meta.banner %>\n',
+        mangle: true
       },
       build: {
         files: {
-          '<%= builddir %>/<%= pkg.name %>.min.js': ['<banner:meta.banner>', '<%= concat.build.dest %>']
+          '<%= builddir %>/ui-router.min.js': ['<banner:meta.banner>', '<%= builddir %>/ui-router.js'],
+          '<%= builddir %>/<%= pkg.name %>.min.js': ['<banner:meta.banner>', '<%= builddir %>/<%= pkg.name %>.js'],
+          '<%= builddir %>/ng1/stateEvents.min.js': ['<banner:meta.banner>', '<%= builddir %>/ng1/stateEvents.js']
+        }
+      }
+    },
+    webpack: {
+      build: {
+        entry: files.ng1CommonJsEntrypoint,
+        output: {
+          path: '<%= builddir %>',
+          filename: '<%= pkg.name %>.js',
+          library: 'ui.router',
+          libraryTarget: 'umd'
+        },
+        module: {
+          loaders: []
+        },
+        externals: [
+          {
+            angular: {
+              root: 'angular',
+              commonjs2: 'angular',
+              commonjs: 'angular'
+            }
+          }
+        ]
+      },
+      core: {
+        entry: files.justjsCommonJsEntrypoint,
+        output: {
+          path: '<%= builddir %>',
+          filename: 'ui-router-justjs.js',
+          library: 'uiRouter',
+          libraryTarget: 'umd'
+        },
+        module: {
+          loaders: []
         }
       }
     },
@@ -48,15 +85,9 @@ module.exports = function (grunt) {
       src: '<%= builddir %>',
       dest: 'release'
     },
-    jshint: {
-      all: ['Gruntfile.js', 'src/*.js', '<%= builddir %>/<%= pkg.name %>.js'],
-      options: {
-        eqnull: true
-      }
-    },
     watch: {
-      files: ['src/*.js', 'test/**/*.js'],
-      tasks: ['build', 'karma:background:run']
+      files: ['src/**/*.ts', 'src/**/*.js', 'test/**/*.js'],
+      tasks: ['ts:es5', 'webpack', 'karma:ng14']
     },
     connect: {
       server: {},
@@ -69,35 +100,41 @@ module.exports = function (grunt) {
     },
     karma: {
       options: {
-        configFile: 'config/karma-1.4.9.js',
-        singleRun: true,
-        exclude: [],
-        frameworks: ['jasmine'],
-        reporters: 'dots', // 'dots' || 'progress'
-        port: 8080,
-        colors: true,
-        autoWatch: false,
-        autoWatchInterval: 0,
+        configFile: 'config/karma.js',
+        // Serve and load angular files using regular Karma mode
         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,
+        autoWatch: true,
+        autoWatchInterval: 1,
         browsers: [ grunt.option('browser') || 'Chrome' ]
       },
-      ng108: { configFile: 'config/karma-1.0.8.js' },
-      ng115: { configFile: 'config/karma-1.1.5.js' },
-      ng1214: { configFile: 'config/karma-1.2.14.js' },
-      ng130: { configFile: 'config/karma-1.3.0.js' },
-      ng149: { configFile: 'config/karma-1.4.9.js' },
-      ng150: { configFile: 'config/karma-1.5.0.js' },
+      // Test with angular 1.2
+      ng12: {
+        options: { files: files.karmaServedFiles('1.2.28') }
+      },
+      // Test with angular 1.3
+      ng13: {
+        options: { files: files.karmaServedFiles('1.3.16') }
+      },
+      // Test with angular 1.4
+      ng14: {
+        options: { files: files.karmaServedFiles('1.4.9') }
+      },
+      // Test with angular 1.5
+      ng15: {
+        options: { files: files.karmaServedFiles('1.5.0') }
+      },
       background: {
-          background: true,
-          browsers: [ grunt.option('browser') || 'PhantomJS' ]
+          background: true
       },
+      // PhantomJS in the console; watch for changes to tests/src
       watch: {
         singleRun: false,
         autoWatch: true,
@@ -125,25 +162,29 @@ module.exports = function (grunt) {
     }
   });
 
-  grunt.registerTask('integrate', ['build', 'jshint', 'karma:ng108', 'karma:ng115', 'karma:ng1214', 'karma:ng130', 'karma:ng149', 'karma:ng150']);
-  grunt.registerTask('default', ['build', 'jshint', 'karma:unit']);
-  grunt.registerTask('build', 'Perform a normal build', ['concat', 'uglify']);
-  grunt.registerTask('dist', 'Perform a clean build', ['clean', 'build']);
-  grunt.registerTask('dist-docs', 'Perform a clean build and generate documentation', ['dist', 'ngdocs', 'widedocs']);
-  grunt.registerTask('release', 'Tag and perform a release', ['prepare-release', 'dist', 'perform-release']);
+  grunt.registerTask('integrate', ['clean', 'build', 'karma:ng12', 'karma:ng13', 'karma:ng14', 'karma:ng15']);
+  grunt.registerTask('default', ['build', 'karma:unit', 'docs']);
+  grunt.registerTask('build', 'Perform a normal build', ['clean', 'ts', 'webpack', 'bundles', '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']);
 
-  grunt.registerTask('widedocs', 'Convert to bootstrap container-fluid', function () {
-    promising(this,
-      system(
-      'sed -i.bak ' + 
-      '-e \'s/class="row"/class="row-fluid"/\' ' + 
-      '-e \'s/icon-cog"><\\/i>/icon-cog"><\\/i>Provider/\' ' + 
-      '-e \'s/role="main" class="container"/role="main" class="container-fluid"/\' site/index.html')
+  grunt.registerTask('docs', 'Generate documentation to _doc', function() { 
+    promising(this, 
+      system('./node_modules/typedoc/bin/typedoc --readme ./README.md --name "UI-Router" --theme ./typedoctheme --mode modules --module commonjs --target es5 --out _doc  src/params src/path src/resolve src/state src/transition src/url src/view src/ng1')
     );
   });
 
+  grunt.registerTask('bundles', 'Create the bundles and reorganize any additional dist files (addons, etc)', function() {
+    var builddir = grunt.config('builddir');
+    grunt.task.requires([ 'clean', 'ts' ]);
+    grunt.task.run(['webpack']);
+
+    ['stateEvents.js', 'stateEvents.js.map'].forEach(function(file) {
+      grunt.file.copy(builddir + "/es5/ng1/" + file, builddir + "/ng1/" + file);
+    })
+  });
 
   grunt.registerTask('publish-pages', 'Publish a clean build, docs, and sample to github.io', function () {
     promising(this,
@@ -194,9 +235,10 @@ module.exports = function (grunt) {
   });
 
   grunt.registerTask('perform-release', function () {
-    grunt.task.requires([ 'prepare-release', 'dist' ]);
-
     var version = grunt.config('pkg.version'), releasedir = grunt.config('builddir');
+    grunt.task.requires([ 'prepare-release', 'build' ]);
+    grunt.file.delete(releasedir + "/es5");
+    grunt.file.delete(releasedir + "/es6");
     promising(this,
       system('git add \'' + releasedir + '\'').then(function () {
         return system('git commit -m \'release ' + version + '\'');

README.md

@@ -1,3 +1,100 @@
+# feature-1.0 branch
+## Note: this is an alpha version of UI-Router 1.0
+
+We've totally redesigned UI-Router under the covers (rewrote about 60% of the codebase!), separating concerns and detangling the spaghetti.  We have taken some new approaches which we hope will provide unprecedented flexibility and control to your UI-Router app.
+
+We're working on a new [sample app](http://ui-router.github.io/sample-app/#/mymessages/inbox/5648b50cc586cac4aed6836f) ([Source](https://github.com/ui-router/sample-app)), as well as a [state and transition visualizer](https://github.com/ui-router/visualizer).  Check them out, and give us some feedback.  
+
+
+#### What's changed?
+
+##### Resolves
+The Resolve API has been rewritten from scratch.  We've introduced the concept of a resolve policy, which can be one of:
+
+* EAGER: All eager resolves for a transition are resolved at the beginning, before any states are entered (this is way UI-Router 0.2.x handles resolves)
+* LAZY: Lazy resolves are resolved when the state they are declared on is entered.
+* JIT: Just-In-Time resolves do not resolve until just before they are injected into some other function. (extremely lazy)
+
+In 1.0, by default, resolves on your states are "JIT"
+
+##### Transition
+
+We've created a Transition Service to manage transitioning from one state to another.  The transition service provides hooks, which you can register a callback on.  The transition hooks allow you to run code at various stages of a transition, altering it as your app requires.
+
+The transition lifecycle hooks are currently:
+
+* onBefore
+* onStart/onInvalid
+* onEnter (for individual states)
+* onSuccess
+* onError
+
+When registering a hook, you can provide criteria (a state name, a glob, or a function), and you can modify the transition by returning something from the hook (an abort, a redirect, a promise, or some new resolves to add to the transition).
+
+This enables lots of fun stuff!  Here are a couple of possibilities to get your imagination started:
+```javascript
+// Perform some async thing before running the transition
+$transitionsProvider.onBefore({ to: 'my.state', from: '*' }, function(AsyncService) {
+  return AsyncService.doSomeAsyncThing();
+});
+
+// Add resolves to a transitoin on-the-fly
+$transitionsProvider.onBefore({ to: 'other.state', from: '*' }, function($transition$, AsyncService) {
+  // someAsyncResult added as resolve to transition. It is injectable into other resolves or controllers.
+  $transition$.addResolves({ someAsyncResult: AsyncService.doSomeAsyncThing });
+});
+
+// Declaratively protect states which require authentication; redirect to 'login' if the user is unauthenticated.
+$transitionsProvider.onStart({ to: function(state) { return state.requiresAuth; } }, function($transition$, $state, AuthService) {
+  return AuthService.ensureAuthenticated().catch(function() { return $state.target("login"); });
+});
+
+// Declaratively set up default substates or other redirects; Redirect to a different target state
+// as declared on the original state, i.e., redirectTo: 'someotherstate'
+$transitionsProvider.onStart({ to: function(state) { return state.redirectTo; } }, function($transition$, $state) {
+  return $state.target($transition$.to.redirectTo); });
+});
+```
+
+##### State
+
+The $state service has been heavily refactored, and is now the primary client of the $transition service.  This doesn't offer the end user much *now*, but this separation should eventually enable us to provide things like multiple simultanesouly active states and parallel transitions (think UI-Router Extras "Sticky States").
+
+State events will soon be deprecated, but can be easily re-enabled by including the stateEvents.js file.  The state events have all been refactored as callbacks to the transition hooks.
+
+##### Views
+
+The way UI-Router manages views has been heavily refactored into a view service.  This should allow us to plug in alternate rendering schemes (react?), and should help ease the transition to angular 2.
+
+##### Parameters
+
+This one has been a long time coming.  Finally, UI-Router supports dynamic parameters in both the URL path and query string.  We've included a decorator which enables reloadOnSearch behavior using dynamic params automatically.
+
+### What's next?
+
+We're not done making sure every use case that you've been using in UI-Router 0.2.x works just as well in 1.0.  In fact, we just got the new code routing again on June 25 and have no idea what gaps are out there.  We'd like to get some other eyes on this new codebase.  We've moved in most of the unit tests from 0.2.x, but there are certain to be some things missing.  
+
+Build it.  Try it.  Let us know what's horribly broken.
+
+#### ES6/TypeScript
+
+We have migrated our codebase to ES6 and Typescript.
+
+#### Angular 2
+
+We'd are going to support Angular 2.  We plan to release a ui-router-ng2 around the same time ng2 final is released.
+
+#### Lazy Loading
+
+We'd like to have out-of-the-box support for lazy loading states (like UI-Router Extras "Future States")
+
+---------------------------------------------
+
+
+The rest of this README is from an old release.
+
+
+
 # AngularUI Router  [![Build Status](https://travis-ci.org/angular-ui/ui-router.svg?branch=master)](https://travis-ci.org/angular-ui/ui-router)
 
 #### The de-facto solution to flexible routing with nested views

bower.json

@@ -1,10 +1,10 @@
 {
   "name": "angular-ui-router",
-  "version": "0.2.18",
+  "version": "1.0.0alpha0",
   "license" : "MIT",
   "main": "./release/angular-ui-router.js",
   "dependencies": {
-    "angular": "^1.0.8"
+    "angular": ">= 1.3.0"
   },
   "ignore": [
     "**/.*",

component.json

@@ -1,6 +1,6 @@
 {
   "name": "angular-ui-router",
-  "version": "0.2.18",
+  "version": "1.0.0alpha0",
   "description": "State-based routing for AngularJS",
   "keywords": [
     "angular",