Skip to content

Commit 6dff6dc

Browse files
committed
Configuration update
1 parent 52342a9 commit 6dff6dc

22 files changed

+141
-362
lines changed

.editorconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Editor configuration, see http://editorconfig.org
1+
# Editor configuration, see https://editorconfig.org
22
root = true
33

44
[*]

angular.json

+18-25
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
"newProjectRoot": "projects",
55
"projects": {
66
"primeng": {
7+
"projectType": "application",
78
"root": "",
89
"sourceRoot": "src",
9-
"projectType": "application",
1010
"prefix": "app",
1111
"schematics": {},
1212
"architect": {
@@ -17,7 +17,7 @@
1717
"index": "src/index.html",
1818
"main": "src/main.ts",
1919
"polyfills": "src/polyfills.ts",
20-
"tsConfig": "src/tsconfig.app.json",
20+
"tsConfig": "tsconfig.app.json",
2121
"assets": [
2222
"src/favicon.png",
2323
"src/assets",
@@ -61,7 +61,14 @@
6161
"aot": true,
6262
"extractLicenses": true,
6363
"vendorChunk": false,
64-
"buildOptimizer": true
64+
"buildOptimizer": true,
65+
"budgets": [
66+
{
67+
"type": "initial",
68+
"maximumWarning": "2mb",
69+
"maximumError": "5mb"
70+
}
71+
]
6572
}
6673
}
6774
},
@@ -87,8 +94,8 @@
8794
"options": {
8895
"main": "src/test.ts",
8996
"polyfills": "src/polyfills.ts",
90-
"tsConfig": "src/tsconfig.spec.json",
91-
"karmaConfig": "src/karma.conf.js",
97+
"tsConfig": "tsconfig.spec.json",
98+
"karmaConfig": "karma.conf.js",
9299
"styles": [
93100
"src/styles.css"
94101
],
@@ -105,38 +112,24 @@
105112
"options": {
106113
"tsConfig": [
107114
"src/tsconfig.app.json",
108-
"src/tsconfig.spec.json"
115+
"src/tsconfig.spec.json",
116+
"e2e/tsconfig.json"
109117
],
110118
"exclude": [
111119
"**/node_modules/**"
112120
]
113121
}
114-
}
115-
}
116-
},
117-
"primeng-e2e": {
118-
"root": "e2e/",
119-
"projectType": "application",
120-
"architect": {
122+
},
121123
"e2e": {
122124
"builder": "@angular-devkit/build-angular:protractor",
123125
"options": {
124126
"protractorConfig": "e2e/protractor.conf.js",
125-
"devServerTarget": "primeng:serve"
127+
"devServerTarget": "cli-test:serve"
126128
},
127129
"configurations": {
128-
"production": {
129-
"devServerTarget": "primeng:serve:production"
130-
}
130+
"production": {
131+
"devServerTarget": "cli-test:serve:production"
131132
}
132-
},
133-
"lint": {
134-
"builder": "@angular-devkit/build-angular:tslint",
135-
"options": {
136-
"tsConfig": "e2e/tsconfig.e2e.json",
137-
"exclude": [
138-
"**/node_modules/**"
139-
]
140133
}
141134
}
142135
}

browserslist

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# This file is used by the build system to adjust CSS and JS output to support the specified browsers below.
2+
# For additional information regarding the format and rule options, please see:
3+
# https://github.com/browserslist/browserslist#queries
4+
5+
# You can see what browsers were selected by your queries by running:
6+
# npx browserslist
7+
8+
> 0.5%
9+
last 2 versions
10+
Firefox ESR
11+
not dead
12+
not IE 9-11 # For IE 9-11 support, remove 'not'.

e2e/src/accordion.e2e-spec.ts

-20
This file was deleted.

e2e/src/app.e2e-spec.ts

+5-11
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,10 @@
1-
import { PrimengPage } from './app.po';
1+
import { AppPage } from './app.po';
2+
import { browser, logging } from 'protractor';
23

3-
describe('primeng App', () => {
4-
let page: PrimengPage;
4+
describe('workspace-project App', () => {
5+
let page: AppPage;
56

67
beforeEach(() => {
7-
page = new PrimengPage();
8-
});
9-
10-
it('should display welcome message', done => {
11-
page.navigateTo();
12-
page.getPROText()
13-
.then(msg => expect(msg).toEqual('PrimeNG PRO Support'))
14-
.then(done, done.fail);
8+
page = new AppPage();
159
});
1610
});

e2e/src/app.po.ts

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

3-
export class PrimengPage {
3+
export class AppPage {
44
navigateTo() {
5-
return browser.get('/');
6-
}
7-
8-
getPROText() {
9-
return element(by.css('.pro-title')).getText();
5+
return browser.get(browser.baseUrl) as Promise<any>;
106
}
117
}

e2e/src/fieldset.e2e-spec.ts

-27
This file was deleted.

e2e/src/growl.e2e-spec.ts

-19
This file was deleted.

e2e/src/inputtext.e2e-spec.ts

-34
This file was deleted.

e2e/src/panel.e2e-spec.ts

-27
This file was deleted.

e2e/src/tabview.e2e-spec.ts

-49
This file was deleted.
+3-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"extends": "../tsconfig.json",
33
"compilerOptions": {
4-
"outDir": "../out-tsc/app",
4+
"outDir": "../out-tsc/e2e",
55
"module": "commonjs",
66
"target": "es5",
77
"types": [
@@ -10,4 +10,5 @@
1010
"node"
1111
]
1212
}
13-
}
13+
}
14+

src/karma.conf.js karma.conf.js

+6-4
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ module.exports = function (config) {
1616
clearContext: false // leave Jasmine Spec Runner output visible in browser
1717
},
1818
coverageIstanbulReporter: {
19-
dir: require('path').join(__dirname, '../coverage'),
20-
reports: ['html', 'lcovonly'],
19+
dir: require('path').join(__dirname, './coverage/cli-test'),
20+
reports: ['html', 'lcovonly', 'text-summary'],
2121
fixWebpackSourcePaths: true
2222
},
2323
files: [
@@ -32,6 +32,8 @@ module.exports = function (config) {
3232
logLevel: config.LOG_INFO,
3333
autoWatch: true,
3434
browsers: ['Chrome'],
35-
singleRun: false
35+
singleRun: false,
36+
restartOnFileChange: true
3637
});
37-
};
38+
};
39+

src/browserslist

-9
This file was deleted.

src/environments/environment.prod.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
export const environment = {
22
production: true
3-
};
4-
3+
};

0 commit comments

Comments
 (0)