From 808292a4fd7425b8a67e34f882db91d03466aff2 Mon Sep 17 00:00:00 2001 From: Oren Farhi Date: Thu, 13 Apr 2017 22:28:52 +0300 Subject: [PATCH] attempt to fix #147 (no an NgModule) --- CHANGELOG.md | 41 ++++++++++++++----- index.ts | 2 +- package.json | 23 ++++++----- public_api.ts | 3 +- src/modules/arithmetic-module.ts | 37 ----------------- ...index.ts => ngx-infinite-scroll.module.ts} | 2 +- src/ngx-infinite-scroll.ts | 10 ++--- tsconfig-build.json | 5 +-- 8 files changed, 54 insertions(+), 69 deletions(-) delete mode 100644 src/modules/arithmetic-module.ts rename src/modules/{index.ts => ngx-infinite-scroll.module.ts} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index ca58b9ac..36b6b4a8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,13 +1,34 @@ -## Angular library starter Changelog +## v 0.4.1 (2017/04/13) +* Fixes #147 - (__InfiniteScrollModule is not an NgModule__) - -### Mar 25, 2017 -* Upgrade to Angular 4 configuration +## v 0.4.0 (2017/04/12) +* Added Angular 4 support +* New starter code base ([based on angular-library-starter](https://github.com/robisim74/angular-library-starter)) - -### Mar 6, 2017 -* Add _compodoc_ for generating documentation +## v 0.3.3 (2017/03/01) + +### Updates +* reverted the fix of #126 + +## v 0.3.2 (2017/03/01) + +### Updates +* fixes [#126](https://github.com/orizens/angular2-infinite-scroll/issues/126) + +## v 0.3.1 (2017/02/15) + +### Updates +* added custom scrollable container from [#108](https://github.com/orizens/angular2-infinite-scroll/pull/108/files) + +## v 0.3.0 (2017/01/31) + +### Updates +* refactored infinite scroller to smaller modules with composition +* added "models" - includes interfaces for development + +## v 0.2.9 (2017/01/13) + +### Updates +* added changelog.md +* ([refactor(scroll): replaces throttle with debounce](https://github.com/orizens/angular2-infinite-scroll/pull/82)) - -### Feb 5, 2017 -* Create library \ No newline at end of file diff --git a/index.ts b/index.ts index 4aaf8f92..fc2fa81b 100644 --- a/index.ts +++ b/index.ts @@ -1 +1 @@ -export * from './public_api'; +import { InfiniteScrollModule } from './src/ngx-infinite-scroll'; diff --git a/package.json b/package.json index 37ae38c8..72939259 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ngx-infinite-scroll", - "version": "0.4.0", + "version": "0.4.1", "description": "Build an Angular library compatible with AoT compilation and Tree shaking", "main": "./bundles/ngx-infinite-scroll.umd.js", "module": "./modules/ngx-infinite-scroll.es5.js", @@ -12,10 +12,11 @@ "publish-lib": "npm publish ./dist", "publish:beta": "npm publish --tag beta ./dist", "compodoc": "compodoc -p tsconfig.json", - "compodoc-serve": "compodoc -s" + "compodoc-serve": "compodoc -s", + "transpile": "ngc -p ./tsconfig.json" }, "typings": "./index.d.ts", - "author": "", + "author": "Oren Farhi (orizens.com)", "repository": { "type": "git", "url": "https://github.com/orizens/ngx-infinite-scroll.git" @@ -35,14 +36,14 @@ "@angular/core": ">= 4.0.0" }, "devDependencies": { - "@angular/common": "4.0.0", - "@angular/compiler": "4.0.0", - "@angular/compiler-cli": "4.0.0", - "@angular/core": "4.0.0", - "@angular/platform-browser": "4.0.0", - "@angular/platform-browser-dynamic": "4.0.0", - "@angular/platform-server": "4.0.0", - "@angular/animations": "4.0.0", + "@angular/common": "^4.0.0", + "@angular/compiler": "^4.0.0", + "@angular/compiler-cli": "^4.0.0", + "@angular/core": "^4.0.0", + "@angular/platform-browser": "^4.0.0", + "@angular/platform-browser-dynamic": "^4.0.0", + "@angular/platform-server": "^4.0.0", + "@angular/animations": "^4.0.0", "@types/jasmine": "2.5.46", "@types/node": "7.0.10", "codelyzer": "3.0.0-beta.4", diff --git a/public_api.ts b/public_api.ts index cac48cee..878626fe 100644 --- a/public_api.ts +++ b/public_api.ts @@ -9,4 +9,5 @@ /** * Entry point for all public APIs of the package. */ -export * from './src/ngx-infinite-scroll'; +export { InfiniteScrollModule } from './src/modules/ngx-infinite-scroll.module'; + diff --git a/src/modules/arithmetic-module.ts b/src/modules/arithmetic-module.ts deleted file mode 100644 index db0d4837..00000000 --- a/src/modules/arithmetic-module.ts +++ /dev/null @@ -1,37 +0,0 @@ -import { NgModule, ModuleWithProviders } from '@angular/core'; - -import { SumService } from '../services/sum-service'; - -@NgModule({ - declarations: [ - // Pipes. - // Directives. - ], - exports: [ - // Pipes. - // Directives. - ] -}) -export class ArithmeticModule { - - /** - * Use in AppModule: new instance of SumService. - */ - public static forRoot(): ModuleWithProviders { - return { - ngModule: ArithmeticModule, - providers: [SumService] - }; - } - - /** - * Use in features modules with lazy loading: new instance of SumService. - */ - public static forChild(): ModuleWithProviders { - return { - ngModule: ArithmeticModule, - providers: [SumService] - }; - } - -} diff --git a/src/modules/index.ts b/src/modules/ngx-infinite-scroll.module.ts similarity index 100% rename from src/modules/index.ts rename to src/modules/ngx-infinite-scroll.module.ts index a54cccc8..3bb91503 100644 --- a/src/modules/index.ts +++ b/src/modules/ngx-infinite-scroll.module.ts @@ -7,9 +7,9 @@ import { ScrollRegister } from '../services/scroll-register'; import { ScrollResolver } from '../services/scroll-resolver'; @NgModule({ - imports: [], declarations: [InfiniteScroll], exports: [InfiniteScroll], + imports: [], providers: [ AxisResolverFactory, PositionResolverFactory, diff --git a/src/ngx-infinite-scroll.ts b/src/ngx-infinite-scroll.ts index 52087060..da0c0943 100644 --- a/src/ngx-infinite-scroll.ts +++ b/src/ngx-infinite-scroll.ts @@ -1,12 +1,12 @@ // Public classes. -// export { SumService } from './services/sum-service'; -// export { ArithmeticModule } from './modules/arithmetic-module'; - export { InfiniteScroll } from './modules/infinite-scroll'; export { PositionResolver, PositionResolverFactory } from './services/position-resolver'; export { AxisResolver, AxisResolverFactory } from './services/axis-resolver'; export { ScrollRegister } from './services/scroll-register'; export { ScrollResolver } from './services/scroll-resolver'; -export { InfiniteScrollModule } from './modules'; +export { InfiniteScrollModule } from './modules/ngx-infinite-scroll.module'; -export { ContainerRef, InfiniteScrollEvent, PositionElements, PositionStats, ScrollStats, ScrollerConfig} from './models'; \ No newline at end of file +export { + ContainerRef, InfiniteScrollEvent, + PositionElements, PositionStats, ScrollStats, ScrollerConfig +} from './models'; diff --git a/tsconfig-build.json b/tsconfig-build.json index 766a8f25..f5d35a07 100644 --- a/tsconfig-build.json +++ b/tsconfig-build.json @@ -17,14 +17,13 @@ ] }, "files": [ - "public_api.ts", - "node_modules/zone.js/dist/zone.js.d.ts" + "public_api.ts" ], "angularCompilerOptions": { "skipTemplateCodegen": true, "annotateForClosureCompiler": true, "strictMetadataEmit": true, "flatModuleOutFile": "index.js", - "flatModuleId": "angular-library-starter" + "flatModuleId": "ngx-infinite-scroll" } } \ No newline at end of file