build(packaging): update @angular/cdk to 2.0.0-beta.11

BREAKING CHANGE: 1. usage related to cdk is changed 2. @angular version dependence update to ^4.4.3 (due to @angular/cdk) close #238, close #290
NG-ZORRO · Oct 28, 2017 · 3e007a2 · 3e007a2
1 parent e4f8337
commit 3e007a2
Show file tree

Hide file tree

Showing 65 changed files with 173 additions and 3,247 deletions.
diff --git a/integration/angular-cli/package.json b/integration/angular-cli/package.json
@@ -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"
   }
 }
diff --git a/integration/rollup/package.json b/integration/rollup/package.json
@@ -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",

diff --git a/integration/webpack/package.json b/integration/webpack/package.json
@@ -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",
@@ -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",

diff --git a/package.json b/package.json
@@ -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",
@@ -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",
@@ -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"
   }
 }
diff --git a/rollup.config.js b/rollup.config.js
@@ -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'
 
@@ -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,
 }
diff --git a/src/components/affix/nz-affix.component.ts b/src/components/affix/nz-affix.component.ts
@@ -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',

diff --git a/src/components/anchor/nz-anchor.component.ts b/src/components/anchor/nz-anchor.component.ts
@@ -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,

diff --git a/src/components/back-top/nz-back-top.component.ts b/src/components/back-top/nz-back-top.component.ts
@@ -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',

diff --git a/src/components/cascader/nz-cascader.component.ts b/src/components/cascader/nz-cascader.component.ts
@@ -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 { }
 
@@ -85,8 +85,8 @@ export interface CascaderOption {
   ],
   template       : `
     <div
-      nz-overlay-origin
-      #origin="nzOverlayOrigin"
+      cdkOverlayOrigin
+      #origin="cdkOverlayOrigin"
       #trigger
     >
       <div *ngIf="nzShowInput">
@@ -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"

diff --git a/src/components/cascader/nz-cascader.module.ts b/src/components/cascader/nz-cascader.module.ts
@@ -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({