Skip to content
This repository has been archived by the owner on Jan 3, 2025. It is now read-only.

Commit

Permalink
chore: Upgrade to Angular 2 RC.5 (#3)
Browse files Browse the repository at this point in the history
Upgrades the store log monitor to Angular RC.5

BREAKING CHANGE:

With the introduction of NgModules, setting up StoreLogMonitor has changed.

Before:

```ts
import { instrumentStore } from '@ngrx/store-devtools';
import { useLogMonitor, StoreLogMonitorComponent } from '@ngrx/store-log-monitor';

@component({
  providers: [
    instrumentStore({ monitor: useLogMonitor() })
  ],
  directives: [
    StoreLogMonitorComponent
  ]
})
export class AppComponent { }
```

After:
```ts
import { StoreDevtoolsModule } from '@ngrx/store-devtools';
import { StoreLogMonitorModule, useLogMonitor } from '@ngrx/store-log-monitor';

@NgModule({
  imports: [
    StoreDevtoolsModule.instrumentStore({ monitor: useLogMonitor() }),
    StoreLogMonitorModule
  ]
})
export class AppModule { }
```
  • Loading branch information
MikeRyanDev authored Aug 26, 2016
1 parent dcf3441 commit 29656f3
Show file tree
Hide file tree
Showing 29 changed files with 174 additions and 240 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -53,4 +53,5 @@ __build__/**
!/typings/custom.d.ts

# Build Artifacts #
release
release
.ngc
41 changes: 21 additions & 20 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,30 +15,31 @@ npm install @ngrx/store-log-monitor --save

*Configure the monitor when instrumenting store*
```ts
import { instrumentStore } from '@ngrx/store-devtools';
import { useLogMonitor } from '@ngrx/store-log-monitor';

bootstrap(App, [
instrumentStore({
monitor: useLogMonitor({
visible: true,
position: 'right'
})
})
]);
import { StoreDevtoolsModule } from '@ngrx/store-devtools';
import { StoreLogMonitorModule, useLogMonitor } from '@ngrx/store-log-monitor';

@NgModule({
imports: [
StoreDevtoolsModule.instrumentStore({
monitor: useLogMonitor({
visible: true,
position: 'right'
})
}),
StoreLogMonitorModule
]
})
export class AppModule { }
```

*Add the StoreLogMonitorComponent to your app*
*Use the StoreLogMonitor component in your app*

```ts
import { StoreLogMonitorComponent } from '@ngrx/store-log-monitor';

@Component({
selector: 'app',
directives: [ StoreLogMonitorComponent ],
template: `
<ngrx-store-log-monitor toggleCommand="ctrl-h" positionCommand="ctrl-m"></ngrx-store-log-monitor>
`
selector: 'app',
template: `
<ngrx-store-log-monitor toggleCommand="ctrl-h" positionCommand="ctrl-m"></ngrx-store-log-monitor>
`
})
export class App { }
export class AppComponent { }
```
76 changes: 0 additions & 76 deletions karma.conf.js

This file was deleted.

2 changes: 0 additions & 2 deletions lib/index.ts

This file was deleted.

50 changes: 16 additions & 34 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,26 +1,22 @@
{
"name": "@ngrx/store-log-monitor",
"version": "2.0.0-beta.1",
"version": "3.0.0",
"description": "Store log monitor for @ngrx/store-devtools",
"main": "./index.js",
"scripts": {
"lint": "npm-run-all lint:*",
"lint:lib": "tslint lib/**/*.ts",
"lint:lib": "tslint src/**/*.ts",
"lint:spec": "tslint spec/**/*.ts",
"typings": "typings install",
"clean": "npm-run-all clean:*",
"clean:release": "rm -rf ./release",
"clean:typings": "rm -rf ./typings",
"prebuild": "npm-run-all clean typings karma",
"build": "npm-run-all build:cjs build:es6",
"build:cjs": "tsc --p tsconfig.es5.json --diagnostics --pretty",
"build:es6": "tsc -m es2015 --outDir ./release/esm --target ES6 -d --diagnostics --pretty",
"prebuild": "npm-run-all clean test",
"build": "npm-run-all build:cjs build:esm",
"build:cjs": "ngc --p tsconfig.json",
"build:esm": "ngc -p tsconfig.esm.json",
"prepare": "npm-run-all prepare:*",
"prepare:es6": "cp -R ./release/esm ./release/npm",
"prepare:package": "cp ./{package.json,README.md,LICENSE} ./release/npm",
"test": "npm-run-all clean typings karma",
"karma": "karma start --single-run",
"karma:watch": "karma start",
"prepare:ts": "cp -R ./src ./release",
"prepare:package": "cp ./{package.json,README.md,LICENSE} ./release",
"test": "echo 'Tests not implemented'",
"changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 0",
"postbuild": "npm run prepare",
"preversion": "npm run test",
Expand Down Expand Up @@ -54,40 +50,26 @@
"homepage": "https://github.com/ngrx/store-log-monitor#readme",
"peerDependencies": {
"rxjs": "5.0.0-beta.6",
"@angular/core": "^2.0.0-rc.1",
"@angular/core": "^2.0.0-rc.5",
"@ngrx/store": "^2.0.0",
"@ngrx/store-devtools": "^2.0.0-beta.1"
"@ngrx/store-devtools": "^2.0.0-beta.5"
},
"devDependencies": {
"@angular/common": "^2.0.0-rc.1",
"@angular/compiler": "^2.0.0-rc.1",
"@angular/compiler": "^2.0.0-rc.5",
"@angular/compiler-cli": "^0.5.0",
"@angular/core": "^2.0.0-rc.1",
"@angular/platform-browser": "^2.0.0-rc.1",
"@angular/platform-browser": "^2.0.0-rc.5",
"@angular/platform-browser-dynamic": "^2.0.0-rc.1",
"@angular/platform-server": "^2.0.0-rc.5",
"@ngrx/core": "^1.0.0",
"@ngrx/store": "^2.0.0",
"@ngrx/store-devtools": "^2.0.0-beta.1",
"conventional-changelog-cli": "^1.1.1",
"core-js": "^2.2.2",
"istanbul-instrumenter-loader": "^0.2.0",
"jasmine-core": "^2.4.1",
"karma": "^0.13.22",
"karma-chrome-launcher": "^0.2.3",
"karma-coverage": "^0.5.5",
"karma-jasmine": "^0.3.8",
"karma-mocha-reporter": "^2.0.0",
"karma-sourcemap-loader": "^0.3.7",
"karma-typescript-preprocessor": "0.0.21",
"karma-webpack": "^1.7.0",
"npm-run-all": "^1.7.0",
"reflect-metadata": "^0.1.3",
"rxjs": "5.0.0-beta.6",
"source-map-loader": "^0.1.5",
"ts-loader": "^0.8.1",
"tslint": "^3.6.0",
"typescript": "^1.8.9",
"typings": "^1.0.4",
"webpack": "^1.12.14",
"zone.js": "^0.6.8"
"typescript": "^2.0.0"
}
}
5 changes: 0 additions & 5 deletions spec/index.spec.ts

