Skip to content

Commit c989672

Browse files
committed
chore(angular-cli): upgrade angular-cli to beta.26
1 parent 90c643b commit c989672

File tree

9 files changed

+5603
-16
lines changed

9 files changed

+5603
-16
lines changed

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,11 @@ The purpose of this project is to show examples of loading routes by including t
44

55
The project shows a simple website, showing a `bundled` route loaded in the main bundle, and a `lazy` route loaded in a seperate bundle (lazy loaded).
66

7+
Mostly you just need `npm start` for `ng serve`, and `npm start -- --aot` for `ng serve --aot` (AoT compiler).
8+
79
## Standard Angular CLI Docs
810

9-
The project was generated with [angular-cli](https://github.com/angular/angular-cli) version 1.0.0-beta.24.
11+
The project was generated with [angular-cli](https://github.com/angular/angular-cli) version 1.0.0-beta.26.
1012

1113
The commands below have been modified to ensure you are using the locally installed `angular-cli` package.
1214

angular-cli.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"project": {
3-
"version": "1.0.0-beta.24",
3+
"version": "1.0.0-beta.26",
44
"name": "routing-angular-cli"
55
},
66
"apps": [
@@ -28,8 +28,6 @@
2828
}
2929
}
3030
],
31-
"addons": [],
32-
"packages": [],
3331
"e2e": {
3432
"protractor": {
3533
"config": "./protractor.conf.js"

package.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"ng": "ng",
88
"reset": "ng init --routing --style=scss",
99
"start": "ng serve",
10-
"lint": "tslint \"src/**/*.ts\"",
10+
"lint": "tslint \"src/**/*.ts\" --project src/tsconfig.json --type-check && tslint \"e2e/**/*.ts\" --project e2e/tsconfig.json --type-check",
1111
"test": "ng test",
1212
"pree2e": "webdriver-manager update --standalone false --gecko false",
1313
"e2e": "protractor"
@@ -31,8 +31,9 @@
3131
"@angular/compiler-cli": "^2.3.1",
3232
"@types/jasmine": "2.5.38",
3333
"@types/node": "^6.0.42",
34-
"angular-cli": "1.0.0-beta.24",
34+
"angular-cli": "1.0.0-beta.26",
3535
"codelyzer": "~2.0.0-beta.1",
36+
"dts-dom": "^0.1.12",
3637
"jasmine-core": "2.5.2",
3738
"jasmine-spec-reporter": "2.5.0",
3839
"karma": "1.2.0",
@@ -42,7 +43,7 @@
4243
"karma-remap-istanbul": "^0.2.1",
4344
"protractor": "~4.0.13",
4445
"ts-node": "1.2.1",
45-
"tslint": "^4.0.2",
46+
"tslint": "^4.3.0",
4647
"typescript": "~2.0.3"
4748
}
4849
}

src/app/app.component.spec.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,21 @@ describe('AppComponent', () => {
1818
});
1919

2020
it('should create the app', async(() => {
21-
let fixture = TestBed.createComponent(AppComponent);
22-
let app = fixture.debugElement.componentInstance;
21+
const fixture = TestBed.createComponent(AppComponent);
22+
const app = fixture.debugElement.componentInstance;
2323
expect(app).toBeTruthy();
2424
}));
2525

2626
it(`should have as title 'app works!'`, async(() => {
27-
let fixture = TestBed.createComponent(AppComponent);
28-
let app = fixture.debugElement.componentInstance;
27+
const fixture = TestBed.createComponent(AppComponent);
28+
const app = fixture.debugElement.componentInstance;
2929
expect(app.title).toEqual('app works!');
3030
}));
3131

3232
it('should render title in a h1 tag', async(() => {
33-
let fixture = TestBed.createComponent(AppComponent);
33+
const fixture = TestBed.createComponent(AppComponent);
3434
fixture.detectChanges();
35-
let compiled = fixture.debugElement.nativeElement;
35+
const compiled = fixture.debugElement.nativeElement;
3636
expect(compiled.querySelector('h1').textContent).toContain('app works!');
3737
}));
3838
});

src/app/lazy/deep/deep-routing.module.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ export const routes: Routes = [
1010
},
1111
{
1212
path: 'third',
13-
// loadChildren: 'app/lazy/deep/third-level/third-level.module#ThirdLevelModule'
1413
loadChildren: './third-level/third-level.module#ThirdLevelModule'
1514
}
1615
];

src/polyfills.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// This file includes polyfills needed by Angular 2 and is loaded before
1+
// This file includes polyfills needed by Angular and is loaded before
22
// the app. You can add your own extra polyfills to this file.
33
import 'core-js/es6/symbol';
44
import 'core-js/es6/object';

src/test.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// This file is required by karma.conf.js and loads recursively all the .spec and framework files
2+
13
import './polyfills.ts';
24

35
import 'zone.js/dist/long-stack-trace-zone';
@@ -25,7 +27,7 @@ getTestBed().initTestEnvironment(
2527
platformBrowserDynamicTesting()
2628
);
2729
// Then we find all the tests.
28-
let context = require.context('./', true, /\.spec\.ts$/);
30+
const context = require.context('./', true, /\.spec\.ts$/);
2931
// And load the modules.
3032
context.keys().map(context);
3133
// Finally, start Karma to run the tests.

tslint.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"node_modules/codelyzer"
44
],
55
"rules": {
6+
"callable-types": true,
67
"class-name": true,
78
"comment-format": [
89
true,
@@ -11,10 +12,13 @@
1112
"curly": true,
1213
"eofline": true,
1314
"forin": true,
15+
"import-blacklist": [true, "rxjs"],
16+
"import-spacing": true,
1417
"indent": [
1518
true,
1619
"spaces"
1720
],
21+
"interface-over-type-literal": true,
1822
"label-position": true,
1923
"max-line-length": [
2024
true,
@@ -40,10 +44,12 @@
4044
"no-debugger": true,
4145
"no-duplicate-variable": true,
4246
"no-empty": false,
47+
"no-empty-interface": true,
4348
"no-eval": true,
4449
"no-inferrable-types": true,
4550
"no-shadowed-variable": true,
4651
"no-string-literal": false,
52+
"no-string-throw": true,
4753
"no-switch-case-fall-through": true,
4854
"no-trailing-whitespace": true,
4955
"no-unused-expression": true,
@@ -57,6 +63,7 @@
5763
"check-else",
5864
"check-whitespace"
5965
],
66+
"prefer-const": true,
6067
"quotemark": [
6168
true,
6269
"single"
@@ -79,6 +86,8 @@
7986
"variable-declaration": "nospace"
8087
}
8188
],
89+
"typeof-compare": true,
90+
"unified-signatures": true,
8291
"variable-name": false,
8392
"whitespace": [
8493
true,

0 commit comments

Comments
 (0)