Skip to content

Commit 0473051

Browse files
committedMay 29, 2018
feat(scrollspy): adding angular 6 support
BREAKING CHANGE: updated peer dependency for angular-inviewport to 3.x
1 parent 648bade commit 0473051

10 files changed

+6290
-3845
lines changed
 

‎.angular-cli.json

-60
This file was deleted.

‎.travis.yml

+18-13
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,25 @@
1-
dist: trusty
2-
sudo: false
31
language: node_js
42
node_js:
53
- "8"
6-
os:
7-
- linux
8-
before_install:
9-
# Use a virtual display.
10-
- export DISPLAY=:99.0
11-
- sh -e /etc/init.d/xvfb start
12-
# Install latest chrome.
13-
- export CHROME_BIN=chromium-browser
4+
5+
addons:
6+
apt:
7+
sources:
8+
- google-chrome
9+
packages:
10+
- google-chrome-stable
11+
12+
cache:
13+
directories:
14+
- ./node_modules
15+
1416
install:
15-
- npm install --no-progress
17+
- npm i --no-progress
18+
1619
script:
20+
# Use Chromium instead of Chrome.
21+
- export CHROME_BIN=chromium-browser
1722
- npm run lint
18-
- npm run test -- --no-progress --code-coverage --single-run --browser=ChromeNoSandbox
19-
- npm run e2e -- --no-progress
23+
- xvfb-run -a npm run test -- --watch false --code-coverage
24+
- xvfb-run -a npm run e2e
2025
- npm run coverage

‎README.md

+1-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@
44
[![Coverage Status][coveralls-badge]][coveralls-badge-url]
55
[![Commitizen friendly][commitizen-badge]][commitizen]
66

7-
This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 1.5.4.
8-
9-
A simple lightweight library for [Angular (2/4+)][angular] which automatically updates links to indicate the currently active section in the viewport. Requires [Angular Inviewport][angular-inviewport] to be installed as well.
7+
A simple lightweight library for [Angular][angular] which automatically updates links to indicate the currently active section in the viewport. Requires [Angular Inviewport][angular-inviewport] to be installed as well.
108

119
This is a simple library for [Angular][angular], implemented in the [Angular Package Format v5.0](https://docs.google.com/document/d/1CZC2rcpxffTDfRDs6p1cfbmKNLA6x5O-NtkJglDaBVs/edit#heading=h.k0mh3o8u5hx).
1210

‎angular.json

+132
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,132 @@
1+
{
2+
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
3+
"version": 1,
4+
"newProjectRoot": "projects",
5+
"projects": {
6+
"angular-scrollspy": {
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.app.json",
18+
"polyfills": "src/polyfills.ts",
19+
"assets": [
20+
"src/assets",
21+
"src/favicon.ico"
22+
],
23+
"styles": [
24+
"src/styles.scss"
25+
],
26+
"scripts": []
27+
},
28+
"configurations": {
29+
"production": {
30+
"optimization": true,
31+
"outputHashing": "all",
32+
"sourceMap": false,
33+
"extractCss": true,
34+
"namedChunks": false,
35+
"aot": true,
36+
"extractLicenses": true,
37+
"vendorChunk": false,
38+
"buildOptimizer": true,
39+
"fileReplacements": [
40+
{
41+
"replace": "src/environments/environment.ts",
42+
"with": "src/environments/environment.prod.ts"
43+
}
44+
]
45+
}
46+
}
47+
},
48+
"serve": {
49+
"builder": "@angular-devkit/build-angular:dev-server",
50+
"options": {
51+
"browserTarget": "angular-scrollspy:build"
52+
},
53+
"configurations": {
54+
"production": {
55+
"browserTarget": "angular-scrollspy:build:production"
56+
}
57+
}
58+
},
59+
"extract-i18n": {
60+
"builder": "@angular-devkit/build-angular:extract-i18n",
61+
"options": {
62+
"browserTarget": "angular-scrollspy:build"
63+
}
64+
},
65+
"test": {
66+
"builder": "@angular-devkit/build-angular:karma",
67+
"options": {
68+
"main": "src/test.ts",
69+
"karmaConfig": "./karma.conf.js",
70+
"polyfills": "src/polyfills.ts",
71+
"tsConfig": "src/tsconfig.spec.json",
72+
"scripts": [],
73+
"styles": [
74+
"src/styles.scss"
75+
],
76+
"assets": [
77+
"src/assets",
78+
"src/favicon.ico"
79+
]
80+
}
81+
},
82+
"lint": {
83+
"builder": "@angular-devkit/build-angular:tslint",
84+
"options": {
85+
"tsConfig": [
86+
"src/tsconfig.app.json",
87+
"src/tsconfig.spec.json"
88+
],
89+
"exclude": [
90+
"**/node_modules/**"
91+
]
92+
}
93+
}
94+
}
95+
},
96+
"angular-scrollspy-e2e": {
97+
"root": "",
98+
"sourceRoot": "",
99+
"projectType": "application",
100+
"architect": {
101+
"e2e": {
102+
"builder": "@angular-devkit/build-angular:protractor",
103+
"options": {
104+
"protractorConfig": "./protractor.conf.js",
105+
"devServerTarget": "angular-scrollspy:serve"
106+
}
107+
},
108+
"lint": {
109+
"builder": "@angular-devkit/build-angular:tslint",
110+
"options": {
111+
"tsConfig": [
112+
"e2e/tsconfig.e2e.json"
113+
],
114+
"exclude": [
115+
"**/node_modules/**"
116+
]
117+
}
118+
}
119+
}
120+
}
121+
},
122+
"defaultProject": "angular-scrollspy",
123+
"schematics": {
124+
"@schematics/angular:component": {
125+
"prefix": "sn",
126+
"styleext": "scss"
127+
},
128+
"@schematics/angular:directive": {
129+
"prefix": "sn"
130+
}
131+
}
132+
}

‎karma.conf.js

+4-3
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,20 @@
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-jasmine-html-reporter'),
1212
require('karma-coverage-istanbul-reporter'),
13-
require('@angular/cli/plugins/karma'),
13+
require('@angular-devkit/build-angular/plugins/karma'),
1414
require('karma-spec-reporter')
1515
],
1616
client:{
1717
clearContext: false // leave Jasmine Spec Runner output visible in browser
1818
},
1919
coverageIstanbulReporter: {
20+
dir: require('path').join(__dirname, 'coverage'),
2021
reports: [ 'html', 'lcovonly', 'text-summary' ],
2122
fixWebpackSourcePaths: true
2223
},
@@ -30,7 +31,7 @@ module.exports = function (config) {
3031
colors: true,
3132
logLevel: config.LOG_INFO,
3233
autoWatch: true,
33-
browsers: ['Chrome'],
34+
browsers: ['ChromeNoSandbox'],
3435
customLaunchers: {
3536
ChromeNoSandbox: {
3637
base: 'Chrome',

0 commit comments

Comments
 (0)