Skip to content

Commit

Permalink
fix(components): change the way to import subject
Browse files Browse the repository at this point in the history
  • Loading branch information
fisherspy committed Sep 30, 2018
1 parent 6620635 commit 88864ab
Show file tree
Hide file tree
Showing 8 changed files with 26 additions and 29 deletions.
2 changes: 1 addition & 1 deletion components/action-sheet/action-sheet-subject.service.ts
@@ -1,5 +1,5 @@
import { Injectable } from '@angular/core';
import { Subject } from 'rxjs/Subject';
import { Subject } from 'rxjs';

/* 浜嬩欢鏋氫妇 */
const enum actionSheetEvent {
Expand Down
2 changes: 1 addition & 1 deletion components/calendar/calendar.component.ts
Expand Up @@ -15,7 +15,7 @@ import PropsType from './calendar.props.component';
import { LocaleProviderService } from '../locale-provider/locale-provider.service';
import { mergeDateTime } from './util/index';
import { takeUntil } from 'rxjs/operators';
import { Subject } from 'rxjs/Subject';
import { Subject } from 'rxjs';

export { PropsType };

Expand Down
2 changes: 1 addition & 1 deletion components/date-picker/date-picker.component.ts
Expand Up @@ -9,7 +9,7 @@ import {
OnDestroy,
AfterViewInit
} from '@angular/core';
import { Subject } from 'rxjs/Subject';
import { Subject } from 'rxjs';
import { takeUntil } from 'rxjs/operators';
import { LocaleProviderService } from '../locale-provider/locale-provider.service';
import { DatePickerOptions } from './date-picker-options.provider';
Expand Down
@@ -1,7 +1,7 @@
import { Component, OnInit, Output, EventEmitter, ViewEncapsulation, OnDestroy, HostBinding } from '@angular/core';
import { LocaleProviderService } from '../../locale-provider/locale-provider.service';
import { takeUntil } from 'rxjs/operators';
import { Subject } from 'rxjs/Subject';
import { Subject } from 'rxjs';
const classnames = require('classnames');

@Component({
Expand Down
2 changes: 1 addition & 1 deletion components/menu/menu.component.ts
@@ -1,5 +1,5 @@
import { Component, OnInit, ViewEncapsulation, Input, Output, EventEmitter, OnDestroy } from '@angular/core';
import { Subject } from 'rxjs/Subject';
import { Subject } from 'rxjs';
import { LocaleProviderService } from '../locale-provider/locale-provider.service';
import { takeUntil } from 'rxjs/operators';

Expand Down
2 changes: 1 addition & 1 deletion components/picker/picker.component.ts
Expand Up @@ -17,7 +17,7 @@ import * as velocity from '../core/util/velocity';
import * as touchEvent from '../core/util/touch-event';
import { LocaleProviderService } from '../locale-provider/locale-provider.service';
import { takeUntil } from 'rxjs/operators';
import { Subject } from 'rxjs/Subject';
import { Subject } from 'rxjs';

@Component({
selector: 'Picker, nzm-picker',
Expand Down
2 changes: 1 addition & 1 deletion components/search-bar/search-bar.component.ts
Expand Up @@ -14,7 +14,7 @@ import {
} from '@angular/core';
import { trigger, state, animate, transition, style } from '@angular/animations';
import { LocaleProviderService } from '../locale-provider/locale-provider.service';
import { Subject } from 'rxjs/Subject';
import { Subject } from 'rxjs';
import { takeUntil } from 'rxjs/operators';
import { NG_VALUE_ACCESSOR } from '@angular/forms';

Expand Down
41 changes: 19 additions & 22 deletions package.json
@@ -1,6 +1,6 @@
{
"name": "ng-zorro-antd-mobile",
"version": "0.9.2",
"version": "0.9.3",
"description": "An enterprise-class mobile UI components based on Ant Design and Angular",
"license": "MIT",
"scripts": {
Expand All @@ -21,10 +21,6 @@
"test": "node site_scripts/generate-site init && ng test --watch=false --code-coverage",
"test-watch": "node site_scripts/generate-site init && ng test --watch=true --code-coverage",
"integration": "npm run generate && bash ./integration-test.sh",
"integration-cli": "npm run generate && cd integration/angular-cli && npm run integration",
"integration-webpack": "npm run generate && cd integration/webpack && npm run integration",
"integration-rollup": "npm run generate && cd integration/rollup && npm run integration",
"lint": "tslint -c tslint.json 'components/*/*.ts'",
"format": "prettier --write './components/**/*.{ts,tsx,js,scss}' && tslint --fix './components/**/*.{js,ts,tsx}'"
},
"main": "./bundles/antd.umd.js",
Expand All @@ -35,6 +31,7 @@
"keywords": [
"ant",
"design",
"ng-zorro-mobile",
"mobile",
"angular",
"ui",
Expand All @@ -44,14 +41,14 @@
"dependencies": {
"@angular/cdk": "^6.3.0",
"positioning": "^1.3.1",
"classnames": "^2.2.5",
"rxjs-compat": "^6.2.0"
"classnames": "^2.2.5"
},
"devDependencies": {
"node-prismjs": "^0.1.1",
"prismjs": "^1.10.0",
"codecov": "^3.0.0",
"remark": "^8.0.0",
"rxjs": "^6.0.0",
"rxjs": "^6.3.3",
"rxjs-compat": "^6.2.0",
"wrench": "^1.5.9",
"yaml-front-matter": "^3.4.0",
Expand All @@ -66,20 +63,20 @@
"marked": "^0.5.1",
"moment": "^2.20.0",
"ng-zorro-antd": "^1.1.0",
"@angular/animations": "^6.0.0",
"@angular/common": "^6.0.0",
"@angular/compiler": "^6.0.0",
"@angular/core": "^6.0.0",
"@angular/forms": "^6.0.0",
"@angular/http": "^6.0.0",
"@angular/platform-browser": "^6.0.0",
"@angular/platform-browser-dynamic": "^6.0.0",
"@angular/router": "^6.0.0",
"@angular/upgrade": "^6.0.0",
"@angular/animations": "^6.1.9",
"@angular/common": "^6.1.9",
"@angular/compiler": "^6.1.9",
"@angular/core": "^6.1.9",
"@angular/forms": "^6.1.9",
"@angular/http": "^6.1.9",
"@angular/platform-browser": "^6.1.9",
"@angular/platform-browser-dynamic": "^6.1.9",
"@angular/router": "^6.1.9",
"@angular/upgrade": "^6.1.9",
"@angular-devkit/build-angular": "~0.6.0",
"@angular/cli": "^6.0.0",
"@angular/compiler-cli": "^6.0.0",
"@angular/platform-server": "^6.0.0",
"@angular/cli": "^6.2.3",
"@angular/compiler-cli": "^6.1.9",
"@angular/platform-server": "^6.1.9",
"@types/jasmine": "~2.8.0",
"@types/jasminewd2": "^2.0.3",
"@types/node": "^6.0.45",
Expand All @@ -106,7 +103,7 @@
"rollup-plugin-uglify": "^2.0.1",
"ts-node": "^5.0.1",
"tslint": "^5.9.1",
"typescript": "^2.7.2"
"typescript": "^2.9.2"
},
"lint-staged": {
"{src,docs}/**/*.{scss}": [
Expand Down

0 comments on commit 88864ab

Please sign in to comment.