Skip to content

Commit 71257f5

Browse files
IsmaestroIsmael Ramos
Ismaestro
authored and
Ismael Ramos
committed
feat(angular): upgrade to v6
1 parent 0ad5c76 commit 71257f5

28 files changed

+5237
-6738
lines changed

‎.angular-cli.json‎

Lines changed: 0 additions & 72 deletions
This file was deleted.

‎.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ testem.log
3131
/typings
3232

3333
# e2e
34-
/e2e/*.js
3534
/e2e/*.map
3635

3736
#System Files

‎README.md‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
1-
# Example app with Angular 5 + Angular CLI + Angular Material + Docker + Angular Example Library
1+
# Example app with Angular 6 + Angular CLI + Angular Material + Docker + Angular Example Library
22

33
> ### Base project made with much :heart: . Contains CRUD, patterns, custom library, etc.
44
5-
![travis](https://travis-ci.org/Ismaestro/angular5-example-app.svg?branch=master)
6-
[![Coverage Status](https://coveralls.io/repos/github/Ismaestro/angular5-example-app/badge.svg?branch=master)](https://coveralls.io/github/Ismaestro/angular5-example-app?branch=master)
7-
[![Codacy Badge](https://api.codacy.com/project/badge/Grade/9d190a60fc864060ac054ba17a4e92e4)](https://www.codacy.com/app/Ismaestro/angular5-example-app?utm_source=github.com&utm_medium=referral&utm_content=Ismaestro/angular5-example-app&utm_campaign=badger)
8-
[![Known Vulnerabilities](https://snyk.io/test/github/ismaestro/angular5-example-app/badge.svg)](https://snyk.io/test/github/ismaestro/angular5-example-app)
5+
![travis](https://travis-ci.org/Ismaestro/angular6-example-app.svg?branch=master)
6+
[![Coverage Status](https://coveralls.io/repos/github/Ismaestro/angular6-example-app/badge.svg?branch=master)](https://coveralls.io/github/Ismaestro/angular6-example-app?branch=master)
7+
[![Codacy Badge](https://api.codacy.com/project/badge/Grade/9d190a60fc864060ac054ba17a4e92e4)](https://www.codacy.com/app/Ismaestro/angular6-example-app?utm_source=github.com&utm_medium=referral&utm_content=Ismaestro/angular6-example-app&utm_campaign=badger)
8+
[![Known Vulnerabilities](https://snyk.io/test/github/ismaestro/angular6-example-app/badge.svg)](https://snyk.io/test/github/ismaestro/angular6-example-app)
99
[![Conventional Commits](https://img.shields.io/badge/Conventional%20Commits-1.0.0-yellow.svg)](https://conventionalcommits.org)
1010

11-
[![dependency Status](https://david-dm.org/ismaestro/angular5-example-app.svg)](https://david-dm.org/ismaestro/angular5-example-app#info=dependencies)
12-
[![devDependency Status](https://david-dm.org/ismaestro/angular5-example-app/dev-status.svg)](https://david-dm.org/ismaestro/angular5-example-app#info=devDependencies)
13-
[![peerDependencies Status](https://david-dm.org/ismaestro/angular5-example-app/peer-status.svg)](https://david-dm.org/ismaestro/angular5-example-app?type=peer)
11+
[![dependency Status](https://david-dm.org/ismaestro/angular6-example-app.svg)](https://david-dm.org/ismaestro/angular6-example-app#info=dependencies)
12+
[![devDependency Status](https://david-dm.org/ismaestro/angular6-example-app/dev-status.svg)](https://david-dm.org/ismaestro/angular6-example-app#info=devDependencies)
13+
[![peerDependencies Status](https://david-dm.org/ismaestro/angular6-example-app/peer-status.svg)](https://david-dm.org/ismaestro/angular6-example-app?type=peer)
1414

1515
[![npm](https://img.shields.io/badge/demo-online-brightgreen.svg)](http://angularexampleapp.com/)
16-
[![Join the chat at https://gitter.im/angular5-example-app/Lobby](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/angular5-example-app/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
16+
[![Join the chat at https://gitter.im/angular6-example-app/Lobby](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/angular6-example-app/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
1717

18-
[![GitHub forks](https://img.shields.io/github/forks/ismaestro/angular5-example-app.svg?style=social&label=Fork)](https://github.com/ismaestro/angular5-example-app/fork)
19-
[![GitHub stars](https://img.shields.io/github/stars/ismaestro/angular5-example-app.svg?style=social&label=Star)](https://github.com/ismaestro/angular5-example-app)
18+
[![GitHub forks](https://img.shields.io/github/forks/ismaestro/angular6-example-app.svg?style=social&label=Fork)](https://github.com/ismaestro/angular6-example-app/fork)
19+
[![GitHub stars](https://img.shields.io/github/stars/ismaestro/angular6-example-app.svg?style=social&label=Star)](https://github.com/ismaestro/angular6-example-app)
2020

2121
## [LIVE DEMO](http://angularexampleapp.com/)
2222

‎angular.json‎

Lines changed: 197 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,197 @@
1+
{
2+
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
3+
"version": 1,
4+
"newProjectRoot": "projects",
5+
"projects": {
6+
"angular-example-app": {
7+
"root": "",
8+
"projectType": "application",
9+
"architect": {
10+
"build": {
11+
"builder": "@angular-devkit/build-angular:browser",
12+
"options": {
13+
"outputPath": "dist",
14+
"index": "src/index.html",
15+
"main": "src/main.ts",
16+
"tsConfig": "src/tsconfig.app.json",
17+
"polyfills": "src/polyfills.ts",
18+
"assets": [
19+
{
20+
"glob": "**/*",
21+
"input": "src/assets",
22+
"output": "/assets"
23+
},
24+
{
25+
"glob": "favicon.ico",
26+
"input": "src",
27+
"output": "/"
28+
},
29+
{
30+
"glob": "sitemap.xml",
31+
"input": "src",
32+
"output": "/"
33+
},
34+
{
35+
"glob": "googled41787c6aae2151b.html",
36+
"input": "src",
37+
"output": "/"
38+
},
39+
{
40+
"glob": "CNAME",
41+
"input": "src",
42+
"output": "/"
43+
}
44+
],
45+
"styles": [
46+
"src/assets/css/reset.css",
47+
"src/assets/css/loading.css",
48+
"src/assets/css/styles.scss"
49+
],
50+
"stylePreprocessorOptions": {
51+
"includePaths": [
52+
"src/styles"
53+
]
54+
},
55+
"scripts": [
56+
"src/assets/js/modernizr.js",
57+
"src/assets/js/gtm.js"
58+
]
59+
},
60+
"configurations": {
61+
"production": {
62+
"optimization": true,
63+
"outputHashing": "all",
64+
"sourceMap": false,
65+
"extractCss": true,
66+
"namedChunks": false,
67+
"aot": true,
68+
"extractLicenses": true,
69+
"vendorChunk": false,
70+
"buildOptimizer": true,
71+
"serviceWorker": true,
72+
"baseHref": "/",
73+
"fileReplacements": [
74+
{
75+
"replace": "src/environments/environment.ts",
76+
"with": "src/environments/environment.prod.ts"
77+
}
78+
]
79+
}
80+
}
81+
},
82+
"serve": {
83+
"builder": "@angular-devkit/build-angular:dev-server",
84+
"options": {
85+
"browserTarget": "angular-example-app:build"
86+
},
87+
"configurations": {
88+
"production": {
89+
"browserTarget": "angular-example-app:build:production",
90+
"aot": false
91+
}
92+
}
93+
},
94+
"extract-i18n": {
95+
"builder": "@angular-devkit/build-angular:extract-i18n",
96+
"options": {
97+
"browserTarget": "angular-example-app:build"
98+
}
99+
},
100+
"test": {
101+
"builder": "@angular-devkit/build-angular:karma",
102+
"options": {
103+
"main": "src/test.ts",
104+
"polyfills": "src/polyfills.ts",
105+
"tsConfig": "src/tsconfig.spec.json",
106+
"karmaConfig": "src/karma.conf.js",
107+
"scripts": [
108+
"src/assets/js/modernizr.js",
109+
"src/assets/js/gtm.js"
110+
],
111+
"styles": [
112+
"src/assets/css/reset.css",
113+
"src/assets/css/loading.css",
114+
"src/assets/css/styles.scss"
115+
],
116+
"assets": [
117+
{
118+
"glob": "**/*",
119+
"input": "src/assets",
120+
"output": "/assets"
121+
},
122+
{
123+
"glob": "favicon.ico",
124+
"input": "src",
125+
"output": "/"
126+
},
127+
{
128+
"glob": "sitemap.xml",
129+
"input": "src",
130+
"output": "/"
131+
},
132+
{
133+
"glob": "googled41787c6aae2151b.html",
134+
"input": "src",
135+
"output": "/"
136+
},
137+
{
138+
"glob": "CNAME",
139+
"input": "src",
140+
"output": "/"
141+
}
142+
],
143+
"stylePreprocessorOptions": {
144+
"includePaths": [
145+
"src/styles"
146+
]
147+
},
148+
"watch": false,
149+
"codeCoverage": true
150+
}
151+
},
152+
"lint": {
153+
"builder": "@angular-devkit/build-angular:tslint",
154+
"options": {
155+
"tsConfig": [
156+
"src/tsconfig.app.json",
157+
"src/tsconfig.spec.json"
158+
],
159+
"exclude": []
160+
}
161+
}
162+
}
163+
},
164+
"angular-example-app-e2e": {
165+
"root": "e2e/",
166+
"projectType": "application",
167+
"architect": {
168+
"e2e": {
169+
"builder": "@angular-devkit/build-angular:protractor",
170+
"options": {
171+
"protractorConfig": "e2e/protractor.conf.js",
172+
"devServerTarget": "angular-example-app:serve"
173+
}
174+
},
175+
"lint": {
176+
"builder": "@angular-devkit/build-angular:tslint",
177+
"options": {
178+
"tsConfig": "e2e/tsconfig.e2e.json",
179+
"exclude": [
180+
"**/node_modules/**"
181+
]
182+
}
183+
}
184+
}
185+
}
186+
},
187+
"defaultProject": "angular-example-app",
188+
"schematics": {
189+
"@schematics/angular:component": {
190+
"prefix": "app",
191+
"styleext": "css"
192+
},
193+
"@schematics/angular:directive": {
194+
"prefix": "app"
195+
}
196+
}
197+
}