This file was deleted.

19 changes: 0 additions & 19 deletions spec/tsconfig.json

This file was deleted.

File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ import 'rxjs/add/operator/map';
import { Component, Input, Output, Renderer } from '@angular/core';
import { Observable } from 'rxjs/Observable';
import { Subject } from 'rxjs/Subject';

import { KEYCODES } from './keycodes';


export interface ParsedCommand {
name?: string;
ctrl: boolean;
Expand All @@ -24,7 +24,7 @@ export interface ParsedCommand {
}
})
export class CommanderComponent {
private keydown$ = new Subject<KeyboardEvent>();
public keydown$ = new Subject<KeyboardEvent>();
private _ignoreTags = ['INPUT', 'SELECT', 'TEXTAREA'];

@Input() shortcut: string;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,13 @@ import { StoreDevtools } from '@ngrx/store-devtools';
import { Component, ChangeDetectionStrategy, Input} from '@angular/core';
import { Subject } from 'rxjs/Subject';
import { Observable } from 'rxjs/Observable';

import { DockState } from './reducer';
import { CommanderComponent } from './commander';
import { DockComponent } from './dock';
import { DockActions } from './actions';


@Component({
selector: 'dock-monitor',
changeDetection: ChangeDetectionStrategy.OnPush,
directives: [ DockComponent, CommanderComponent ],
providers: [ DockActions ],
template: `
<ngrx-commander [shortcut]="toggleCommand" (command)="toggle$.next($event)"></ngrx-commander>
<ngrx-commander [shortcut]="positionCommand" (command)="changePosition$.next($event)"></ngrx-commander>
Expand Down Expand Up @@ -45,11 +40,11 @@ export class DockMonitorComponent {
position$ = this.state$.map(s => s.position).distinctUntilChanged();
size$ = this.state$.map(s => s.size).distinctUntilChanged();

private toggle$ = new Subject();
public toggle$ = new Subject();
private toggleAction$ = this.toggle$
.map(() => this.actions.toggleVisibility());

private changePosition$ = new Subject();
public changePosition$ = new Subject();
private positionAction$ = this.changePosition$
.map(() => this.actions.changePosition());
}
File renamed without changes.
29 changes: 29 additions & 0 deletions src/dock-monitor/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { CommanderComponent } from './commander';
import { DockComponent } from './dock';
import { DockMonitorComponent } from './dock-monitor';
import { DockActions } from './actions';


@NgModule({
imports: [
CommonModule
],
declarations: [
CommanderComponent,
DockComponent,
DockMonitorComponent
],
providers: [
DockActions
],
exports: [
DockMonitorComponent
]
})
export class DockMonitorModule {

}

export { useDockMonitor, DockState } from './reducer';
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { combineReducers, ActionReducer } from '@ngrx/store';
import { DockActions } from './actions';


export const POSITIONS = ['left', 'top', 'right', 'bottom'];
export type PositionsType = 'left' | 'top' | 'right' | 'bottom';

Expand Down
24 changes: 24 additions & 0 deletions src/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { DockMonitorModule } from './dock-monitor';
import { LogMonitorModule } from './log-monitor';
import { StoreLogMonitorComponent } from './store-log-monitor';


@NgModule({
imports: [
CommonModule,
DockMonitorModule,
LogMonitorModule
],
declarations: [
StoreLogMonitorComponent
],
exports: [
StoreLogMonitorComponent
]
})
export class StoreLogMonitorModule { }


export { useDockMonitor as useLogMonitor, DockState as LogMonitorState } from './dock-monitor';
19 changes: 19 additions & 0 deletions src/json-tree/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { JsonNodeComponent } from './json-node';
import { JsonTreeComponent } from './json-tree';


@NgModule({
imports: [
CommonModule
],
declarations: [
JsonNodeComponent,
JsonTreeComponent
],
exports: [
JsonTreeComponent
]
})
export class JsonTreeModule { }
Loading

0 comments on commit 29656f3

Please sign in to comment.