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: ui-router/core
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 5.0.16
Choose a base ref
...
head repository: ui-router/core
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5.0.17
Choose a head ref
  • 18 commits
  • 6 files changed
  • 4 contributors

Commits on Jan 30, 2018

  1. Copy the full SHA
    eaa81b0 View commit details
  2. Copy the full SHA
    5d7c1e4 View commit details

Commits on Jan 31, 2018

  1. Copy the full SHA
    d2e9c15 View commit details

Commits on Feb 6, 2018

  1. Copy the full SHA
    cd87522 View commit details
  2. Copy the full SHA
    b3c3e65 View commit details
  3. Merge pull request #120 from ui-router/greenkeeper/jasmine-core-2.99.0

    Update jasmine-core to the latest version 🚀
    christopherthielen authored Feb 6, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    a43aee0 View commit details
  4. Copy the full SHA
    de1cc5d View commit details
  5. Copy the full SHA
    cd4c00e View commit details

Commits on Feb 7, 2018

  1. Copy the full SHA
    0329205 View commit details

Commits on Feb 8, 2018

  1. Copy the full SHA
    8a46984 View commit details

Commits on Feb 10, 2018

  1. Copy the full SHA
    2a68156 View commit details
  2. Copy the full SHA
    8089235 View commit details
  3. Copy the full SHA
    dcf8b55 View commit details
  4. Copy the full SHA
    cbd6b1b View commit details
  5. Merge pull request #126 from ui-router/greenkeeper/rollup-0.55.5

    Greenkeeper/rollup 0.55.5
    christopherthielen authored Feb 10, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    5ec6e03 View commit details
  6. Merge pull request #125 from ui-router/greenkeeper/webpack-3.11.0

    Update webpack to the latest version 🚀
    christopherthielen authored Feb 10, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    4dddd20 View commit details

Commits on Feb 12, 2018

  1. Copy the full SHA
    0a1f518 View commit details
  2. 5.0.17

    christopherthielen committed Feb 12, 2018
    Copy the full SHA
    eabd49c View commit details
