From 8707a79d3930cf309b43878f3e357bec4fa7eea7 Mon Sep 17 00:00:00 2001 From: David Rouyer Date: Tue, 8 May 2018 16:17:32 +0200 Subject: [PATCH 1/2] feat: Angular 6 & RxJS 6.1 --- package-lock.json | 112 ++++++++++-------- package.json | 24 ++-- .../notifier-container.component.spec.ts | 2 +- .../notifier-container.component.ts | 2 +- .../services/notifier-queue.service.spec.ts | 2 +- .../src/services/notifier-queue.service.ts | 2 +- 6 files changed, 81 insertions(+), 63 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5be507d4..fa13f2f4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,57 +5,87 @@ "requires": true, "dependencies": { "@angular/common": { - "version": "5.1.3", - "resolved": "https://registry.npmjs.org/@angular/common/-/common-5.1.3.tgz", - "integrity": "sha512-n0bzjfOVZH7+FPHQ3nnE3aAgMWebz4afO/Wh01LZNfVgcjdBxHblAYcMaoJeR7zW7f1zm51P6aDa4XlVtsVupQ==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/@angular/common/-/common-6.0.0.tgz", + "integrity": "sha512-oo/KESihAZo0FsZPHthO9PYhanN4Q+Lo7Lb2HNbWnD+xRIPa1yFC12JOWiD+SPPfFGWMI6aW3wAlcoej1+QKSw==", "dev": true, "requires": { "tslib": "1.9.0" } }, "@angular/compiler": { - "version": "5.1.3", - "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-5.1.3.tgz", - "integrity": "sha512-YQyL52+CtduFqyodv3m+s8qNDRbmEyEv/ZZHEWNKxKFr7RQ5n7+pbjdincwGf2c2mBw4EqWLgyCdd9SFmjJd0w==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-6.0.0.tgz", + "integrity": "sha512-UsYfsvHf4VVtkhzM7tyabh8co7gqWZTm3p79hbLDeyCEojl0AkrwbSgh0DQnKRxp4Tu3DEeeDkg1ahA7n19I8A==", "dev": true, "requires": { "tslib": "1.9.0" } }, "@angular/compiler-cli": { - "version": "5.1.3", - "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-5.1.3.tgz", - "integrity": "sha512-5pmVgFch67qYxl04PitagfUgiw0k7Ak1Cvj5LY2gs0961SHo8qLRA2/4xUKAxv4rFy+fx2Qr9KD99YB+wbsb3A==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-6.0.0.tgz", + "integrity": "sha512-RV0xTSTPT3yOnbS5Gx6lMAETQeTUr72Ifu0+JZh9AV07xGVislZ+SdQGSeNgXoqxise6e65lJp3Nrb5KE4Lv6g==", "dev": true, "requires": { "chokidar": "1.7.0", "minimist": "1.2.0", "reflect-metadata": "0.1.12", - "tsickle": "0.25.6" + "tsickle": "0.27.5" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + }, + "source-map-support": { + "version": "0.5.5", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.5.tgz", + "integrity": "sha512-mR7/Nd5l1z6g99010shcXJiNEaf3fEtmLhRB/sBcQVJGodcHCULPp2y4Sfa43Kv2zq7T+Izmfp/WHCR6dYkQCA==", + "dev": true, + "requires": { + "buffer-from": "1.0.0", + "source-map": "0.6.1" + } + }, + "tsickle": { + "version": "0.27.5", + "resolved": "https://registry.npmjs.org/tsickle/-/tsickle-0.27.5.tgz", + "integrity": "sha512-NP+CjM1EXza/M8mOXBLH3vkFEJiu1zfEAlC5WdJxHPn8l96QPz5eooP6uAgYtw1CcKfuSyIiheNUdKxtDWCNeg==", + "dev": true, + "requires": { + "minimist": "1.2.0", + "mkdirp": "0.5.1", + "source-map": "0.6.1", + "source-map-support": "0.5.5" + } + } } }, "@angular/core": { - "version": "5.1.3", - "resolved": "https://registry.npmjs.org/@angular/core/-/core-5.1.3.tgz", - "integrity": "sha512-lGlILYCumA5s8Pf+egDW6kjlrEQwnpUG2fBQ4SNRChzzRoTWeJ1XPCrEI9YyFvC8qUsYcDIZwHWBXQQqhdEvmQ==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/@angular/core/-/core-6.0.0.tgz", + "integrity": "sha512-52X2ZKXOoaMRYaC/ycHePTkXuwku8qJFxoEXAFBItAkk9rebLU4CD8Fx1Z9vUd8aWu1uFfLTxqkgE0mUyBANZw==", "dev": true, "requires": { "tslib": "1.9.0" } }, "@angular/platform-browser": { - "version": "5.1.3", - "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-5.1.3.tgz", - "integrity": "sha512-APMYMgEith68hsuSS8PpE0Dn1dEhJN1IkaIeL+ZlmhZQ4GktVAvMV2ySFYHoQofT5QIWEnvbT2r/cvgW9+8IUQ==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-6.0.0.tgz", + "integrity": "sha512-ExI1o40BJIbJKFz1p1ivGSgLA1+T0uUo8rjheOZhcGDwCNx54/RapCFLdcHCNiW8NzAIzx+kt4DdXnCSKitnDA==", "dev": true, "requires": { "tslib": "1.9.0" } }, "@angular/platform-browser-dynamic": { - "version": "5.1.3", - "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-5.1.3.tgz", - "integrity": "sha512-LKyHzN0LZqcw8nL19yJsbqPMBZ2nxPYFDkbsBicxfr9RHWbWbDuIZXY5l742guzAFBPHhccx9Lpjd3Gwxi7syg==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-6.0.0.tgz", + "integrity": "sha512-yk4wZYn2bosuvDaYaEq6UuEeI966/28uCljm5iBfo3l8Vuv2IChk5664M68O6C+KwWzCCWDHvIqm0q178YUYug==", "dev": true, "requires": { "tslib": "1.9.0" @@ -1687,6 +1717,12 @@ "isarray": "1.0.0" } }, + "buffer-from": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.0.0.tgz", + "integrity": "sha512-83apNb8KK0Se60UE1+4Ukbe3HbfELJ6UlI4ldtOGs7So4KD26orJM8hIY9lxdzP+UpItH1Yh/Y8GUvNFWFFRxA==", + "dev": true + }, "buffer-indexof": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz", @@ -10580,12 +10616,12 @@ "dev": true }, "rxjs": { - "version": "5.5.6", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.5.6.tgz", - "integrity": "sha512-v4Q5HDC0FHAQ7zcBX7T2IL6O5ltl1a2GX4ENjPXg6SjDY69Cmx9v4113C99a4wGF16ClPv5Z8mghuYorVkg/kg==", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.1.0.tgz", + "integrity": "sha512-lMZdl6xbHJCSb5lmnb6nOhsoBVCyoDC5LDJQK9WWyq+tsI7KnlDIZ0r0AZAlBpRPLbwQA9kzSBAZwNIZEZ+hcw==", "dev": true, "requires": { - "symbol-observable": "1.0.1" + "tslib": "1.9.0" } }, "safe-buffer": { @@ -11879,12 +11915,6 @@ "whet.extend": "0.9.9" } }, - "symbol-observable": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.0.1.tgz", - "integrity": "sha1-g0D8RwLDEi310iKI+IKD9RPT/dQ=", - "dev": true - }, "symbol-tree": { "version": "3.2.2", "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.2.tgz", @@ -12483,18 +12513,6 @@ } } }, - "tsickle": { - "version": "0.25.6", - "resolved": "https://registry.npmjs.org/tsickle/-/tsickle-0.25.6.tgz", - "integrity": "sha1-tZXbFrI2chgk7u2ouyYjZbR+8zQ=", - "dev": true, - "requires": { - "minimist": "1.2.0", - "mkdirp": "0.5.1", - "source-map": "0.5.7", - "source-map-support": "0.4.18" - } - }, "tslib": { "version": "1.9.0", "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.0.tgz", @@ -12546,9 +12564,9 @@ "dev": true }, "typescript": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.4.2.tgz", - "integrity": "sha1-+DlfhdRZJ2BnyYiqQYN6j4KHCEQ=", + "version": "2.7.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.7.2.tgz", + "integrity": "sha512-p5TCYZDAO0m4G344hD+wx/LATebLWZNkkh2asWUFqSsD2OrDNhbAHuSjobrmsUmdzjJjEeZVU9g1h3O6vpstnw==", "dev": true }, "ua-parser-js": { @@ -13776,9 +13794,9 @@ "dev": true }, "zone.js": { - "version": "0.8.20", - "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.8.20.tgz", - "integrity": "sha512-FXlA37ErSXCMy5RNBcGFgCI/Zivqzr0D19GuvDxhcYIJc7xkFp6c29DKyODJu0Zo+EMyur/WPPgcBh1EHjB9jA==", + "version": "0.8.26", + "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.8.26.tgz", + "integrity": "sha512-W9Nj+UmBJG251wkCacIkETgra4QgBo/vgoEkb4a2uoLzpQG7qF9nzwoLXWU5xj3Fg2mxGvEDh47mg24vXccYjA==", "dev": true } } diff --git a/package.json b/package.json index bba7d593..9ef80d60 100644 --- a/package.json +++ b/package.json @@ -48,17 +48,17 @@ "test": "jest --config jest.config.json --runInBand --no-cache" }, "peerDependencies": { - "@angular/common": ">= 5.0.0 < 6.0.0", - "@angular/core": ">= 5.0.0 < 6.0.0", - "rxjs": ">= 5.5.2 < 6.0.0" + "@angular/common": ">= 6.0.0 < 7.0.0", + "@angular/core": ">= 6.0.0 < 7.0.0", + "rxjs": ">= 6.1.0 < 7.0.0" }, "devDependencies": { - "@angular/common": "5.1.x", - "@angular/compiler-cli": "5.1.x", - "@angular/compiler": "5.1.x", - "@angular/core": "5.1.x", - "@angular/platform-browser-dynamic": "5.1.x", - "@angular/platform-browser": "5.1.x", + "@angular/common": "6.0.x", + "@angular/compiler-cli": "6.0.x", + "@angular/compiler": "6.0.x", + "@angular/core": "6.0.x", + "@angular/platform-browser-dynamic": "6.0.x", + "@angular/platform-browser": "6.0.x", "@types/jest": "22.1.x", "@types/node": "8.9.x", "add-asset-html-webpack-plugin": "2.1.x", @@ -81,17 +81,17 @@ "raw-loader": "0.5.x", "reflect-metadata": "0.1.x", "rimraf": "2.6.x", - "rxjs": "5.5.x", + "rxjs": "6.1.x", "sass-loader": "6.0.x", "script-ext-html-webpack-plugin": "1.8.x", "simple-progress-webpack-plugin": "1.0.x", "source-map-loader": "0.2.x", "style-loader": "0.20.x", "ts-jest": "21.2.x", - "typescript": "2.4.x", + "typescript": "2.7.x", "web-animations-js": "2.3.x", "webpack-dev-server": "2.9.x", "webpack": "3.11.x", - "zone.js": "0.8.20" + "zone.js": "0.8.26" } } diff --git a/src/lib/src/components/notifier-container.component.spec.ts b/src/lib/src/components/notifier-container.component.spec.ts index 9cd4c94d..27d63297 100644 --- a/src/lib/src/components/notifier-container.component.spec.ts +++ b/src/lib/src/components/notifier-container.component.spec.ts @@ -2,7 +2,7 @@ import { By } from '@angular/platform-browser'; import { DebugElement, EventEmitter, NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing'; -import { Subject } from 'rxjs/Subject'; +import { Subject } from 'rxjs'; import { NotifierConfigToken } from '../notifier.module'; import { NotifierNotification } from '../models/notifier-notification.model'; diff --git a/src/lib/src/components/notifier-container.component.ts b/src/lib/src/components/notifier-container.component.ts index 72910faf..2518603c 100644 --- a/src/lib/src/components/notifier-container.component.ts +++ b/src/lib/src/components/notifier-container.component.ts @@ -1,6 +1,6 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core'; -import { Subscription } from 'rxjs/Subscription'; +import { Subscription } from 'rxjs'; import { NotifierAction } from './../models/notifier-action.model'; import { NotifierConfig } from './../models/notifier-config.model'; diff --git a/src/lib/src/services/notifier-queue.service.spec.ts b/src/lib/src/services/notifier-queue.service.spec.ts index d01f18a6..4460f4f8 100644 --- a/src/lib/src/services/notifier-queue.service.spec.ts +++ b/src/lib/src/services/notifier-queue.service.spec.ts @@ -1,6 +1,6 @@ import { TestBed, inject } from '@angular/core/testing'; -import { Subject } from 'rxjs/Subject'; +import { Subject } from 'rxjs'; import { NotifierQueueService } from './notifier-queue.service'; import { NotifierAction } from '../models/notifier-action.model'; diff --git a/src/lib/src/services/notifier-queue.service.ts b/src/lib/src/services/notifier-queue.service.ts index be90e10e..2c85bcc9 100644 --- a/src/lib/src/services/notifier-queue.service.ts +++ b/src/lib/src/services/notifier-queue.service.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; -import { Subject } from 'rxjs/Subject'; +import { Subject } from 'rxjs'; import { NotifierAction } from './../models/notifier-action.model'; From 84c79c8bddf0fc68e2051df58962c27e56c220ae Mon Sep 17 00:00:00 2001 From: David Rouyer Date: Fri, 25 May 2018 11:22:13 +0200 Subject: [PATCH 2/2] chore: bump rxjs --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 9ef80d60..9850a214 100644 --- a/package.json +++ b/package.json @@ -50,7 +50,7 @@ "peerDependencies": { "@angular/common": ">= 6.0.0 < 7.0.0", "@angular/core": ">= 6.0.0 < 7.0.0", - "rxjs": ">= 6.1.0 < 7.0.0" + "rxjs": ">= 6.2.0 < 7.0.0" }, "devDependencies": { "@angular/common": "6.0.x", @@ -81,7 +81,7 @@ "raw-loader": "0.5.x", "reflect-metadata": "0.1.x", "rimraf": "2.6.x", - "rxjs": "6.1.x", + "rxjs": "6.2.x", "sass-loader": "6.0.x", "script-ext-html-webpack-plugin": "1.8.x", "simple-progress-webpack-plugin": "1.0.x",