From 2e848d66a331d3c5e4de0c91cb15902987b7549b Mon Sep 17 00:00:00 2001 From: Janne Julkunen Date: Sun, 26 Mar 2017 17:41:49 +0300 Subject: [PATCH] Bumped up the version and changed project name --- CHANGELOG.md | 6 ++++++ example/package.json | 9 +++++---- example/src/app/app.component.ts | 2 +- example/src/app/app.module.ts | 4 ++-- example/src/tsconfig.json | 4 ++++ package.json | 27 ++++++++++++--------------- src/index.ts | 11 ++++++++++- src/lib/font-picker.component.ts | 2 +- src/lib/font-picker.module.ts | 2 +- src/lib/index.ts | 27 +++++++++++++++++++++------ 10 files changed, 63 insertions(+), 31 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e5acd62..02ec086 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +2.5.0 Last 2.x release + + - Preparing for moving to Angular 4.x + + - Changed from angular2 to ngx prefix + 2.1.1 Bug fix release - Fixed the font change emitting diff --git a/example/package.json b/example/package.json index 638dec6..96be69e 100644 --- a/example/package.json +++ b/example/package.json @@ -1,8 +1,8 @@ { - "name": "angular2-font-picker-example", - "description": "Example app for the angular2-font-picker", + "name": "ngx-font-picker-example", + "description": "Example app for the ngx-font-picker", "license": "MIT", - "version": "2.1.1", + "version": "2.5.0", "tslint": { "extends": "./tslint.json" }, @@ -45,7 +45,8 @@ "@angular/platform-browser": "~2.4.0", "@angular/platform-browser-dynamic": "~2.4.0", "@angular/router": "~3.4.0", - "angular2-font-picker": "~2.0.0", + "ngx-font-picker": "~2.5.0", + "ngx-perfect-scrollbar": "~2.5.0", "core-js": "~2.4.0", "rxjs": "~5.0.0", "webfontloader": "~1.6.0", diff --git a/example/src/app/app.component.ts b/example/src/app/app.component.ts index 54326a4..68fb3a0 100644 --- a/example/src/app/app.component.ts +++ b/example/src/app/app.component.ts @@ -1,6 +1,6 @@ import { Component } from '@angular/core'; -import { Font } from 'angular2-font-picker'; +import { Font } from 'ngx-font-picker'; @Component({ moduleId: module.id + '', diff --git a/example/src/app/app.module.ts b/example/src/app/app.module.ts index 8f703ac..230dfe0 100644 --- a/example/src/app/app.module.ts +++ b/example/src/app/app.module.ts @@ -3,8 +3,8 @@ import { FlexLayoutModule } from '@angular/flex-layout'; import { BrowserModule } from '@angular/platform-browser'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; -import { FontPickerModule, FontPickerConfigInterface } from 'angular2-font-picker'; -import { PerfectScrollbarModule, PerfectScrollbarConfigInterface } from 'angular2-perfect-scrollbar'; +import { FontPickerModule, FontPickerConfigInterface } from 'ngx-font-picker'; +import { PerfectScrollbarModule, PerfectScrollbarConfigInterface } from 'ngx-perfect-scrollbar'; import { AppComponent } from './app.component'; diff --git a/example/src/tsconfig.json b/example/src/tsconfig.json index c0a0307..d60ca4f 100644 --- a/example/src/tsconfig.json +++ b/example/src/tsconfig.json @@ -3,6 +3,10 @@ "declaration": false, "emitDecoratorMetadata": true, "experimentalDecorators": true, + "lib": [ + "dom", + "es6" + ], "module": "commonjs", "moduleResolution": "node", "outDir": "./dist", diff --git a/package.json b/package.json index 35b26b8..3f2a4ac 100644 --- a/package.json +++ b/package.json @@ -1,10 +1,10 @@ { - "name": "angular2-font-picker", - "description": "Google fonts font picker widget for Angular 2", - "bugs": "https://github.com/zefoy/angular2-font-picker/issues", + "name": "ngx-font-picker", + "description": "Google fonts font picker widget for Angular", + "bugs": "https://github.com/zefoy/ngx-font-picker/issues", "license": "MIT", - "version": "2.1.1", - "main": "bundles/angular2-font-picker.umd.js", + "version": "2.5.0", + "main": "bundles/ngx-font-picker.umd.js", "module": "./dist/index.js", "typings": "./dist/index.d.ts", "tslint": { @@ -22,6 +22,7 @@ "build": "npm run build:umd && npm run build:aot", "deploy": "npm run build && npm run inline && npm publish", "inline": "ng2-inline --compress -b dist/lib/ -o ./ 'dist/lib/*.js'", + "release": "npm version -m 'New release with version %s'", "lint:ts": "tslint 'src/**/*.ts'", "lint:scss": "stylelint 'src/**/*.scss' --syntax scss", "build:js": "ngc -p src/tsconfig.json", @@ -32,10 +33,10 @@ }, "repository": { "type": "git", - "url": "https://github.com/zefoy/angular2-font-picker.git" + "url": "https://github.com/zefoy/ngx-font-picker.git" }, "dependencies": { - "angular2-perfect-scrollbar": "~2.0.0", + "ngx-perfect-scrollbar": "~2.5.0", "webfontloader": "~1.6.26" }, "devDependencies": { @@ -69,13 +70,9 @@ "zone.js": "~0.7.0" }, "peerDependencies": { - "@angular/common": "^2.0.0", - "@angular/core": "^2.0.0", - "@angular/forms": "^2.0.0", - "@angular/http": "^2.0.0", - "@angular/platform-browser": "^2.0.0", - "core-js": "^2.4.0", - "rxjs": "^5.0.0", - "zone.js": "^0.7.0" + "@angular/common": ">=2.0.0", + "@angular/core": ">=2.0.0", + "@angular/forms": ">=2.0.0", + "@angular/http": ">=2.0.0" } } diff --git a/src/index.ts b/src/index.ts index 11aece6..0844e3f 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1 +1,10 @@ -export * from './lib/index'; +export { + FontPickerComponent, FontPickerDirective, FontPickerService, + Font, GoogleFonts, + FontInterface, GoogleFontInterface, + FontPickerConfig, FontPickerConfigInterface, + FontSizePipe, FontStylesPipe, StatefulSlicePipe, + provideDefaultConfig, provideForRootGuard, + FONT_PICKER_CONFIG, FONT_PICKER_GUARD, + FontPickerModule +} from './lib/index'; diff --git a/src/lib/font-picker.component.ts b/src/lib/font-picker.component.ts index b7dc073..c7b1ea9 100644 --- a/src/lib/font-picker.component.ts +++ b/src/lib/font-picker.component.ts @@ -8,7 +8,7 @@ import 'rxjs/add/operator/distinctUntilChanged'; import { FormControl } from '@angular/forms'; import { Component, OnInit, ElementRef, ViewChild } from '@angular/core'; -import { PerfectScrollbarComponent, PerfectScrollbarConfigInterface } from 'angular2-perfect-scrollbar'; +import { PerfectScrollbarComponent, PerfectScrollbarConfigInterface } from 'ngx-perfect-scrollbar'; import { FontPickerService } from './font-picker.service'; diff --git a/src/lib/font-picker.module.ts b/src/lib/font-picker.module.ts index 5ec99b9..1508f26 100644 --- a/src/lib/font-picker.module.ts +++ b/src/lib/font-picker.module.ts @@ -4,7 +4,7 @@ import { HttpModule } from '@angular/http'; import { CommonModule } from '@angular/common'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; -import { PerfectScrollbarModule } from 'angular2-perfect-scrollbar'; +import { PerfectScrollbarModule } from 'ngx-perfect-scrollbar'; import { FontPickerService } from './font-picker.service'; import { FontPickerComponent } from './font-picker.component'; diff --git a/src/lib/index.ts b/src/lib/index.ts index 569e6d4..3032fcd 100644 --- a/src/lib/index.ts +++ b/src/lib/index.ts @@ -1,6 +1,21 @@ -export * from './font-picker.component'; -export * from './font-picker.directive'; -export * from './font-picker.module'; -export * from './font-picker.service'; -export * from './interfaces'; -export * from './pipes'; +export { FontPickerComponent } from './font-picker.component'; + +export { FontPickerDirective } from './font-picker.directive'; + +export { FontPickerService } from './font-picker.service'; + +export { + provideDefaultConfig, provideForRootGuard, + FONT_PICKER_CONFIG, FONT_PICKER_GUARD, + FontPickerModule +} from './font-picker.module'; + +export { + Font, GoogleFonts, + FontInterface, GoogleFontInterface, + FontPickerConfig, FontPickerConfigInterface +} from './interfaces'; + +export { + FontSizePipe, FontStylesPipe, StatefulSlicePipe +} from './pipes';