Skip to content

Commit

Permalink
feat: upgrade ng to 12
Browse files Browse the repository at this point in the history
  • Loading branch information
why520crazy committed Jul 9, 2021
1 parent 3e87f4e commit eb35223
Show file tree
Hide file tree
Showing 31 changed files with 17,415 additions and 10,869 deletions.
2 changes: 1 addition & 1 deletion .docgenirc.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module.exports = {
mode: 'full',
title: 'NgxTethys',
title: 'TETHYS',
siteProjectName: 'site',
repoUrl: 'https://github.com/atinc/ngx-tethys',
logoUrl: 'https://cdn.worktile.com/open-sources/ngx-tethys/logos/tethys.png',
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ An UI components based on Worktile Design and Angular.
![](https://img.shields.io/badge/Made%20with%20Angular-red?logo=angular)
[![npm (scoped)](https://img.shields.io/npm/v/ngx-tethys?style=flat)](https://www.npmjs.com/package/ngx-tethys)
[![npm](https://img.shields.io/npm/dm/ngx-tethys)](https://www.npmjs.com/package/ngx-tethys)
[![release](https://img.shields.io/github/release-date/NG-ZORRO/ng-zorro-antd.svg?style=flat-square
[![release](https://img.shields.io/github/release-date/atinc/ngx-tethys.svg?style=flat-square
)](https://github.com/atinc/ngx-tethys)
[![docgeni](https://img.shields.io/badge/docs%20by-docgeni-348fe4)](https://github.com/docgeni/docgeni)
[![code style: prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg?style=flat-square)](https://github.com/prettier/prettier)
Expand Down
12 changes: 9 additions & 3 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@
"main": "site/src/main.ts",
"polyfills": "site/src/polyfills.ts",
"tsConfig": "site/tsconfig.app.json",
"aot": true,
"stylePreprocessorOptions": {
"includePaths": ["./site/src/styles"]
},
Expand All @@ -74,7 +73,13 @@
}
],
"styles": ["site/src/styles.scss"],
"scripts": []
"scripts": [],
"vendorChunk": true,
"extractLicenses": false,
"buildOptimizer": false,
"sourceMap": true,
"optimization": false,
"namedChunks": true
},
"configurations": {
"production": {
Expand Down Expand Up @@ -105,7 +110,8 @@
}
]
}
}
},
"defaultConfiguration": ""
},
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
Expand Down
7 changes: 4 additions & 3 deletions cdk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@
"name": "@tethys/cdk",
"version": "11.0.3",
"peerDependencies": {
"@angular/common": "^11.2.9",
"@angular/core": "^11.2.9"
"@angular/common": "^12.0.0",
"@angular/core": "^12.0.0",
"@angular/cdk": "^12.0.0"
},
"dependencies": {
"tslib": "^2.0.0"
"tslib": "^2.3.0"
}
}
4 changes: 2 additions & 2 deletions cdk/test.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// This file is required by karma.conf.js and loads recursively all the .spec and framework files

import 'zone.js/dist/zone';
import 'zone.js/dist/zone-testing';
import 'zone.js';
import 'zone.js/testing';
import { getTestBed } from '@angular/core/testing';
import { BrowserDynamicTestingModule, platformBrowserDynamicTesting } from '@angular/platform-browser-dynamic/testing';

Expand Down
2 changes: 1 addition & 1 deletion cdk/tsconfig.lib.prod.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
"declarationMap": false
},
"angularCompilerOptions": {
"enableIvy": false
"compilationMode": "partial"
}
}
6 changes: 3 additions & 3 deletions docs/guide/getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,13 @@ $ yarn add ngx-tethys
```
{
"styles": [
"node_modules/ngx-tethys/styles/main.bundle.scss"
"node_modules/ngx-tethys/styles/main.bundle.scss" // or main.bundle.css
]
}
```
-`style.scss`中引入预构建样式文件
```scss
@import "~ngx-tethys/styles/main.bundle.scss";
@import "~ngx-tethys/styles/main.bundle.scss"; // or main.bundle.css
```

### 引入图标
Expand Down Expand Up @@ -106,5 +106,5 @@ export class AppModule { }
<button thyButton="primary">主要按钮</button>
```

> 在 <=9.0.0 版本,`ngx-tethys` 提供了根入口`NgxTethysModule`导入所有模块,将来的版本会移出,请避免使用根入口模块。
> 在 <=11.0.0 版本,`ngx-tethys` 提供了根入口`NgxTethysModule`导入所有模块,将来的版本会移出,请避免使用根入口模块。
2 changes: 1 addition & 1 deletion docs/guide/intro.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ order: 0
## 当前版本
[![npm (scoped)](https://img.shields.io/npm/v/ngx-tethys?style=flat-square)](https://www.npmjs.com/package/ngx-tethys)
## 版本规则
`ngx-tethys``@angular/core` 保持相同的主版本号,目前支持 Angular `^10.0.0` 版本。
`ngx-tethys``@angular/core` 保持相同的主版本号,目前支持 Angular `^12.0.0` 版本。
## 依赖第三方库
- Components Dev Kit (CDK)
- date-fns
Expand Down
2 changes: 1 addition & 1 deletion docs/guide/migration-v11.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ order: 997

## 开始之前

- 首先确保你 `Node.js >= 12.14` || `Node.js >= 14.0`
- 首先确保你 `Node.js >= 12.14`
- 创建新的分支进行升级,或者把当前分支备份

## 自动升级
Expand Down
Loading

0 comments on commit eb35223

Please sign in to comment.