Skip to content

Commit

Permalink
Project refactoring for the Angular 7 support
Browse files Browse the repository at this point in the history
  • Loading branch information
vsfedorenko committed Oct 26, 2018
1 parent 457bbb6 commit 16813c0
Show file tree
Hide file tree
Showing 29 changed files with 5,560 additions and 931 deletions.
54 changes: 0 additions & 54 deletions .angular-cli.json

This file was deleted.

1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

# compiled output
/build
/.build
/dist
/tmp
/out-tsc
Expand Down
11 changes: 8 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ env:

addons:
apt:
sources:
- google-chrome
packages:
- google-chrome-stable
- tree
Expand All @@ -30,17 +32,20 @@ language: node_js
node_js:
- stable

cache:
directories:
- "node_modules"

before_install:
- export CHROME_BIN=chromium-browser
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
- sleep 3 # give xvfb some time to start
- sleep 10 # give xvfb some time to start

install:
- npm install

script:
- npm run ci
- npm run test:ci
- npm run build:release

after_success:
Expand Down
7 changes: 3 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

Create Beautiful Fullscreen Scrolling websites (now with Angular 2 and above)!

This is an Angular 2(4) [fullPage.js](https://github.com/alvarotrigo/fullPage.js) port library.
This is an Angular [fullPage.js](https://github.com/alvarotrigo/fullPage.js) port library.

[![npm version](https://badge.fury.io/js/ngx-fullpage.svg)](https://badge.fury.io/js/ngx-fullpage)
[![Dependency Status](https://david-dm.org/meiblorn/ngx-fullpage.svg)](https://david-dm.org/meiblorn/ngx-fullpage)
Expand All @@ -12,9 +12,8 @@ This is an Angular 2(4) [fullPage.js](https://github.com/alvarotrigo/fullPage.js
[![Test Coverage](https://codeclimate.com/github/meiblorn/ngx-fullpage/badges/coverage.svg)](https://codeclimate.com/github/meiblorn/ngx-fullpage/coverage)
[![Code Climate](https://codeclimate.com/github/meiblorn/ngx-fullpage/badges/gpa.svg)](https://codeclimate.com/github/meiblorn/ngx-fullpage)

-----------------------------------
Updated for Angular 4.X.X
-----------------------------------
New:
- Project is updated to support Angular 7 !

## Demo

Expand Down
139 changes: 139 additions & 0 deletions angular.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,139 @@
{
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
"version": 1,
"newProjectRoot": ".",
"projects": {
"ngx-fullpage-demo": {
"root": "",
"sourceRoot": "sources/demo",
"projectType": "application",
"prefix": "app",
"schematics": {
"@schematics/angular:component": {
"styleext": "sсss"
}
},
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:browser",
"options": {
"outputPath": "./.build/demo",
"index": "sources/index.html",
"main": "sources/demo/main.ts",
"polyfills": "sources/polyfills.ts",
"tsConfig": "sources/tsconfig.compile.json",
"assets": [],
"styles": [
"./node_modules/fullpage.js/dist/fullpage.css"
],
"scripts": [
"./node_modules/jquery/dist/jquery.js",
"./node_modules/fullpage.js/dist/fullpage.js"
]
},
"configurations": {
"production": {
"fileReplacements": [
{
"replace": "sources/demo/environments/environment.ts",
"with": "sources/demo/environments/environment.prod.ts"
}
],
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
"extractCss": true,
"namedChunks": false,
"aot": true,
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": true,
"budgets": [
{
"type": "initial",
"maximumWarning": "2mb",
"maximumError": "5mb"
}
]
}
}
},
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"options": {
"browserTarget": "ngx-fullpage-demo:build"
},
"configurations": {
"production": {
"browserTarget": "ngx-fullpage-demo:build:production"
}
}
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
"browserTarget": "ngx-fullpage-demo:build"
}
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"main": "sources/test.ts",
"polyfills": "sources/polyfills.ts",
"tsConfig": "sources/tsconfig.spec.json",
"karmaConfig": "karma.conf.js",
"styles": [
"./node_modules/fullpage.js/dist/fullpage.css"
],
"scripts": [
"./node_modules/jquery/dist/jquery.js",
"./node_modules/fullpage.js/dist/fullpage.js"
],
"assets": []
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"sources/tsconfig.compile.json",
"sources/tsconfig.spec.json"
],
"exclude": [
"**/node_modules/**"
]
}
}
}
},
"ngx-fullpage-demo-e2e": {
"root": "e2e",
"projectType": "application",
"prefix": "",
"architect": {
"e2e": {
"builder": "@angular-devkit/build-angular:protractor",
"options": {
"protractorConfig": "protractor.conf.js",
"devServerTarget": "ngx-fullpage-demo:serve"
},
"configurations": {
"production": {
"devServerTarget": "ngx-fullpage-demo:serve:production"
}
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": "e2e/tsconfig.e2e.json",
"exclude": [
"**/node_modules/**"
]
}
}
}
}
},
"defaultProject": "ngx-fullpage-demo"
}
2 changes: 1 addition & 1 deletion e2e/tsconfig.e2e.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"extends": "../tsconfig.json",
"compilerOptions": {
"outDir": "../build/e2e",
"outDir": "../.build/e2e",
"module": "commonjs",
"target": "es5",
"types": [
Expand Down
18 changes: 4 additions & 14 deletions karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,36 +4,26 @@
module.exports = function (karmaConf) {
const configuration = {
basePath: '',
frameworks: ['jasmine', '@angular/cli'],
frameworks: ['jasmine', '@angular-devkit/build-angular'],
plugins: [
require('karma-jasmine'),
require('karma-chrome-launcher'),
require('karma-jasmine-html-reporter'),
require('karma-coverage-istanbul-reporter'),
require('@angular/cli/plugins/karma')
require('@angular-devkit/build-angular/plugins/karma')
],
client: {
clearContext: false // leave Jasmine Spec Runner output visible in browser
},
files: [
{pattern: './sources/test.ts', watched: false}
],
preprocessors: {
'./sources/test.ts': ['@angular/cli']
},
mime: {
'text/x-typescript': ['ts', 'tsx']
},
coverageIstanbulReporter: {
dir: require('path').join(__dirname, 'coverage'),
reports: ['html', 'lcovonly'],
fixWebpackSourcePaths: true
},
angularCli: {
environment: 'dev'
},
reporters: karmaConf.angularCli && karmaConf.angularCli.codeCoverage
? ['progress', 'coverage-istanbul']
: ['progress', 'kjhtml'],
reporters: ['progress', 'kjhtml'],
port: 9876,
colors: true,
logLevel: karmaConf.LOG_INFO,
Expand Down
Loading

0 comments on commit 16813c0

Please sign in to comment.