chore: bump to v10 (#741)

NG-ZORRO · Oct 16, 2020 · e81e65c · e81e65c
1 parent eb5a8e8
commit e81e65c
Show file tree

Hide file tree

Showing 7 changed files with 70 additions and 70 deletions.
diff --git a/docs/introduce.zh-CN.md b/docs/introduce.zh-CN.md
@@ -133,7 +133,7 @@ title: Ant Design Mobile of Angular <div class="github-btn"><a class="gh-btn" hr
 
 ## 支持 Angular 版本
 
-目前支持 Angular `^9.0.0` 版本。
+目前支持 Angular `^10.0.0` 版本。
 
 ## 安装
 

diff --git a/package.json b/package.json
@@ -44,31 +44,31 @@
     "frontend"
   ],
   "dependencies": {
-    "@angular/animations": "^9.0.0",
-    "@angular/cdk": "^9.2.1",
+    "@angular/animations": "^10.0.14",
+    "@angular/cdk": "^10.1.3",
     "@angular/pwa": "^0.13.8",
     "@ant-design/icons-angular": "^9.0.1",
     "ant-design": "^1.0.0",
     "antd-mobile-demo-data": "^0.2.0"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^0.900.0",
-    "@angular-devkit/build-ng-packagr": "^0.900.0",
-    "@angular-devkit/core": "^9.0.0",
-    "@angular-devkit/schematics": "^9.0.0",
-    "@angular/cli": "^9.0.0",
-    "@angular/common": "^9.0.0",
-    "@angular/compiler": "^9.0.0",
-    "@angular/compiler-cli": "^9.0.0",
-    "@angular/core": "^9.0.0",
-    "@angular/forms": "^9.0.0",
+    "@angular-devkit/build-angular": "^0.1000.8",
+    "@angular-devkit/build-ng-packagr": "^0.1000.8",
+    "@angular-devkit/core": "^10.0.8",
+    "@angular-devkit/schematics": "^10.0.8",
+    "@angular/cli": "^10.0.8",
+    "@angular/common": "^10.0.14",
+    "@angular/compiler": "^10.0.14",
+    "@angular/compiler-cli": "^10.0.14",
+    "@angular/core": "^10.0.14",
+    "@angular/forms": "^10.0.14",
     "@angular/http": "^7.2.13",
-    "@angular/platform-browser": "^9.0.0",
-    "@angular/platform-browser-dynamic": "^9.0.0",
-    "@angular/platform-server": "^9.0.0",
-    "@angular/router": "^9.0.0",
-    "@angular/service-worker": "^9.0.0",
-    "@angular/upgrade": "^9.0.0",
+    "@angular/platform-browser": "^10.0.14",
+    "@angular/platform-browser-dynamic": "^10.0.14",
+    "@angular/platform-server": "^10.0.14",
+    "@angular/router": "^10.0.14",
+    "@angular/service-worker": "^10.0.14",
+    "@angular/upgrade": "^10.0.14",
     "@schematics/angular": "^9.0.1",
     "@stackblitz/sdk": "^1.3.0",
     "@types/jasmine": "~2.8.8",
@@ -94,8 +94,8 @@
     "less": "^3.9.0",
     "less-plugin-clean-css": "^1.5.1",
     "marked": "~0.6.0",
-    "ng-packagr": "9.0.0",
-    "ng-zorro-antd": "^9.0.0-beta.3",
+    "ng-packagr": "10.1.0",
+    "ng-zorro-antd": "^10.0.0",
     "ngx-color": "^4.0.0",
     "ngx-infinite-scroll": "~7.1.0",
     "node-prismjs": "^0.1.1",
@@ -111,12 +111,12 @@
     "rollup-plugin-replace": "~2.2.0",
     "rollup-plugin-sourcemaps": "~0.4.2",
     "rollup-plugin-uglify": "~6.0.0",
-    "rxjs": "~6.5.3",
+    "rxjs": "~6.6.2",
     "ts-node": "~8.1.0",
-    "tsickle": "~0.37.0",
-    "tslib": "^1.10.0",
+    "tsickle": "~0.38.1",
+    "tslib": "^2.0.1",
     "tslint": "~5.18.0",
-    "typescript": "~3.7.4",
+    "typescript": "~3.9.7",
     "web-animations-js": "^2.3.1",
     "yaml-front-matter": "^4.0.0",
     "zone.js": "~0.10.2"

diff --git a/schematics/utils/testing.ts b/schematics/utils/testing.ts
@@ -6,20 +6,22 @@ const collectionPath = join('./node_modules/@schematics/angular/collection.json'
 /**
  * Create a base app used for testing.
  */
-export function createTestApp(): UnitTestTree {
+export async function createTestApp(): Promise<UnitTestTree> {
   const baseRunner = new SchematicTestRunner('schematics', collectionPath);
-  return baseRunner.runSchematic('application', {
-    directory        : '',
-    name             : 'app',
-    prefix           : 'app',
-    sourceDir        : 'src',
-    inlineStyle      : false,
-    inlineTemplate   : false,
-    viewEncapsulation: 'None',
-    version          : '1.2.3',
-    routing          : true,
-    style            : 'scss',
-    skipTests        : false,
-    minimal          : false
-  });
+  return await baseRunner
+    .runSchematicAsync('application', {
+      directory: '',
+      name: 'app',
+      prefix: 'app',
+      sourceDir: 'src',
+      inlineStyle: false,
+      inlineTemplate: false,
+      viewEncapsulation: 'None',
+      version: '1.2.3',
+      routing: true,
+      style: 'scss',
+      skipTests: false,
+      minimal: false
+    })
+    .toPromise();
 }
diff --git a/scripts/site/_site/src/app/app.module.ts b/scripts/site/_site/src/app/app.module.ts
@@ -5,43 +5,41 @@ import { BrowserModule, Title } from '@angular/platform-browser';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { PreloadAllModules, RouterModule } from '@angular/router';
 // import { ServiceWorkerModule } from '@angular/service-worker';
-import { NZ_CONFIG, NZ_ICONS, NzConfig } from 'ng-zorro-antd';
+import { NZ_ICONS } from 'ng-zorro-antd/icon';
+import { NzConfig, NZ_CONFIG } from 'ng-zorro-antd/core/config';
 import { ShareModule } from './share/share.module';
 import { IconDefinition } from '@ant-design/icons-angular';
 
 import { AppComponent } from './app.component';
 import { DEMOComponent } from './_demo/demo.component';
 import { routes } from './app.routing.module';
 import { environment } from '../environments/environment';
-import { NgZorroAntdMobileModule } from 'ng-zorro-antd-mobile';
 
 import { LeftOutline, RightOutline } from '@ant-design/icons-angular/icons';
+import { NgZorroAntdMobileModule } from 'ng-zorro-antd-mobile';
+// import { NgZorroAntdMobileModule } from '../../../../../components/ng-zorro-antd-mobile.module';
 
 const ngZorroConfig: NzConfig = {
   icon: { nzTwotoneColor: '#1890ff' }
 };
-const icons: IconDefinition[] = [ LeftOutline, RightOutline ];
+const icons: IconDefinition[] = [LeftOutline, RightOutline];
 
 @NgModule({
-  declarations: [
-    AppComponent, DEMOComponent
-  ],
-  imports     : [
+  declarations: [AppComponent, DEMOComponent],
+  imports: [
     BrowserModule,
     BrowserAnimationsModule,
     FormsModule,
     HttpClientModule,
     ShareModule,
     NgZorroAntdMobileModule,
-    RouterModule.forRoot(routes, environment.production ? { useHash: true, preloadingStrategy: PreloadAllModules } : {useHash: true}),
+    RouterModule.forRoot(
+      routes,
+      environment.production ? { useHash: true, preloadingStrategy: PreloadAllModules } : { useHash: true }
+    )
     // ServiceWorkerModule.register('ngsw-worker.js', { enabled: environment.production })
   ],
-  providers   : [
-    Title,
-    { provide: NZ_ICONS, useValue: icons },
-    { provide: NZ_CONFIG, useValue: ngZorroConfig }
-  ],
-  bootstrap   : [ AppComponent ]
+  providers: [Title, { provide: NZ_ICONS, useValue: icons }, { provide: NZ_CONFIG, useValue: ngZorroConfig }],
+  bootstrap: [AppComponent]
 })
-export class AppModule {
-}
+export class AppModule {}
diff --git a/scripts/site/_site/src/app/share/nz-codebox/nz-codebox.module.ts b/scripts/site/_site/src/app/share/nz-codebox/nz-codebox.module.ts
@@ -2,7 +2,9 @@ import { NgModule } from '@angular/core';
 import { NzCodeBoxComponent } from './nz-codebox.component';
 import { CommonModule } from '@angular/common';
 import { NzHighlightModule } from '../nz-highlight/nz-highlight.module';
-import { NzIconModule, NzModalModule, NzToolTipModule } from 'ng-zorro-antd';
+import { NzIconModule } from 'ng-zorro-antd/icon';
+import { NzModalModule } from 'ng-zorro-antd/modal';
+import { NzToolTipModule } from 'ng-zorro-antd/tooltip';
 
 const ngZorroModules = [
   NzIconModule,

diff --git a/scripts/site/_site/src/app/share/nz-nav-bottom/nz-nav-bottom.module.ts b/scripts/site/_site/src/app/share/nz-nav-bottom/nz-nav-bottom.module.ts
@@ -1,7 +1,7 @@
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
-import { NzIconModule } from 'ng-zorro-antd';
+import { NzIconModule } from 'ng-zorro-antd/icon';
 import { NzNavBottomComponent } from './nz-nav-bottom.component';
 
 @NgModule({

diff --git a/scripts/site/_site/src/app/share/share.module.ts b/scripts/site/_site/src/app/share/share.module.ts
@@ -2,20 +2,18 @@ import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { ReactiveFormsModule, FormsModule } from '@angular/forms';
 import { RouterModule } from '@angular/router';
-import {
-  NzSelectModule,
-  NzButtonModule,
-  NzGridModule,
-  NzMenuModule,
-  NzModalModule,
-  NzIconModule,
-  NzToolTipModule,
-  NzPopoverModule,
-  NzAffixModule,
-  NzAnchorModule
-} from 'ng-zorro-antd';
 import { InfiniteScrollModule } from 'ngx-infinite-scroll';
 import { ColorSketchModule } from 'ngx-color/sketch';
+import { NzIconModule } from 'ng-zorro-antd/icon';
+import { NzModalModule } from 'ng-zorro-antd/modal';
+import { NzToolTipModule } from 'ng-zorro-antd/tooltip';
+import { NzGridModule } from 'ng-zorro-antd/grid';
+import { NzSelectModule } from 'ng-zorro-antd/select';
+import { NzButtonModule } from 'ng-zorro-antd/button';
+import { NzMenuModule } from 'ng-zorro-antd/menu';
+import { NzPopoverModule } from 'ng-zorro-antd/popover';
+import { NzAffixModule } from 'ng-zorro-antd/affix';
+import { NzAnchorModule } from 'ng-zorro-antd/anchor';
 
 import { NzCodeBoxModule } from './nz-codebox/nz-codebox.module';
 import { NzHighlightModule } from './nz-highlight/nz-highlight.module';