Skip to content

Commit

Permalink
build(packaging): update @angular/cdk to 2.0.0-beta.11
Browse files Browse the repository at this point in the history
  • Loading branch information
wilsoncook committed Oct 3, 2017
1 parent 03b87c1 commit f23a172
Show file tree
Hide file tree
Showing 65 changed files with 173 additions and 3,247 deletions.
26 changes: 13 additions & 13 deletions integration/angular-cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,26 +15,26 @@
},
"private": true,
"dependencies": {
"@angular/animations": "^4.2.4",
"@angular/cdk": "2.0.0-beta.8",
"@angular/common": "^4.2.4",
"@angular/compiler": "^4.2.4",
"@angular/core": "^4.2.4",
"@angular/forms": "^4.2.4",
"@angular/http": "^4.2.4",
"@angular/platform-browser": "^4.2.4",
"@angular/platform-browser-dynamic": "^4.2.4",
"@angular/router": "^4.2.4",
"@angular/animations": "^4.4.3",
"@angular/cdk": "2.0.0-beta.11",
"@angular/common": "^4.4.3",
"@angular/compiler": "^4.4.3",
"@angular/core": "^4.4.3",
"@angular/forms": "^4.4.3",
"@angular/http": "^4.4.3",
"@angular/platform-browser": "^4.4.3",
"@angular/platform-browser-dynamic": "^4.4.3",
"@angular/router": "^4.4.3",
"core-js": "^2.4.1",
"moment": "^2.18.1",
"ng-zorro-antd": "file:lib/ng-zorro-antd",
"rxjs": "^5.4.2",
"zone.js": "^0.8.14"
},
"devDependencies": {
"@angular/cli": "1.3.2",
"@angular/compiler-cli": "^4.2.4",
"@angular/language-service": "^4.2.4",
"@angular/cli": "1.3.0",
"@angular/compiler-cli": "^4.4.3",
"@angular/language-service": "^4.4.3",
"typescript": "~2.3.3"
}
}
26 changes: 13 additions & 13 deletions integration/rollup/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,26 +20,26 @@
},
"private": true,
"dependencies": {
"@angular/animations": "^4.2.4",
"@angular/cdk": "2.0.0-beta.8",
"@angular/common": "^4.2.4",
"@angular/compiler": "^4.2.4",
"@angular/core": "^4.2.4",
"@angular/forms": "^4.2.4",
"@angular/http": "^4.2.4",
"@angular/platform-browser": "^4.2.4",
"@angular/platform-browser-dynamic": "^4.2.4",
"@angular/router": "^4.2.4",
"@angular/animations": "^4.4.3",
"@angular/cdk": "2.0.0-beta.11",
"@angular/common": "^4.4.3",
"@angular/compiler": "^4.4.3",
"@angular/core": "^4.4.3",
"@angular/forms": "^4.4.3",
"@angular/http": "^4.4.3",
"@angular/platform-browser": "^4.4.3",
"@angular/platform-browser-dynamic": "^4.4.3",
"@angular/router": "^4.4.3",
"core-js": "^2.4.1",
"moment": "^2.18.1",
"ng-zorro-antd": "file:lib/ng-zorro-antd",
"rxjs": "^5.4.2",
"zone.js": "^0.8.14"
},
"devDependencies": {
"@angular/cli": "1.3.2",
"@angular/compiler-cli": "^4.2.4",
"@angular/language-service": "^4.2.4",
"@angular/cli": "1.3.0",
"@angular/compiler-cli": "^4.4.3",
"@angular/language-service": "^4.4.3",
"http-server": "^0.10.0",
"rimraf": "^2.6.1",
"rollup": "^0.49.2",
Expand Down
26 changes: 13 additions & 13 deletions integration/webpack/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,16 @@
},
"private": true,
"dependencies": {
"@angular/animations": "^4.2.4",
"@angular/cdk": "2.0.0-beta.8",
"@angular/common": "^4.2.4",
"@angular/compiler": "^4.2.4",
"@angular/core": "^4.2.4",
"@angular/forms": "^4.2.4",
"@angular/http": "^4.2.4",
"@angular/platform-browser": "^4.2.4",
"@angular/platform-browser-dynamic": "^4.2.4",
"@angular/router": "^4.2.4",
"@angular/animations": "^4.4.3",
"@angular/cdk": "2.0.0-beta.11",
"@angular/common": "^4.4.3",
"@angular/compiler": "^4.4.3",
"@angular/core": "^4.4.3",
"@angular/forms": "^4.4.3",
"@angular/http": "^4.4.3",
"@angular/platform-browser": "^4.4.3",
"@angular/platform-browser-dynamic": "^4.4.3",
"@angular/router": "^4.4.3",
"core-js": "^2.4.1",
"moment": "^2.18.1",
"ng-zorro-antd": "file:lib/ng-zorro-antd",
Expand All @@ -32,9 +32,9 @@
},
"devDependencies": {
"@angular-devkit/build-optimizer": "0.0.18",
"@angular/cli": "1.3.2",
"@angular/compiler-cli": "^4.2.4",
"@angular/language-service": "^4.2.4",
"@angular/cli": "1.3.0",
"@angular/compiler-cli": "^4.4.3",
"@angular/language-service": "^4.4.3",
"@ngtools/webpack": "^1.6.2",
"html-webpack-plugin": "^2.30.1",
"typescript": "~2.3.3",
Expand Down
35 changes: 18 additions & 17 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,23 +35,23 @@
"url": "https://github.com/NG-ZORRO/ng-zorro-antd/issues"
},
"dependencies": {
"@angular/cdk": "2.0.0-beta.8",
"@angular/cdk": "2.0.0-beta.11",
"moment": "^2.18.1",
"tslib": "^1.7.1"
},
"devDependencies": {
"@angular/animations": "^4.0.0",
"@angular/cli": "1.3.0",
"@angular/common": "^4.0.0",
"@angular/compiler": "^4.0.0",
"@angular/compiler-cli": "^4.0.0",
"@angular/core": "^4.0.0",
"@angular/forms": "^4.0.0",
"@angular/http": "^4.0.0",
"@angular/language-service": "^4.0.0",
"@angular/platform-browser": "^4.0.0",
"@angular/platform-browser-dynamic": "^4.0.0",
"@angular/router": "^4.0.0",
"@angular/animations": "^4.4.3",
"@angular/common": "^4.4.3",
"@angular/compiler": "^4.4.3",
"@angular/compiler-cli": "^4.4.3",
"@angular/core": "^4.4.3",
"@angular/forms": "^4.4.3",
"@angular/http": "^4.4.3",
"@angular/platform-browser": "^4.4.3",
"@angular/platform-browser-dynamic": "^4.4.3",
"@angular/router": "^4.4.3",
"@angular/language-service": "^4.4.3",
"@types/jasmine": "~2.5.53",
"@types/jasminewd2": "~2.0.2",
"@types/node": "~6.0.60",
Expand All @@ -74,6 +74,7 @@
"rollup": "^0.49.2",
"rollup-plugin-node-resolve": "^3.0.0",
"rollup-plugin-replace": "^2.0.0",
"rollup-plugin-commonjs": "^8.2.1",
"rxjs": "^5.0.1",
"ts-node": "~3.2.0",
"tslint": "~5.3.2",
Expand All @@ -83,11 +84,11 @@
"zone.js": "^0.8.14"
},
"peerDependencies": {
"@angular/animations": "^4.0.0",
"@angular/cdk": "2.0.0-beta.8",
"@angular/common": "^4.0.0",
"@angular/core": "^4.0.0",
"@angular/forms": "^4.0.0",
"@angular/animations": "^4.4.3",
"@angular/cdk": "2.0.0-beta.11",
"@angular/common": "^4.4.3",
"@angular/core": "^4.4.3",
"@angular/forms": "^4.4.3",
"moment": "^2.18.1"
}
}
11 changes: 8 additions & 3 deletions rollup.config.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import resolve from 'rollup-plugin-node-resolve'
import replace from 'rollup-plugin-replace'
import resolve from 'rollup-plugin-node-resolve';
import replace from 'rollup-plugin-replace';
import commonjs from 'rollup-plugin-commonjs';

