diff --git a/modules/router-store/spec/integration.spec.ts b/modules/router-store/spec/integration.spec.ts index 8d851b980f..90f9c3a4b5 100644 --- a/modules/router-store/spec/integration.spec.ts +++ b/modules/router-store/spec/integration.spec.ts @@ -494,7 +494,7 @@ describe('integration spec', () => { }); }); - xit('should support cancellation of initial navigation using canLoad guard', (done: any) => { + it('should support cancellation of initial navigation using canLoad guard', (done: any) => { const reducer = (state: any, action: RouterAction) => { const r = routerReducer(state, action); return r && r.state diff --git a/package.json b/package.json index 0bc69933f3..9354e1425c 100644 --- a/package.json +++ b/package.json @@ -66,28 +66,28 @@ ] }, "dependencies": { - "@angular/animations": "^7.0.0-rc.0", - "@angular/bazel": "^7.0.0-rc.0", - "@angular/cdk": "^7.0.0-rc.0", - "@angular/cli": "^7.0.0-rc.0", - "@angular/common": "^7.0.0-rc.0", - "@angular/compiler": "^7.0.0-rc.0", - "@angular/compiler-cli": "^7.0.0-rc.0", - "@angular/core": "^7.0.0-rc.0", - "@angular/forms": "^7.0.0-rc.0", - "@angular/http": "^7.0.0-rc.0", - "@angular/material": "^7.0.0-rc.0", - "@angular/platform-browser": "^7.0.0-rc.0", - "@angular/platform-browser-dynamic": "^7.0.0-rc.0", - "@angular/platform-server": "^7.0.0-rc.0", - "@angular/router": "^7.0.0-rc.0", + "@angular/animations": "^7.0.0", + "@angular/bazel": "^7.0.0", + "@angular/cdk": "^7.0.0", + "@angular/cli": "^7.0.1", + "@angular/common": "^7.0.0", + "@angular/compiler": "^7.0.0", + "@angular/compiler-cli": "^7.0.0", + "@angular/core": "^7.0.0", + "@angular/forms": "^7.0.0", + "@angular/http": "^7.0.0", + "@angular/material": "^7.0.0", + "@angular/platform-browser": "^7.0.0", + "@angular/platform-browser-dynamic": "^7.0.0", + "@angular/platform-server": "^7.0.0", + "@angular/router": "^7.0.0", "@ngrx/db": "^2.2.0-beta.0", "core-js": "^2.5.4", "hammerjs": "^2.0.8", "ngrx-store-freeze": "^0.2.2", "opencollective": "^1.0.3", "rxjs": "^6.3.3", - "rxjs-compat": "^6.2.2", + "rxjs-compat": "^6.3.3", "zone.js": "^0.8.26" }, "devDependencies": { diff --git a/yarn.lock b/yarn.lock index 484a1cd4fd..73e42ac298 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,6 +2,13 @@ # yarn lockfile v1 +"@angular-devkit/architect@0.10.1": + version "0.10.1" + resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.10.1.tgz#73996383ba040f858bf06595e90805c3f3bff1fe" + dependencies: + "@angular-devkit/core" "7.0.1" + rxjs "6.3.3" + "@angular-devkit/architect@0.6.8": version "0.6.8" resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.6.8.tgz#977acc605aba45d21b95ca704cc99492e14299dd" @@ -9,13 +16,6 @@ "@angular-devkit/core" "0.6.8" rxjs "^6.0.0" -"@angular-devkit/architect@0.9.0-rc.2": - version "0.9.0-rc.2" - resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.9.0-rc.2.tgz#96c86e11263ab6d2bd5a988913fe67253bacf792" - dependencies: - "@angular-devkit/core" "7.0.0-rc.2" - rxjs "6.3.3" - "@angular-devkit/build-angular@~0.6.0": version "0.6.8" resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.6.8.tgz#ea108509f970efc9cd9087a47894c0164dd2d0c0" @@ -91,9 +91,9 @@ rxjs "^6.0.0" source-map "^0.5.6" -"@angular-devkit/core@7.0.0-rc.2": - version "7.0.0-rc.2" - resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-7.0.0-rc.2.tgz#5fe63ff17d6cfd6029507802e3d88b500c4e4e1e" +"@angular-devkit/core@7.0.1": + version "7.0.1" + resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-7.0.1.tgz#78e6af0be6364532186bf4ac2e1da0f1685d95cb" dependencies: ajv "6.5.3" chokidar "2.0.4" @@ -101,59 +101,59 @@ rxjs "6.3.3" source-map "0.7.3" -"@angular-devkit/schematics@7.0.0-rc.2": - version "7.0.0-rc.2" - resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-7.0.0-rc.2.tgz#1dbe684e9e752db54a2e6b1076ae1da3e3a7fbc2" +"@angular-devkit/schematics@7.0.1": + version "7.0.1" + resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-7.0.1.tgz#ccd7c5349c08aaf6224a28881bfeeacaf0ee0307" dependencies: - "@angular-devkit/core" "7.0.0-rc.2" + "@angular-devkit/core" "7.0.1" rxjs "6.3.3" -"@angular/animations@^7.0.0-rc.0": - version "7.0.0-rc.0" - resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-7.0.0-rc.0.tgz#963e64fa7265d948a08cb32508cea1a24107e439" +"@angular/animations@^7.0.0": + version "7.0.0" + resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-7.0.0.tgz#5c9e1683063c29df10253b7dc5bb9b13694ee396" dependencies: tslib "^1.9.0" -"@angular/bazel@^7.0.0-rc.0": - version "7.0.0-rc.0" - resolved "https://registry.yarnpkg.com/@angular/bazel/-/bazel-7.0.0-rc.0.tgz#3d624c7a2c9ec9a2a00a8cdbb6d1d1137f94fdf8" +"@angular/bazel@^7.0.0": + version "7.0.0" + resolved "https://registry.yarnpkg.com/@angular/bazel/-/bazel-7.0.0.tgz#c02e8426060e96823f2c7a1a3d9064f9ccc99812" dependencies: "@bazel/typescript" "^0.15.0" "@types/node" "6.0.84" protobufjs "5.0.0" -"@angular/cdk@^7.0.0-rc.0": - version "7.0.0-rc.0" - resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-7.0.0-rc.0.tgz#c31433660ea752c7d91c7352fa7dc0e39f41de5e" +"@angular/cdk@^7.0.0": + version "7.0.0" + resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-7.0.0.tgz#b98d7378e84fed1af30c460aa91af4ada2cf252b" dependencies: tslib "^1.7.1" optionalDependencies: parse5 "^5.0.0" -"@angular/cli@^7.0.0-rc.0": - version "7.0.0-rc.2" - resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-7.0.0-rc.2.tgz#4d5316f1c2933b363cfe82ea44a3a4765a005322" +"@angular/cli@^7.0.1": + version "7.0.1" + resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-7.0.1.tgz#77811e468bfa8208e01398a81e793b25be75bc14" dependencies: - "@angular-devkit/architect" "0.9.0-rc.2" - "@angular-devkit/core" "7.0.0-rc.2" - "@angular-devkit/schematics" "7.0.0-rc.2" - "@schematics/angular" "7.0.0-rc.2" - "@schematics/update" "0.9.0-rc.2" + "@angular-devkit/architect" "0.10.1" + "@angular-devkit/core" "7.0.1" + "@angular-devkit/schematics" "7.0.1" + "@schematics/angular" "7.0.1" + "@schematics/update" "0.10.1" inquirer "6.2.0" opn "5.3.0" rxjs "6.3.3" semver "5.5.1" symbol-observable "1.2.0" -"@angular/common@^7.0.0-rc.0": - version "7.0.0-rc.0" - resolved "https://registry.yarnpkg.com/@angular/common/-/common-7.0.0-rc.0.tgz#4872a430838653cbddfba759ccf1f9332c065171" +"@angular/common@^7.0.0": + version "7.0.0" + resolved "https://registry.yarnpkg.com/@angular/common/-/common-7.0.0.tgz#29206614d2b8dc79e5207b7dc6f9fc559e9a24f2" dependencies: tslib "^1.9.0" -"@angular/compiler-cli@^7.0.0-rc.0": - version "7.0.0-rc.0" - resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-7.0.0-rc.0.tgz#59f37f2409ce896cb73daa221dbd898855d12939" +"@angular/compiler-cli@^7.0.0": + version "7.0.0" + resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-7.0.0.tgz#fc3f2be293d00834ea5ba268e5aea796cc5deccc" dependencies: canonical-path "0.0.2" chokidar "^1.4.2" @@ -166,61 +166,59 @@ source-map "^0.6.1" yargs "9.0.1" -"@angular/compiler@^7.0.0-rc.0": - version "7.0.0-rc.0" - resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-7.0.0-rc.0.tgz#2dfd293ad6583f9574c9fe79354256206f594a51" +"@angular/compiler@^7.0.0": + version "7.0.0" + resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-7.0.0.tgz#f953a213a01e4736e94fe1a370b07e13e2393b71" dependencies: tslib "^1.9.0" -"@angular/core@^7.0.0-rc.0": - version "7.0.0-rc.0" - resolved "https://registry.yarnpkg.com/@angular/core/-/core-7.0.0-rc.0.tgz#c1d845d5d1718f96f542abe7ae86b64c280da3bb" +"@angular/core@^7.0.0": + version "7.0.0" + resolved "https://registry.yarnpkg.com/@angular/core/-/core-7.0.0.tgz#01e9db9074a1db1c47a32f745b787d1c86f5d61a" dependencies: tslib "^1.9.0" -"@angular/forms@^7.0.0-rc.0": - version "7.0.0-rc.0" - resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-7.0.0-rc.0.tgz#b86f5db32bc840948cd5c0f253ad9da5cef24789" +"@angular/forms@^7.0.0": + version "7.0.0" + resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-7.0.0.tgz#672c306b13e94a20b72c096214642a326c43699a" dependencies: tslib "^1.9.0" -"@angular/http@^7.0.0-rc.0": - version "7.0.0-rc.0" - resolved "https://registry.yarnpkg.com/@angular/http/-/http-7.0.0-rc.0.tgz#659c3ac6bd66199a726f1f46cdc800fc25e37922" +"@angular/http@^7.0.0": + version "7.0.0" + resolved "https://registry.yarnpkg.com/@angular/http/-/http-7.0.0.tgz#8add9bc7d548a0ff7dfe1fdb66d0024d4fc62dfa" dependencies: tslib "^1.9.0" -"@angular/material@^7.0.0-rc.0": - version "7.0.0-rc.0" - resolved "https://registry.yarnpkg.com/@angular/material/-/material-7.0.0-rc.0.tgz#de6b38c0ca9dad8506eca49aff29310be16e348b" +"@angular/material@^7.0.0": + version "7.0.0" + resolved "https://registry.yarnpkg.com/@angular/material/-/material-7.0.0.tgz#00cacc2f210c5d7e822e34b09078f41df52d8f58" dependencies: tslib "^1.7.1" - optionalDependencies: - parse5 "^5.0.0" -"@angular/platform-browser-dynamic@^7.0.0-rc.0": - version "7.0.0-rc.0" - resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-7.0.0-rc.0.tgz#b66d4c30ed25f67dab15e64462b959d039ada705" +"@angular/platform-browser-dynamic@^7.0.0": + version "7.0.0" + resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-7.0.0.tgz#2b2a50b5a8176bee257f90ee47b1d873502f7182" dependencies: tslib "^1.9.0" -"@angular/platform-browser@^7.0.0-rc.0": - version "7.0.0-rc.0" - resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-7.0.0-rc.0.tgz#9e19e83bce242f9dde0457719d15a87a90e314cc" +"@angular/platform-browser@^7.0.0": + version "7.0.0" + resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-7.0.0.tgz#8c13a6380cf465b3628e5b576a1313e9b4976093" dependencies: tslib "^1.9.0" -"@angular/platform-server@^7.0.0-rc.0": - version "7.0.0-rc.0" - resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-7.0.0-rc.0.tgz#ae03a549203b91e6335fb3b4401fe9c0c972fc00" +"@angular/platform-server@^7.0.0": + version "7.0.0" + resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-7.0.0.tgz#0a60f306f2d7d93daca2214f5afa2899dcd5f977" dependencies: domino "^2.1.0" tslib "^1.9.0" xhr2 "^0.1.4" -"@angular/router@^7.0.0-rc.0": - version "7.0.0-rc.0" - resolved "https://registry.yarnpkg.com/@angular/router/-/router-7.0.0-rc.0.tgz#6d6ddae8cf8bb15f9c0aaba2bb7487eb42248bd2" +"@angular/router@^7.0.0": + version "7.0.0" + resolved "https://registry.yarnpkg.com/@angular/router/-/router-7.0.0.tgz#a4741d8dfa57ac68283fd1c84ac0926eb625e507" dependencies: tslib "^1.9.0" @@ -257,20 +255,20 @@ dependencies: any-observable "^0.3.0" -"@schematics/angular@7.0.0-rc.2": - version "7.0.0-rc.2" - resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-7.0.0-rc.2.tgz#3ef308d6cab9e23586b53db4f08163356a10127c" +"@schematics/angular@7.0.1": + version "7.0.1" + resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-7.0.1.tgz#17ba40fe9665c60bcaa9a3cf722baf0862cf9b94" dependencies: - "@angular-devkit/core" "7.0.0-rc.2" - "@angular-devkit/schematics" "7.0.0-rc.2" - typescript "3.1.1" + "@angular-devkit/core" "7.0.1" + "@angular-devkit/schematics" "7.0.1" + typescript "3.1.3" -"@schematics/update@0.9.0-rc.2": - version "0.9.0-rc.2" - resolved "https://registry.yarnpkg.com/@schematics/update/-/update-0.9.0-rc.2.tgz#a2447f7ad17835c1fd9d6bc17bf417ddcf9acd3c" +"@schematics/update@0.10.1": + version "0.10.1" + resolved "https://registry.yarnpkg.com/@schematics/update/-/update-0.10.1.tgz#bbadb151aa3f71fbac22e63778c11cc060e6bc6d" dependencies: - "@angular-devkit/core" "7.0.0-rc.2" - "@angular-devkit/schematics" "7.0.0-rc.2" + "@angular-devkit/core" "7.0.1" + "@angular-devkit/schematics" "7.0.1" npm-registry-client "8.6.0" rxjs "6.3.3" semver "5.5.1" @@ -7069,9 +7067,9 @@ rx@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782" -rxjs-compat@^6.2.2: - version "6.2.2" - resolved "https://registry.yarnpkg.com/rxjs-compat/-/rxjs-compat-6.2.2.tgz#3c0fcdb46130cc70aa55412c2b1147905ab4680a" +rxjs-compat@^6.3.3: + version "6.3.3" + resolved "https://registry.yarnpkg.com/rxjs-compat/-/rxjs-compat-6.3.3.tgz#2ab3b9ac0dac0c073749d55fef9c03ea1df2045c" rxjs@6.3.3, rxjs@^6.3.3: version "6.3.3" @@ -8207,14 +8205,18 @@ typedarray@^0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" -typescript@3.1.1, typescript@~3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.1.1.tgz#3362ba9dd1e482ebb2355b02dfe8bcd19a2c7c96" +typescript@3.1.3: + version "3.1.3" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.1.3.tgz#01b70247a6d3c2467f70c45795ef5ea18ce191d5" typescript@~2.9.1: version "2.9.2" resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.9.2.tgz#1cbf61d05d6b96269244eb6a3bce4bd914e0f00c" +typescript@~3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.1.1.tgz#3362ba9dd1e482ebb2355b02dfe8bcd19a2c7c96" + uglify-es@^3.3.4: version "3.3.9" resolved "https://registry.yarnpkg.com/uglify-es/-/uglify-es-3.3.9.tgz#0c1c4f0700bed8dbc124cdb304d2592ca203e677"