Skip to content

Commit

Permalink
Bumped up the version and changed project name
Browse files Browse the repository at this point in the history
  • Loading branch information
sconix committed Mar 26, 2017
1 parent 0218c12 commit 2e848d6
Show file tree
Hide file tree
Showing 10 changed files with 63 additions and 31 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
9 changes: 5 additions & 4 deletions example/package.json
Original file line number Diff line number Diff line change
@@ -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"
},
Expand Down Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion example/src/app/app.component.ts
Original file line number Diff line number Diff line change
@@ -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 + '',
Expand Down
4 changes: 2 additions & 2 deletions example/src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
4 changes: 4 additions & 0 deletions example/src/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
"declaration": false,
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
"lib": [
"dom",
"es6"
],
"module": "commonjs",
"moduleResolution": "node",
"outDir": "./dist",
Expand Down
27 changes: 12 additions & 15 deletions package.json
Original file line number Diff line number Diff line change
@@ -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": {
Expand All @@ -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",
Expand All @@ -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": {
Expand Down Expand Up @@ -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"
}
}
11 changes: 10 additions & 1 deletion src/index.ts
Original file line number Diff line number Diff line change
@@ -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';
2 changes: 1 addition & 1 deletion src/lib/font-picker.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
2 changes: 1 addition & 1 deletion src/lib/font-picker.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
27 changes: 21 additions & 6 deletions src/lib/index.ts
Original file line number Diff line number Diff line change
@@ -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';

0 comments on commit 2e848d6

Please sign in to comment.