Merge pull request #16567 from ant-design/master

chore: feature merge master

CHANGELOG.en-US.md

@@ -15,10 +15,19 @@ timeline: true
 
 ---
 
-## 3.17.1
+## 3.18.1
+
+`2019-05-13`
+
+- 🐞 Remove useless `module.export` of package. [#antd-tools](https://github.com/ant-design/antd-tools/commit/b9e230c91551af5b4555f672130b14304ff58357)
+
+## 3.18.0
 
 `2019-05-12`
 
+- 🌟 Transfer support `children` prop to customize render list. [#16026](https://github.com/ant-design/ant-design/pull/16026)
+- 🌟 Pagination support `disabled` prop. [#16493](https://github.com/ant-design/ant-design/pull/16493)
+- 🌟 Upgrade `@ant-design/icons` and `@ant-design/icons-react` to 2.0 for fix lots of missing icons. [#15874](https://github.com/ant-design/ant-design/pull/15874)
 - 🐞 Fix Form `hasFeedback` overlap issue with Input.Password. [#16445](https://github.com/ant-design/ant-design/pull/16445)
 - 🐞 Fix Select selected and disabled item wrong hover color. [#16477](https://github.com/ant-design/ant-design/pull/16477)
 - 🐞 Fix disabled Upload being triggered by label. [#16483](https://github.com/ant-design/ant-design/pull/16483)

CHANGELOG.zh-CN.md

@@ -15,10 +15,19 @@ timeline: true
 
 ---
 
-## 3.17.1
+## 3.18.1
+
+`2019-05-13`
+
+- 🐞 移除打包后多余的 `module.export`。[#antd-tools](https://github.com/ant-design/antd-tools/commit/b9e230c91551af5b4555f672130b14304ff58357)
+
+## 3.18.0
 
 `2019-05-12`
 
+- 🌟 Transfer 支持 `children` 来自定义渲染列表。[#16026](https://github.com/ant-design/ant-design/pull/16026)
+- 🌟 Pagination 支持 `disabled` 属性。[#16493](https://github.com/ant-design/ant-design/pull/16493)
+- 🌟 升级 `@ant-design/icons` 和 `@ant-design/icons-react` 到 2.0 修复一些图标缺失的问题。[#15874](https://github.com/ant-design/ant-design/pull/15874)
 - 🐞 修复 Form `hasFeedback` 和 Input.Password 一起使用时互相重叠的问题。[#16445](https://github.com/ant-design/ant-design/pull/16445)
 - 🐞 修复 Select 当前选中的失效项的样式问题。[#16477](https://github.com/ant-design/ant-design/pull/16477)
 - 🐞 修复 Upload disabled 状态下会被 label 激活的问题。[#16483](https://github.com/ant-design/ant-design/pull/16483)

components/style/themes/index.less

@@ -1,4 +1 @@
 @import './default.less';
-
-@ant-theme-file: ~'./override.less';
-@import '@{ant-theme-file}';

components/style/themes/override.less

@@ -1 +0,0 @@
-// Placeholder, it's used for user to customize the theme variable by less file.

components/table/__tests__/__snapshots__/demo.test.js.snap

@@ -12107,7 +12107,7 @@ exports[`renders ./components/table/demo/resizable-column.md correctly 1`] = `
                       </div>
                     </span>
                     <span
-                      class="react-resizable-handle"
+                      class="react-resizable-handle react-resizable-handle-se"
                       style="touch-action:none"
                     />
                   </th>
@@ -12129,7 +12129,7 @@ exports[`renders ./components/table/demo/resizable-column.md correctly 1`] = `
                       </div>
                     </span>
                     <span
-                      class="react-resizable-handle"
+                      class="react-resizable-handle react-resizable-handle-se"
                       style="touch-action:none"
                     />
                   </th>
@@ -12151,7 +12151,7 @@ exports[`renders ./components/table/demo/resizable-column.md correctly 1`] = `
                       </div>
                     </span>
                     <span
-                      class="react-resizable-handle"
+                      class="react-resizable-handle react-resizable-handle-se"
                       style="touch-action:none"
                     />
                   </th>
@@ -12173,7 +12173,7 @@ exports[`renders ./components/table/demo/resizable-column.md correctly 1`] = `
                       </div>
                     </span>
                     <span
-                      class="react-resizable-handle"
+                      class="react-resizable-handle react-resizable-handle-se"
                       style="touch-action:none"
                     />
                   </th>

docs/react/customize-theme.en-US.md

@@ -56,7 +56,7 @@ module.exports = {
 +         'link-color': '#1DA57A',
 +         'border-radius-base': '2px',
 +         // or
-+         'ant-theme-file': "~'your-less-file-path.less'", // Override with less file
++         'hack': `true; @import "your-less-file-path.less";`, // Override with less file
 +       },
 +       javascriptEnabled: true,
 +     },

docs/react/customize-theme.zh-CN.md

@@ -56,7 +56,7 @@ module.exports = {
 +         'link-color': '#1DA57A',
 +         'border-radius-base': '2px',
 +         // or
-+         'ant-theme-file': "~'your-less-file-path.less'", // Override with less file
++         'hack': `true; @import "your-less-file-path.less";`, // Override with less file
 +       },
 +       javascriptEnabled: true,
 +     },

package.json

@@ -1,6 +1,6 @@
 {
   "name": "antd",
-  "version": "3.17.1",
+  "version": "3.18.1",
   "title": "Ant Design",
   "description": "An enterprise-class UI design language and React components implementation",
   "homepage": "http://ant.design/",
@@ -106,7 +106,7 @@
     "@yesmeck/offline-plugin": "^5.0.5",
     "ansi-styles": "^3.2.1",
     "antd-theme-generator": "^1.1.4",
-    "antd-tools": "^7.3.0",
+    "antd-tools": "^7.3.5",
     "babel-eslint": "^10.0.1",
     "babel-plugin-add-react-displayname": "^0.0.5",
     "bisheng": "^1.2.4",
@@ -137,7 +137,7 @@
     "fetch-jsonp": "^1.1.3",
     "glob": "^7.1.3",
     "immutability-helper": "^3.0.0",
-    "intersection-observer": "^0.6.0",
+    "intersection-observer": "^0.7.0",
     "jest": "^24.0.0",
     "jsdom": "^15.0.0",
     "jsonml.js": "^0.1.0",
@@ -167,7 +167,7 @@
     "react-highlight-words": "^0.16.0",
     "react-infinite-scroller": "^1.2.1",
     "react-intl": "^2.7.0",
-    "react-resizable": "^1.7.5",
+    "react-resizable": "^1.8.0",
     "react-router-dom": "^5.0.0",
     "react-sticky": "^6.0.3",
     "react-test-renderer": "^16.6.3",