Skip to content

Commit 739045c

Browse files
committed
v7.0.0 - upgraded to angular 7
1 parent 9acacb5 commit 739045c

File tree

11 files changed

+7088
-7123
lines changed

11 files changed

+7088
-7123
lines changed

.angular-cli.json

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

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2017-2018 Gerard Rovira Sánchez
3+
Copyright (c) 2017-2019 Gerard Rovira Sánchez
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

angular.json

Lines changed: 141 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,141 @@
1+
{
2+
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
3+
"version": 1,
4+
"newProjectRoot": "projects",
5+
"projects": {
6+
"angular-contents": {
7+
"root": "",
8+
"sourceRoot": "example",
9+
"projectType": "application",
10+
"architect": {
11+
"build": {
12+
"builder": "@angular-devkit/build-angular:browser",
13+
"options": {
14+
"outputPath": "dist",
15+
"index": "example/index.html",
16+
"main": "example/main.ts",
17+
"tsConfig": "example/tsconfig.app.json",
18+
"polyfills": "example/polyfills.ts",
19+
"assets": [
20+
"example/assets",
21+
"example/favicon.ico"
22+
],
23+
"styles": [],
24+
"scripts": []
25+
},
26+
"configurations": {
27+
"prod": {
28+
"fileReplacements": [
29+
{
30+
"replace": "example/config/environment.ts",
31+
"with": "example/config/environment.prod.ts"
32+
}
33+
]
34+
},
35+
"production": {
36+
"optimization": true,
37+
"outputHashing": "all",
38+
"sourceMap": false,
39+
"extractCss": true,
40+
"namedChunks": false,
41+
"aot": true,
42+
"extractLicenses": true,
43+
"vendorChunk": false,
44+
"buildOptimizer": true
45+
}
46+
}
47+
},
48+
"serve": {
49+
"builder": "@angular-devkit/build-angular:dev-server",
50+
"options": {
51+
"browserTarget": "angular-contents:build"
52+
},
53+
"configurations": {
54+
"prod": {
55+
"browserTarget": "angular-contents:build:prod"
56+
},
57+
"production": {
58+
"browserTarget": "angular-contents:build:production"
59+
}
60+
}
61+
},
62+
"extract-i18n": {
63+
"builder": "@angular-devkit/build-angular:extract-i18n",
64+
"options": {
65+
"browserTarget": "angular-contents:build"
66+
}
67+
},
68+
"test": {
69+
"builder": "@angular-devkit/build-angular:karma",
70+
"options": {
71+
"main": "example/test.ts",
72+
"karmaConfig": "./karma.conf.js",
73+
"polyfills": "example/polyfills.ts",
74+
"tsConfig": "example/tsconfig.spec.json",
75+
"scripts": [],
76+
"styles": [],
77+
"assets": [
78+
"example/assets",
79+
"example/favicon.ico"
80+
]
81+
}
82+
},
83+
"lint": {
84+
"builder": "@angular-devkit/build-angular:tslint",
85+
"options": {
86+
"tsConfig": [
87+
"example/tsconfig.app.json",
88+
"example/tsconfig.spec.json"
89+
],
90+
"exclude": [
91+
"**/node_modules/**",
92+
"./example/test.ts",
93+
"./example/polyfills.ts"
94+
]
95+
}
96+
}
97+
}
98+
},
99+
"angular-contents-e2e": {
100+
"root": "e2e",
101+
"sourceRoot": "e2e",
102+
"projectType": "application",
103+
"architect": {
104+
"e2e": {
105+
"builder": "@angular-devkit/build-angular:protractor",
106+
"options": {
107+
"protractorConfig": "./protractor.conf.js",
108+
"devServerTarget": "angular-contents:serve"
109+
}
110+
},
111+
"lint": {
112+
"builder": "@angular-devkit/build-angular:tslint",
113+
"options": {
114+
"tsConfig": [
115+
"example/tsconfig.app.json",
116+
"example/tsconfig.spec.json"
117+
],
118+
"exclude": [
119+
"**/node_modules/**",
120+
"./example/test.ts",
121+
"./example/polyfills.ts"
122+
]
123+
}
124+
}
125+
}
126+
}
127+
},
128+
"defaultProject": "angular-contents",
129+
"schematics": {
130+
"@schematics/angular:class": {
131+
"spec": false
132+
},
133+
"@schematics/angular:component": {
134+
"prefix": "app",
135+
"styleext": "scss"
136+
},
137+
"@schematics/angular:directive": {
138+
"prefix": "app"
139+
}
140+
}
141+
}

