diff --git a/CHANGELOG.md b/CHANGELOG.md
index 34525a682e..1f391cf56e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,33 @@
+
+# [1.0.0-alpha.5](https://github.com/DevExpress/devextreme-reactive/compare/v1.0.0-alpha.4...v1.0.0-alpha.5) (2017-07-07)
+
+
+### Bug Fixes
+
+* **react-grid:** add grid bottom offset in Material UI ([#180](https://github.com/DevExpress/devextreme-reactive/issues/180)) ([48f12a2](https://github.com/DevExpress/devextreme-reactive/commit/48f12a2))
+* **react-grid:** add group icon offset in Material UI ([#171](https://github.com/DevExpress/devextreme-reactive/issues/171)) ([43d9da1](https://github.com/DevExpress/devextreme-reactive/commit/43d9da1))
+* **react-grid:** limit filterCellTemplate arguments ([#163](https://github.com/DevExpress/devextreme-reactive/issues/163)) ([2a4f003](https://github.com/DevExpress/devextreme-reactive/commit/2a4f003))
+* **react-grid:** reset a column filter when clearing the filter editor value ([#184](https://github.com/DevExpress/devextreme-reactive/issues/184)) ([83b321c](https://github.com/DevExpress/devextreme-reactive/commit/83b321c)), closes [#136](https://github.com/DevExpress/devextreme-reactive/issues/136)
+* **react-grid:** use MUI Chips for group panel items rendering ([#168](https://github.com/DevExpress/devextreme-reactive/issues/168)) ([45ceb12](https://github.com/DevExpress/devextreme-reactive/commit/45ceb12))
+
+
+### Code Refactoring
+
+* **react-grid:** extract GroupPanelLayout ([#149](https://github.com/DevExpress/devextreme-reactive/issues/149)) ([ed73aa1](https://github.com/DevExpress/devextreme-reactive/commit/ed73aa1))
+
+
+### Features
+
+* **react-grid:** introduce column reordering animation ([#169](https://github.com/DevExpress/devextreme-reactive/issues/169)) ([d5e808b](https://github.com/DevExpress/devextreme-reactive/commit/d5e808b))
+* **react-grid:** introduce Material UI templates (closes [#93](https://github.com/DevExpress/devextreme-reactive/issues/93))
+
+
+### BREAKING CHANGES
+
+* **react-grid:** Use the `groupPanelCellTemplate` property of the grouping-panel plugin instead of the GroupPanelProps interface's `cellTemplate` property to specify a template used to render a grouping panel cell. The GroupPanelProps interface's `cellTemplate` property is no longer available.
+
+
+
# [1.0.0-alpha.4](https://github.com/DevExpress/devextreme-reactive/compare/v1.0.0-alpha.3...v1.0.0-alpha.4) (2017-06-23)
diff --git a/lerna.json b/lerna.json
index 640d09690f..8b455aec7d 100644
--- a/lerna.json
+++ b/lerna.json
@@ -3,5 +3,5 @@
"packages": [
"packages/*"
],
- "version": "1.0.0-alpha.4"
+ "version": "1.0.0-alpha.5"
}
diff --git a/packages/dx-core/package.json b/packages/dx-core/package.json
index e6625b1309..5fc7e3cde4 100644
--- a/packages/dx-core/package.json
+++ b/packages/dx-core/package.json
@@ -1,6 +1,6 @@
{
"name": "@devexpress/dx-core",
- "version": "1.0.0-alpha.4",
+ "version": "1.0.0-alpha.5",
"description": "Core library for DevExtreme Reactive Components",
"author": {
"name": "Developer Express Inc.",
diff --git a/packages/dx-grid-core/package.json b/packages/dx-grid-core/package.json
index ec8b0f10b6..a0fd873357 100644
--- a/packages/dx-grid-core/package.json
+++ b/packages/dx-grid-core/package.json
@@ -1,6 +1,6 @@
{
"name": "@devexpress/dx-grid-core",
- "version": "1.0.0-alpha.4",
+ "version": "1.0.0-alpha.5",
"description": "Core library for the DevExtreme Reactive Grid component",
"author": {
"name": "Developer Express Inc.",
@@ -50,7 +50,7 @@
"output": "../../shippable/testresults/dx-grid-core.xml"
},
"devDependencies": {
- "@devexpress/dx-core": "1.0.0-alpha.4",
+ "@devexpress/dx-core": "1.0.0-alpha.5",
"babel-cli": "^6.24.1",
"babel-core": "^6.25.0",
"babel-jest": "^20.0.3",
@@ -72,6 +72,6 @@
"seamless-immutable": "^7.1.2"
},
"peerDependencies": {
- "@devexpress/dx-core": "1.0.0-alpha.4"
+ "@devexpress/dx-core": "1.0.0-alpha.5"
}
}
diff --git a/packages/dx-react-core/package.json b/packages/dx-react-core/package.json
index ca4c239383..273eb67313 100644
--- a/packages/dx-react-core/package.json
+++ b/packages/dx-react-core/package.json
@@ -1,6 +1,6 @@
{
"name": "@devexpress/dx-react-core",
- "version": "1.0.0-alpha.4",
+ "version": "1.0.0-alpha.5",
"description": "Core library for DevExtreme React Components",
"author": {
"name": "Developer Express Inc.",
@@ -77,7 +77,7 @@
"rollup-watch": "^4.0.0"
},
"dependencies": {
- "@devexpress/dx-core": "1.0.0-alpha.4",
+ "@devexpress/dx-core": "1.0.0-alpha.5",
"prop-types": "^15.5.8"
},
"peerDependencies": {
diff --git a/packages/dx-react-demos/package.json b/packages/dx-react-demos/package.json
index f15547fb92..c4e96991a9 100644
--- a/packages/dx-react-demos/package.json
+++ b/packages/dx-react-demos/package.json
@@ -1,7 +1,7 @@
{
"private": true,
"name": "@devexpress/dx-react-demos",
- "version": "1.0.0-alpha.4",
+ "version": "1.0.0-alpha.5",
"description": "DevExtreme React Components Demos",
"author": {
"name": "Developer Express Inc.",
@@ -34,10 +34,10 @@
"output": "../../shippable/testresults/dx-react-grid-demos.xml"
},
"dependencies": {
- "@devexpress/dx-react-core": "1.0.0-alpha.4",
- "@devexpress/dx-react-grid": "1.0.0-alpha.4",
- "@devexpress/dx-react-grid-bootstrap3": "1.0.0-alpha.4",
- "@devexpress/dx-react-grid-material-ui": "1.0.0-alpha.4",
+ "@devexpress/dx-react-core": "1.0.0-alpha.5",
+ "@devexpress/dx-react-grid": "1.0.0-alpha.5",
+ "@devexpress/dx-react-grid-bootstrap3": "1.0.0-alpha.5",
+ "@devexpress/dx-react-grid-material-ui": "1.0.0-alpha.5",
"core-js": "^2.4.1",
"material-ui": "^1.0.0-alpha.19",
"material-ui-icons": "1.0.0-alpha.3",
diff --git a/packages/dx-react-grid-bootstrap3/package.json b/packages/dx-react-grid-bootstrap3/package.json
index 803f30e836..2296ed1953 100644
--- a/packages/dx-react-grid-bootstrap3/package.json
+++ b/packages/dx-react-grid-bootstrap3/package.json
@@ -1,6 +1,6 @@
{
"name": "@devexpress/dx-react-grid-bootstrap3",
- "version": "1.0.0-alpha.4",
+ "version": "1.0.0-alpha.5",
"description": "Bootstrap 3 templates for DevExtreme React Grid component",
"author": {
"name": "Developer Express Inc.",
@@ -56,10 +56,10 @@
"output": "../../shippable/testresults/dx-react-grid-bootstrap3.xml"
},
"devDependencies": {
- "@devexpress/dx-grid-core": "1.0.0-alpha.4",
- "@devexpress/dx-react-core": "1.0.0-alpha.4",
- "@devexpress/dx-react-grid": "1.0.0-alpha.4",
- "@devexpress/dx-testing": "1.0.0-alpha.4",
+ "@devexpress/dx-grid-core": "1.0.0-alpha.5",
+ "@devexpress/dx-react-core": "1.0.0-alpha.5",
+ "@devexpress/dx-react-grid": "1.0.0-alpha.5",
+ "@devexpress/dx-testing": "1.0.0-alpha.5",
"babel-cli": "^6.24.1",
"babel-core": "^6.25.0",
"babel-jest": "^20.0.3",
@@ -93,9 +93,9 @@
"prop-types": "^15.5.8"
},
"peerDependencies": {
- "@devexpress/dx-grid-core": "1.0.0-alpha.4",
- "@devexpress/dx-react-core": "1.0.0-alpha.4",
- "@devexpress/dx-react-grid": "1.0.0-alpha.4",
+ "@devexpress/dx-grid-core": "1.0.0-alpha.5",
+ "@devexpress/dx-react-core": "1.0.0-alpha.5",
+ "@devexpress/dx-react-grid": "1.0.0-alpha.5",
"react": "^15.5.4",
"react-bootstrap": "^0.31.0"
}
diff --git a/packages/dx-react-grid-material-ui/package.json b/packages/dx-react-grid-material-ui/package.json
index a319ba36e3..31381ced38 100644
--- a/packages/dx-react-grid-material-ui/package.json
+++ b/packages/dx-react-grid-material-ui/package.json
@@ -1,6 +1,6 @@
{
"name": "@devexpress/dx-react-grid-material-ui",
- "version": "1.0.0-alpha.4",
+ "version": "1.0.0-alpha.5",
"description": "Material UI templates for DevExtreme React Grid component",
"author": {
"name": "Developer Express Inc.",
@@ -56,10 +56,10 @@
"output": "../../shippable/testresults/dx-react-grid-material-ui.xml"
},
"devDependencies": {
- "@devexpress/dx-grid-core": "1.0.0-alpha.4",
- "@devexpress/dx-react-core": "1.0.0-alpha.4",
- "@devexpress/dx-react-grid": "1.0.0-alpha.4",
- "@devexpress/dx-testing": "1.0.0-alpha.4",
+ "@devexpress/dx-grid-core": "1.0.0-alpha.5",
+ "@devexpress/dx-react-core": "1.0.0-alpha.5",
+ "@devexpress/dx-react-grid": "1.0.0-alpha.5",
+ "@devexpress/dx-testing": "1.0.0-alpha.5",
"babel-cli": "^6.24.1",
"babel-core": "^6.25.0",
"babel-jest": "^20.0.3",
@@ -100,9 +100,9 @@
"prop-types": "^15.5.8"
},
"peerDependencies": {
- "@devexpress/dx-grid-core": "1.0.0-alpha.4",
- "@devexpress/dx-react-core": "1.0.0-alpha.4",
- "@devexpress/dx-react-grid": "1.0.0-alpha.4",
+ "@devexpress/dx-grid-core": "1.0.0-alpha.5",
+ "@devexpress/dx-react-core": "1.0.0-alpha.5",
+ "@devexpress/dx-react-grid": "1.0.0-alpha.5",
"material-ui": "^1.0.0-alpha.19",
"material-ui-icons": "1.0.0-alpha.3",
"react": "^15.5.4"
diff --git a/packages/dx-react-grid/package.json b/packages/dx-react-grid/package.json
index a5c8ea9de7..fc289da4c4 100644
--- a/packages/dx-react-grid/package.json
+++ b/packages/dx-react-grid/package.json
@@ -1,6 +1,6 @@
{
"name": "@devexpress/dx-react-grid",
- "version": "1.0.0-alpha.4",
+ "version": "1.0.0-alpha.5",
"description": "Composable plugin-based data grid component for React",
"author": {
"name": "Developer Express Inc.",
@@ -53,8 +53,8 @@
"output": "../../shippable/testresults/dx-react-grid.xml"
},
"devDependencies": {
- "@devexpress/dx-react-core": "1.0.0-alpha.4",
- "@devexpress/dx-testing": "1.0.0-alpha.4",
+ "@devexpress/dx-react-core": "1.0.0-alpha.5",
+ "@devexpress/dx-testing": "1.0.0-alpha.5",
"babel-cli": "^6.24.1",
"babel-core": "^6.25.0",
"babel-jest": "^20.0.3",
@@ -84,11 +84,11 @@
"rollup-watch": "^4.0.0"
},
"dependencies": {
- "@devexpress/dx-grid-core": "1.0.0-alpha.4",
+ "@devexpress/dx-grid-core": "1.0.0-alpha.5",
"prop-types": "^15.5.8"
},
"peerDependencies": {
- "@devexpress/dx-react-core": "1.0.0-alpha.4",
+ "@devexpress/dx-react-core": "1.0.0-alpha.5",
"react": "^15.5.4",
"react-dom": "^15.5.4"
}
diff --git a/packages/dx-testing/package.json b/packages/dx-testing/package.json
index 2dbac55741..0cabe9a660 100644
--- a/packages/dx-testing/package.json
+++ b/packages/dx-testing/package.json
@@ -1,7 +1,7 @@
{
"private": true,
"name": "@devexpress/dx-testing",
- "version": "1.0.0-alpha.4",
+ "version": "1.0.0-alpha.5",
"description": "DevExtreme Reactive Components Testing Utilities",
"author": {
"name": "Developer Express Inc.",
diff --git a/scripts/publish-npm.js b/scripts/publish-npm.js
index 3cb0da3dba..755d652089 100644
--- a/scripts/publish-npm.js
+++ b/scripts/publish-npm.js
@@ -33,8 +33,8 @@ prompt({
execSync('git merge --ff-only');
console.log('Cleaning previous build result...');
- const rmScript = "require('fs-extra').removeSync(require('path').join(process.cwd(), 'dist'))";
- execSync(`./node_modules/.bin/lerna exec --loglevel silent -- node -e "\\"${rmScript}\\""`);
+ const rmScript = "require('fs-extra').removeSync(require('path').join(process.cwd(),'dist'))";
+ execSync(`"./node_modules/.bin/lerna" exec --loglevel silent -- node -e "${rmScript}"`);
console.log('Installing dependencies...');
execSync('npm install');
@@ -44,13 +44,13 @@ prompt({
console.log('Genereting CHANGELOG.md...');
const changelogFile = join(process.cwd(), 'CHANGELOG.md');
- execSync('./node_modules/.bin/conventional-changelog -p angular -i CHANGELOG.md -s');
+ execSync('"./node_modules/.bin/conventional-changelog" -p angular -i CHANGELOG.md -s');
writeFileSync(
changelogFile,
String(readFileSync(changelogFile))
.replace('name=""', `name="${version}"`)
.replace('[](', `[${version}](`)
- .replace('...v)', `...v${version})`),
+ .replace('...v)', `...v${version})`)
);
prompt({
@@ -70,7 +70,7 @@ prompt({
execSync('npm login', { stdio: 'inherit' });
console.log('Publishing npm...');
- execSync(`./node_modules/.bin/lerna publish --exact --force-publish * --repo-version ${version} --yes --skip-git`);
+ execSync(`"./node_modules/.bin/lerna" publish --exact --force-publish * --repo-version ${version} --yes --skip-git`);
console.log('Logout from npm...');
execSync('npm logout', { stdio: 'ignore' });