From 647ba193cddae02d211c821a2575af3527379162 Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Wed, 28 Nov 2018 12:39:10 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9A=99=EF=B8=8F=20=20upgrade=20code=20style?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/ISSUE_TEMPLATE.md        |  4 ++--
 .github/PULL_REQUEST_TEMPLATE.md |  8 ++++----
 scripts/prepub.js                | 14 +++++++-------
 tests/index.test.js              |  5 +++--
 typings/custom-typings.d.ts      |  4 ++--
 5 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 93367f2352..6d65a8907e 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,5 +1,5 @@
 <!--
- ⚠️ ⚠️ ⚠️  IMPORTANT: Please use the following link to create a new issue:
+ ⚠️ ⚠️ ⚠️  IMPORTANT: Please use the following link to create a new issue: ⚠️ ⚠️ ⚠️
 
   http://new-issue.ant.design
 
@@ -7,7 +7,7 @@ If your issue was not created using the app above, it will be closed immediately
 -->
 
 <!--
- ⚠️ ⚠️ ⚠️  注意：请使用下面的链接来新建 issue：
+ ⚠️ ⚠️ ⚠️  注意：请使用下面的链接来新建 issue： ⚠️ ⚠️ ⚠️
 
   http://new-issue.ant.design
 
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index ed6b2cd985..a628b70c30 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,12 +1,12 @@
 First of all, thank you for your contribution! :-)
 
-Please makes sure that these checkboxes are checked before submitting your PR, thank you!
+Please makes sure that these checkboxes are checked before submitting your pull request, thank you!
 
-* [ ] Make sure that you propose PR to right branch: bugfix for `master`, feature for branch `feature`.
+* [ ] Make sure that you propose pull request to right branch: bugfix for `master`, feature for branch `feature`.
 * [ ] Make sure that you follow antd's [code convention](https://github.com/ant-design/ant-design/wiki/Code-convention-for-antd).
 * [ ] Run `npm run lint` and fix those errors before submitting in order to keep consistent code style.
-* [ ] Rebase before creating a PR to keep commit history clear.
-* [ ] Add some descriptions and refer relative issues for you PR.
+* [ ] Rebase before creating a pull request to keep commit history clear.
+* [ ] Add some descriptions and refer relative issues for you pull request.
 
 Extra checklist:
 
diff --git a/scripts/prepub.js b/scripts/prepub.js
index a98802c461..fc6eeac371 100644
--- a/scripts/prepub.js
+++ b/scripts/prepub.js
@@ -1,8 +1,5 @@
 #!/usr/bin/env node
 
-/* eslint-disable */
-'use strict';
-
 const fs = require('fs');
 const path = require('path');
 const packageInfo = require('../package.json');
@@ -14,8 +11,9 @@ if (fs.existsSync(path.join(__dirname, '../lib'))) {
   const versionFileContent = fs.readFileSync(versionFilePath).toString();
   fs.writeFileSync(
     versionFilePath,
-    versionFileContent.replace(`require('../../package.json')`, `{ version: '${packageInfo.version}' }`)
+    versionFileContent.replace("require('../../package.json')", `{ version: '${packageInfo.version}' }`)
   );
+  // eslint-disable-next-line
   console.log('Wrote version into lib/version/index.js');
 
   // Build package.json version to lib/version/index.d.ts
@@ -25,6 +23,7 @@ if (fs.existsSync(path.join(__dirname, '../lib'))) {
     versionDefPath,
     `declare var _default: "${packageInfo.version}";\nexport default _default;\n`
   );
+  // eslint-disable-next-line
   console.log('Wrote version into lib/version/index.d.ts');
 }
 
@@ -34,10 +33,10 @@ if (fs.existsSync(path.join(__dirname, '../dist'))) {
   let componentsLessContent = '';
 
   // Build components in one file: lib/style/components.less
-  fs.readdir(componentsPath, function (err, files) {
-    files.forEach(function (file) {
+  fs.readdir(componentsPath, (err, files) => {
+    files.forEach((file) => {
       if (fs.existsSync(path.join(componentsPath, file, 'style', 'index.less'))) {
-        componentsLessContent += `@import "../${path.join(file, 'style', 'index.less')}";\n`
+        componentsLessContent += `@import "../${path.join(file, 'style', 'index.less')}";\n`;
       }
     });
     fs.writeFileSync(path.join(process.cwd(), 'lib', 'style', 'components.less'), componentsLessContent);
@@ -48,5 +47,6 @@ if (fs.existsSync(path.join(__dirname, '../dist'))) {
       '@import "../lib/style/index.less";\n@import "../lib/style/components.less";'
     );
   });
+  // eslint-disable-next-line
   console.log('Built a entry less file to dist/antd.less');
 }
diff --git a/tests/index.test.js b/tests/index.test.js
index 6faa5b07e8..5c2f9c750c 100644
--- a/tests/index.test.js
+++ b/tests/index.test.js
@@ -1,3 +1,4 @@
+/* eslint-disable global-require */
 import pkg from '../package.json';
 
 const testDist = process.env.LIB_DIR === 'dist';
@@ -6,7 +7,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'); // eslint-disable-line global-require
+    const antd = testDist ? require('../dist/antd') : require('../components');
     expect(Object.keys(antd)).toMatchSnapshot();
   });
 
@@ -14,7 +15,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'); // eslint-disable-line global-require
+      const antd = require('../dist/antd');
       expect(antd.version).toBe(pkg.version);
     });
   }
diff --git a/typings/custom-typings.d.ts b/typings/custom-typings.d.ts
index 28d17bf8c4..6eeda57c1e 100644
--- a/typings/custom-typings.d.ts
+++ b/typings/custom-typings.d.ts
@@ -95,10 +95,10 @@ declare module "lodash/debounce";
 
 declare module "lodash/uniqBy";
 
-declare module 'intersperse';
-
 declare module "raf";
 
+declare module 'intersperse';
+
 declare module "react-lifecycles-compat";
 
 declare module "react-copy-to-clipboard";