Skip to content

Commit 6d9e3bd

Browse files
committed
Version 2.0.0
1 parent eb07a14 commit 6d9e3bd

37 files changed

+9526
-11376
lines changed

.angular-cli.json

+43-33
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,55 @@
11
{
22
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
33
"project": {
4-
"name": "a4"
4+
"name": "cli5"
55
},
6-
"apps": [{
7-
"root": "src",
8-
"outDir": "dist",
9-
"assets": [
10-
"assets",
11-
"favicon.ico"
12-
],
13-
"index": "index.html",
14-
"main": "main.ts",
15-
"polyfills": "polyfills.ts",
16-
"test": "test.ts",
17-
"tsconfig": "tsconfig.app.json",
18-
"testTsconfig": "tsconfig.spec.json",
19-
"prefix": "app",
20-
"styles": [
21-
"../node_modules/font-awesome/css/font-awesome.css",
22-
"styles.css"
23-
],
24-
"scripts": [],
25-
"environmentSource": "environments/environment.ts",
26-
"environments": {
27-
"dev": "environments/environment.ts",
28-
"prod": "environments/environment.prod.ts"
6+
"apps": [
7+
{
8+
"root": "src",
9+
"outDir": "dist",
10+
"assets": [
11+
"assets",
12+
"favicon.ico"
13+
],
14+
"index": "index.html",
15+
"main": "main.ts",
16+
"polyfills": "polyfills.ts",
17+
"test": "test.ts",
18+
"tsconfig": "tsconfig.app.json",
19+
"testTsconfig": "tsconfig.spec.json",
20+
"prefix": "app",
21+
"styles": [
22+
"../node_modules/bootstrap/dist/css/bootstrap.min.css",
23+
"../node_modules/font-awesome/css/font-awesome.css",
24+
"styles.css"
25+
],
26+
"scripts": [],
27+
"environmentSource": "environments/environment.ts",
28+
"environments": {
29+
"dev": "environments/environment.ts",
30+
"prod": "environments/environment.prod.ts"
31+
}
2932
}
30-
}],
33+
],
3134
"e2e": {
3235
"protractor": {
3336
"config": "./protractor.conf.js"
3437
}
3538
},
36-
"lint": [{
37-
"project": "src/tsconfig.app.json"
38-
}, {
39-
"project": "src/tsconfig.spec.json"
40-
}, {
41-
"project": "e2e/tsconfig.e2e.json"
42-
}],
39+
"lint": [
40+
{
41+
"project": "src/tsconfig.app.json",
42+
"exclude": "**/node_modules/**"
43+
},
44+
{
45+
"project": "src/tsconfig.spec.json",
46+
"exclude": "**/node_modules/**"
47+
},
48+
{
49+
"project": "e2e/tsconfig.e2e.json",
50+
"exclude": "**/node_modules/**"
51+
}
52+
],
4353
"test": {
4454
"karma": {
4555
"config": "./karma.conf.js"
@@ -49,4 +59,4 @@
4959
"styleExt": "css",
5060
"component": {}
5161
}
52-
}
62+
}

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
# compiled output
44
/dist
5+
/dist-server
56
/tmp
67
/out-tsc
78

e2e/app.e2e-spec.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
import { A4Page } from './app.po';
1+
import { AppPage } from './app.po';
22

3-
describe('a4 App', () => {
4-
let page: A4Page;
3+
describe('cli5 App', () => {
4+
let page: AppPage;
55

66
beforeEach(() => {
7-
page = new A4Page();
7+
page = new AppPage();
88
});
99

10-
it('should display message saying app works', () => {
10+
it('should display welcome message', () => {
1111
page.navigateTo();
12-
expect(page.getParagraphText()).toEqual('app works!');
12+
expect(page.getParagraphText()).toEqual('Welcome to app!');
1313
});
1414
});

e2e/app.po.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { browser, element, by } from 'protractor';
1+
import { browser, by, element } from 'protractor';
22

3-
export class A4Page {
3+
export class AppPage {
44
navigateTo() {
55
return browser.get('/');
66
}

e2e/tsconfig.e2e.json

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@
22
"extends": "../tsconfig.json",
33
"compilerOptions": {
44
"outDir": "../out-tsc/e2e",
5+
"baseUrl": "./",
56
"module": "commonjs",
67
"target": "es5",
7-
"types":[
8+
"types": [
89
"jasmine",
10+
"jasminewd2",
911
"node"
1012
]
1113
}

karma.conf.js

+2-13
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// Karma configuration file, see link for more information
2-
// https://karma-runner.github.io/0.13/config/configuration-file.html
2+
// https://karma-runner.github.io/1.0/config/configuration-file.html
33

44
module.exports = function (config) {
55
config.set({
@@ -15,25 +15,14 @@ module.exports = function (config) {
1515
client:{
1616
clearContext: false // leave Jasmine Spec Runner output visible in browser
1717
},
18-
files: [
19-
{ pattern: './src/test.ts', watched: false }
20-
],
21-
preprocessors: {
22-
'./src/test.ts': ['@angular/cli']
23-
},
24-
mime: {
25-
'text/x-typescript': ['ts','tsx']
26-
},
2718
coverageIstanbulReporter: {
2819
reports: [ 'html', 'lcovonly' ],
2920
fixWebpackSourcePaths: true
3021
},
3122
angularCli: {
3223
environment: 'dev'
3324
},
34-
reporters: config.angularCli && config.angularCli.codeCoverage
35-
? ['progress', 'coverage-istanbul']
36-
: ['progress', 'kjhtml'],
25+
reporters: ['progress', 'kjhtml'],
3726
port: 9876,
3827
colors: true,
3928
logLevel: config.LOG_INFO,

0 commit comments

Comments
 (0)