Skip to content

Commit 9b7fca3

Browse files
ismcagdasismcagdas
committed
resolved #232: Upgraded to Angular 6
1 parent 9739952 commit 9b7fca3

File tree

9 files changed

+12786
-1581
lines changed

9 files changed

+12786
-1581
lines changed

‎angular/.angular-cli.json

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

‎angular/angular.json

Lines changed: 251 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,251 @@
1+
{
2+
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
3+
"version": 1,
4+
"newProjectRoot": "projects",
5+
"projects": {
6+
"AbpProjectName": {
7+
"root": "",
8+
"sourceRoot": "src",
9+
"projectType": "application",
10+
"architect": {
11+
"build": {
12+
"builder": "@angular-devkit/build-angular:browser",
13+
"options": {
14+
"outputPath": "dist",
15+
"index": "src/index.html",
16+
"main": "src/main.ts",
17+
"tsConfig": "src/tsconfig.json",
18+
"polyfills": "src/polyfills.ts",
19+
"assets": [
20+
"src/assets",
21+
"src/favicon.ico",
22+
{
23+
"glob": "abp.signalr.js",
24+
"input": "node_modules/abp-web-resources/Abp/Framework/scripts/libs",
25+
"output": "/assets/abp"
26+
},
27+
{
28+
"glob": "abp.signalr-client.js",
29+
"input": "node_modules/abp-web-resources/Abp/Framework/scripts/libs",
30+
"output": "/assets/abp"
31+
}
32+
],
33+
"styles": [
34+
"src/assets/fonts/roboto/roboto.css",
35+
"node_modules/bootstrap/dist/css/bootstrap.min.css",
36+
"node_modules/simple-line-icons/css/simple-line-icons.css",
37+
"node_modules/font-awesome/css/font-awesome.css",
38+
"node_modules/famfamfam-flags/dist/sprite/famfamfam-flags.css",
39+
"node_modules/toastr/build/toastr.css",
40+
"node_modules/node-waves/dist/waves.css",
41+
"src/bsb-theme/css/materialize.css",
42+
"src/bsb-theme/css/style.css",
43+
"src/bsb-theme/css/themes/all-themes.css",
44+
"src/shared/core.less"
45+
],
46+
"scripts": [
47+
"node_modules/jquery/dist/jquery.min.js",
48+
"node_modules/jquery-migrate/dist/jquery-migrate.min.js",
49+
"node_modules/js-cookie/src/js.cookie.js",
50+
"node_modules/bootstrap/dist/js/bootstrap.js",
51+
"node_modules/lodash/lodash.min.js",
52+
"node_modules/moment/min/moment.min.js",
53+
"node_modules/signalr/jquery.signalR.js",
54+
"node_modules/@aspnet/signalr/dist/browser/signalr.min.js",
55+
"node_modules/toastr/toastr.js",
56+
"node_modules/sweetalert/dist/sweetalert.min.js",
57+
"node_modules/block-ui/jquery.blockUI.js",
58+
"node_modules/spin.js/spin.min.js",
59+
"node_modules/spin.js/jquery.spin.js",
60+
"node_modules/push.js/bin/push.min.js",
61+
"node_modules/jquery-slimscroll/jquery.slimscroll.min.js",
62+
"node_modules/node-waves/dist/waves.min.js",
63+
"node_modules/jquery-countto/jquery.countTo.js",
64+
"node_modules/raphael/raphael.min.js",
65+
"node_modules/morris.js/morris.min.js",
66+
"node_modules/chart.js/dist/Chart.bundle.min.js",
67+
"node_modules/flot/jquery.flot.js",
68+
"node_modules/flot/jquery.flot.resize.js",
69+
"node_modules/flot/jquery.flot.pie.js",
70+
"node_modules/flot/jquery.flot.categories.js",
71+
"node_modules/flot/jquery.flot.time.js",
72+
"node_modules/jquery-sparkline/jquery.sparkline.min.js",
73+
"node_modules/abp-web-resources/Abp/Framework/scripts/abp.js",
74+
"node_modules/abp-web-resources/Abp/Framework/scripts/libs/abp.jquery.js",
75+
"node_modules/abp-web-resources/Abp/Framework/scripts/libs/abp.toastr.js",
76+
"node_modules/abp-web-resources/Abp/Framework/scripts/libs/abp.blockUI.js",
77+
"node_modules/abp-web-resources/Abp/Framework/scripts/libs/abp.spin.js",
78+
"node_modules/abp-web-resources/Abp/Framework/scripts/libs/abp.sweet-alert.js",
79+
"node_modules/abp-web-resources/Abp/Framework/scripts/libs/abp.moment.js",
80+
"src/bsb-theme/js/admin.js",
81+
"src/bsb-theme/js/demo.js",
82+
"src/bsb-theme/js/jquery.validate.js"
83+
]
84+
},
85+
"configurations": {
86+
"production": {
87+
"optimization": true,
88+
"outputHashing": "all",
89+
"sourceMap": false,
90+
"extractCss": true,
91+
"namedChunks": false,
92+
"aot": true,
93+
"extractLicenses": true,
94+
"vendorChunk": false,
95+
"buildOptimizer": true,
96+
"fileReplacements": [
97+
{
98+
"replace": "src/environments/environment.ts",
99+
"with": "src/environments/environment.prod.ts"
100+
}
101+
]
102+
},
103+
"hmr": {
104+
"fileReplacements": [
105+
{
106+
"replace": "src/environments/environment.ts",
107+
"with": "src/environments/environment.hmr.ts"
108+
}
109+
]
110+
}
111+
}
112+
},
113+
"serve": {
114+
"builder": "@angular-devkit/build-angular:dev-server",
115+
"options": {
116+
"browserTarget": "AbpProjectName:build"
117+
},
118+
"configurations": {
119+
"production": {
120+
"browserTarget": "AbpProjectName:build:production"
121+
},
122+
"hmr": {
123+
"browserTarget": "AbpProjectName:build:hmr"
124+
}
125+
}
126+
},
127+
"extract-i18n": {
128+
"builder": "@angular-devkit/build-angular:extract-i18n",
129+
"options": {
130+
"browserTarget": "AbpProjectName:build"
131+
}
132+
},
133+
"test": {
134+
"builder": "@angular-devkit/build-angular:karma",
135+
"options": {
136+
"main": "src/test.ts",
137+
"karmaConfig": "./karma.conf.js",
138+
"polyfills": "src/polyfills.ts",
139+
"scripts": [
140+
"node_modules/jquery/dist/jquery.min.js",
141+
"node_modules/jquery-migrate/dist/jquery-migrate.min.js",
142+
"node_modules/js-cookie/src/js.cookie.js",
143+
"node_modules/bootstrap/dist/js/bootstrap.js",
144+
"node_modules/lodash/lodash.min.js",
145+
"node_modules/moment/min/moment.min.js",
146+
"node_modules/signalr/jquery.signalR.js",
147+
"node_modules/@aspnet/signalr/dist/browser/signalr.min.js",
148+
"node_modules/toastr/toastr.js",
149+
"node_modules/sweetalert/dist/sweetalert.min.js",
150+
"node_modules/block-ui/jquery.blockUI.js",
151+
"node_modules/spin.js/spin.min.js",
152+
"node_modules/spin.js/jquery.spin.js",
153+
"node_modules/push.js/bin/push.min.js",
154+
"node_modules/jquery-slimscroll/jquery.slimscroll.min.js",
155+
"node_modules/node-waves/dist/waves.min.js",
156+
"node_modules/jquery-countto/jquery.countTo.js",
157+
"node_modules/raphael/raphael.min.js",
158+
"node_modules/morris.js/morris.min.js",
159+
"node_modules/chart.js/dist/Chart.bundle.min.js",
160+
"node_modules/flot/jquery.flot.js",
161+
"node_modules/flot/jquery.flot.resize.js",
162+
"node_modules/flot/jquery.flot.pie.js",
163+
"node_modules/flot/jquery.flot.categories.js",
164+
"node_modules/flot/jquery.flot.time.js",
165+
"node_modules/jquery-sparkline/jquery.sparkline.min.js",
166+
"node_modules/abp-web-resources/Abp/Framework/scripts/abp.js",
167+
"node_modules/abp-web-resources/Abp/Framework/scripts/libs/abp.jquery.js",
168+
"node_modules/abp-web-resources/Abp/Framework/scripts/libs/abp.toastr.js",
169+
"node_modules/abp-web-resources/Abp/Framework/scripts/libs/abp.blockUI.js",
170+
"node_modules/abp-web-resources/Abp/Framework/scripts/libs/abp.spin.js",
171+
"node_modules/abp-web-resources/Abp/Framework/scripts/libs/abp.sweet-alert.js",
172+
"node_modules/abp-web-resources/Abp/Framework/scripts/libs/abp.moment.js",
173+
"src/bsb-theme/js/admin.js",
174+
"src/bsb-theme/js/demo.js",
175+
"src/bsb-theme/js/jquery.validate.js"
176+
],
177+
"styles": [
178+
"src/assets/fonts/roboto/roboto.css",
179+
"node_modules/bootstrap/dist/css/bootstrap.min.css",
180+
"node_modules/simple-line-icons/css/simple-line-icons.css",
181+
"node_modules/font-awesome/css/font-awesome.css",
182+
"node_modules/famfamfam-flags/dist/sprite/famfamfam-flags.css",
183+
"node_modules/toastr/build/toastr.css",
184+
"node_modules/node-waves/dist/waves.css",
185+
"src/bsb-theme/css/materialize.css",
186+
"src/bsb-theme/css/style.css",
187+
"src/bsb-theme/css/themes/all-themes.css",
188+
"src/shared/core.less"
189+
],
190+
"assets": [
191+
"src/assets",
192+
"src/favicon.ico",
193+
{
194+
"glob": "abp.signalr.js",
195+
"input": "node_modules/abp-web-resources/Abp/Framework/scripts/libs",
196+
"output": "/assets/abp"
197+
},
198+
{
199+
"glob": "abp.signalr-client.js",
200+
"input": "node_modules/abp-web-resources/Abp/Framework/scripts/libs",
201+
"output": "/assets/abp"
202+
}
203+
]
204+
}
205+
},
206+
"lint": {
207+
"builder": "@angular-devkit/build-angular:tslint",
208+
"options": {
209+
"tsConfig": [
210+
"src/tsconfig.json"
211+
],
212+
"exclude": []
213+
}
214+
}
215+
}
216+
},
217+
"AbpProjectName-e2e": {
218+
"root": "",
219+
"sourceRoot": "",
220+
"projectType": "application",
221+
"architect": {
222+
"e2e": {
223+
"builder": "@angular-devkit/build-angular:protractor",
224+
"options": {
225+
"protractorConfig": "./protractor.conf.js",
226+
"devServerTarget": "AbpProjectName:serve"
227+
}
228+
},
229+
"lint": {
230+
"builder": "@angular-devkit/build-angular:tslint",
231+
"options": {
232+
"tsConfig": [
233+
"e2e/tsconfig.json"
234+
],
235+
"exclude": []
236+
}
237+
}
238+
}
239+
}
240+
},
241+
"defaultProject": "AbpProjectName",
242+
"schematics": {
243+
"@schematics/angular:component": {
244+
"prefix": "app",
245+
"styleext": "css"
246+
},
247+
"@schematics/angular:directive": {
248+
"prefix": "app"
249+
}
250+
}
251+
}

‎angular/karma.conf.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,24 @@
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-coverage-istanbul-reporter'),
12-
require('@angular/cli/plugins/karma')
12+
require('@angular-devkit/build-angular/plugins/karma')
1313
],
1414
files: [
15-
{ pattern: './src/test.ts', watched: false }
15+
1616
],
1717
preprocessors: {
18-
'./src/test.ts': ['@angular/cli']
18+
1919
},
2020
mime: {
2121
'text/x-typescript': ['ts','tsx']
2222
},
2323
coverageIstanbulReporter: {
24-
reports: [ 'html', 'lcovonly' ],
24+
dir: require('path').join(__dirname, 'coverage'), reports: [ 'html', 'lcovonly' ],
2525
fixWebpackSourcePaths: true
2626
},
2727
angularCli: {

0 commit comments

Comments
 (0)