Skip to content

Commit

Permalink
fix(core): update to rxjs 6 and angular 6
Browse files Browse the repository at this point in the history
update to rxjs 6 and angular 6
  • Loading branch information
JonnyBGod authored Aug 22, 2018
2 parents a30343b + e84f3d7 commit 2e70d9e
Show file tree
Hide file tree
Showing 9 changed files with 1,418 additions and 435 deletions.
1,797 changes: 1,387 additions & 410 deletions package-lock.json

Large diffs are not rendered by default.

30 changes: 17 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@
"description": "Angular ScrollSpy Service",
"author": "João Ribeiro <jonnybgod@gmail.com> (http://github.com/JonnyBGod)",
"devDependencies": {
"@angular/common": "^5.0.0",
"@angular/compiler": "^5.0.0",
"@angular/compiler-cli": "^5.0.0",
"@angular/core": "^5.0.0",
"@angular/platform-browser": "^5.0.0",
"@angular/platform-browser-dynamic": "^5.0.0",
"@angular/router": "^5.0.0",
"@angular/common": "^6.1.3",
"@angular/compiler": "^6.1.3",
"@angular/compiler-cli": "^6.1.3",
"@angular/core": "^6.1.3",
"@angular/platform-browser": "^6.1.3",
"@angular/platform-browser-dynamic": "^6.1.3",
"@angular/router": "^6.1.3",
"@types/core-js": "^0.9.41",
"@types/jasmine": "^2.5.47",
"@types/node": "^8.0.47",
"@types/node": "^10.1.4",
"awesome-typescript-loader": "^3.3.0",
"codelyzer": "^4.0.0",
"commitizen": "^2.9.6",
Expand All @@ -32,16 +32,16 @@
"ng-packagr": "^1.5.0-rc.1",
"reflect-metadata": "^0.1.10",
"rimraf": "^2.6.1",
"rxjs": "^5.3.0",
"rxjs": "^6.2.2",
"semantic-release": "^8.2.0",
"source-map-loader": "^0.2.1",
"systemjs": "^0.20.12",
"ts-helpers": "^1.1.1",
"tslint": "^5.1.0",
"tslint-loader": "^3.5.2",
"typescript": "^2.4.0",
"typescript": "^2.9.2",
"webpack": "^3.8.1",
"zone.js": "^0.8.5"
"zone.js": "^0.8.26"
},
"bugs": {
"url": "http://github.com/jonnybgod/ngx-scrollspy/issues"
Expand All @@ -52,7 +52,7 @@
"pretest": "npm run rimraf -- dist coverage",
"test": "karma start",
"test-watch": "karma start --singleRun=false --autoWatch=true",
"clean": "npm cache clean && npm run rimraf -- node_modules dist coverage",
"clean": "npm cache clean --force && npm run rimraf -- node_modules dist coverage",
"preclean:install": "npm run clean",
"clean:install": "npm set progress=false && npm i",
"commit": "git-cz",
Expand Down Expand Up @@ -85,11 +85,15 @@
],
"license": "MIT",
"engines": {
"node": ">=6.9.0"
"node": ">=8.0.0"
},
"config": {
"commitizen": {
"path": "node_modules/cz-conventional-changelog"
}
},
"dependencies": {
"@angular/cli": "^6.1.4",
"rxjs-tslint": "^0.1.5"
}
}
7 changes: 2 additions & 5 deletions spec-bundle.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,12 @@ require('core-js/es7/reflect');
require('ts-helpers');

require('zone.js/dist/zone');
require('zone.js/dist/zone-testing');
require('zone.js/dist/long-stack-trace-zone');
require('zone.js/dist/async-test');
require('zone.js/dist/fake-async-test');
require('zone.js/dist/sync-test');
require('zone.js/dist/proxy'); // since zone.js 0.6.15
require('zone.js/dist/jasmine-patch'); // put here since zone.js 0.6.14

// RxJS
require('rxjs/Rx');
require('rxjs');

var testing = require('@angular/core/testing');
var browser = require('@angular/platform-browser-dynamic/testing');
Expand Down
2 changes: 1 addition & 1 deletion src/core/element.directive.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Directive, Injectable, Input, OnInit, OnDestroy } from '@angular/core';
import { ReplaySubject } from 'rxjs/ReplaySubject';
import { ReplaySubject } from 'rxjs';
import { ScrollSpyService } from './service';

@Injectable()
Expand Down
2 changes: 1 addition & 1 deletion src/core/service.spec.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ReplaySubject } from 'rxjs/ReplaySubject';
import { ReplaySubject } from 'rxjs';
import { ScrollSpyService } from './service';

jasmine.DEFAULT_TIMEOUT_INTERVAL = 5000;
Expand Down
3 changes: 1 addition & 2 deletions src/core/service.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { Injectable, EventEmitter } from '@angular/core';
import { Observable } from 'rxjs/Observable';
import { ReplaySubject } from 'rxjs/ReplaySubject';
import { Observable, ReplaySubject } from 'rxjs';

@Injectable()
export class ScrollSpyService {
Expand Down
2 changes: 1 addition & 1 deletion src/core/window.directive.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Directive, Injectable, OnInit } from '@angular/core';
import { ReplaySubject } from 'rxjs/ReplaySubject';
import { ReplaySubject } from 'rxjs';
import { ScrollSpyService } from './service';

@Injectable()
Expand Down
1 change: 1 addition & 0 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"moduleResolution": "node",
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
"preserveWhitespaces": false,
"target": "es5",
"typeRoots": [
"node_modules/@types"
Expand Down
9 changes: 7 additions & 2 deletions tslint.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"rulesDirectory": [
"node_modules/codelyzer"
"node_modules/codelyzer",
"node_modules/rxjs-tslint"
],
"rules": {
"class-name": true,
Expand Down Expand Up @@ -64,6 +65,10 @@
"use-output-property-decorator": true,
"use-host-property-decorator": false,
"use-life-cycle-interface": true,
"use-pipe-transform-interface": true
"use-pipe-transform-interface": true,
"rxjs-collapse-imports": true,
"rxjs-pipeable-operators-only": true,
"rxjs-no-static-observable-methods": true,
"rxjs-proper-imports": true
}
}

0 comments on commit 2e70d9e

Please sign in to comment.