Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: angular-ui/ui-router
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1.0.7
Choose a base ref
...
head repository: angular-ui/ui-router
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1.0.8
Choose a head ref
  • 4 commits
  • 6 files changed
  • 1 contributor

Commits on Oct 5, 2017

  1. Copy the full SHA
    bd6046a View commit details
  2. Copy the full SHA
    1451c97 View commit details

Commits on Oct 7, 2017

  1. 1.0.8

    christopherthielen committed Oct 7, 2017
    Copy the full SHA
    fe680e6 View commit details
  2. Release 1.0.8

    christopherthielen committed Oct 7, 2017
    Copy the full SHA
    ce40527 View commit details
Showing with 660 additions and 1,780 deletions.
  1. +20 −0 CHANGELOG.md
  2. +1 −1 bower.json
  3. +24 −5 karma.conf.js
  4. +14 −23 package.json
  5. +0 −53 webpack.config.js
  6. +601 −1,698 yarn.lock
20 changes: 20 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,23 @@
## 1.0.8 (2017-10-07)
[Compare `@uirouter/angularjs` versions 1.0.7 and 1.0.8](https://github.com/angular-ui/ui-router/compare/1.0.7...1.0.8)


## 5.0.10 (2017-10-07)
[Compare `@uirouter/core` versions 5.0.8 and 5.0.10](https://github.com/ui-router/core/compare/5.0.8...5.0.10)

### Bug Fixes

* **angular/cli:** Use package.json fields: 'typings', 'main', 'jsnext:main' ([74143d9](https://github.com/ui-router/core/commit/74143d9))
* **isomorphic:** Remove use of CustomEvent. Detect root scope (global/window/self) for nodejs, browser, or web-worker. ([2d206ba](https://github.com/ui-router/core/commit/2d206ba))
* **typings:** Use StateObject for parameter to hook criteria functions ([5b58566](https://github.com/ui-router/core/commit/5b58566))


### Features

* **TransitionHook:** Add hook registration option `invokeLimit` to limit the number of times a hook is invoked before being auto-deregistered. ([2cb17ef](https://github.com/ui-router/core/commit/2cb17ef))



## 1.0.7 (2017-09-30)
[Compare `@uirouter/angularjs` versions 1.0.6 and 1.0.7](https://github.com/angular-ui/ui-router/compare/1.0.6...1.0.7)

2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"name":"angular-ui-router","description":"State-based routing for AngularJS","license":"MIT","main":"./release/angular-ui-router.js","dependencies":{"angular":">= 1.2.0"},"ignore":["**/.*","**/tsconfig.json","**/tsconfig.typedoc.json","**/webpack.config.js","**/node_modules","package.json","scripts","test","src"],"version":"1.0.7"}
{"name":"angular-ui-router","description":"State-based routing for AngularJS","license":"MIT","main":"./release/angular-ui-router.js","dependencies":{"angular":">= 1.2.0"},"ignore":["**/.*","**/tsconfig.json","**/tsconfig.typedoc.json","**/webpack.config.js","**/node_modules","package.json","scripts","test","src"],"version":"1.0.8"}
29 changes: 24 additions & 5 deletions karma.conf.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// Karma configuration file
var karma = require("karma");
var DEFAULT_NG_VERSION = "1.5";
var ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin');
var DEFAULT_NG_VERSION = "1.6";

/**
* This returns a Karma 'files configuration'.
@@ -30,10 +31,28 @@ function karmaServedFiles(ngVersion) {
return angularFiles.concat('test/index.js');
}

var webpackConfig = require('./webpack.config.js');
webpackConfig.entry = {};
webpackConfig.plugins = [];
webpackConfig.devtool = 'inline-source-map';
var webpackConfig = module.exports = {
resolve: {
modules: ['node_modules'],
extensions: ['.js', '.jsx', '.ts', '.tsx']
},

devtool: 'inline-source-map',

module: {
rules: [
{ test: /\.tsx?$/, loader: 'ts-loader', options: { transpileOnly: true } }
]
},

stats: false,

plugins: [
new ForkTsCheckerWebpackPlugin(),
],

externals: [ 'angular' ]
};

module.exports = function(config) {
var ngVersion = config.ngversion || DEFAULT_NG_VERSION;
37 changes: 14 additions & 23 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@uirouter/angularjs",
"description": "State-based routing for AngularJS 1.x",
"version": "1.0.7",
"version": "1.0.8",
"scripts": {
"clean": "shx rm -rf lib lib-esm _doc build release *.log",
"compile": "tsc && tsc -m es6 --outDir lib-esm && npm run fixdts",
@@ -73,39 +73,31 @@
"jsnext:main": "lib-esm/index.js",
"typings": "lib/index.d.ts",
"dependencies": {
"@uirouter/core": "5.0.8"
"@uirouter/core": "5.0.10"
},
"peerDependencies": {
"angular": ">=1.2.0"
},
"devDependencies": {
"@types/angular": "^1.5.14",
"@types/angular-animate": "^1.5.5",
"@types/angular-mocks": "^1.5.5",
"@types/jasmine": "^2.2.34",
"@types/angular-mocks": "1.5.11",
"@types/jasmine": "2.6.0",
"@types/jquery": "^1.10.31",
"@uirouter/publish-scripts": "1.0.7",
"awesome-typescript-loader": "3.2.3",
"babel-core": "^5.8.14",
"clone": "^1.0.2",
"conventional-changelog": "1.1.5",
"conventional-changelog-cli": "1.3.3",
"conventional-changelog": "1.1.6",
"conventional-changelog-cli": "1.3.4",
"dts-downlevel": "^0.3.0",
"glob": "^7.0.5",
"jasmine-core": "^2.4.1",
"karma": "^1.2.0",
"karma-chrome-launcher": "~0.1.0",
"karma-coverage": "^0.5.3",
"fork-ts-checker-webpack-plugin": "^0.2.8",
"jasmine-core": "2.8.0",
"karma": "1.7.1",
"karma-chrome-launcher": "2.2.0",
"karma-jasmine": "^1.0.2",
"karma-phantomjs-launcher": "^1.0.2",
"karma-script-launcher": "~0.1.0",
"karma-sourcemap-loader": "^0.3.7",
"karma-systemjs": "^0.7.2",
"karma-webpack": "^1.8.0",
"karma-webpack": "2.0.4",
"lodash": "^4.5.1",
"readline-sync": "^1.4.5",
"remap-istanbul": "^0.6.3",
"replace-in-file": "^2.0.3",
"replace-in-file": "2.6.4",
"rollup": "0.50.0",
"rollup-plugin-node-resolve": "3.0.0",
"rollup-plugin-progress": "0.4.0",
@@ -114,7 +106,7 @@
"rollup-plugin-visualizer": "0.3.1",
"shelljs": "^0.7.0",
"shx": "0.2.2",
"systemjs": "^0.18.4",
"ts-loader": "^2.3.7",
"tslint": "5.7.0",
"typedoc": "~0.5.0",
"typedoc-plugin-external-module-name": "^1.0.2",
@@ -123,8 +115,7 @@
"typescript": "2.5.3",
"ui-router-typedoc-themes": "^1.0.1",
"watch": "^0.18.0",
"webpack": "1.x",
"webpack-dev-server": "1.x",
"webpack": "3.6.0",
"yargs": "^4.2.0"
}
}
53 changes: 0 additions & 53 deletions webpack.config.js

This file was deleted.

Loading