Skip to content

Commit

Permalink
Merge pull request #864 from aijunhao/feature/angular15
Browse files Browse the repository at this point in the history
Feature/angular15
  • Loading branch information
mshmyw committed Dec 22, 2022
2 parents 0f4606d + 9f6b8cc commit 3ffa485
Show file tree
Hide file tree
Showing 14 changed files with 92 additions and 92 deletions.
4 changes: 2 additions & 2 deletions README-zh_CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@

> 需要 [polyfills](https://angular.io/guide/browser-support)
- `iOS 7.0+`
- `iOS 10.3+`
- `Android 4.4+`

## Angular 支持

现在支持 Angular `^14.0.0`.
现在支持 Angular `^15.0.0`.

## 安装

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ This is the **Angular** implementation of **Ant Design Mobile** specification, s

> with [polyfills](https://angular.io/guide/browser-support)
- `iOS 7.0+`
- `iOS 10.3+`
- `Android 4.4+`

## Angular Support

Now Supports Angular `^14.0.0`.
Now Supports Angular `^15.0.0`.

## Installation

Expand Down
40 changes: 20 additions & 20 deletions components/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ng-zorro-antd-mobile",
"version": "7.0.0",
"version": "8.0.0",
"description": "An enterprise-class mobile UI components based on Ant Design and Angular",
"schematics": "./schematics/collection.json",
"keywords": [
Expand All @@ -22,26 +22,26 @@
"url": "https://github.com/NG-ZORRO/ng-zorro-antd-mobile/issues"
},
"dependencies": {
"@angular/animations": "^14.2.8",
"@angular/cdk": "^14.2.6",
"@angular/common": "^14.2.8",
"@angular/compiler": "^14.2.8",
"@angular/core": "^14.2.8",
"@angular/forms": "^14.2.8",
"@angular/platform-browser": "^14.2.8",
"@angular/platform-browser-dynamic": "^14.2.8",
"@angular/router": "^14.2.8",
"@ant-design/icons-angular": "^14.1.0"
"@angular/animations": "^15.0.3",
"@angular/cdk": "^15.0.2",
"@angular/common": "^15.0.3",
"@angular/compiler": "^15.0.3",
"@angular/core": "^15.0.3",
"@angular/forms": "^15.0.3",
"@angular/platform-browser": "^15.0.3",
"@angular/platform-browser-dynamic": "^15.0.3",
"@angular/router": "^15.0.3",
"@ant-design/icons-angular": "^15.0.0"
},
"devDependencies": {
"@angular/upgrade": "^14.2.8",
"@angular-devkit/build-angular": "^14.2.7",
"@angular/cli": "^14.2.7",
"@angular/compiler-cli": "^14.2.8",
"@angular/platform-server": "^14.2.8",
"tslib": "^2.3.0",
"@angular/upgrade": "^15.0.3",
"@angular-devkit/build-angular": "^15.0.3",
"@angular/cli": "^15.0.3",
"@angular/compiler-cli": "^15.0.3",
"@angular/platform-server": "^15.0.3",
"tslib": "^2.4.1",
"tslint": "~6.1.3",
"typescript": "~4.7.4"
"typescript": "~4.8.4"
},
"lint-staged": {
"{src,docs}/**/*.{scss}": [
Expand All @@ -58,7 +58,7 @@
"test"
],
"browserslist": [
"iOS >= 7",
"Android >= 4.4"
"iOS > 10.3",
"Android > 4.4"
]
}
6 changes: 3 additions & 3 deletions components/test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ getTestBed().initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDyn
teardown: { destroyAfterEach: false }
});
// Then we find all the tests.
const context = require.context('./', true, /\.spec\.ts$/);
// And load the modules.
context.keys().map(context);
// const context = require.context('./', true, /\.spec\.ts$/);
// // And load the modules.
// context.keys().map(context);
3 changes: 2 additions & 1 deletion components/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
{
"extends": "../tsconfig.json",
"compilerOptions": {
"target": "es2015",
"target": "es2022",
"module": "es2015",
"sourceMap": true,
"moduleResolution": "node",
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
"useDefineForClassFields": false,
"declaration": true,
"outDir": "./dist",
"lib": ["es2015", "dom"]
Expand Down
3 changes: 2 additions & 1 deletion components/tsconfig.lib.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,15 @@
"extends": "./tsconfig.json",
"compilerOptions": {
"baseUrl": "./",
"target": "es2020",
"target": "es2022",
"module": "es2015",
"sourceMap": true,
"inlineSources": true,
"moduleResolution": "node",
"importHelpers": true,
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
"useDefineForClassFields": false,
"declaration": true,
"outDir": "../release",
"lib": ["es2015", "dom"]
Expand Down
2 changes: 1 addition & 1 deletion components/tsconfig.spec.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"compilerOptions": {
"outDir": "../out-tsc/spec",
"baseUrl": "./",
"target": "es2020",
"target": "es2022",
"types": [
"jasmine",
"node"
Expand Down
4 changes: 2 additions & 2 deletions docs/introduce.en-US.md
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ This is the **Angular** implementation of **Ant Design Mobile** specification, s

> with [polyfills](https://angular.io/guide/browser-support)
- `iOS 7.0+`
- `iOS 10.3+`
- `Android 4.4+`

## Version
Expand All @@ -133,7 +133,7 @@ This is the **Angular** implementation of **Ant Design Mobile** specification, s

## Angular Support

Now Supports Angular `^14.0.0`.
Now Supports Angular `^15.0.0`.

## Installation

Expand Down
4 changes: 2 additions & 2 deletions docs/introduce.zh-CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ title: Ant Design Mobile of Angular <div class="github-btn"><a class="gh-btn" hr

> 需要 [polyfills](https://angular.io/guide/browser-support)
- `iOS 7.0+`
- `iOS 10.3+`
- `Android 4.4+`

## 当前版本
Expand All @@ -133,7 +133,7 @@ title: Ant Design Mobile of Angular <div class="github-btn"><a class="gh-btn" hr

## 支持 Angular 版本

目前支持 Angular `^14.0.0` 版本。
目前支持 Angular `^15.0.0` 版本。

## 安装

Expand Down
68 changes: 33 additions & 35 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,39 +45,37 @@
"frontend"
],
"dependencies": {
"@angular/animations": "^14.2.8",
"@angular/cdk": "^14.2.6",
"@angular/common": "^14.2.8",
"@angular/compiler": "^14.2.8",
"@angular/core": "^14.2.8",
"@angular/forms": "^14.2.8",
"@angular/platform-browser": "^14.2.8",
"@angular/platform-browser-dynamic": "^14.2.8",
"@angular/pwa": "^14.2.7",
"@angular/router": "^14.2.8",
"@ant-design/icons-angular": "^14.1.0",
"ant-design": "^1.0.0",
"@angular/animations": "^15.0.3",
"@angular/cdk": "^15.0.2",
"@angular/common": "^15.0.3",
"@angular/compiler": "^15.0.3",
"@angular/core": "^15.0.3",
"@angular/forms": "^15.0.3",
"@angular/platform-browser": "^15.0.3",
"@angular/platform-browser-dynamic": "^15.0.3",
"@angular/pwa": "^15.0.3",
"@angular/router": "^15.0.3",
"@ant-design/icons-angular": "^15.0.0",
"antd-mobile-demo-data": "^0.3.0",
"ng-zorro-antd": "^14.1.1"
},
"devDependencies": {
"@angular-devkit/build-angular": "^14.2.7",
"@angular-devkit/core": "^14.2.7",
"@angular-devkit/schematics": "^14.2.7",
"@angular/cli": "^14.2.7",
"@angular/compiler-cli": "^14.2.8",
"@angular/platform-server": "^14.2.8",
"@angular/service-worker": "^14.2.8",
"@angular/upgrade": "^14.2.8",
"@schematics/angular": "^9.0.1",
"@stackblitz/sdk": "^1.3.0",
"@types/estree": "^1.0.0",
"@angular-devkit/build-angular": "^15.0.3",
"@angular-devkit/core": "^15.0.3",
"@angular-devkit/schematics": "^15.0.3",
"@angular/cli": "^15.0.3",
"@angular/compiler-cli": "^15.0.3",
"@angular/platform-server": "^15.0.3",
"@angular/service-worker": "^15.0.3",
"@angular/upgrade": "^15.0.3",
"@schematics/angular": "^15.0.3",
"@stackblitz/sdk": "^1.8.1",
"@types/jasmine": "~2.8.8",
"@types/jasminewd2": "~2.0.3",
"@types/node": "~18.11.10",
"antd-theme-generator": "1.2.2",
"codecov": "^3.0.0",
"codelyzer": "^6.0.1",
"codecov": "^3.8.3",
"codelyzer": "^6.0.2",
"conventional-changelog-cli": "^2.1.1",
"core-js": "~3.26.1",
"fs-extra": "~11.1.0",
Expand All @@ -94,16 +92,15 @@
"less": "^4.1.3",
"less-plugin-clean-css": "^1.5.1",
"marked": "^4.2.3",
"ng-packagr": "14.2.2",
"ng-packagr": "15.0.3 ",
"ngx-color": "^8.0.3",
"ngx-infinite-scroll": "~14.0.1",
"node-prismjs": "^0.1.1",
"phantomjs-prebuilt": "^2.1.7",
"pre-commit": "^1.2.2",
"prettier": "^2.8.0",
"prettier": "^2.8.1",
"prismjs": "^1.10.0",
"protractor": "^7.0.0",
"puppeteer": "^15.5.0",
"raw-loader": "^4.0.2",
"readline-sync": "^1.4.9",
"remark": "^13.0.0",
Expand All @@ -112,12 +109,12 @@
"rollup-plugin-replace": "~2.2.0",
"rollup-plugin-sourcemaps": "~0.4.2",
"rollup-plugin-uglify": "~6.0.0",
"rxjs": "~7.5.7",
"rxjs": "~7.6.0",
"ts-node": "~10.9.1",
"tsickle": "^0.46.3",
"tslib": "^2.3.0",
"tslib": "^2.4.1",
"tslint": "~6.1.3",
"typescript": "~4.7.4",
"typescript": "~4.8.4",
"yaml-front-matter": "^4.0.0",
"zone.js": "~0.12.0"
},
Expand All @@ -133,7 +130,7 @@
]
},
"engines": {
"node": ">=14.15.0"
"node": "14.20.x || 16.13.x || 18.10.x"
},
"husky": {
"hooks": {
Expand All @@ -142,7 +139,8 @@
}
},
"browserslist": [
"iOS >= 7",
"Android >= 4.4"
]
"iOS > 10.3",
"Android > 4.4"
],
"repository": "https://github.com/aijunhao/ng-zorro-antd-mobile.git"
}
7 changes: 3 additions & 4 deletions schematics/utils/html.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,12 @@ import { Project } from './devkit-utils/config';
* @param src the src path of the html file to parse
*/
export function getHeadTag(host: Tree, src: string) {
const document = parse5.parse(src,
{ locationInfo: true }) as parse5.AST.Default.Document;
const document = parse5.parse(src, { sourceCodeLocationInfo: true }) ;

let head;
const visit = (nodes: parse5.AST.Default.Node[]) => {
const visit = (nodes) => {
nodes.forEach(node => {
const element = <parse5.AST.Default.Element>node;
const element = node;
if (element.tagName === 'head') {
head = element;
} else {
Expand Down
10 changes: 5 additions & 5 deletions scripts/site/_site/src/app/app.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,18 @@ export class AppComponent implements OnInit, AfterViewInit {
docsearch = null;
kitchenUrl = window.location.origin + '/#/kitchen-sink?lang=zh-CN';
language = 'zh';
versionList = ['0.12.x', '1.0.6', '2.0.7', '3.0.3', '4.0.0', '5.0.1', '6.0.0', '7.0.0'];
versionList = ['0.12.x', '1.0.6', '2.0.7', '3.0.3', '4.0.0', '5.0.3', '6.0.2', '7.0.1'];
versionMap = {
'0.12.x': '0.12.5',
'1.0.6': '2001.0.6',
'2.0.7': '2012.0.7',
'3.0.3': '2013.0.3',
'4.0.0': '2014.0.0',
'5.0.1': '2015.0.3',
'6.0.0': '2016.0.0',
'7.0.0': '2016.0.0'
'5.0.3': '2015.0.3',
'6.0.2': '2016.0.2',
'7.0.1': '2017.0.1'
};
currentVersion = '7.0.0';
currentVersion = '7.0.1';
isHomeURL = true;
isKitchenURL = false;
demoTitle = '';
Expand Down
26 changes: 13 additions & 13 deletions scripts/site/_site/src/app/share/nz-codebox/nz-codebox.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -340,19 +340,19 @@ export class AppModule { }
description: 'Created with <3 by the StackBlitz SDK!',
template: 'angular-cli',
dependencies: {
'@angular/animations': '^14.2.8',
'@angular/cdk': '^14.2.6',
'@angular/common': '^14.2.8',
'@angular/compiler': '^14.2.8',
'@angular/core': '^14.2.8',
'@angular/forms': '^14.2.8',
'@angular/platform-browser': '^14.2.8',
'@angular/platform-browser-dynamic': '^14.2.8',
'@angular/router': '^14.2.8',
'@ant-design/icons-angular': '^14.1.0',
rxjs: '~7.5.7',
'zone.js': '~0.11.4',
'ng-zorro-antd-mobile': '7.0.0'
'@angular/animations': '^15.0.3',
'@angular/cdk': '^15.0.2',
'@angular/common': '^15.0.3',
'@angular/compiler': '^15.0.3',
'@angular/core': '^15.0.3',
'@angular/forms': '^15.0.3',
'@angular/platform-browser': '^15.0.3',
'@angular/platform-browser-dynamic': '^15.0.3',
'@angular/router': '^15.0.3',
'@ant-design/icons-angular': '^15.0.0',
rxjs: '~7.6.0',
'zone.js': '~0.12.0',
'ng-zorro-antd-mobile': '8.0.0'
},
tags: ['stackblitz', 'sdk']
});
Expand Down
3 changes: 2 additions & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
"moduleResolution": "node",
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
"target": "es2020",
"useDefineForClassFields": false,
"target": "es2022",
"typeRoots": [
"node_modules/@types"
],
Expand Down

0 comments on commit 3ffa485

Please sign in to comment.