Skip to content

Commit

Permalink
Configuration update
Browse files Browse the repository at this point in the history
  • Loading branch information
cagataycivici committed Jun 1, 2019
1 parent 52342a9 commit 6dff6dc
Show file tree
Hide file tree
Showing 22 changed files with 141 additions and 362 deletions.
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Editor configuration, see http://editorconfig.org
# Editor configuration, see https://editorconfig.org
root = true

[*]
Expand Down
43 changes: 18 additions & 25 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
"newProjectRoot": "projects",
"projects": {
"primeng": {
"projectType": "application",
"root": "",
"sourceRoot": "src",
"projectType": "application",
"prefix": "app",
"schematics": {},
"architect": {
Expand All @@ -17,7 +17,7 @@
"index": "src/index.html",
"main": "src/main.ts",
"polyfills": "src/polyfills.ts",
"tsConfig": "src/tsconfig.app.json",
"tsConfig": "tsconfig.app.json",
"assets": [
"src/favicon.png",
"src/assets",
Expand Down Expand Up @@ -61,7 +61,14 @@
"aot": true,
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": true
"buildOptimizer": true,
"budgets": [
{
"type": "initial",
"maximumWarning": "2mb",
"maximumError": "5mb"
}
]
}
}
},
Expand All @@ -87,8 +94,8 @@
"options": {
"main": "src/test.ts",
"polyfills": "src/polyfills.ts",
"tsConfig": "src/tsconfig.spec.json",
"karmaConfig": "src/karma.conf.js",
"tsConfig": "tsconfig.spec.json",
"karmaConfig": "karma.conf.js",
"styles": [
"src/styles.css"
],
Expand All @@ -105,38 +112,24 @@
"options": {
"tsConfig": [
"src/tsconfig.app.json",
"src/tsconfig.spec.json"
"src/tsconfig.spec.json",
"e2e/tsconfig.json"
],
"exclude": [
"**/node_modules/**"
]
}
}
}
},
"primeng-e2e": {
"root": "e2e/",
"projectType": "application",
"architect": {
},
"e2e": {
"builder": "@angular-devkit/build-angular:protractor",
"options": {
"protractorConfig": "e2e/protractor.conf.js",
"devServerTarget": "primeng:serve"
"devServerTarget": "cli-test:serve"
},
"configurations": {
"production": {
"devServerTarget": "primeng:serve:production"
}
"production": {
"devServerTarget": "cli-test:serve:production"
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": "e2e/tsconfig.e2e.json",
"exclude": [
"**/node_modules/**"
]
}
}
}
Expand Down
12 changes: 12 additions & 0 deletions browserslist
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# This file is used by the build system to adjust CSS and JS output to support the specified browsers below.
# For additional information regarding the format and rule options, please see:
# https://github.com/browserslist/browserslist#queries

# You can see what browsers were selected by your queries by running:
# npx browserslist

> 0.5%
last 2 versions
Firefox ESR
not dead
not IE 9-11 # For IE 9-11 support, remove 'not'.
20 changes: 0 additions & 20 deletions e2e/src/accordion.e2e-spec.ts

This file was deleted.

16 changes: 5 additions & 11 deletions e2e/src/app.e2e-spec.ts
Original file line number Diff line number Diff line change
@@ -1,16 +1,10 @@
import { PrimengPage } from './app.po';
import { AppPage } from './app.po';
import { browser, logging } from 'protractor';

describe('primeng App', () => {
let page: PrimengPage;
describe('workspace-project App', () => {
let page: AppPage;

beforeEach(() => {
page = new PrimengPage();
});

it('should display welcome message', done => {
page.navigateTo();
page.getPROText()
.then(msg => expect(msg).toEqual('PrimeNG PRO Support'))
.then(done, done.fail);
page = new AppPage();
});
});
8 changes: 2 additions & 6 deletions e2e/src/app.po.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
import { browser, by, element } from 'protractor';

export class PrimengPage {
export class AppPage {
navigateTo() {
return browser.get('/');
}

getPROText() {
return element(by.css('.pro-title')).getText();
return browser.get(browser.baseUrl) as Promise<any>;
}
}
27 changes: 0 additions & 27 deletions e2e/src/fieldset.e2e-spec.ts

This file was deleted.

19 changes: 0 additions & 19 deletions e2e/src/growl.e2e-spec.ts

This file was deleted.

34 changes: 0 additions & 34 deletions e2e/src/inputtext.e2e-spec.ts

This file was deleted.

27 changes: 0 additions & 27 deletions e2e/src/panel.e2e-spec.ts

This file was deleted.

49 changes: 0 additions & 49 deletions e2e/src/tabview.e2e-spec.ts

This file was deleted.

5 changes: 3 additions & 2 deletions e2e/tsconfig.e2e.json → e2e/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"extends": "../tsconfig.json",
"compilerOptions": {
"outDir": "../out-tsc/app",
"outDir": "../out-tsc/e2e",
"module": "commonjs",
"target": "es5",
"types": [
Expand All @@ -10,4 +10,5 @@
"node"
]
}
}
}

10 changes: 6 additions & 4 deletions src/karma.conf.js → karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ module.exports = function (config) {
clearContext: false // leave Jasmine Spec Runner output visible in browser
},
coverageIstanbulReporter: {
dir: require('path').join(__dirname, '../coverage'),
reports: ['html', 'lcovonly'],
dir: require('path').join(__dirname, './coverage/cli-test'),
reports: ['html', 'lcovonly', 'text-summary'],
fixWebpackSourcePaths: true
},
files: [
Expand All @@ -32,6 +32,8 @@ module.exports = function (config) {
logLevel: config.LOG_INFO,
autoWatch: true,
browsers: ['Chrome'],
singleRun: false
singleRun: false,
restartOnFileChange: true
});
};
};

9 changes: 0 additions & 9 deletions src/browserslist

This file was deleted.

3 changes: 1 addition & 2 deletions src/environments/environment.prod.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
export const environment = {
production: true
};

};
Loading

0 comments on commit 6dff6dc

Please sign in to comment.