‎e2e/protractor.conf.js‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
// Protractor configuration file, see link for more information
2+
// https://github.com/angular/protractor/blob/master/lib/config.ts
3+
4+
const { SpecReporter } = require('jasmine-spec-reporter');
5+
6+
exports.config = {
7+
allScriptsTimeout: 11000,
8+
specs: [
9+
'./src/**/*.e2e-spec.ts'
10+
],
11+
capabilities: {
12+
'browserName': 'chrome'
13+
},
14+
directConnect: true,
15+
baseUrl: 'http://localhost:4200/',
16+
framework: 'jasmine',
17+
jasmineNodeOpts: {
18+
showColors: true,
19+
defaultTimeoutInterval: 30000,
20+
print: function() {}
21+
},
22+
onPrepare() {
23+
require('ts-node').register({
24+
project: require('path').join(__dirname, './tsconfig.e2e.json')
25+
});
26+
jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } }));
27+
}
28+
};

‎e2e/heroes-list/heroes-list-page.e2e-spec.ts‎ renamed to ‎e2e/src/heroes-list/heroes-list-page.e2e-spec.ts‎

File renamed without changes.

‎e2e/heroes-list/heroes-list-page.ts‎ renamed to ‎e2e/src/heroes-list/heroes-list-page.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {browser, by, element} from 'protractor';
2-
import {AppConfig} from '../../src/app/config/app.config';
2+
import {AppConfig} from '../../../src/app/config/app.config';
33

44
export class HeroesListPage {
55
static navigateTo(): any {

‎e2e/home/home-page.e2e-spec.ts‎ renamed to ‎e2e/src/home/home-page.e2e-spec.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {AppConfig} from '../../src/app/config/app.config';
1+
import {AppConfig} from '../../../src/app/config/app.config';
22
import {HomePage} from './home-page';
33

44
describe('Home page', function () {

‎e2e/home/home-page.ts‎ renamed to ‎e2e/src/home/home-page.ts‎

File renamed without changes.

0 commit comments

Comments
 (0)