Skip to content
This repository was archived by the owner on Sep 21, 2018. It is now read-only.

Commit 7a3142e

Browse files
krjordankrjordan
committed
chore(deps): upgrade Angular CLI to RC.0
1 parent 300c143 commit 7a3142e

File tree

9 files changed

+425
-269
lines changed

9 files changed

+425
-269
lines changed

‎.angular-cli.json‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
33
"project": {
4-
"version": "1.0.0-beta.32.3",
54
"name": "example-app"
65
},
76
"apps": [
@@ -16,7 +15,8 @@
1615
"main": "main.ts",
1716
"polyfills": "polyfills.ts",
1817
"test": "test.ts",
19-
"tsconfig": "tsconfig.json",
18+
"tsconfig": "tsconfig.app.json",
19+
"testTsconfig": "tsconfig.spec.json",
2020
"prefix": "bc",
2121
"styles": [
2222
"styles.css"
@@ -36,12 +36,13 @@
3636
},
3737
"lint": [
3838
{
39-
"files": "src/**/*.ts",
40-
"project": "src/tsconfig.json"
39+
"project": "src/tsconfig.app.json"
4140
},
4241
{
43-
"files": "e2e/**/*.ts",
44-
"project": "e2e/tsconfig.json"
42+
"project": "src/tsconfig.spec.json"
43+
},
44+
{
45+
"project": "e2e/tsconfig.e2e.json"
4546
}
4647
],
4748
"test": {

e2e/tsconfig.json renamed to e2e/tsconfig.e2e.json

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
11
{
2-
"compileOnSave": false,
32
"compilerOptions": {
3+
"sourceMap": true,
44
"declaration": false,
5+
"moduleResolution": "node",
56
"emitDecoratorMetadata": true,
67
"experimentalDecorators": true,
7-
"module": "commonjs",
8-
"moduleResolution": "node",
8+
"lib": [
9+
"es2016"
10+
],
911
"outDir": "../dist/out-tsc-e2e",
10-
"sourceMap": true,
11-
"target": "es5",
12-
"typeRoots": [
13-
"../node_modules/@types"
12+
"module": "commonjs",
13+
"target": "es6",
14+
"types": [
15+
"jasmine",
16+
"node"
1417
]
1518
}
1619
}

‎karma.conf.js‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,13 @@ module.exports = function (config) {
88
plugins: [
99
require('karma-jasmine'),
1010
require('karma-chrome-launcher'),
11+
require('karma-jasmine-html-reporter'),
1112
require('karma-coverage-istanbul-reporter'),
1213
require('@angular/cli/plugins/karma')
1314
],
15+
client: {
16+
clearContext: false // leave Jasmine Spec Runner output visible in browser
17+
},
1418
files: [
1519
{ pattern: './src/test.ts', watched: false }
1620
],
@@ -21,16 +25,15 @@ module.exports = function (config) {
2125
'text/x-typescript': ['ts','tsx']
2226
},
2327
coverageIstanbulReporter: {
24-
reports: [ 'html', 'lcovonly' ],
28+
reports: [ 'html', 'lcovonly', 'text-summary' ],
2529
fixWebpackSourcePaths: true
2630
},
2731
angularCli: {
28-
config: './.angular-cli.json',
2932
environment: 'dev'
3033
},
3134
reporters: config.angularCli && config.angularCli.codeCoverage
32-
? ['progress', 'coverage-istanbul']
33-
: ['progress'],
35+
? ['progress', 'coverage-istanbul', 'kjhtml']
36+
: ['progress', 'kjhtml'],
3437
port: 9876,
3538
colors: true,
3639
logLevel: config.LOG_INFO,

‎package.json‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
"version": "1.0.0",
44
"description": "Example application demoing the @ngrx platform",
55
"main": "index.ts",
6-
"angular-cli": {},
76
"scripts": {
87
"ng": "ng",
98
"start": "ng serve",
@@ -51,11 +50,11 @@
5150
"zone.js": "^0.7.6"
5251
},
5352
"devDependencies": {
54-
"@angular/cli": "1.0.0-beta.32.3",
53+
"@angular/cli": "1.0.0-rc.0",
5554
"@angular/compiler-cli": "^2.4.0",
5655
"@types/jasmine": "2.5.38",
57-
"@types/node": "^6.0.60",
58-
"codelyzer": "~2.0.0-beta.4",
56+
"@types/node": "~6.0.60",
57+
"codelyzer": "~2.0.0",
5958
"jasmine-core": "~2.5.2",
6059
"jasmine-spec-reporter": "~3.2.0",
6160
"karma": "~1.4.1",

‎protractor.conf.js‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// https://github.com/angular/protractor/blob/master/lib/config.ts
33

44
/*global jasmine */
5-
var SpecReporter = require('jasmine-spec-reporter');
5+
const { SpecReporter } = require('jasmine-spec-reporter');
66

77
exports.config = {
88
allScriptsTimeout: 11000,
@@ -20,13 +20,12 @@ exports.config = {
2020
defaultTimeoutInterval: 30000,
2121
print: function() {}
2222
},
23-
useAllAngular2AppRoots: true,
2423
beforeLaunch: function() {
2524
require('ts-node').register({
2625
project: 'e2e'
2726
});
2827
},
29-
onPrepare: function() {
30-
jasmine.getEnv().addReporter(new SpecReporter());
28+
onPrepare() {
29+
jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } }));
3130
}
3231
};

‎src/app/pipes/ellipsis.spec.ts‎

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,38 @@ import { EllipsisPipe } from './ellipsis';
22

33
describe('Pipe: Ellipsis', () => {
44
let pipe: EllipsisPipe;
5-
const longStr: string = 'Lorem ipsum dolor sit amet, consectetur adipisicing elit. Quibusdam ab similique, odio sit harum laborum rem, nesciunt atque iure a pariatur nam nihil dolore necessitatibus quos ea autem accusantium dolor voluptates voluptatibus. Doloribus libero, facilis ea nam quibusdam aut labore itaque aliquid, optio. Rerum, dolorum! Error ratione tempore nesciunt magnam reprehenderit earum tempora aliquam laborum consectetur repellendus, nam hic maiores, qui corrupti saepe possimus, velit impedit eveniet totam. Aliquid qui corrupti facere. Alias itaque pariatur aliquam, nemo praesentium. Iure delectus, nemo natus! Libero ducimus aspernatur laborum voluptatibus officiis eaque enim minus accusamus, harum facilis sed eum! Sit vero vitae voluptatibus deleniti, corporis deserunt? Optio reprehenderit quae nesciunt minus at, sint fuga impedit, laborum praesentium illo nisi natus quia illum obcaecati id error suscipit eaque! Sed quam, ab dolorum qui sit dolorem fuga laudantium est, voluptas sequi consequuntur dolores animi veritatis doloremque at placeat maxime suscipit provident? Mollitia deserunt repudiandae illo. Similique voluptatem repudiandae possimus veritatis amet incidunt alias, debitis eveniet voluptate magnam consequatur eum molestiae provident est dicta. A autem praesentium voluptas, quis itaque doloremque quidem debitis? Ex qui, corporis voluptatibus assumenda necessitatibus accusamus earum rem cum quidem quasi! Porro assumenda, modi. Voluptatibus enim dignissimos fugit voluptas hic ducimus ullam, minus. Soluta architecto ratione, accusamus vitae eligendi explicabo beatae reprehenderit. Officiis voluptatibus dignissimos cum magni! Deleniti fuga reiciendis, ab dicta quasi impedit voluptatibus earum ratione inventore cum voluptas eligendi vel ut tenetur numquam, alias praesentium iusto asperiores, ipsa. Odit a ea, quaerat culpa dolore veritatis mollitia veniam quidem, velit, natus sint at.';
5+
const longStr: string = `Lorem ipsum dolor sit amet,
6+
consectetur adipisicing elit. Quibusdam ab similique, odio sit
7+
harum laborum rem, nesciunt atque iure a pariatur nam nihil dolore necessitatibus quos ea autem accusantium dolor
8+
voluptates voluptatibus. Doloribus libero, facilis ea nam
9+
quibusdam aut labore itaque aliquid, optio. Rerum, dolorum!
10+
Error ratione tempore nesciunt magnam reprehenderit earum
11+
tempora aliquam laborum consectetur repellendus, nam hic
12+
maiores, qui corrupti saepe possimus, velit impedit eveniet
13+
totam. Aliquid qui corrupti facere. Alias itaque pariatur
14+
aliquam, nemo praesentium. Iure delectus, nemo natus! Libero
15+
ducimus aspernatur laborum voluptatibus officiis eaque enim
16+
minus accusamus, harum facilis sed eum! Sit vero vitae
17+
voluptatibus deleniti, corporis deserunt? Optio reprehenderit
18+
quae nesciunt minus at, sint fuga impedit, laborum praesentium
19+
illo nisi natus quia illum obcaecati id error suscipit eaque!
20+
Sed quam, ab dolorum qui sit dolorem fuga laudantium est,
21+
voluptas sequi consequuntur dolores animi veritatis doloremque
22+
at placeat maxime suscipit provident? Mollitia deserunt
23+
repudiandae illo. Similique voluptatem repudiandae possimus
24+
veritatis amet incidunt alias, debitis eveniet voluptate
25+
magnam consequatur eum molestiae provident est dicta. A autem
26+
praesentium voluptas, quis itaque doloremque quidem debitis?
27+
Ex qui, corporis voluptatibus assumenda necessitatibus
28+
accusamus earum rem cum quidem quasi! Porro assumenda, modi.
29+
Voluptatibus enim dignissimos fugit voluptas hic ducimus ullam,
30+
minus. Soluta architecto ratione, accusamus vitae eligendi
31+
explicabo beatae reprehenderit. Officiis voluptatibus
32+
dignissimos cum magni! Deleniti fuga reiciendis, ab dicta
33+
quasi impedit voluptatibus earum ratione inventore cum
34+
voluptas eligendi vel ut tenetur numquam, alias praesentium
35+
iusto asperiores, ipsa. Odit a ea, quaerat culpa dolore
36+
veritatis mollitia veniam quidem, velit, natus sint at.`;
637

738
beforeEach(() => {
839
pipe = new EllipsisPipe();

src/tsconfig.json renamed to src/tsconfig.app.json

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,22 @@
11
{
22
"compilerOptions": {
3-
"baseUrl": "",
3+
"sourceMap": true,
44
"declaration": false,
5+
"moduleResolution": "node",
56
"emitDecoratorMetadata": true,
67
"experimentalDecorators": true,
78
"lib": [
89
"es2016",
910
"dom"
1011
],
11-
"mapRoot": "./",
12-
"module": "es2015",
13-
"moduleResolution": "node",
14-
"outDir": "../dist/out-tsc",
15-
"sourceMap": true,
12+
"outDir": "../out-tsc/app",
1613
"target": "es5",
17-
"typeRoots": [
18-
"../node_modules/@types"
19-
]
20-
}
14+
"module": "es2015",
15+
"baseUrl": "",
16+
"types": []
17+
},
18+
"exclude": [
19+
"test.ts",
20+
"**/*.spec.ts"
21+
]
2122
}

‎src/tsconfig.spec.json‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
{
2+
"compilerOptions": {
3+
"sourceMap": true,
4+
"declaration": false,
5+
"moduleResolution": "node",
6+
"emitDecoratorMetadata": true,
7+
"experimentalDecorators": true,
8+
"lib": [
9+
"es2016"
10+
],
11+
"outDir": "../out-tsc/spec",
12+
"module": "commonjs",
13+
"target": "es6",
14+
"baseUrl": "",
15+
"types": [
16+
"jasmine",
17+
"node"
18+
]
19+
},
20+
"files": [
21+
"test.ts"
22+
],
23+
"include": [
24+
"**/*.spec.ts"
25+
]
26+
}

0 commit comments

Comments
 (0)