Skip to content

Commit

Permalink
feat(rx): Move reactive extension to its own project at http://github…
Browse files Browse the repository at this point in the history
  • Loading branch information
christopherthielen committed Jan 21, 2017
1 parent 8bc17f5 commit b0a672f
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 72 deletions.
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,8 @@
"main": "lib/index.js",
"typings": "lib/index.d.ts",
"dependencies": {
"ui-router-core": "=3.1.1"
"ui-router-core": "=3.1.1",
"ui-router-rx": "=0.2.0"
},
"peerDependencies": {
"@angular/common": "^2.0.0",
Expand Down
21 changes: 7 additions & 14 deletions src/directives/uiSref.ts
Original file line number Diff line number Diff line change
@@ -1,17 +1,10 @@
/** @ng2api @module directives */ /** */
import {UIRouter, UIRouterGlobals} from "ui-router-core";
import {Directive, Inject, Input} from "@angular/core";
import {Optional} from "@angular/core";
import {ElementRef} from "@angular/core";
import {Renderer} from "@angular/core";
import {UIView, ParentUIViewInject} from "./uiView";
import {extend, Obj} from "ui-router-core";
import {TransitionOptions} from "ui-router-core";
import {Globals} from "ui-router-core";
import {ReplaySubject} from 'rxjs/ReplaySubject';
import {Subscription} from 'rxjs/Subscription';
import {TargetState} from "ui-router-core";
import "../rx";
/** @ng2api @module directives */
/** */
import { UIRouter, UIRouterGlobals, extend, Obj, TransitionOptions, Globals, TargetState } from "ui-router-core";
import { Directive, Inject, Input, Optional, ElementRef, Renderer } from "@angular/core";
import { UIView, ParentUIViewInject } from "./uiView";
import { ReplaySubject } from "rxjs/ReplaySubject";
import { Subscription } from "rxjs/Subscription";

/**
* @internalapi
Expand Down
1 change: 0 additions & 1 deletion src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,3 @@ export * from "./directives/directives";
export * from "./location/uiRouterLocation";
export * from "./statebuilders/views";
export * from "./lazyLoad/lazyLoadNgModule";
export * from "./rx";
2 changes: 1 addition & 1 deletion src/providers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,10 @@ import { Ng2ViewDeclaration } from "./interface";
import { applyRootModuleConfig, applyModuleConfig } from "./uiRouterConfig";
import { UIRouterLocation } from "./location/uiRouterLocation";
import { RootModule, StatesModule, UIROUTER_ROOT_MODULE, UIROUTER_MODULE_TOKEN } from "./uiRouterNgModule";
import { UIRouterRx } from "./rx";
import { servicesPlugin } from "ui-router-core/lib/vanilla";
import { ServicesPlugin } from "ui-router-core/lib/vanilla/interface";
import { ng2LazyLoadBuilder } from "./statebuilders/lazyLoad";
import { UIRouterRx } from "ui-router-rx";

/**
* This is a factory function for a UIRouter instance
Expand Down
55 changes: 0 additions & 55 deletions src/rx.ts

This file was deleted.

0 comments on commit b0a672f

Please sign in to comment.