const format = process.env.ROLLUP_FORMAT || 'es'

Expand Down Expand Up @@ -68,7 +69,11 @@ export default {
},
exports: 'named',
name: 'ngZorro.antd',
plugins: [replace({ "import * as moment": "import moment" }), resolve()],
plugins: [
replace({ "import * as moment": "import moment" }),
resolve(),
commonjs(), // For rxjs currently
],
external: Object.keys(globals),
globals,
}
4 changes: 2 additions & 2 deletions src/components/affix/nz-affix.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ import {
HostBinding
} from '@angular/core';
// import { Observable } from 'rxjs/Observable';
import { RxChain } from '@angular/cdk';
import { RxChain } from '@angular/cdk/rxjs';
import { fromEvent } from 'rxjs/observable/fromEvent';
import { throttleTime } from 'rxjs/operator/throttleTime';
import { distinctUntilChanged } from 'rxjs/operator/distinctUntilChanged';
import { Subscription } from 'rxjs/Subscription';

import { NzScrollService } from "../core/scroll/nz-scroll.service";
import { NzScrollService } from '../core/scroll/nz-scroll.service';

@Component({
selector: 'nz-affix',
Expand Down
6 changes: 3 additions & 3 deletions src/components/anchor/nz-anchor.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ import {
Inject
} from '@angular/core';
import { DOCUMENT } from '@angular/platform-browser';
import { RxChain } from '@angular/cdk';
import { RxChain } from '@angular/cdk/rxjs';
import { fromEvent } from 'rxjs/observable/fromEvent';
import { throttleTime } from 'rxjs/operator/throttleTime';
import { distinctUntilChanged } from 'rxjs/operator/distinctUntilChanged';
import { Subscription } from 'rxjs/Subscription';

import { NzScrollService } from "../core/scroll/nz-scroll.service";
import { NzAnchorLinkComponent } from "./nz-anchor-link.component";
import { NzScrollService } from '../core/scroll/nz-scroll.service';
import { NzAnchorLinkComponent } from './nz-anchor-link.component';

type Section = {
comp: NzAnchorLinkComponent,
Expand Down
4 changes: 2 additions & 2 deletions src/components/back-top/nz-back-top.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ import {
animate
} from '@angular/animations';
// import { Observable } from 'rxjs/Observable';
import { RxChain } from '@angular/cdk';
import { RxChain } from '@angular/cdk/rxjs';
import { fromEvent } from 'rxjs/observable/fromEvent';
import { throttleTime } from 'rxjs/operator/throttleTime';
import { distinctUntilChanged } from 'rxjs/operator/distinctUntilChanged';
import { Subscription } from 'rxjs/Subscription';

import { NzScrollService } from "../core/scroll/nz-scroll.service";
import { NzScrollService } from '../core/scroll/nz-scroll.service';

@Component({
selector: 'nz-back-top',
Expand Down
16 changes: 8 additions & 8 deletions src/components/cascader/nz-cascader.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ import {
UP_ARROW,
DOWN_ARROW,
ENTER,
} from '@angular/cdk';
} from '@angular/cdk/keycodes';
const ESC = 27;

import { DropDownAnimation } from '../core/animation/dropdown-animations';
import { ConnectionPositionPair } from '../core/overlay/index';
import { ConnectionPositionPair } from '@angular/cdk/overlay';

function noop(): void { }

Expand Down Expand Up @@ -85,8 +85,8 @@ export interface CascaderOption {
],
template : `
<div
nz-overlay-origin
#origin="nzOverlayOrigin"
cdkOverlayOrigin
#origin="cdkOverlayOrigin"
#trigger
>
<div *ngIf="nzShowInput">
Expand Down Expand Up @@ -122,13 +122,13 @@ export interface CascaderOption {
<ng-content></ng-content>
</div>
<ng-template
nz-connected-overlay
hasBackdrop
[origin]="origin"
cdkConnectedOverlay
cdkConnectedOverlayHasBackdrop
[cdkConnectedOverlayOrigin]="origin"
(backdropClick)="_closeMenu()"
(detach)="_closeMenu()"
(positionChange)="onPositionChange($event)"
[open]="_popupVisible"
[cdkConnectedOverlayOpen]="_popupVisible"
>
<div #menu
[ngClass]="_menuCls"
Expand Down
2 changes: 1 addition & 1 deletion src/components/cascader/nz-cascader.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { NgModule } from '@angular/core';
import { NzCascaderComponent } from './nz-cascader.component';
import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
import { OverlayModule } from '../core/overlay/index';
import { OverlayModule } from '@angular/cdk/overlay';
import { NzInputModule } from '../input/nz-input.module';

@NgModule({
Expand Down
Loading

0 comments on commit f23a172

Please sign in to comment.