Skip to content

Commit 112e777

Browse files
wardbellmatsko
authored andcommitted
build(aio): update karma & systemjs config for HttpClient
While adding the references to the `HttpClient` packages it also crucially adds ref to new “tslib” library required by `HttpClient`.
1 parent a176cd6 commit 112e777

File tree

5 files changed

+12
-0
lines changed

5 files changed

+12
-0
lines changed

aio/content/examples/testing/karma-test-shim.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ System.config({
4444
map: {
4545
'@angular/core/testing': 'npm:@angular/core/bundles/core-testing.umd.js',
4646
'@angular/common/testing': 'npm:@angular/common/bundles/common-testing.umd.js',
47+
'@angular/common/http/testing': 'npm:@angular/common/bundles/common-http-testing.umd.js',
4748
'@angular/compiler/testing': 'npm:@angular/compiler/bundles/compiler-testing.umd.js',
4849
'@angular/platform-browser/testing': 'npm:@angular/platform-browser/bundles/platform-browser-testing.umd.js',
4950
'@angular/platform-browser-dynamic/testing': 'npm:@angular/platform-browser-dynamic/bundles/platform-browser-dynamic-testing.umd.js',

aio/content/examples/testing/karma.conf.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,10 @@ module.exports = function(config) {
5252
{ pattern: 'node_modules/rxjs/**/*.js', included: false, watched: false },
5353
{ pattern: 'node_modules/rxjs/**/*.js.map', included: false, watched: false },
5454

55+
// tslib (TS helper fns such as `__extends`)
56+
{ pattern: 'node_modules/tslib/**/*.js', included: false, watched: false },
57+
{ pattern: 'node_modules/tslib/**/*.js.map', included: false, watched: false },
58+
5559
// Paths loaded via module imports:
5660
// Angular itself
5761
{ pattern: 'node_modules/@angular/**/*.js', included: false, watched: false },

aio/tools/examples/shared/boilerplate/src/systemjs.config.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
'@angular/animations/browser': 'npm:@angular/animations/bundles/animations-browser.umd.js',
1919
'@angular/core': 'npm:@angular/core/bundles/core.umd.js',
2020
'@angular/common': 'npm:@angular/common/bundles/common.umd.js',
21+
'@angular/common/http': 'npm:@angular/common/bundles/common-http.umd.js',
2122
'@angular/compiler': 'npm:@angular/compiler/bundles/compiler.umd.js',
2223
'@angular/platform-browser': 'npm:@angular/platform-browser/bundles/platform-browser.umd.js',
2324
'@angular/platform-browser/animations': 'npm:@angular/platform-browser/bundles/platform-browser-animations.umd.js',
@@ -31,6 +32,7 @@
3132

3233
// other libraries
3334
'rxjs': 'npm:rxjs',
35+
'tslib': 'npm:tslib/tslib.js',
3436
'angular-in-memory-web-api': 'npm:angular-in-memory-web-api/bundles/in-memory-web-api.umd.js'
3537
},
3638
// packages tells the System loader how to load when no filename and/or no extension

aio/tools/examples/shared/boilerplate/src/systemjs.config.web.build.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
'@angular/animations/browser': 'ng:animations-builds/master/bundles/animations-browser.umd.js',
4343
'@angular/core': 'ng:core-builds/master/bundles/core.umd.js',
4444
'@angular/common': 'ng:common-builds/master/bundles/common.umd.js',
45+
'@angular/common/http': 'ng:common-builds/master/bundles/common-http.umd.js',
4546
'@angular/compiler': 'ng:compiler-builds/master/bundles/compiler.umd.js',
4647
'@angular/platform-browser': 'ng:platform-browser-builds/master/bundles/platform-browser.umd.js',
4748
'@angular/platform-browser/animations': 'ng:animations-builds/master/bundles/platform-browser-animations.umd.js',
@@ -56,6 +57,7 @@
5657
// angular testing umd bundles (overwrite the shim mappings)
5758
'@angular/core/testing': 'ng:core-builds/master/bundles/core-testing.umd.js',
5859
'@angular/common/testing': 'ng:common-builds/master/bundles/common-testing.umd.js',
60+
'@angular/common/http/testing': 'ng:common-builds/master/bundles/common-http-testing.umd.js',
5961
'@angular/compiler/testing': 'ng:compiler-builds/master/bundles/compiler-testing.umd.js',
6062
'@angular/platform-browser/testing': 'ng:platform-browser-builds/master/bundles/platform-browser-testing.umd.js',
6163
'@angular/platform-browser-dynamic/testing': 'ng:platform-browser-dynamic-builds/master/bundles/platform-browser-dynamic-testing.umd.js',
@@ -65,6 +67,7 @@
6567

6668
// other libraries
6769
'rxjs': 'npm:rxjs@5.0.1',
70+
'tslib': 'npm:tslib/tslib.js',
6871
'angular-in-memory-web-api': 'npm:angular-in-memory-web-api/bundles/in-memory-web-api.umd.js',
6972
'ts': 'npm:plugin-typescript@5.2.7/lib/plugin.js',
7073
'typescript': 'npm:typescript@2.3.2/lib/typescript.js',

aio/tools/examples/shared/boilerplate/src/systemjs.config.web.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
'@angular/animations/browser': 'npm:@angular/animations/bundles/animations-browser.umd.js',
4040
'@angular/core': 'npm:@angular/core/bundles/core.umd.js',
4141
'@angular/common': 'npm:@angular/common/bundles/common.umd.js',
42+
'@angular/common/http': 'npm:@angular/common/bundles/common-http.umd.js',
4243
'@angular/compiler': 'npm:@angular/compiler/bundles/compiler.umd.js',
4344
'@angular/platform-browser': 'npm:@angular/platform-browser/bundles/platform-browser.umd.js',
4445
'@angular/platform-browser/animations': 'npm:@angular/platform-browser/bundles/platform-browser-animations.umd.js',
@@ -52,6 +53,7 @@
5253

5354
// other libraries
5455
'rxjs': 'npm:rxjs@5.0.1',
56+
'tslib': 'npm:tslib/tslib.js',
5557
'angular-in-memory-web-api': 'npm:angular-in-memory-web-api/bundles/in-memory-web-api.umd.js',
5658
'ts': 'npm:plugin-typescript@5.2.7/lib/plugin.js',
5759
'typescript': 'npm:typescript@2.3.2/lib/typescript.js',

0 commit comments

Comments
 (0)