Skip to content

Commit

Permalink
release(7.0.0-rc.1): release 7.0.0-rc.1 (NG-ZORRO#2623)
Browse files Browse the repository at this point in the history
  • Loading branch information
hsuanxyz authored and vthinkxie committed Dec 12, 2018
1 parent bb1489b commit d7699a7
Show file tree
Hide file tree
Showing 7 changed files with 70 additions and 11 deletions.
20 changes: 20 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,23 @@
# [7.0.0-rc.1](https://github.com/NG-ZORRO/ng-zorro-antd/compare/7.0.0-rc.0...7.0.0-rc.1) (2018-12-12)


### Bug Fixes

* **drawer, modal:** fix focus bug of IE ([#2589](https://github.com/NG-ZORRO/ng-zorro-antd/issues/2589)) ([0458604](https://github.com/NG-ZORRO/ng-zorro-antd/commit/0458604)), closes [#2388](https://github.com/NG-ZORRO/ng-zorro-antd/issues/2388)
* **collapse:** fix collapse ([#2597](https://github.com/NG-ZORRO/ng-zorro-antd/issues/2597)) ([5bb1a99](https://github.com/NG-ZORRO/ng-zorro-antd/commit/5bb1a99)), closes [#2567](https://github.com/NG-ZORRO/ng-zorro-antd/issues/2567)
* **icon:** add missing icons used by ng-zorro-ant itself ([ef10595](https://github.com/NG-ZORRO/ng-zorro-antd/commit/ef10595))
* **select:** add title property for select component ([#2575](https://github.com/NG-ZORRO/ng-zorro-antd/issues/2575)) ([3444634](https://github.com/NG-ZORRO/ng-zorro-antd/commit/3444634)), closes [#1974](https://github.com/NG-ZORRO/ng-zorro-antd/issues/1974)
* **table:** should prevent tr click trigger when clicking expand ([#2618](https://github.com/NG-ZORRO/ng-zorro-antd/issues/2618)) ([88be1c3](https://github.com/NG-ZORRO/ng-zorro-antd/commit/88be1c3)), closes [#2419](https://github.com/NG-ZORRO/ng-zorro-antd/issues/2419)
* **schematics:** compatible with old version options ([#2622](https://github.com/NG-ZORRO/ng-zorro-antd/issues/2622)) ([bb1489b](https://github.com/NG-ZORRO/ng-zorro-antd/commit/bb1489b))


### Features

* **tabs:** support forceRender in tabs ([#2619](https://github.com/NG-ZORRO/ng-zorro-antd/issues/2619)) ([fa9160c](https://github.com/NG-ZORRO/ng-zorro-antd/commit/fa9160c))
* **upload:** support Observable in nzFilter ([#2590](https://github.com/NG-ZORRO/ng-zorro-antd/issues/2590)) ([c664c6f](https://github.com/NG-ZORRO/ng-zorro-antd/commit/c664c6f)), closes [#2389](https://github.com/NG-ZORRO/ng-zorro-antd/issues/2389)



# [7.0.0-rc.0](https://github.com/NG-ZORRO/ng-zorro-antd/compare/1.8.0...7.0.0-rc.0) (2018-11-30)


Expand Down
2 changes: 1 addition & 1 deletion components/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ng-zorro-antd",
"version": "7.0.0-rc.0",
"version": "7.0.0-rc.1",
"license": "MIT",
"description": "An enterprise-class UI components based on Ant Design and Angular",
"schematics": "./schematics/collection.json",
Expand Down
19 changes: 19 additions & 0 deletions docs/changelog.en-US.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,25 @@ timeline: true

---

## 7.0.0-rc.1
`2018-12-11`

### Bug Fixes

* **drawer, modal:** fix focus bug of IE ([#2589](https://github.com/NG-ZORRO/ng-zorro-antd/issues/2589)) ([0458604](https://github.com/NG-ZORRO/ng-zorro-antd/commit/0458604)), closes [#2388](https://github.com/NG-ZORRO/ng-zorro-antd/issues/2388)
* **collapse:** fix collapse ([#2597](https://github.com/NG-ZORRO/ng-zorro-antd/issues/2597)) ([5bb1a99](https://github.com/NG-ZORRO/ng-zorro-antd/commit/5bb1a99)), closes [#2567](https://github.com/NG-ZORRO/ng-zorro-antd/issues/2567)
* **icon:** add missing icons used by ng-zorro-ant itself ([ef10595](https://github.com/NG-ZORRO/ng-zorro-antd/commit/ef10595))
* **select:** add title property for select component ([#2575](https://github.com/NG-ZORRO/ng-zorro-antd/issues/2575)) ([3444634](https://github.com/NG-ZORRO/ng-zorro-antd/commit/3444634)), closes [#1974](https://github.com/NG-ZORRO/ng-zorro-antd/issues/1974)
* **table:** should prevent tr click trigger when clicking expand ([#2618](https://github.com/NG-ZORRO/ng-zorro-antd/issues/2618)) ([88be1c3](https://github.com/NG-ZORRO/ng-zorro-antd/commit/88be1c3)), closes [#2419](https://github.com/NG-ZORRO/ng-zorro-antd/issues/2419)
* **schematics:** compatible with old version options ([#2622](https://github.com/NG-ZORRO/ng-zorro-antd/issues/2622)) ([bb1489b](https://github.com/NG-ZORRO/ng-zorro-antd/commit/bb1489b))


### Features

* **tabs:** support forceRender in tabs ([#2619](https://github.com/NG-ZORRO/ng-zorro-antd/issues/2619)) ([fa9160c](https://github.com/NG-ZORRO/ng-zorro-antd/commit/fa9160c))
* **upload:** support Observable in nzFilter ([#2590](https://github.com/NG-ZORRO/ng-zorro-antd/issues/2590)) ([c664c6f](https://github.com/NG-ZORRO/ng-zorro-antd/commit/c664c6f)), closes [#2389](https://github.com/NG-ZORRO/ng-zorro-antd/issues/2389)


## 7.0.0-rc.0
`2018-11-30`

Expand Down
19 changes: 19 additions & 0 deletions docs/changelog.zh-CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,25 @@ timeline: true

---

## 7.0.0-rc.1
`2018-12-11`

### Bug Fixes

* **drawer, modal:** 修复 IE 的 BUG ([#2589](https://github.com/NG-ZORRO/ng-zorro-antd/issues/2589)) ([0458604](https://github.com/NG-ZORRO/ng-zorro-antd/commit/0458604)), closes [#2388](https://github.com/NG-ZORRO/ng-zorro-antd/issues/2388)
* **collapse:** 修复无法改变状态的问题 ([#2597](https://github.com/NG-ZORRO/ng-zorro-antd/issues/2597)) ([5bb1a99](https://github.com/NG-ZORRO/ng-zorro-antd/commit/5bb1a99)), closes [#2567](https://github.com/NG-ZORRO/ng-zorro-antd/issues/2567)
* **icon:** 修复缺少的图标的静态引入 ([ef10595](https://github.com/NG-ZORRO/ng-zorro-antd/commit/ef10595))
* **select:** 修复 title 属性([#2575](https://github.com/NG-ZORRO/ng-zorro-antd/issues/2575)) ([3444634](https://github.com/NG-ZORRO/ng-zorro-antd/commit/3444634)), closes [#1974](https://github.com/NG-ZORRO/ng-zorro-antd/issues/1974)
* **table:** 修复单击事件冒泡的问题 ([#2618](https://github.com/NG-ZORRO/ng-zorro-antd/issues/2618)) ([88be1c3](https://github.com/NG-ZORRO/ng-zorro-antd/commit/88be1c3)), closes [#2419](https://github.com/NG-ZORRO/ng-zorro-antd/issues/2419)
* **schematics:** 兼容旧版选项 ([#2622](https://github.com/NG-ZORRO/ng-zorro-antd/issues/2622)) ([bb1489b](https://github.com/NG-ZORRO/ng-zorro-antd/commit/bb1489b))


### Features

* **tabs:** 添加支持 `nzForceRender` ([#2619](https://github.com/NG-ZORRO/ng-zorro-antd/issues/2619)) ([fa9160c](https://github.com/NG-ZORRO/ng-zorro-antd/commit/fa9160c))
* **upload:** `nzFilter` 支持 `Observable` ([#2590](https://github.com/NG-ZORRO/ng-zorro-antd/issues/2590)) ([c664c6f](https://github.com/NG-ZORRO/ng-zorro-antd/commit/c664c6f)), closes [#2389](https://github.com/NG-ZORRO/ng-zorro-antd/issues/2389)


## 7.0.0-rc.0
`2018-11-30`

Expand Down
17 changes: 9 additions & 8 deletions scripts/publish/publish.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ function changeVersion() {
log.info('Updating version number...');

const packageJsonPath = path.join(__dirname, '../../components/package.json');
const appComponentPath = path.join(__dirname, '../site/_site/src/app/app.component.ts') ;
const appComponentPath = path.join(__dirname, '../site/_site/src/app/app.component.ts');
const codeBoxPath = path.join(__dirname, '../site/_site/src/app/share/nz-codebox/nz-codebox.component.ts');

const packageJson = fs.readJsonSync(packageJsonPath);
Expand All @@ -59,17 +59,19 @@ function changeVersion() {
}

return {
major: Number(matches[1]),
minor: Number(matches[2]),
patch: Number(matches[3]),
major : Number(matches[1]),
minor : Number(matches[2]),
patch : Number(matches[3]),
preTag: matches[4],
pre: Number(matches[5]),
pre : Number(matches[5]),
}
}

function checkVersionNumber(cur, next) {
// Must be numbers and dots.
if (!versionNameRegex.test(next)) { return false; }
if (!versionNameRegex.test(next)) {
return false;
}

const curVersion = parseVersion(cur);
const nextVersion = parseVersion(next);
Expand Down Expand Up @@ -138,9 +140,8 @@ function generatingPublishNote() {
}

function preRelease() {
// FIXME: No command line output???
log.info('Running pre-release script... Be patient...');
execSync('npm run pre-release');
execSync('npm run pre-release', {stdio: [0, 1, 2]});
log.info('pre-release completed!');
}

Expand Down
2 changes: 1 addition & 1 deletion scripts/site/_site/src/app/app.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export class AppComponent implements OnInit, AfterViewInit {
'0.7.x',
'1.8.x'
];
currentVersion = '7.0.0-rc.0';
currentVersion = '7.0.0-rc.1';

@ViewChild('searchInput') searchInput: ElementRef<HTMLInputElement>;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -401,7 +401,7 @@ export class AppModule { }
'date-fns' : '^1.29.0',
'tslib' : '^1.9.3',
'typescript' : '~3.1.1',
'ng-zorro-antd' : '^7.0.0-rc.0'
'ng-zorro-antd' : '^7.0.0-rc.1'
},
tags : [ 'stackblitz', 'sdk' ]
});
Expand Down

0 comments on commit d7699a7

Please sign in to comment.