Merge branch 'master' into feature

.antd-tools.config.js

@@ -1,6 +1,8 @@
 const fs = require('fs');
 const path = require('path');
+// eslint-disable-next-line import/no-extraneous-dependencies
 const packageInfo = require('./package.json');
+const darkVars = require('./scripts/dark-vars');
 
 // We need compile additional content for antd user
 function finalizeCompile() {
@@ -57,6 +59,25 @@ function finalizeDist() {
 
     // eslint-disable-next-line
     console.log('Built a entry less file to dist/antd.less');
+
+    // Build less entry file: dist/antd.dark.less
+    fs.writeFileSync(
+      path.join(process.cwd(), 'dist', 'antd.dark.less'),
+      '@import "../lib/style/dark.less";\n@import "../lib/style/components.less";',
+    );
+
+    // eslint-disable-next-line
+    console.log('Built a entry less file to dist/antd.dark.less');
+
+    // Build dark.js: dist/dark-theme.js, for less-loader
+
+    fs.writeFileSync(
+      path.join(process.cwd(), 'dist', 'dark-theme.js'),
+      `module.exports = ${JSON.stringify(darkVars, null, 2)};`,
+    );
+
+    // eslint-disable-next-line
+    console.log('Built a dark theme js file to dist/dark-theme.js');
   }
 }
 

.circleci/config.yml

@@ -10,13 +10,6 @@ references:
     attach_workspace:
       at: ~/ant-design
 
-  install_react: &install_react
-    run: REACT=15 ./scripts/install-react.sh
-
-  react_15: &react_15
-    environment:
-      REACT: 15
-
   react_16: &react_16
     environment:
       REACT: 16
@@ -51,21 +44,6 @@ references:
       - test_node:
           requires:
             - setup
-      - test_dist_15:
-          requires:
-            - dist
-      - test_lib_15:
-          requires:
-            - compile
-      - test_es_15:
-          requires:
-            - compile
-      - test_dom_15:
-          requires:
-            - setup
-      - test_node_15:
-          requires:
-            - setup
       - check_metadata:
           requires:
             - setup
@@ -173,69 +151,6 @@ jobs:
       - *attach_workspace
       - run: npm run test-node -- -w 1
 
-  test_dist_15:
-    <<: *container_config
-    <<: *react_15
-    steps:
-      - checkout
-      - *attach_workspace
-      - *install_react
-      - run:
-          command: npm test -- -w 1 -u
-          environment:
-            LIB_DIR: dist
-            REACT: 15
-
-  test_lib_15:
-    <<: *container_config
-    <<: *react_15
-    steps:
-      - checkout
-      - *attach_workspace
-      - *install_react
-      - run:
-          command: npm test -- -w 1 -u
-          environment:
-            LIB_DIR: lib
-            REACT: 15
-
-  test_es_15:
-    <<: *container_config
-    <<: *react_15
-    steps:
-      - checkout
-      - *attach_workspace
-      - *install_react
-      - run:
-          command: npm test -- -w 1 -u
-          environment:
-            LIB_DIR: es
-            REACT: 15
-
-  test_dom_15:
-    <<: *container_config
-    <<: *react_15
-    steps:
-      - checkout
-      - *attach_workspace
-      - *install_react
-      - run:
-          command: npm test -- -w 1 -u
-          environment:
-            REACT: 15
-
-  test_node_15:
-    <<: *container_config
-    <<: *react_15
-    steps:
-      - checkout
-      - *attach_workspace
-      - *install_react
-      - run:
-          command: npm run test-node -- -w 1 -u
-          environment:
-            REACT: 15
-
   check_metadata:
     <<: *container_config
     steps:

.depslintrc.js

@@ -14,5 +14,9 @@ module.exports = {
       pattern: /ConfigConsumer.*renderEmpty/ms,
       module: '../empty',
     },
+    {
+      pattern: /config-provider\/context.*renderEmpty/ms,
+      module: '../empty',
+    },
   ],
 };

.eslintignore

@@ -4,8 +4,13 @@ components/**/*.jsx
 !components/*/demo/*
 !.*.js
 # Docs templates
+site/theme/template/Color/ColorPicker.jsx
 site/theme/template/IconDisplay/*.js
 site/theme/template/IconDisplay/*.jsx
+site/theme/template/IconDisplay/fields.js
+site/theme/template/Home/**/*.jsx
+site/theme/template/utils.jsx
+site/theme/template/Layout/Footer.jsx
 typings
 es/**/*
 lib/**/*

.eslintrc.js

@@ -37,6 +37,7 @@ const eslintrc = {
     'react/forbid-prop-types': 0,
     'react/jsx-indent': 0,
     'react/jsx-wrap-multilines': ['error', { declaration: false, assignment: false }],
+    'import/extensions': 0,
     'import/no-extraneous-dependencies': [
       'error',
       {
@@ -87,7 +88,6 @@ const eslintrc = {
     'react/static-property-placement': 0,
     'jest/no-test-callback': 0,
     'jest/expect-expect': 0,
-    'import/extensions': 0,
   },
   globals: {
     gtag: true,

.gitignore

@@ -38,8 +38,13 @@ components/**/*.jsx
 !components/**/__tests__/**/*.js
 !components/**/__tests__/**/*.js.snap
 /.history
+*.tmp
+
 # Docs templates
+site/theme/template/Color/ColorPicker.jsx
 site/theme/template/IconDisplay/*.js
 site/theme/template/IconDisplay/*.jsx
 site/theme/template/IconDisplay/fields.js
-*.tmp
+site/theme/template/Home/**/*.jsx
+site/theme/template/utils.jsx
+site/theme/template/Layout/Footer.jsx

.npmignore

@@ -1 +1,2 @@
 ~*
+dist/report.html

.travis.yml

@@ -13,19 +13,11 @@ matrix:
   fast_finish: true
   include:
     - env: TEST_TYPE=lint
-    - env: REACT=16 TEST_TYPE=test:dist
-    - env: REACT=16 TEST_TYPE=test:lib
-    - env: REACT=16 TEST_TYPE=test:es
-    - env: REACT=16 TEST_TYPE=test:dom
-    - env: REACT=16 TEST_TYPE=test:node
-    - env: REACT=15 TEST_TYPE=test:dist
-    - env: REACT=15 TEST_TYPE=test:lib
-    - env: REACT=15 TEST_TYPE=test:es
-    - env: REACT=15 TEST_TYPE=test:dom
-    - env: REACT=15 TEST_TYPE=test:node
-
-before_script:
-  - scripts/install-react.sh
+    - env: TEST_TYPE=test:dist
+    - env: TEST_TYPE=test:lib
+    - env: TEST_TYPE=test:es
+    - env: TEST_TYPE=test:dom
+    - env: TEST_TYPE=test:node
 
 script:
   - scripts/travis-script.sh

AUTHORS.txt

@@ -190,6 +190,7 @@ Gray Choi <gray.choi.1988@gmail.com>
 Guan Hao <raptium@gmail.com>
 Guan Yu Pan (Jacky) <jackypan1989@gmail.com>
 Guichi Zhao <zgc910619@gmail.com>
+Hami Abdi <abdih@users.noreply.github.com>
 HJin.me <hjin.me@gmail.com>
 Hai Phan Nguyen <pnghai@gmail.com>
 Haibin Yu <haibin.yu@oceanwing.com>