From d6c39e124c7aa2ff5c834a92d6ace30e370ba843 Mon Sep 17 00:00:00 2001 From: Michel Palourdio Date: Sun, 5 Nov 2017 15:23:46 +0100 Subject: [PATCH 01/15] Move code to respective folders --- src/{ => components}/abstract.loader.component.ts | 0 .../sk-chasing-dots/sk-chasing-dots.component.css | 0 .../sk-chasing-dots/sk-chasing-dots.component.html | 0 src/{ => components}/sk-chasing-dots/sk-chasing-dots.component.ts | 0 src/{ => components}/sk-cube-grid/sk-cube-grid.component.css | 0 src/{ => components}/sk-cube-grid/sk-cube-grid.component.html | 0 src/{ => components}/sk-cube-grid/sk-cube-grid.component.ts | 0 .../sk-double-bounce/sk-double-bounce.component.css | 0 .../sk-double-bounce/sk-double-bounce.component.html | 0 .../sk-double-bounce/sk-double-bounce.component.ts | 0 .../sk-rotating-plane/sk-rotating-plane.component.css | 0 .../sk-rotating-plane/sk-rotating-plane.component.html | 0 .../sk-rotating-plane/sk-rotating-plane.component.ts | 0 .../sk-spinner-pulse/sk-spinner-pulse.component.css | 0 .../sk-spinner-pulse/sk-spinner-pulse.component.html | 0 .../sk-spinner-pulse/sk-spinner-pulse.component.ts | 0 .../sk-three-bounce/sk-three-bounce.component.css | 0 .../sk-three-bounce/sk-three-bounce.component.html | 0 src/{ => components}/sk-three-bounce/sk-three-bounce.component.ts | 0 .../sk-wandering-cubes/sk-wandering-cubes.component.css | 0 .../sk-wandering-cubes/sk-wandering-cubes.component.html | 0 .../sk-wandering-cubes/sk-wandering-cubes.component.ts | 0 src/{ => components}/sk-wave/sk-wave.component.css | 0 src/{ => components}/sk-wave/sk-wave.component.html | 0 src/{ => components}/sk-wave/sk-wave.component.ts | 0 src/{ => components}/spinner/spinner.component.css | 0 src/{ => components}/spinner/spinner.component.html | 0 src/{ => components}/spinner/spinner.component.ts | 0 src/{ => services}/pending-interceptor.service.ts | 0 .../sk-chasing-dots/sk-chasing-dots.component.spec.ts | 0 test/{ => components}/sk-cube-grid/sk-cube-grid.component.spec.ts | 0 .../sk-double-bounce/sk-double-bounce.component.spec.ts | 0 .../sk-rotating-plane/sk-rotating-plane.component.spec.ts | 0 .../sk-spinner-pulse/sk-spinner-pulse.component.spec.ts | 0 .../sk-three-bounce/sk-three-bounce.component.spec.ts | 0 .../sk-wandering-cubes/sk-wandering-cubes.component.spec.ts | 0 test/{ => components}/sk-wave/sk-wave.component.spec.ts | 0 test/{ => components}/spinner/spinner.component.spec.ts | 0 test/{ => services}/pending-interceptor.service.spec.ts | 0 39 files changed, 0 insertions(+), 0 deletions(-) rename src/{ => components}/abstract.loader.component.ts (100%) rename src/{ => components}/sk-chasing-dots/sk-chasing-dots.component.css (100%) rename src/{ => components}/sk-chasing-dots/sk-chasing-dots.component.html (100%) rename src/{ => components}/sk-chasing-dots/sk-chasing-dots.component.ts (100%) rename src/{ => components}/sk-cube-grid/sk-cube-grid.component.css (100%) rename src/{ => components}/sk-cube-grid/sk-cube-grid.component.html (100%) rename src/{ => components}/sk-cube-grid/sk-cube-grid.component.ts (100%) rename src/{ => components}/sk-double-bounce/sk-double-bounce.component.css (100%) rename src/{ => components}/sk-double-bounce/sk-double-bounce.component.html (100%) rename src/{ => components}/sk-double-bounce/sk-double-bounce.component.ts (100%) rename src/{ => components}/sk-rotating-plane/sk-rotating-plane.component.css (100%) rename src/{ => components}/sk-rotating-plane/sk-rotating-plane.component.html (100%) rename src/{ => components}/sk-rotating-plane/sk-rotating-plane.component.ts (100%) rename src/{ => components}/sk-spinner-pulse/sk-spinner-pulse.component.css (100%) rename src/{ => components}/sk-spinner-pulse/sk-spinner-pulse.component.html (100%) rename src/{ => components}/sk-spinner-pulse/sk-spinner-pulse.component.ts (100%) rename src/{ => components}/sk-three-bounce/sk-three-bounce.component.css (100%) rename src/{ => components}/sk-three-bounce/sk-three-bounce.component.html (100%) rename src/{ => components}/sk-three-bounce/sk-three-bounce.component.ts (100%) rename src/{ => components}/sk-wandering-cubes/sk-wandering-cubes.component.css (100%) rename src/{ => components}/sk-wandering-cubes/sk-wandering-cubes.component.html (100%) rename src/{ => components}/sk-wandering-cubes/sk-wandering-cubes.component.ts (100%) rename src/{ => components}/sk-wave/sk-wave.component.css (100%) rename src/{ => components}/sk-wave/sk-wave.component.html (100%) rename src/{ => components}/sk-wave/sk-wave.component.ts (100%) rename src/{ => components}/spinner/spinner.component.css (100%) rename src/{ => components}/spinner/spinner.component.html (100%) rename src/{ => components}/spinner/spinner.component.ts (100%) rename src/{ => services}/pending-interceptor.service.ts (100%) rename test/{ => components}/sk-chasing-dots/sk-chasing-dots.component.spec.ts (100%) rename test/{ => components}/sk-cube-grid/sk-cube-grid.component.spec.ts (100%) rename test/{ => components}/sk-double-bounce/sk-double-bounce.component.spec.ts (100%) rename test/{ => components}/sk-rotating-plane/sk-rotating-plane.component.spec.ts (100%) rename test/{ => components}/sk-spinner-pulse/sk-spinner-pulse.component.spec.ts (100%) rename test/{ => components}/sk-three-bounce/sk-three-bounce.component.spec.ts (100%) rename test/{ => components}/sk-wandering-cubes/sk-wandering-cubes.component.spec.ts (100%) rename test/{ => components}/sk-wave/sk-wave.component.spec.ts (100%) rename test/{ => components}/spinner/spinner.component.spec.ts (100%) rename test/{ => services}/pending-interceptor.service.spec.ts (100%) diff --git a/src/abstract.loader.component.ts b/src/components/abstract.loader.component.ts similarity index 100% rename from src/abstract.loader.component.ts rename to src/components/abstract.loader.component.ts diff --git a/src/sk-chasing-dots/sk-chasing-dots.component.css b/src/components/sk-chasing-dots/sk-chasing-dots.component.css similarity index 100% rename from src/sk-chasing-dots/sk-chasing-dots.component.css rename to src/components/sk-chasing-dots/sk-chasing-dots.component.css diff --git a/src/sk-chasing-dots/sk-chasing-dots.component.html b/src/components/sk-chasing-dots/sk-chasing-dots.component.html similarity index 100% rename from src/sk-chasing-dots/sk-chasing-dots.component.html rename to src/components/sk-chasing-dots/sk-chasing-dots.component.html diff --git a/src/sk-chasing-dots/sk-chasing-dots.component.ts b/src/components/sk-chasing-dots/sk-chasing-dots.component.ts similarity index 100% rename from src/sk-chasing-dots/sk-chasing-dots.component.ts rename to src/components/sk-chasing-dots/sk-chasing-dots.component.ts diff --git a/src/sk-cube-grid/sk-cube-grid.component.css b/src/components/sk-cube-grid/sk-cube-grid.component.css similarity index 100% rename from src/sk-cube-grid/sk-cube-grid.component.css rename to src/components/sk-cube-grid/sk-cube-grid.component.css diff --git a/src/sk-cube-grid/sk-cube-grid.component.html b/src/components/sk-cube-grid/sk-cube-grid.component.html similarity index 100% rename from src/sk-cube-grid/sk-cube-grid.component.html rename to src/components/sk-cube-grid/sk-cube-grid.component.html diff --git a/src/sk-cube-grid/sk-cube-grid.component.ts b/src/components/sk-cube-grid/sk-cube-grid.component.ts similarity index 100% rename from src/sk-cube-grid/sk-cube-grid.component.ts rename to src/components/sk-cube-grid/sk-cube-grid.component.ts diff --git a/src/sk-double-bounce/sk-double-bounce.component.css b/src/components/sk-double-bounce/sk-double-bounce.component.css similarity index 100% rename from src/sk-double-bounce/sk-double-bounce.component.css rename to src/components/sk-double-bounce/sk-double-bounce.component.css diff --git a/src/sk-double-bounce/sk-double-bounce.component.html b/src/components/sk-double-bounce/sk-double-bounce.component.html similarity index 100% rename from src/sk-double-bounce/sk-double-bounce.component.html rename to src/components/sk-double-bounce/sk-double-bounce.component.html diff --git a/src/sk-double-bounce/sk-double-bounce.component.ts b/src/components/sk-double-bounce/sk-double-bounce.component.ts similarity index 100% rename from src/sk-double-bounce/sk-double-bounce.component.ts rename to src/components/sk-double-bounce/sk-double-bounce.component.ts diff --git a/src/sk-rotating-plane/sk-rotating-plane.component.css b/src/components/sk-rotating-plane/sk-rotating-plane.component.css similarity index 100% rename from src/sk-rotating-plane/sk-rotating-plane.component.css rename to src/components/sk-rotating-plane/sk-rotating-plane.component.css diff --git a/src/sk-rotating-plane/sk-rotating-plane.component.html b/src/components/sk-rotating-plane/sk-rotating-plane.component.html similarity index 100% rename from src/sk-rotating-plane/sk-rotating-plane.component.html rename to src/components/sk-rotating-plane/sk-rotating-plane.component.html diff --git a/src/sk-rotating-plane/sk-rotating-plane.component.ts b/src/components/sk-rotating-plane/sk-rotating-plane.component.ts similarity index 100% rename from src/sk-rotating-plane/sk-rotating-plane.component.ts rename to src/components/sk-rotating-plane/sk-rotating-plane.component.ts diff --git a/src/sk-spinner-pulse/sk-spinner-pulse.component.css b/src/components/sk-spinner-pulse/sk-spinner-pulse.component.css similarity index 100% rename from src/sk-spinner-pulse/sk-spinner-pulse.component.css rename to src/components/sk-spinner-pulse/sk-spinner-pulse.component.css diff --git a/src/sk-spinner-pulse/sk-spinner-pulse.component.html b/src/components/sk-spinner-pulse/sk-spinner-pulse.component.html similarity index 100% rename from src/sk-spinner-pulse/sk-spinner-pulse.component.html rename to src/components/sk-spinner-pulse/sk-spinner-pulse.component.html diff --git a/src/sk-spinner-pulse/sk-spinner-pulse.component.ts b/src/components/sk-spinner-pulse/sk-spinner-pulse.component.ts similarity index 100% rename from src/sk-spinner-pulse/sk-spinner-pulse.component.ts rename to src/components/sk-spinner-pulse/sk-spinner-pulse.component.ts diff --git a/src/sk-three-bounce/sk-three-bounce.component.css b/src/components/sk-three-bounce/sk-three-bounce.component.css similarity index 100% rename from src/sk-three-bounce/sk-three-bounce.component.css rename to src/components/sk-three-bounce/sk-three-bounce.component.css diff --git a/src/sk-three-bounce/sk-three-bounce.component.html b/src/components/sk-three-bounce/sk-three-bounce.component.html similarity index 100% rename from src/sk-three-bounce/sk-three-bounce.component.html rename to src/components/sk-three-bounce/sk-three-bounce.component.html diff --git a/src/sk-three-bounce/sk-three-bounce.component.ts b/src/components/sk-three-bounce/sk-three-bounce.component.ts similarity index 100% rename from src/sk-three-bounce/sk-three-bounce.component.ts rename to src/components/sk-three-bounce/sk-three-bounce.component.ts diff --git a/src/sk-wandering-cubes/sk-wandering-cubes.component.css b/src/components/sk-wandering-cubes/sk-wandering-cubes.component.css similarity index 100% rename from src/sk-wandering-cubes/sk-wandering-cubes.component.css rename to src/components/sk-wandering-cubes/sk-wandering-cubes.component.css diff --git a/src/sk-wandering-cubes/sk-wandering-cubes.component.html b/src/components/sk-wandering-cubes/sk-wandering-cubes.component.html similarity index 100% rename from src/sk-wandering-cubes/sk-wandering-cubes.component.html rename to src/components/sk-wandering-cubes/sk-wandering-cubes.component.html diff --git a/src/sk-wandering-cubes/sk-wandering-cubes.component.ts b/src/components/sk-wandering-cubes/sk-wandering-cubes.component.ts similarity index 100% rename from src/sk-wandering-cubes/sk-wandering-cubes.component.ts rename to src/components/sk-wandering-cubes/sk-wandering-cubes.component.ts diff --git a/src/sk-wave/sk-wave.component.css b/src/components/sk-wave/sk-wave.component.css similarity index 100% rename from src/sk-wave/sk-wave.component.css rename to src/components/sk-wave/sk-wave.component.css diff --git a/src/sk-wave/sk-wave.component.html b/src/components/sk-wave/sk-wave.component.html similarity index 100% rename from src/sk-wave/sk-wave.component.html rename to src/components/sk-wave/sk-wave.component.html diff --git a/src/sk-wave/sk-wave.component.ts b/src/components/sk-wave/sk-wave.component.ts similarity index 100% rename from src/sk-wave/sk-wave.component.ts rename to src/components/sk-wave/sk-wave.component.ts diff --git a/src/spinner/spinner.component.css b/src/components/spinner/spinner.component.css similarity index 100% rename from src/spinner/spinner.component.css rename to src/components/spinner/spinner.component.css diff --git a/src/spinner/spinner.component.html b/src/components/spinner/spinner.component.html similarity index 100% rename from src/spinner/spinner.component.html rename to src/components/spinner/spinner.component.html diff --git a/src/spinner/spinner.component.ts b/src/components/spinner/spinner.component.ts similarity index 100% rename from src/spinner/spinner.component.ts rename to src/components/spinner/spinner.component.ts diff --git a/src/pending-interceptor.service.ts b/src/services/pending-interceptor.service.ts similarity index 100% rename from src/pending-interceptor.service.ts rename to src/services/pending-interceptor.service.ts diff --git a/test/sk-chasing-dots/sk-chasing-dots.component.spec.ts b/test/components/sk-chasing-dots/sk-chasing-dots.component.spec.ts similarity index 100% rename from test/sk-chasing-dots/sk-chasing-dots.component.spec.ts rename to test/components/sk-chasing-dots/sk-chasing-dots.component.spec.ts diff --git a/test/sk-cube-grid/sk-cube-grid.component.spec.ts b/test/components/sk-cube-grid/sk-cube-grid.component.spec.ts similarity index 100% rename from test/sk-cube-grid/sk-cube-grid.component.spec.ts rename to test/components/sk-cube-grid/sk-cube-grid.component.spec.ts diff --git a/test/sk-double-bounce/sk-double-bounce.component.spec.ts b/test/components/sk-double-bounce/sk-double-bounce.component.spec.ts similarity index 100% rename from test/sk-double-bounce/sk-double-bounce.component.spec.ts rename to test/components/sk-double-bounce/sk-double-bounce.component.spec.ts diff --git a/test/sk-rotating-plane/sk-rotating-plane.component.spec.ts b/test/components/sk-rotating-plane/sk-rotating-plane.component.spec.ts similarity index 100% rename from test/sk-rotating-plane/sk-rotating-plane.component.spec.ts rename to test/components/sk-rotating-plane/sk-rotating-plane.component.spec.ts diff --git a/test/sk-spinner-pulse/sk-spinner-pulse.component.spec.ts b/test/components/sk-spinner-pulse/sk-spinner-pulse.component.spec.ts similarity index 100% rename from test/sk-spinner-pulse/sk-spinner-pulse.component.spec.ts rename to test/components/sk-spinner-pulse/sk-spinner-pulse.component.spec.ts diff --git a/test/sk-three-bounce/sk-three-bounce.component.spec.ts b/test/components/sk-three-bounce/sk-three-bounce.component.spec.ts similarity index 100% rename from test/sk-three-bounce/sk-three-bounce.component.spec.ts rename to test/components/sk-three-bounce/sk-three-bounce.component.spec.ts diff --git a/test/sk-wandering-cubes/sk-wandering-cubes.component.spec.ts b/test/components/sk-wandering-cubes/sk-wandering-cubes.component.spec.ts similarity index 100% rename from test/sk-wandering-cubes/sk-wandering-cubes.component.spec.ts rename to test/components/sk-wandering-cubes/sk-wandering-cubes.component.spec.ts diff --git a/test/sk-wave/sk-wave.component.spec.ts b/test/components/sk-wave/sk-wave.component.spec.ts similarity index 100% rename from test/sk-wave/sk-wave.component.spec.ts rename to test/components/sk-wave/sk-wave.component.spec.ts diff --git a/test/spinner/spinner.component.spec.ts b/test/components/spinner/spinner.component.spec.ts similarity index 100% rename from test/spinner/spinner.component.spec.ts rename to test/components/spinner/spinner.component.spec.ts diff --git a/test/pending-interceptor.service.spec.ts b/test/services/pending-interceptor.service.spec.ts similarity index 100% rename from test/pending-interceptor.service.spec.ts rename to test/services/pending-interceptor.service.spec.ts From 01f0758ae8b9511f988d41daabd8ac23d181a061 Mon Sep 17 00:00:00 2001 From: Michel Palourdio Date: Sun, 5 Nov 2017 15:31:08 +0100 Subject: [PATCH 02/15] Fix path after move --- src/components/spinner/spinner.component.ts | 4 +-- src/ng-http-loader.module.ts | 27 +++++-------------- .../sk-chasing-dots.component.spec.ts | 2 +- .../sk-cube-grid.component.spec.ts | 2 +- .../sk-double-bounce.component.spec.ts | 2 +- .../sk-rotating-plane.component.spec.ts | 2 +- .../sk-spinner-pulse.component.spec.ts | 2 +- .../sk-three-bounce.component.spec.ts | 2 +- .../sk-wandering-cubes.component.spec.ts | 2 +- .../sk-wave/sk-wave.component.spec.ts | 2 +- .../spinner/spinner.component.spec.ts | 21 +++++---------- 11 files changed, 22 insertions(+), 46 deletions(-) diff --git a/src/components/spinner/spinner.component.ts b/src/components/spinner/spinner.component.ts index c3e3809..30a8ed5 100644 --- a/src/components/spinner/spinner.component.ts +++ b/src/components/spinner/spinner.component.ts @@ -9,8 +9,8 @@ import { Component, Input, OnDestroy, OnInit } from '@angular/core'; import { Subscription } from 'rxjs/Subscription'; -import { Spinkit } from '../spinkits'; -import { PendingInterceptorService } from '../pending-interceptor.service'; +import { Spinkit } from '../../spinkits'; +import { PendingInterceptorService } from '../../services/pending-interceptor.service'; @Component({ selector: 'spinner', diff --git a/src/ng-http-loader.module.ts b/src/ng-http-loader.module.ts index bffe4f4..ba72b70 100644 --- a/src/ng-http-loader.module.ts +++ b/src/ng-http-loader.module.ts @@ -8,35 +8,20 @@ */ import { NgModule } from '@angular/core'; -import { SpinnerComponent } from './spinner/spinner.component'; import { CommonModule } from '@angular/common'; -import { PendingInterceptorService, PendingInterceptorServiceFactoryProvider } from './pending-interceptor.service'; -import { HTTP_INTERCEPTORS, HttpClientModule } from '@angular/common/http'; -import { SPINKIT_COMPONENTS } from './spinkits'; - -const PendingInterceptorServiceExistingProvider = { - provide: HTTP_INTERCEPTORS, - useExisting: PendingInterceptorService, - multi: true -}; +import { NgHttpLoaderComponentsModule } from './components/ng-http-loader-components.module'; +import { NgHttpLoaderServicesModule } from './services/ng-http-loader-services.module'; @NgModule({ - declarations: [ - SpinnerComponent, - SPINKIT_COMPONENTS, - ], imports: [ CommonModule, - HttpClientModule, + NgHttpLoaderComponentsModule, + NgHttpLoaderServicesModule, ], exports: [ - SpinnerComponent, - SPINKIT_COMPONENTS, + NgHttpLoaderComponentsModule, + NgHttpLoaderServicesModule, ], - providers: [ - PendingInterceptorServiceExistingProvider, - PendingInterceptorServiceFactoryProvider, - ] }) export class NgHttpLoaderModule { } diff --git a/test/components/sk-chasing-dots/sk-chasing-dots.component.spec.ts b/test/components/sk-chasing-dots/sk-chasing-dots.component.spec.ts index 6032518..9992e58 100644 --- a/test/components/sk-chasing-dots/sk-chasing-dots.component.spec.ts +++ b/test/components/sk-chasing-dots/sk-chasing-dots.component.spec.ts @@ -8,7 +8,7 @@ */ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { SkChasingDotsComponent } from '../../src/sk-chasing-dots/sk-chasing-dots.component'; +import { SkChasingDotsComponent } from '../../../src/components/sk-chasing-dots/sk-chasing-dots.component'; describe('SkChasingDotsComponent', () => { diff --git a/test/components/sk-cube-grid/sk-cube-grid.component.spec.ts b/test/components/sk-cube-grid/sk-cube-grid.component.spec.ts index 989480d..1249f33 100644 --- a/test/components/sk-cube-grid/sk-cube-grid.component.spec.ts +++ b/test/components/sk-cube-grid/sk-cube-grid.component.spec.ts @@ -8,7 +8,7 @@ */ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { SkCubeGridComponent } from '../../src/sk-cube-grid/sk-cube-grid.component'; +import { SkCubeGridComponent } from '../../../src/components/sk-cube-grid/sk-cube-grid.component'; describe('SkCubeGridComponent', () => { diff --git a/test/components/sk-double-bounce/sk-double-bounce.component.spec.ts b/test/components/sk-double-bounce/sk-double-bounce.component.spec.ts index c10cb90..0f82119 100644 --- a/test/components/sk-double-bounce/sk-double-bounce.component.spec.ts +++ b/test/components/sk-double-bounce/sk-double-bounce.component.spec.ts @@ -8,7 +8,7 @@ */ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { SkDoubleBounceComponent } from '../../src/sk-double-bounce/sk-double-bounce.component'; +import { SkDoubleBounceComponent } from '../../../src/components/sk-double-bounce/sk-double-bounce.component'; describe('SkDoubleBounceComponent', () => { diff --git a/test/components/sk-rotating-plane/sk-rotating-plane.component.spec.ts b/test/components/sk-rotating-plane/sk-rotating-plane.component.spec.ts index cd6a57c..7461519 100644 --- a/test/components/sk-rotating-plane/sk-rotating-plane.component.spec.ts +++ b/test/components/sk-rotating-plane/sk-rotating-plane.component.spec.ts @@ -8,7 +8,7 @@ */ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { SkRotatingPlaneComponent } from '../../src/sk-rotating-plane/sk-rotating-plane.component'; +import { SkRotatingPlaneComponent } from '../../../src/components/sk-rotating-plane/sk-rotating-plane.component'; describe('SkRotatingPlaneComponent', () => { diff --git a/test/components/sk-spinner-pulse/sk-spinner-pulse.component.spec.ts b/test/components/sk-spinner-pulse/sk-spinner-pulse.component.spec.ts index ab70650..bfc9328 100644 --- a/test/components/sk-spinner-pulse/sk-spinner-pulse.component.spec.ts +++ b/test/components/sk-spinner-pulse/sk-spinner-pulse.component.spec.ts @@ -8,7 +8,7 @@ */ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { SkSpinnerPulseComponent } from '../../src/sk-spinner-pulse/sk-spinner-pulse.component'; +import { SkSpinnerPulseComponent } from '../../../src/components/sk-spinner-pulse/sk-spinner-pulse.component'; describe('SkSpinnerPulseComponent', () => { diff --git a/test/components/sk-three-bounce/sk-three-bounce.component.spec.ts b/test/components/sk-three-bounce/sk-three-bounce.component.spec.ts index a60bd7c..f5722e4 100644 --- a/test/components/sk-three-bounce/sk-three-bounce.component.spec.ts +++ b/test/components/sk-three-bounce/sk-three-bounce.component.spec.ts @@ -8,7 +8,7 @@ */ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { SkThreeBounceComponent } from '../../src/sk-three-bounce/sk-three-bounce.component'; +import { SkThreeBounceComponent } from '../../../src/components/sk-three-bounce/sk-three-bounce.component'; describe('SkThreeBounceComponent', () => { diff --git a/test/components/sk-wandering-cubes/sk-wandering-cubes.component.spec.ts b/test/components/sk-wandering-cubes/sk-wandering-cubes.component.spec.ts index ef67fa3..11b273f 100644 --- a/test/components/sk-wandering-cubes/sk-wandering-cubes.component.spec.ts +++ b/test/components/sk-wandering-cubes/sk-wandering-cubes.component.spec.ts @@ -8,7 +8,7 @@ */ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { SkWanderingCubesComponent } from '../../src/sk-wandering-cubes/sk-wandering-cubes.component'; +import { SkWanderingCubesComponent } from '../../../src/components/sk-wandering-cubes/sk-wandering-cubes.component'; describe('SkWanderingCubesComponent', () => { diff --git a/test/components/sk-wave/sk-wave.component.spec.ts b/test/components/sk-wave/sk-wave.component.spec.ts index d178dbb..190ce6b 100644 --- a/test/components/sk-wave/sk-wave.component.spec.ts +++ b/test/components/sk-wave/sk-wave.component.spec.ts @@ -8,7 +8,7 @@ */ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { SkWaveComponent } from '../../src/sk-wave/sk-wave.component'; +import { SkWaveComponent } from '../../../src/components/sk-wave/sk-wave.component'; describe('SkWaveComponent', () => { diff --git a/test/components/spinner/spinner.component.spec.ts b/test/components/spinner/spinner.component.spec.ts index 7529b7f..eff5dbe 100644 --- a/test/components/spinner/spinner.component.spec.ts +++ b/test/components/spinner/spinner.component.spec.ts @@ -8,33 +8,24 @@ */ import { async, ComponentFixture, inject, TestBed } from '@angular/core/testing'; -import { SpinnerComponent } from '../../src/spinner/spinner.component'; +import { SpinnerComponent } from '../../../src/components/spinner/spinner.component'; import { By } from '@angular/platform-browser'; -import { Spinkit, SPINKIT_COMPONENTS } from '../../src/spinkits'; +import { Spinkit, SPINKIT_COMPONENTS } from '../../../src/spinkits'; import { Observable } from 'rxjs/Observable'; -import { PendingInterceptorService } from '../../src/pending-interceptor.service'; -import { HTTP_INTERCEPTORS, HttpClient } from '@angular/common/http'; +import { PendingInterceptorService } from '../../../src/services/pending-interceptor.service'; +import { HttpClient } from '@angular/common/http'; import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { NgHttpLoaderServicesModule } from '../../../src/services/ng-http-loader-services.module'; import 'rxjs/add/observable/forkJoin'; describe('SpinnerComponent', () => { let component: SpinnerComponent; let fixture: ComponentFixture; - const PendingInterceptorServiceExistingProvider = { - provide: HTTP_INTERCEPTORS, - useExisting: PendingInterceptorService, - multi: true - }; - beforeEach(async(() => { TestBed.configureTestingModule({ declarations: [SpinnerComponent, SPINKIT_COMPONENTS], - providers: [ - PendingInterceptorService, - PendingInterceptorServiceExistingProvider, - ], - imports: [HttpClientTestingModule] + imports: [NgHttpLoaderServicesModule, HttpClientTestingModule] }) .compileComponents(); })); From cb7cd0ee589d378a55e6b8811cd6ecc97df573a1 Mon Sep 17 00:00:00 2001 From: Michel Palourdio Date: Sun, 5 Nov 2017 15:31:41 +0100 Subject: [PATCH 03/15] Add splitted modules declarations --- .../ng-http-loader-components.module.ts | 22 +++++++++++++++++++ .../ng-http-loader-services.module.ts | 22 +++++++++++++++++++ 2 files changed, 44 insertions(+) create mode 100644 src/components/ng-http-loader-components.module.ts create mode 100644 src/services/ng-http-loader-services.module.ts diff --git a/src/components/ng-http-loader-components.module.ts b/src/components/ng-http-loader-components.module.ts new file mode 100644 index 0000000..dac6378 --- /dev/null +++ b/src/components/ng-http-loader-components.module.ts @@ -0,0 +1,22 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { HttpClientModule } from '@angular/common/http'; +import { SpinnerComponent } from './spinner/spinner.component'; +import { SPINKIT_COMPONENTS } from '../spinkits'; + +@NgModule({ + declarations: [ + SpinnerComponent, + SPINKIT_COMPONENTS, + ], + imports: [ + CommonModule, + HttpClientModule, + ], + exports: [ + SpinnerComponent, + SPINKIT_COMPONENTS, + ], +}) +export class NgHttpLoaderComponentsModule { +} diff --git a/src/services/ng-http-loader-services.module.ts b/src/services/ng-http-loader-services.module.ts new file mode 100644 index 0000000..5a408eb --- /dev/null +++ b/src/services/ng-http-loader-services.module.ts @@ -0,0 +1,22 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { HTTP_INTERCEPTORS } from '@angular/common/http'; +import { PendingInterceptorService, PendingInterceptorServiceFactoryProvider } from './pending-interceptor.service'; + +const PendingInterceptorServiceExistingProvider = { + provide: HTTP_INTERCEPTORS, + useExisting: PendingInterceptorService, + multi: true +}; + +@NgModule({ + imports: [ + CommonModule + ], + providers: [ + PendingInterceptorServiceExistingProvider, + PendingInterceptorServiceFactoryProvider, + ], +}) +export class NgHttpLoaderServicesModule { +} From 88fcf42166e2044f535b57b207e93ace7f7e3b08 Mon Sep 17 00:00:00 2001 From: Michel Palourdio Date: Sun, 5 Nov 2017 15:37:43 +0100 Subject: [PATCH 04/15] Adjust paths --- src/spinkits.ts | 17 ++++++++--------- .../pending-interceptor.service.spec.ts | 2 +- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/spinkits.ts b/src/spinkits.ts index 83872be..aba55dc 100644 --- a/src/spinkits.ts +++ b/src/spinkits.ts @@ -7,14 +7,14 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -import { SkCubeGridComponent } from './sk-cube-grid/sk-cube-grid.component'; -import { SkChasingDotsComponent } from './sk-chasing-dots/sk-chasing-dots.component'; -import { SkDoubleBounceComponent } from './sk-double-bounce/sk-double-bounce.component'; -import { SkRotatingPlaneComponent } from './sk-rotating-plane/sk-rotating-plane.component'; -import { SkSpinnerPulseComponent } from './sk-spinner-pulse/sk-spinner-pulse.component'; -import { SkThreeBounceComponent } from './sk-three-bounce/sk-three-bounce.component'; -import { SkWanderingCubesComponent } from './sk-wandering-cubes/sk-wandering-cubes.component'; -import { SkWaveComponent } from './sk-wave/sk-wave.component'; +import { SkCubeGridComponent } from './components/sk-cube-grid/sk-cube-grid.component'; +import { SkChasingDotsComponent } from './components/sk-chasing-dots/sk-chasing-dots.component'; +import { SkDoubleBounceComponent } from './components/sk-double-bounce/sk-double-bounce.component'; +import { SkRotatingPlaneComponent } from './components/sk-rotating-plane/sk-rotating-plane.component'; +import { SkSpinnerPulseComponent } from './components/sk-spinner-pulse/sk-spinner-pulse.component'; +import { SkThreeBounceComponent } from './components/sk-three-bounce/sk-three-bounce.component'; +import { SkWanderingCubesComponent } from './components/sk-wandering-cubes/sk-wandering-cubes.component'; +import { SkWaveComponent } from './components/sk-wave/sk-wave.component'; export const Spinkit = { skChasingDots: 'sk-chasing-dots', @@ -27,7 +27,6 @@ export const Spinkit = { skWave: 'sk-wave', }; - export const SPINKIT_COMPONENTS = [ SkCubeGridComponent, SkChasingDotsComponent, diff --git a/test/services/pending-interceptor.service.spec.ts b/test/services/pending-interceptor.service.spec.ts index 9480786..026dc45 100644 --- a/test/services/pending-interceptor.service.spec.ts +++ b/test/services/pending-interceptor.service.spec.ts @@ -8,7 +8,7 @@ */ import { async, inject, TestBed } from '@angular/core/testing'; -import { PendingInterceptorService } from '../src/pending-interceptor.service'; +import { PendingInterceptorService } from '../../src/services/pending-interceptor.service'; import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; import { HTTP_INTERCEPTORS, HttpClient, HttpErrorResponse } from '@angular/common/http'; import { Observable } from 'rxjs/Observable'; From ae9849bf24e54e4c6cbaf9ab5124b7229d1b22e9 Mon Sep 17 00:00:00 2001 From: Michel Palourdio Date: Sun, 5 Nov 2017 15:59:12 +0100 Subject: [PATCH 05/15] Document splitted modules --- README.MD | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/README.MD b/README.MD index d05a4cd..d51fcff 100644 --- a/README.MD +++ b/README.MD @@ -62,6 +62,33 @@ import { NgHttpLoaderModule } from 'ng-http-loader/ng-http-loader.module'; <==== export class AppModule { } ``` +or (splitted modules mode for more convenience) + +```typescript +import { BrowserModule } from '@angular/platform-browser'; +import { NgModule } from '@angular/core'; +[...] +import { AppComponent } from './app.component'; +import { HttpClientModule } from '@angular/common/http'; <============ +import { NgHttpLoaderComponentsModule } from 'ng-http-loader/components/ng-http-loader-components.module'; <============ +import { NgHttpLoaderServicesModule } from 'ng-http-loader/services/ng-http-loader-services.module'; <============ + +@NgModule({ + declarations: [ + AppComponent + ], + imports: [ + BrowserModule, + HttpClientModule, <============ (Perform http requests with this module) + NgHttpLoaderServicesModule, <============ + NgHttpLoaderComponentsModule, <============ + ], + providers: [], + bootstrap: [AppComponent] +}) +export class AppModule { } +``` + In your app.component.html, add : ```xml From e4f6e22cfbc4de7316a285f98d777c832fa5f8ca Mon Sep 17 00:00:00 2001 From: Michel Palourdio Date: Sun, 5 Nov 2017 16:15:58 +0100 Subject: [PATCH 06/15] Add changelog --- CHANGELOG.MD | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 CHANGELOG.MD diff --git a/CHANGELOG.MD b/CHANGELOG.MD new file mode 100644 index 0000000..073e9f4 --- /dev/null +++ b/CHANGELOG.MD @@ -0,0 +1,28 @@ +## v0.5.0 + +The module is now splitted in sub-modules for more convenience. See [usage](https://github.com/mpalourdio/ng-http-loader#usage). +It's an **opt-in** feature. The "old" module import method, by simply declaring ``NgHttpLoaderModule``, is still fully supported. + +**BC break** : paths of components and services have changed. +- Components are now located in the ``components`` folders. +- Services are now located in the ``services`` folders. + +## v0.4.0 + +Added **angular 5** full support. The last version compatible with angular 4 is ``version 0.3.4`` + +## v0.3.4 + +Fixed default spinners background. + +## v0.3.0 + +This release gives the possibility to filter http requests that should not be handled by the interceptor by providing an array of URL regex to the component's ``filteredUrlPatterns`` property. + +## v0.2.0 + +Definitely switch to the new HttpClientModule api available from angular 4.3 + +## v0.1.0 + +Before completely removing HttpInterceptorService, provide a parallel implementation based on the new built-in angular 4.3 intercepto From 82a8b9fa2efe9377794911ec400afb472464c269 Mon Sep 17 00:00:00 2001 From: Michel Palourdio Date: Sun, 5 Nov 2017 16:18:07 +0100 Subject: [PATCH 07/15] Add reference to changelog --- README.MD | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.MD b/README.MD index d51fcff..6e552c5 100644 --- a/README.MD +++ b/README.MD @@ -2,6 +2,10 @@ # ng-http-loader +## Changelog + +[Please read the changelog](CHANGELOG.MD) + ## Installation To install this library, run: From 9ffdebda3c62df5be14014cd9ee8d2c650159391 Mon Sep 17 00:00:00 2001 From: Michel Palourdio Date: Sun, 5 Nov 2017 16:19:40 +0100 Subject: [PATCH 08/15] Prepare v0.5.0 release --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9e9a02d..3293c28 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ng-http-loader", - "version": "0.4.0", + "version": "0.5.0", "scripts": { "prepare-deploy": "gulp inline-templates && gulp clean-dist && ngc -p tsconfig.ngc.json && gulp clean-tmp && gulp copy-all", "test": "ng test --watch false" From 8e06f3d6607ef5b8b84eaf56213c80c007fc3d92 Mon Sep 17 00:00:00 2001 From: Michel Palourdio Date: Sun, 5 Nov 2017 17:52:54 +0100 Subject: [PATCH 09/15] Move dependencies to devDependencies and express peerDependencies --- package.json | 19 +++++---- yarn.lock | 114 ++++++++++++++++++++++++++------------------------- 2 files changed, 69 insertions(+), 64 deletions(-) diff --git a/package.json b/package.json index 3293c28..ad2ba8f 100644 --- a/package.json +++ b/package.json @@ -28,24 +28,25 @@ "bugs": { "url": "https://github.com/mpalourdio/ng-http-loader/issues" }, - "dependencies": { + "peerDependencies": { "@angular/common": "^5.0.0", - "@angular/compiler": "^5.0.0", "@angular/core": "^5.0.0", - "@angular/platform-browser": "^5.0.0", - "@angular/platform-browser-dynamic": "^5.0.0", - "core-js": "^2.4.1", - "rxjs": "^5.5.2", - "zone.js": "^0.8.14" + "rxjs": "^5.5.2" }, "devDependencies": { "@angular/cli": "^1.5.0", + "@angular/common": "^5.0.0", + "@angular/compiler": "^5.0.0", + "@angular/core": "^5.0.0", "@angular/compiler-cli": "^5.0.0", "@angular/language-service": "^5.0.0", + "@angular/platform-browser": "^5.0.0", + "@angular/platform-browser-dynamic": "^5.0.0", "@types/jasmine": "~2.5.53", "@types/jasminewd2": "~2.0.2", "@types/node": "~6.0.60", "codelyzer": "~3.2.0", + "core-js": "^2.4.1", "gulp": "^3.9.1", "gulp-clean": "^0.3.2", "gulp-inline-ng2-template": "^4.0.0", @@ -60,8 +61,10 @@ "karma-phantomjs-launcher": "^1.0.4", "phantomjs-prebuilt": "^2.1.14", "protractor": "~5.1.2", + "rxjs": "^5.5.2", "ts-node": "~3.2.0", "tslint": "~5.7.0", - "typescript": "~2.4.2" + "typescript": "~2.4.2", + "zone.js": "^0.8.14" } } diff --git a/yarn.lock b/yarn.lock index be3e540..090812c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -854,8 +854,8 @@ caniuse-api@^1.5.2: lodash.uniq "^4.5.0" caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639: - version "1.0.30000757" - resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000757.tgz#fa23a383213d857f4a1e6a3bee17b32668504cbf" + version "1.0.30000758" + resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000758.tgz#a235627b1922e878b63164942c991b84de92c810" caseless@~0.12.0: version "0.12.0" @@ -1280,8 +1280,8 @@ cryptiles@3.x.x: boom "5.x.x" crypto-browserify@^3.11.0: - version "3.11.1" - resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.11.1.tgz#948945efc6757a400d6e5e5af47194d10064279f" + version "3.12.0" + resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec" dependencies: browserify-cipher "^1.0.0" browserify-sign "^4.0.0" @@ -1293,6 +1293,7 @@ crypto-browserify@^3.11.0: pbkdf2 "^3.0.3" public-encrypt "^4.0.0" randombytes "^2.0.0" + randomfill "^1.0.3" css-color-names@0.0.4: version "0.0.4" @@ -1845,9 +1846,9 @@ es6-map@^0.1.3: es6-symbol "~3.1.1" event-emitter "~0.3.5" -es6-promise@~4.0.3: - version "4.0.5" - resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.0.5.tgz#7882f30adde5b240ccfa7f7d78c548330951ae42" +es6-promise@^4.0.3: + version "4.1.1" + resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.1.1.tgz#8811e90915d9a0dba36274f0b242dbda78f9c92a" es6-set@~0.1.5: version "0.1.5" @@ -2074,7 +2075,7 @@ extract-text-webpack-plugin@3.0.0: schema-utils "^0.3.0" webpack-sources "^1.0.1" -extract-zip@~1.6.5: +extract-zip@^1.6.5: version "1.6.6" resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.6.6.tgz#1290ede8d20d0872b429fd3f351ca128ec5ef85c" dependencies: @@ -2317,6 +2318,14 @@ fs-extra@^0.23.1: path-is-absolute "^1.0.0" rimraf "^2.2.8" +fs-extra@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-1.0.0.tgz#cd3ce5f7e7cb6145883fcae3191e9877f8587950" + dependencies: + graceful-fs "^4.1.2" + jsonfile "^2.1.0" + klaw "^1.0.0" + fs-extra@^4.0.0, fs-extra@^4.0.2: version "4.0.2" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.2.tgz#f91704c53d1b461f893452b0c307d9997647ab6b" @@ -2325,14 +2334,6 @@ fs-extra@^4.0.0, fs-extra@^4.0.2: jsonfile "^4.0.0" universalify "^0.1.0" -fs-extra@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-1.0.0.tgz#cd3ce5f7e7cb6145883fcae3191e9877f8587950" - dependencies: - graceful-fs "^4.1.2" - jsonfile "^2.1.0" - klaw "^1.0.0" - fs-write-stream-atomic@^1.0.8: version "1.0.10" resolved "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz#b47df53493ef911df75731e70a9ded0189db40c9" @@ -2759,7 +2760,7 @@ hash.js@^1.0.0, hash.js@^1.0.3: inherits "^2.0.3" minimalistic-assert "^1.0.0" -hasha@~2.2.0: +hasha@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/hasha/-/hasha-2.2.0.tgz#78d7cbfc1e6d66303fe79837365984517b2f6ee1" dependencies: @@ -3526,7 +3527,7 @@ karma@~1.7.0: tmp "0.0.31" useragent "^2.1.12" -kew@~0.7.0: +kew@^0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/kew/-/kew-0.7.0.tgz#79d93d2d33363d6fdd2970b335d9141ad591d79b" @@ -4287,8 +4288,8 @@ node-pre-gyp@^0.6.36: tar-pack "^3.4.0" node-sass@^4.3.0: - version "4.5.3" - resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.5.3.tgz#d09c9d1179641239d1b97ffc6231fdcec53e1568" + version "4.6.0" + resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.6.0.tgz#1a54f5f4502e3cde310a26d6346266fd667271d9" dependencies: async-foreach "^0.1.3" chalk "^1.1.1" @@ -4306,7 +4307,7 @@ node-sass@^4.3.0: node-gyp "^3.3.1" npmlog "^4.0.0" request "^2.79.0" - sass-graph "^2.1.1" + sass-graph "^2.2.4" stdout-stream "^1.4.0" "nopt@2 || 3": @@ -4709,18 +4710,18 @@ performance-now@^2.1.0: resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" phantomjs-prebuilt@^2.1.14, phantomjs-prebuilt@^2.1.7: - version "2.1.15" - resolved "https://registry.yarnpkg.com/phantomjs-prebuilt/-/phantomjs-prebuilt-2.1.15.tgz#20f86e82d3349c505917527745b7a411e08b3903" - dependencies: - es6-promise "~4.0.3" - extract-zip "~1.6.5" - fs-extra "~1.0.0" - hasha "~2.2.0" - kew "~0.7.0" - progress "~1.1.8" - request "~2.81.0" - request-progress "~2.0.1" - which "~1.2.10" + version "2.1.16" + resolved "https://registry.yarnpkg.com/phantomjs-prebuilt/-/phantomjs-prebuilt-2.1.16.tgz#efd212a4a3966d3647684ea8ba788549be2aefef" + dependencies: + es6-promise "^4.0.3" + extract-zip "^1.6.5" + fs-extra "^1.0.0" + hasha "^2.2.0" + kew "^0.7.0" + progress "^1.1.8" + request "^2.81.0" + request-progress "^2.0.1" + which "^1.2.10" pify@^2.0.0, pify@^2.3.0: version "2.3.0" @@ -5082,7 +5083,7 @@ process@^0.11.0: version "0.11.10" resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182" -progress@~1.1.8: +progress@^1.1.8: version "1.1.8" resolved "https://registry.yarnpkg.com/progress/-/progress-1.1.8.tgz#e260c78f6161cdd9b0e56cc3e0a85de17c7a57be" @@ -5214,12 +5215,19 @@ randomatic@^1.1.3: is-number "^3.0.0" kind-of "^4.0.0" -randombytes@^2.0.0, randombytes@^2.0.1: +randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5: version "2.0.5" resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.0.5.tgz#dc009a246b8d09a177b4b7a0ae77bc570f4b1b79" dependencies: safe-buffer "^5.1.0" +randomfill@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/randomfill/-/randomfill-1.0.3.tgz#b96b7df587f01dd91726c418f30553b1418e3d62" + dependencies: + randombytes "^2.0.5" + safe-buffer "^5.1.0" + range-parser@^1.0.3, range-parser@^1.2.0, range-parser@~1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e" @@ -5427,13 +5435,13 @@ replace-ext@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-0.0.1.tgz#29bbd92078a739f0bcce2b4ee41e837953522924" -request-progress@~2.0.1: +request-progress@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/request-progress/-/request-progress-2.0.1.tgz#5d36bb57961c673aa5b788dbc8141fdf23b44e08" dependencies: throttleit "^1.0.0" -request@2, request@^2.78.0, request@^2.79.0: +request@2, request@^2.78.0, request@^2.79.0, request@^2.81.0: version "2.83.0" resolved "https://registry.yarnpkg.com/request/-/request-2.83.0.tgz#ca0b65da02ed62935887808e6f510381034e3356" dependencies: @@ -5460,7 +5468,7 @@ request@2, request@^2.78.0, request@^2.79.0: tunnel-agent "^0.6.0" uuid "^3.1.0" -request@2.81.0, request@~2.81.0: +request@2.81.0: version "2.81.0" resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0" dependencies: @@ -5561,7 +5569,7 @@ safe-buffer@5.1.1, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, s version "5.1.1" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853" -sass-graph@^2.1.1: +sass-graph@^2.2.4: version "2.2.4" resolved "https://registry.yarnpkg.com/sass-graph/-/sass-graph-2.2.4.tgz#13fbd63cd1caf0908b9fd93476ad43a51d1e0b49" dependencies: @@ -5873,7 +5881,7 @@ source-map@0.1.x, source-map@~0.1.7: dependencies: amdefine ">=0.0.4" -source-map@0.5.x, source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.0, source-map@~0.5.1, source-map@~0.5.3: +source-map@0.5.x, source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.0, source-map@~0.5.1: version "0.5.7" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" @@ -6337,8 +6345,8 @@ tslint@~5.7.0: tsutils "^2.8.1" tsutils@^2.8.1: - version "2.12.1" - resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.12.1.tgz#f4d95ce3391c8971e46e54c4cf0edb0a21dd5b24" + version "2.12.2" + resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.12.2.tgz#ad58a4865d17ec3ddb6631b6ca53be14a5656ff3" dependencies: tslib "^1.7.1" @@ -6376,15 +6384,15 @@ typescript@~2.4.2: resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.4.2.tgz#f8395f85d459276067c988aa41837a8f82870844" uglify-es@^3.1.3: - version "3.1.6" - resolved "https://registry.yarnpkg.com/uglify-es/-/uglify-es-3.1.6.tgz#b0f818c055a7e9538abc2286e70c743f2938311f" + version "3.1.7" + resolved "https://registry.yarnpkg.com/uglify-es/-/uglify-es-3.1.7.tgz#4994b6d7dee6ae0b05bd4fb5d18c9ae2023b6d58" dependencies: commander "~2.11.0" source-map "~0.6.1" uglify-js@3.1.x: - version "3.1.6" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.1.6.tgz#918832602036e95d2318e11f27ee8461a8592c5d" + version "3.1.7" + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.1.7.tgz#13379168b7fcf132ed977254a7802e0a294b1ffb" dependencies: commander "~2.11.0" source-map "~0.6.1" @@ -6737,11 +6745,11 @@ webpack-merge@^4.1.0: lodash "^4.17.4" webpack-sources@^1.0.0, webpack-sources@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.0.1.tgz#c7356436a4d13123be2e2426a05d1dad9cbe65cf" + version "1.0.2" + resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.0.2.tgz#d0148ec083b3b5ccef1035a6b3ec16442983b27a" dependencies: source-list-map "^2.0.0" - source-map "~0.5.3" + source-map "~0.6.1" webpack-subresource-integrity@^1.0.1: version "1.0.1" @@ -6803,18 +6811,12 @@ which-module@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" -which@1, which@^1.2.1, which@^1.2.12, which@^1.2.9: +which@1, which@^1.2.1, which@^1.2.10, which@^1.2.12, which@^1.2.9: version "1.3.0" resolved "https://registry.yarnpkg.com/which/-/which-1.3.0.tgz#ff04bdfc010ee547d780bec38e1ac1c2777d253a" dependencies: isexe "^2.0.0" -which@~1.2.10: - version "1.2.14" - resolved "https://registry.yarnpkg.com/which/-/which-1.2.14.tgz#9a87c4378f03e827cecaf1acdf56c736c01c14e5" - dependencies: - isexe "^2.0.0" - wide-align@^1.1.0: version "1.1.2" resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.2.tgz#571e0f1b0604636ebc0dfc21b0339bbe31341710" From 900b593d7c66248086892b9cedfa24563fb8e270 Mon Sep 17 00:00:00 2001 From: Michel Palourdio Date: Sun, 5 Nov 2017 18:19:48 +0100 Subject: [PATCH 10/15] Add CHANGELOG.MD to copy-misc-files task --- gulpfile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gulpfile.js b/gulpfile.js index c03e6b8..70fb74c 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -31,7 +31,7 @@ gulp.task('copy-package-json', function () { }); gulp.task('copy-misc-files', function () { - return gulp.src(['README.MD', 'LICENSE']) + return gulp.src(['README.MD', 'LICENSE', 'CHANGELOG.MD']) .pipe(gulp.dest(distDir)); }); From 43a7816ed314dad02f2c2f0d3b5f190b3af3d34c Mon Sep 17 00:00:00 2001 From: Michel Palourdio Date: Sun, 5 Nov 2017 21:15:59 +0100 Subject: [PATCH 11/15] Add main.ts to .npmignore --- .npmignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.npmignore b/.npmignore index 7cd7b6a..a9a625f 100644 --- a/.npmignore +++ b/.npmignore @@ -12,6 +12,7 @@ coverage .travis.yml gulpfile.js karma.conf.js +main.ts polyfills.ts test.ts tsconfig.json From 32898b14c2af7aa39f2adba2da4a41f3ed1c38c6 Mon Sep 17 00:00:00 2001 From: Michel Palourdio Date: Mon, 6 Nov 2017 09:26:05 +0100 Subject: [PATCH 12/15] Add more things to ignore lists --- .gitignore | 1 + .npmignore | 1 + 2 files changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 0be9cc0..6d50bcf 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ tmp *.iml dist coverage +.idea/ diff --git a/.npmignore b/.npmignore index a9a625f..4864397 100644 --- a/.npmignore +++ b/.npmignore @@ -21,3 +21,4 @@ tsconfig.spec.json tslint.json yarn.lock *.iml +.idea/ From c4c0a513181b1b98c4a006675f7309b22f0fe029 Mon Sep 17 00:00:00 2001 From: Michel Palourdio Date: Mon, 6 Nov 2017 11:00:38 +0100 Subject: [PATCH 13/15] Re-order dependencies --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ad2ba8f..4e6768f 100644 --- a/package.json +++ b/package.json @@ -37,8 +37,8 @@ "@angular/cli": "^1.5.0", "@angular/common": "^5.0.0", "@angular/compiler": "^5.0.0", - "@angular/core": "^5.0.0", "@angular/compiler-cli": "^5.0.0", + "@angular/core": "^5.0.0", "@angular/language-service": "^5.0.0", "@angular/platform-browser": "^5.0.0", "@angular/platform-browser-dynamic": "^5.0.0", From bef3476bada1d0c101bb637ae0e6418045e5158d Mon Sep 17 00:00:00 2001 From: Michel Palourdio Date: Mon, 6 Nov 2017 20:40:28 +0100 Subject: [PATCH 14/15] Add declaration=true --- tsconfig.ngc.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tsconfig.ngc.json b/tsconfig.ngc.json index c9f6009..12ce234 100644 --- a/tsconfig.ngc.json +++ b/tsconfig.ngc.json @@ -7,7 +7,8 @@ "rootDir": "./tmp", "noImplicitAny": true, "allowUnusedLabels": false, - "noImplicitReturns": true + "noImplicitReturns": true, + "declaration": true }, "include": [ "./tmp" From f0f3af11e4346d949fd7b91883e4b6f0f476b765 Mon Sep 17 00:00:00 2001 From: Michel Palourdio Date: Mon, 6 Nov 2017 20:50:33 +0100 Subject: [PATCH 15/15] Upgrade dependencies before release --- yarn.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/yarn.lock b/yarn.lock index 090812c..5640ede 100644 --- a/yarn.lock +++ b/yarn.lock @@ -149,14 +149,14 @@ tree-kill "^1.0.0" "@schematics/angular@~0.1.0": - version "0.1.0" - resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-0.1.0.tgz#cd6c445ead33144a532523d1ccac68c38a2b0050" + version "0.1.1" + resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-0.1.1.tgz#e0ebb7206a4382fecee235a790f689281229defb" dependencies: "@angular-devkit/core" "0.0.20" "@types/jasmine@*": - version "2.6.2" - resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-2.6.2.tgz#6e6d4cb183cd55c7a1ad6270bced10fdd5367a3c" + version "2.6.3" + resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-2.6.3.tgz#586963bfdd35e38f24a0a0b63a438cf521292ed9" "@types/jasmine@~2.5.53": version "2.5.54"