Skip to content
This repository was archived by the owner on Nov 8, 2021. It is now read-only.

Commit f4b5ccb

Browse files
committed
chore(npm): update to angular 4.0.0 final
1 parent 4470ad8 commit f4b5ccb

File tree

6 files changed

+716
-492
lines changed

6 files changed

+716
-492
lines changed

config/webpack.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ module.exports = {
6363
plugins: [
6464
// fix the warning in ./~/@angular/core/src/linker/system_js_ng_module_factory_loader.js
6565
new webpack.ContextReplacementPlugin(
66-
/angular(\\|\/)core(\\|\/)(esm(\\|\/)src|src)(\\|\/)linker/,
66+
/angular(\\|\/)core(\\|\/)@angular/,
6767
helpers.root('./src')
6868
),
6969

package.json

Lines changed: 35 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -30,51 +30,52 @@
3030
"module": "index.js",
3131
"typings": "index.d.ts",
3232
"peerDependencies": {
33-
"@ngx-translate/core": "^6.0.0-beta.1",
34-
"@angular/core": ">=2.3.0 || >=4.0.0-beta.0",
35-
"@angular/http": ">=2.3.0 || >=4.0.0-beta.0"
33+
"@ngx-translate/core": ">=6.0.0",
34+
"@angular/core": ">=2.0.0",
35+
"@angular/http": ">=2.0.0"
3636
},
3737
"devDependencies": {
38-
"@angular/common": "2.4.6",
39-
"@angular/compiler": "2.4.6",
40-
"@angular/compiler-cli": "2.4.6",
41-
"@angular/core": "2.4.6",
42-
"@angular/http": "2.4.6",
43-
"@ngx-translate/core": "6.0.0-beta.1",
44-
"@angular/platform-browser": "2.4.6",
45-
"@angular/platform-browser-dynamic": "2.4.6",
46-
"@angular/platform-server": "2.4.6",
38+
"@angular/animations": "4.0.0",
39+
"@angular/common": "4.0.0",
40+
"@angular/compiler": "4.0.0",
41+
"@angular/compiler-cli": "4.0.0",
42+
"@angular/core": "4.0.0",
43+
"@angular/http": "4.0.0",
44+
"@ngx-translate/core": "6.0.1",
45+
"@angular/platform-browser": "4.0.0",
46+
"@angular/platform-browser-dynamic": "4.0.0",
47+
"@angular/platform-server": "4.0.0",
4748
"@types/hammerjs": "2.0.34",
48-
"@types/jasmine": "2.5.41",
49-
"@types/node": "7.0.4",
50-
"awesome-typescript-loader": "3.0.0-beta.18",
51-
"clean-webpack-plugin": "0.1.15",
52-
"codelyzer": "2.0.0-beta.4",
53-
"commitizen": "2.9.5",
49+
"@types/jasmine": "2.5.46",
50+
"@types/node": "7.0.10",
51+
"awesome-typescript-loader": "3.1.2",
52+
"clean-webpack-plugin": "0.1.16",
53+
"codelyzer": "3.0.0-beta.4",
54+
"commitizen": "2.9.6",
5455
"core-js": "2.4.1",
55-
"cz-conventional-changelog": "1.2.0",
56-
"istanbul-instrumenter-loader": "0.2.0",
56+
"cz-conventional-changelog": "2.0.0",
57+
"istanbul-instrumenter-loader": "2.0.0",
5758
"jasmine-core": "2.5.2",
58-
"karma": "1.3.0",
59+
"karma": "1.5.0",
5960
"karma-chrome-launcher": "2.0.0",
6061
"karma-coverage": "1.1.1",
6162
"karma-jasmine": "1.1.0",
62-
"karma-mocha-reporter": "2.2.2",
63-
"karma-remap-coverage": "0.1.2",
63+
"karma-mocha-reporter": "2.2.3",
64+
"karma-remap-coverage": "0.1.4",
6465
"karma-sourcemap-loader": "0.3.7",
65-
"karma-webpack": "2.0.2",
66-
"loader-utils": "0.2.16",
67-
"reflect-metadata": "0.1.9",
68-
"rimraf": "2.5.4",
69-
"rxjs": "5.0.1",
66+
"karma-webpack": "2.0.3",
67+
"loader-utils": "1.1.0",
68+
"reflect-metadata": "0.1.10",
69+
"rimraf": "2.6.1",
70+
"rxjs": "5.2.0",
7071
"semantic-release": "6.3.5",
71-
"source-map-loader": "0.1.6",
72+
"source-map-loader": "0.2.0",
7273
"ts-helpers": "1.1.2",
73-
"tslint": "4.4.2",
74-
"tslint-loader": "3.3.0",
75-
"typescript": "2.0.10",
76-
"webpack": "2.2.1",
77-
"zone.js": "0.7.6"
74+
"tslint": "4.5.1",
75+
"tslint-loader": "3.4.3",
76+
"typescript": "2.2.1",
77+
"webpack": "2.3.1",
78+
"zone.js": "0.8.5"
7879
},
7980
"config": {
8081
"commitizen": {

tests/http-loader.spec.ts

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,16 @@
11
import {Injector} from "@angular/core";
2-
import {ResponseOptions, Response, XHRBackend, HttpModule, Http} from "@angular/http";
3-
import {MockBackend, MockConnection} from "@angular/http/testing";
4-
import {TranslateService, TranslateLoader, TranslateModule} from '@ngx-translate/core';
52
import {getTestBed, TestBed} from "@angular/core/testing";
3+
import {
4+
BaseRequestOptions,
5+
ConnectionBackend,
6+
Http,
7+
HttpModule,
8+
RequestOptions,
9+
Response,
10+
ResponseOptions, XHRBackend
11+
} from "@angular/http";
12+
import {MockBackend, MockConnection} from "@angular/http/testing";
13+
import {TranslateLoader, TranslateModule, TranslateService} from "@ngx-translate/core";
614
import {TranslateHttpLoader} from "../index";
715

816
const mockBackendResponse = (connection: MockConnection, response: string) => {
@@ -12,7 +20,7 @@ const mockBackendResponse = (connection: MockConnection, response: string) => {
1220
describe('TranslateLoader', () => {
1321
let injector: Injector;
1422
let translate: TranslateService;
15-
let backend: MockBackend;
23+
let backend: any;
1624
let connection: MockConnection; // this will be set when a new connection is emitted from the backend.
1725

1826
beforeEach(() => {
@@ -28,7 +36,9 @@ describe('TranslateLoader', () => {
2836
})
2937
],
3038
providers: [
31-
{provide: XHRBackend, useClass: MockBackend}
39+
{provide: XHRBackend, useClass: MockBackend},
40+
{provide: ConnectionBackend, useClass: MockBackend},
41+
{provide: RequestOptions, useClass: BaseRequestOptions}
3242
]
3343
});
3444
injector = getTestBed();

tslint.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@
6161
"use-input-property-decorator": true,
6262
"use-output-property-decorator": true,
6363
"use-host-property-decorator": false,
64-
"use-life-cycle-interface": true,
6564
"use-pipe-transform-interface": true
6665
}
6766
}

webpack.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ module.exports = {
4949
plugins: [
5050
// fix the warning in ./~/@angular/webpack.config.js/src/linker/system_js_ng_module_factory_loader.js
5151
new webpack.ContextReplacementPlugin(
52-
/angular(\\|\/)core(\\|\/)(esm(\\|\/)src|src)(\\|\/)linker/,
52+
/angular(\\|\/)core(\\|\/)@angular/,
5353
helpers.root('./src')
5454
),
5555

0 commit comments

Comments
 (0)