Merge remote-tracking branch 'origin/master' into feature

package.json

@@ -94,7 +94,7 @@
   "devDependencies": {
     "@types/classnames": "^2.2.6",
     "@types/prop-types": "^15.5.6",
-    "@types/react": "^16.4.15",
+    "@types/react": "~16.4.0",
     "@types/react-dom": "^16.0.8",
     "@types/react-intl": "^2.3.11",
     "@types/react-slick": "^0.23.2",

tests/__mocks__/rc-trigger.js

@@ -4,9 +4,10 @@ let Trigger; // eslint-disable-line
 
 if (process.env.REACT === '15') {
   const ActualTrigger = require.requireActual('rc-trigger');
-  const { render } = ActualTrigger.prototype;
+  // cannot use object destruction, cause react 15 test cases fail
+  const render = ActualTrigger.prototype.render; // eslint-disable-line
 
-  ActualTrigger.prototype.render = () => {
+  ActualTrigger.prototype.render = function () {
     const { popupVisible } = this.state; // eslint-disable-line
     let component;
 

tests/index.test.js

@@ -1,4 +1,3 @@
-/* eslint-disable global-require */
 import pkg from '../package.json';
 
 const testDist = process.env.LIB_DIR === 'dist';
@@ -7,7 +6,7 @@ describe('antd dist files', () => {
   // https://github.com/ant-design/ant-design/issues/1638
   // https://github.com/ant-design/ant-design/issues/1968
   it('exports modules correctly', () => {
-    const antd = testDist ? require('../dist/antd') : require('../components');
+    const antd = testDist ? require('../dist/antd') : require('../components'); // eslint-disable-line
     expect(Object.keys(antd)).toMatchSnapshot();
   });
 
@@ -15,7 +14,7 @@ describe('antd dist files', () => {
   // https://github.com/ant-design/ant-design/issues/1804
   if (testDist) {
     it('should have antd.version', () => {
-      const antd = require('../dist/antd');
+      const antd = require('../dist/antd'); // eslint-disable-line
       expect(antd.version).toBe(pkg.version);
     });
   }