Skip to content
This repository has been archived by the owner on Mar 9, 2020. It is now read-only.

Commit

Permalink
out lib and install prettier
Browse files Browse the repository at this point in the history
  • Loading branch information
Olivier LIN-SI-CHENG committed Sep 13, 2018
1 parent ffe9b42 commit e91c2e5
Show file tree
Hide file tree
Showing 42 changed files with 9,458 additions and 15,349 deletions.
6 changes: 1 addition & 5 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

# compiled output
/dist
/dist-server
/tmp
/out-tsc

Expand Down Expand Up @@ -31,13 +30,10 @@
/coverage
/libpeerconnection.log
npm-debug.log
yarn-error.log
testem.log
/typings

# e2e
/e2e/*.js
/e2e/*.map

# System Files
.DS_Store
Thumbs.db
113 changes: 76 additions & 37 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,30 +3,42 @@
"version": 1,
"newProjectRoot": "projects",
"projects": {
"angular-page-visibility": {
"angular-page-visibility-app": {
"root": "",
"sourceRoot": "src",
"projectType": "application",
"prefix": "app",
"schematics": {
"@schematics/angular:component": {
"styleext": "less"
}
},
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:browser",
"options": {
"outputPath": "dist",
"outputPath": "dist/angular-page-visibility-app",
"index": "src/index.html",
"main": "src/main.ts",
"tsConfig": "src/tsconfig.app.json",
"polyfills": "src/polyfills.ts",
"tsConfig": "src/tsconfig.app.json",
"assets": [
"src/assets",
"src/favicon.ico"
"src/favicon.ico",
"src/assets"
],
"styles": [
"src/styles.scss"
"src/styles.less"
],
"scripts": []
},
"configurations": {
"production": {
"fileReplacements": [
{
"replace": "src/environments/environment.ts",
"with": "src/environments/environment.prod.ts"
}
],
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
Expand All @@ -35,47 +47,41 @@
"aot": true,
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": true,
"fileReplacements": [
{
"replace": "src/environments/environment.ts",
"with": "src/environments/environment.prod.ts"
}
]
"buildOptimizer": true
}
}
},
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"options": {
"browserTarget": "angular-page-visibility:build"
"browserTarget": "angular-page-visibility-app:build"
},
"configurations": {
"production": {
"browserTarget": "angular-page-visibility:build:production"
"browserTarget": "angular-page-visibility-app:build:production"
}
}
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
"browserTarget": "angular-page-visibility:build"
"browserTarget": "angular-page-visibility-app:build"
}
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"main": "src/test.ts",
"karmaConfig": "./karma.conf.js",
"polyfills": "src/polyfills.ts",
"tsConfig": "src/tsconfig.spec.json",
"scripts": [],
"karmaConfig": "src/karma.conf.js",
"styles": [
"src/styles.scss"
"src/styles.less"
],
"scripts": [],
"assets": [
"src/assets",
"src/favicon.ico"
"src/favicon.ico",
"src/assets"
]
}
},
Expand All @@ -93,23 +99,65 @@
}
}
},
"angular-page-visibility-e2e": {
"root": "e2e",
"sourceRoot": "e2e",
"angular-page-visibility-app-e2e": {
"root": "e2e/",
"projectType": "application",
"architect": {
"e2e": {
"builder": "@angular-devkit/build-angular:protractor",
"options": {
"protractorConfig": "./protractor.conf.js",
"devServerTarget": "angular-page-visibility:serve"
"protractorConfig": "e2e/protractor.conf.js",
"devServerTarget": "angular-page-visibility-app:serve"
},
"configurations": {
"production": {
"devServerTarget": "angular-page-visibility-app:serve:production"
}
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": "e2e/tsconfig.e2e.json",
"exclude": [
"**/node_modules/**"
]
}
}
}
},
"angular-page-visibility-lib": {
"root": "projects/angular-page-visibility-lib",
"sourceRoot": "projects/angular-page-visibility-lib/src",
"projectType": "library",
"prefix": "apvl",
"architect": {
"build": {
"builder": "@angular-devkit/build-ng-packagr:build",
"options": {
"tsConfig": "projects/angular-page-visibility-lib/tsconfig.lib.json",
"project": "projects/angular-page-visibility-lib/ng-package.json"
},
"configurations": {
"production": {
"project": "projects/angular-page-visibility-lib/ng-package.prod.json"
}
}
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"main": "projects/angular-page-visibility-lib/src/test.ts",
"tsConfig": "projects/angular-page-visibility-lib/tsconfig.spec.json",
"karmaConfig": "projects/angular-page-visibility-lib/karma.conf.js"
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"e2e/tsconfig.e2e.json"
"projects/angular-page-visibility-lib/tsconfig.lib.json",
"projects/angular-page-visibility-lib/tsconfig.spec.json"
],
"exclude": [
"**/node_modules/**"
Expand All @@ -119,14 +167,5 @@
}
}
},
"defaultProject": "angular-page-visibility",
"schematics": {
"@schematics/angular:component": {
"prefix": "app",
"styleext": "scss"
},
"@schematics/angular:directive": {
"prefix": "app"
}
}
"defaultProject": "angular-page-visibility-app"
}
14 changes: 0 additions & 14 deletions e2e/app.e2e-spec.ts

This file was deleted.

6 changes: 3 additions & 3 deletions protractor.conf.js → e2e/protractor.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const { SpecReporter } = require('jasmine-spec-reporter');
exports.config = {
allScriptsTimeout: 11000,
specs: [
'./e2e/**/*.e2e-spec.ts'
'./src/**/*.e2e-spec.ts'
],
capabilities: {
'browserName': 'chrome'
Expand All @@ -21,8 +21,8 @@ exports.config = {
},
onPrepare() {
require('ts-node').register({
project: 'e2e/tsconfig.e2e.json'
project: require('path').join(__dirname, './tsconfig.e2e.json')
});
jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } }));
}
};
};
14 changes: 14 additions & 0 deletions e2e/src/app.e2e-spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import { AppPage } from './app.po';

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

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

it('should display welcome message', () => {
page.navigateTo();
expect(page.getParagraphText()).toEqual('Welcome to angular-page-visibility-app!');
});
});
File renamed without changes.
5 changes: 2 additions & 3 deletions e2e/tsconfig.e2e.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
{
"extends": "../tsconfig.json",
"compilerOptions": {
"outDir": "../out-tsc/e2e",
"baseUrl": "./",
"outDir": "../out-tsc/app",
"module": "commonjs",
"target": "es5",
"types": [
Expand All @@ -11,4 +10,4 @@
"node"
]
}
}
}
9 changes: 0 additions & 9 deletions ng-package.json

This file was deleted.

Loading

0 comments on commit e91c2e5

Please sign in to comment.