Skip to content

Commit 413efd4

Browse files
alexeaglebrandonroberts
authored andcommitted
fix(build): Fix UMD global names (#1005)
Closes #1004 * Update Angular to 6 rc.6 * Remove package-lock.json
1 parent 7e50187 commit 413efd4

File tree

5 files changed

+59
-18027
lines changed

5 files changed

+59
-18027
lines changed

WORKSPACE

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ workspace(name = "ngrx")
1212
# Fetch and install the NodeJS rules
1313
http_archive(
1414
name = "build_bazel_rules_nodejs",
15-
url = "https://github.com/bazelbuild/rules_nodejs/archive/0.6.0.zip",
16-
strip_prefix = "rules_nodejs-0.6.0",
17-
sha256 = "e8a2bb5ca51fbafb244bc507bcebcae33a63d969f47413b319a8dcce032845bf",
15+
url = "https://github.com/bazelbuild/rules_nodejs/archive/0.7.0.zip",
16+
strip_prefix = "rules_nodejs-0.7.0",
17+
sha256 = "d0cecf6b149d431ee8349f683d1db6a2a881ee81d8066a66c1b112a4b02748de",
1818
)
1919

2020
load("@build_bazel_rules_nodejs//:defs.bzl", "check_bazel_version", "node_repositories", "yarn_install")
@@ -26,9 +26,9 @@ node_repositories(package_json = ["//:package.json"])
2626
# Fetch and install the TypeScript rules
2727
http_archive(
2828
name = "build_bazel_rules_typescript",
29-
url = "https://github.com/bazelbuild/rules_typescript/archive/0.11.1.zip",
30-
strip_prefix = "rules_typescript-0.11.1",
31-
sha256 = "7406bea7954e1c906f075115dfa176551a881119f6820b126ea1eacb09f34a1a",
29+
url = "https://github.com/bazelbuild/rules_typescript/archive/0.12.2.zip",
30+
strip_prefix = "rules_typescript-0.12.2",
31+
sha256 = "5ccbbca4f8ad2da5b4e04aadedaad3383342df0e25954e151aa51e10c353d1c2",
3232
)
3333

3434
load("@build_bazel_rules_typescript//:defs.bzl", "ts_setup_workspace")

modules/router-store/spec/integration.spec.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -540,7 +540,10 @@ describe('integration spec', () => {
540540
const store = TestBed.get(Store);
541541
const log = logOfRouterAndStore(router, store);
542542

543-
store.dispatch({ type: ROUTER_NAVIGATION, payload: {routerState: {url: '/next'}} });
543+
store.dispatch({
544+
type: ROUTER_NAVIGATION,
545+
payload: { routerState: { url: '/next' } },
546+
});
544547
waitForNavigation(router)
545548
.then(() => {
546549
router.navigate(['/']);
@@ -564,11 +567,10 @@ describe('integration spec', () => {
564567
{ type: 'router', event: 'GuardsCheckEnd', url: '/' },
565568
{ type: 'router', event: 'ResolveStart', url: '/' },
566569
{ type: 'router', event: 'ResolveEnd', url: '/' },
567-
{ type: 'router', event: 'NavigationEnd', url: '/' }
570+
{ type: 'router', event: 'NavigationEnd', url: '/' },
568571
]);
569572
done();
570573
});
571-
572574
});
573575
});
574576

0 commit comments

Comments
 (0)