Showing with 285 additions and 123 deletions.
  1. +10 −0 CHANGELOG.md
  2. +8 −10 package.json
  3. +1 −5 src/common/queue.ts
  4. +8 −9 src/hooks/coreResolvables.ts
  5. +35 −0 typedoc.json
  6. +223 −99 yarn.lock
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
## 5.0.17 (2018-02-12)
[Compare `@uirouter/core` versions 5.0.16 and 5.0.17](https://github.com/ui-router/core/compare/5.0.16...5.0.17)

### Bug Fixes

* **core:** Fix leak of old transitions by mutating pathnode*.resolvables*.data ([0a1f518](https://github.com/ui-router/core/commit/0a1f518))




## 5.0.16 (2018-01-30)
[Compare `@uirouter/core` versions 5.0.15 and 5.0.16](https://github.com/ui-router/core/compare/5.0.15...5.0.16)

18 changes: 8 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@uirouter/core",
"description": "UI-Router Core: Framework agnostic, State-based routing for JavaScript Single Page Apps",
"version": "5.0.16",
"version": "5.0.17",
"scripts": {
"clean": "shx rm -rf lib lib-esm _bundles",
"compile": "npm run clean && tsc && tsc -m es6 --outDir lib-esm",
@@ -14,6 +14,7 @@
"prepublishOnly": "npm run build",
"test": "karma start",
"test:downstream": "npm run build && test_downstream_projects",
"docs": "generate_docs && publish_docs",
"watch": "run-p watch:*",
"watch:buildjs": "tsc -w",
"watch:buildesm": "tsc -w -m es6 --outDir lib-esm",
@@ -66,14 +67,12 @@
"devDependencies": {
"@types/jasmine": "2.8.6",
"@types/jquery": "3.3.0",
"@uirouter/publish-scripts": "2.2.4",
"conventional-changelog": "1.1.7",
"conventional-changelog-cli": "1.3.5",
"@uirouter/publish-scripts": "2.3.1",
"core-js": "2.5.3",
"dts-downlevel": "0.3.0",
"fork-ts-checker-webpack-plugin": "0.3.0",
"glob": "7.1.2",
"jasmine-core": "2.9.1",
"jasmine-core": "3.0.0",
"karma": "2.0.0",
"karma-chrome-launcher": "2.2.0",
"karma-firefox-launcher": "1.1.0",
@@ -83,17 +82,16 @@
"karma-sourcemap-loader": "0.3.7",
"karma-webpack": "2.0.9",
"npm-run-all": "4.1.2",
"readline-sync": "1.4.7",
"rollup": "0.55.1",
"rollup": "0.55.5",
"rollup-plugin-node-resolve": "3.0.2",
"rollup-plugin-sourcemaps": "0.4.2",
"rollup-plugin-uglify": "3.0.0",
"shelljs": "0.8.1",
"shx": "0.2.2",
"ts-loader": "3.3.1",
"ts-loader": "3.4.0",
"tslint": "5.9.1",
"tslint-eslint-rules": "4.1.1",
"typescript": "2.6.2",
"webpack": "3.10.0"
"typescript": "2.7.1",
"webpack": "3.11.0"
}
}
6 changes: 1 addition & 5 deletions src/common/queue.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
/** @module common */
import { pushTo } from './common';

/**
* @module common
*/
/** for typedoc */

export class Queue<T> {
private _evictListeners: ((item: T) => void)[] = [];
public onEvict = pushTo(this._evictListeners);
17 changes: 8 additions & 9 deletions src/hooks/coreResolvables.ts
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ import { Transition } from '../transition/transition';
import { UIRouter } from '../router';
import { TransitionService } from '../transition/transitionService';
import { Resolvable } from '../resolve';
import { extend, inArray, map, mapObj, unnestR, values } from '../common';
import { extend, inArray, map, mapObj, uniqR, unnestR, values } from '../common';
import { PathNode } from '../path';
import { TreeChanges } from "../transition";

@@ -29,15 +29,14 @@ const isTransition = inArray(TRANSITION_TOKENS);
// This function removes resolves for '$transition$' and `Transition` from the treeChanges.
// Do not use this on current transitions, only on old ones.
export const treeChangesCleanup = (trans: Transition) => {
const nodes = values(trans.treeChanges()).reduce(unnestR, []).reduce(uniqR, []);

// If the resolvable is a Transition, return a new resolvable with null data
const replaceTransitionWithNull = (r: Resolvable): Resolvable =>
isTransition(r.token) ? Resolvable.fromData(r.token, null) : r;
const replaceTransitionWithNull = (r: Resolvable): Resolvable => {
return isTransition(r.token) ? Resolvable.fromData(r.token, null) : r;
};

const cleanPath = (path: PathNode[]) => path.map((node: PathNode) => {
const resolvables = node.resolvables.map(replaceTransitionWithNull);
return extend(node.clone(), { resolvables });
nodes.forEach((node: PathNode) => {
node.resolvables = node.resolvables.map(replaceTransitionWithNull);
});

const treeChanges: TreeChanges = trans.treeChanges();
mapObj(treeChanges, cleanPath, treeChanges);
};
35 changes: 35 additions & 0 deletions typedoc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"compilerOptions": {
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
"moduleResolution": "node",
"module": "commonjs",
"target": "es5",
"lib": [ "es6", "dom" ],
"allowSyntheticDefaultImports": true,
"rootDir": "src",
"outDir": "lib",
"declaration": true,
"sourceMap": true,
"inlineSources": true
},
"typedoc": {
"publishDir": "_core_docs",
"include": [ ],
"generateOptions": {
"tsconfig": "typedoc.json",
"readme": "README.md",
"name": "@uirouter/core",
"theme": "node_modules/ui-router-typedoc-themes/bin/default",
"out": "_doc",
"internal-aliases": "internal,coreapi",
"external-aliases": "internalapi,external",
"navigation-label-globals": "@uirouter/core"
}
},
"files": [
"src/index.ts",
"src/vanilla.ts",
"node_modules/typedoc/node_modules/typescript/lib/lib.es6.d.ts"
]
}
Loading