example/polyfills.ts

Lines changed: 0 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,4 @@
1-
/**
2-
* This file includes polyfills needed by Angular and is loaded before the app.
3-
* You can add your own extra polyfills to this file.
4-
*
5-
* This file is divided into 2 sections:
6-
* 1. Browser polyfills. These are applied before loading ZoneJS and are sorted by browsers.
7-
* 2. Application imports. Files imported after ZoneJS that should be loaded before your main
8-
* file.
9-
*
10-
* The current setup is for so-called "evergreen" browsers; the last versions of browsers that
11-
* automatically update themselves. This includes Safari >= 10, Chrome >= 55 (including Opera),
12-
* Edge >= 13 on the desktop, and iOS 10 and Chrome on mobile.
13-
*
14-
* Learn more in https://angular.io/docs/ts/latest/guide/browser-support.html
15-
*/
16-
17-
/***************************************************************************************************
18-
* BROWSER POLYFILLS
19-
*/
20-
21-
/** IE9, IE10 and IE11 requires all of the following polyfills. **/
22-
// import 'core-js/es6/symbol';
23-
// import 'core-js/es6/object';
24-
// import 'core-js/es6/function';
25-
// import 'core-js/es6/parse-int';
26-
// import 'core-js/es6/parse-float';
27-
// import 'core-js/es6/number';
28-
// import 'core-js/es6/math';
29-
// import 'core-js/es6/string';
30-
// import 'core-js/es6/date';
31-
// import 'core-js/es6/array';
32-
// import 'core-js/es6/regexp';
33-
// import 'core-js/es6/map';
34-
// import 'core-js/es6/weak-map';
35-
// import 'core-js/es6/set';
36-
37-
/** IE10 and IE11 requires the following for NgClass support on SVG elements */
38-
// import 'classlist.js'; // Run `npm install --save classlist.js`.
39-
40-
/** IE10 and IE11 requires the following for the Reflect API. */
41-
// import 'core-js/es6/reflect';
42-
431

44-
/** Evergreen browsers require these. **/
45-
// Used for reflect-metadata in JIT. If you use AOT (and only Angular decorators), you can remove.
46-
import 'core-js/es7/reflect';
472

483

494
/**

example/tsconfig.spec.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
]
1212
},
1313
"files": [
14-
"test.ts"
14+
"test.ts",
15+
"polyfills.ts"
1516
],
1617
"include": [
1718
"**/*.spec.ts",

karma.conf.js

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,30 +4,29 @@
44
module.exports = function (config) {
55
config.set({
66
basePath: '',
7-
frameworks: ['jasmine', '@angular/cli'],
7+
frameworks: ['jasmine', '@angular-devkit/build-angular'],
88
plugins: [
99
require('karma-jasmine'),
1010
require('karma-chrome-launcher'),
1111
require('karma-jasmine-html-reporter'),
1212
require('karma-coverage-istanbul-reporter'),
13-
require('@angular/cli/plugins/karma')
13+
require('@angular-devkit/build-angular/plugins/karma')
1414
],
15-
client:{
15+
client: {
1616
clearContext: false // leave Jasmine Spec Runner output visible in browser
1717
},
1818
coverageIstanbulReporter: {
19-
reports: [ 'html', 'lcovonly' ],
19+
dir: require('path').join(__dirname, '../coverage/foo'),
20+
dir: require('path').join(__dirname, 'coverage'), reports: ['html', 'lcovonly', 'text-summary'],
2021
fixWebpackSourcePaths: true
2122
},
22-
angularCli: {
23-
environment: 'dev'
24-
},
2523
reporters: ['progress', 'kjhtml'],
2624
port: 9876,
2725
colors: true,
2826
logLevel: config.LOG_INFO,
2927
autoWatch: true,
3028
browsers: ['Chrome'],
31-
singleRun: false
29+
singleRun: false,
30+
restartOnFileChange: true
3231
});
3332
};

0 commit comments

Comments
 (0)