Skip to content

Commit 2e70d9e

Browse files
authored
fix(core): update to rxjs 6 and angular 6
update to rxjs 6 and angular 6
2 parents a30343b + e84f3d7 commit 2e70d9e

File tree

9 files changed

+1418
-435
lines changed

9 files changed

+1418
-435
lines changed

package-lock.json

Lines changed: 1387 additions & 410 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33
"description": "Angular ScrollSpy Service",
44
"author": "João Ribeiro <jonnybgod@gmail.com> (http://github.com/JonnyBGod)",
55
"devDependencies": {
6-
"@angular/common": "^5.0.0",
7-
"@angular/compiler": "^5.0.0",
8-
"@angular/compiler-cli": "^5.0.0",
9-
"@angular/core": "^5.0.0",
10-
"@angular/platform-browser": "^5.0.0",
11-
"@angular/platform-browser-dynamic": "^5.0.0",
12-
"@angular/router": "^5.0.0",
6+
"@angular/common": "^6.1.3",
7+
"@angular/compiler": "^6.1.3",
8+
"@angular/compiler-cli": "^6.1.3",
9+
"@angular/core": "^6.1.3",
10+
"@angular/platform-browser": "^6.1.3",
11+
"@angular/platform-browser-dynamic": "^6.1.3",
12+
"@angular/router": "^6.1.3",
1313
"@types/core-js": "^0.9.41",
1414
"@types/jasmine": "^2.5.47",
15-
"@types/node": "^8.0.47",
15+
"@types/node": "^10.1.4",
1616
"awesome-typescript-loader": "^3.3.0",
1717
"codelyzer": "^4.0.0",
1818
"commitizen": "^2.9.6",
@@ -32,16 +32,16 @@
3232
"ng-packagr": "^1.5.0-rc.1",
3333
"reflect-metadata": "^0.1.10",
3434
"rimraf": "^2.6.1",
35-
"rxjs": "^5.3.0",
35+
"rxjs": "^6.2.2",
3636
"semantic-release": "^8.2.0",
3737
"source-map-loader": "^0.2.1",
3838
"systemjs": "^0.20.12",
3939
"ts-helpers": "^1.1.1",
4040
"tslint": "^5.1.0",
4141
"tslint-loader": "^3.5.2",
42-
"typescript": "^2.4.0",
42+
"typescript": "^2.9.2",
4343
"webpack": "^3.8.1",
44-
"zone.js": "^0.8.5"
44+
"zone.js": "^0.8.26"
4545
},
4646
"bugs": {
4747
"url": "http://github.com/jonnybgod/ngx-scrollspy/issues"
@@ -52,7 +52,7 @@
5252
"pretest": "npm run rimraf -- dist coverage",
5353
"test": "karma start",
5454
"test-watch": "karma start --singleRun=false --autoWatch=true",
55-
"clean": "npm cache clean && npm run rimraf -- node_modules dist coverage",
55+
"clean": "npm cache clean --force && npm run rimraf -- node_modules dist coverage",
5656
"preclean:install": "npm run clean",
5757
"clean:install": "npm set progress=false && npm i",
5858
"commit": "git-cz",
@@ -85,11 +85,15 @@
8585
],
8686
"license": "MIT",
8787
"engines": {
88-
"node": ">=6.9.0"
88+
"node": ">=8.0.0"
8989
},
9090
"config": {
9191
"commitizen": {
9292
"path": "node_modules/cz-conventional-changelog"
9393
}
94+
},
95+
"dependencies": {
96+
"@angular/cli": "^6.1.4",
97+
"rxjs-tslint": "^0.1.5"
9498
}
9599
}

spec-bundle.js

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,12 @@ require('core-js/es7/reflect');
1616
require('ts-helpers');
1717

1818
require('zone.js/dist/zone');
19+
require('zone.js/dist/zone-testing');
1920
require('zone.js/dist/long-stack-trace-zone');
20-
require('zone.js/dist/async-test');
21-
require('zone.js/dist/fake-async-test');
22-
require('zone.js/dist/sync-test');
2321
require('zone.js/dist/proxy'); // since zone.js 0.6.15
24-
require('zone.js/dist/jasmine-patch'); // put here since zone.js 0.6.14
2522

2623
// RxJS
27-
require('rxjs/Rx');
24+
require('rxjs');
2825

2926
var testing = require('@angular/core/testing');
3027
var browser = require('@angular/platform-browser-dynamic/testing');

src/core/element.directive.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Directive, Injectable, Input, OnInit, OnDestroy } from '@angular/core';
2-
import { ReplaySubject } from 'rxjs/ReplaySubject';
2+
import { ReplaySubject } from 'rxjs';
33
import { ScrollSpyService } from './service';
44

55
@Injectable()

src/core/service.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { ReplaySubject } from 'rxjs/ReplaySubject';
1+
import { ReplaySubject } from 'rxjs';
22
import { ScrollSpyService } from './service';
33

44
jasmine.DEFAULT_TIMEOUT_INTERVAL = 5000;

src/core/service.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { Injectable, EventEmitter } from '@angular/core';
2-
import { Observable } from 'rxjs/Observable';
3-
import { ReplaySubject } from 'rxjs/ReplaySubject';
2+
import { Observable, ReplaySubject } from 'rxjs';
43

54
@Injectable()
65
export class ScrollSpyService {

src/core/window.directive.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Directive, Injectable, OnInit } from '@angular/core';
2-
import { ReplaySubject } from 'rxjs/ReplaySubject';
2+
import { ReplaySubject } from 'rxjs';
33
import { ScrollSpyService } from './service';
44

55
@Injectable()

tsconfig.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
"moduleResolution": "node",
99
"emitDecoratorMetadata": true,
1010
"experimentalDecorators": true,
11+
"preserveWhitespaces": false,
1112
"target": "es5",
1213
"typeRoots": [
1314
"node_modules/@types"

tslint.json

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"rulesDirectory": [
3-
"node_modules/codelyzer"
3+
"node_modules/codelyzer",
4+
"node_modules/rxjs-tslint"
45
],
56
"rules": {
67
"class-name": true,
@@ -64,6 +65,10 @@
6465
"use-output-property-decorator": true,
6566
"use-host-property-decorator": false,
6667
"use-life-cycle-interface": true,
67-
"use-pipe-transform-interface": true
68+
"use-pipe-transform-interface": true,
69+
"rxjs-collapse-imports": true,
70+
"rxjs-pipeable-operators-only": true,
71+
"rxjs-no-static-observable-methods": true,
72+
"rxjs-proper-imports": true
6873
}
6974
}

0 commit comments

Comments
 (0)