support prettier

ant-design · Dec 7, 2018 · 3208276 · 3208276
1 parent cd5a5ca
commit 3208276
Show file tree

Hide file tree

Showing 20 changed files with 316 additions and 188 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -1,30 +1,21 @@
 {
-  "extends": "airbnb",
+  "extends": ["airbnb", "prettier"],
   "rules": {
-    "strict": [
-      0
-    ],
-    "func-names": [
-      0
-    ],
-    "no-param-reassign": [
-      0
-    ],
-    "global-require": [
-      0
-    ],
-    "no-console": [
-      0
-    ],
-    "import/no-dynamic-require": [
-      0
-    ],
-    "comma-dangle": ["error", {
-      arrays: 'always-multiline',
-      objects: 'always-multiline',
-      imports: 'always-multiline',
-      exports: 'always-multiline',
-      functions: 'never',
-    }]
+    "strict": [0],
+    "func-names": [0],
+    "no-param-reassign": [0],
+    "global-require": [0],
+    "no-console": [0],
+    "import/no-dynamic-require": [0],
+    "comma-dangle": [
+      "error",
+      {
+        "arrays": "always-multiline",
+        "objects": "always-multiline",
+        "imports": "always-multiline",
+        "exports": "always-multiline",
+        "functions": "never"
+      }
+    ]
   }
 }
diff --git a/.prettierignore b/.prettierignore
@@ -0,0 +1,7 @@
+**/*.md
+**/*.svg
+**/*.ejs
+**/*.html
+package.json
+.umi
+.umi-production
diff --git a/.prettierrc b/.prettierrc
@@ -0,0 +1,11 @@
+{
+  "singleQuote": true,
+  "trailingComma": "es5",
+  "printWidth": 100,
+  "overrides": [
+    {
+      "files": ".prettierrc",
+      "options": { "parser": "json" }
+    }
+  ]
+}
diff --git a/lib/getBabelCommonConfig.js b/lib/getBabelCommonConfig.js
@@ -1,32 +1,38 @@
 'use strict';
 
-module.exports = function (modules) {
+module.exports = function(modules) {
   const plugins = [
     require.resolve('babel-plugin-transform-es3-member-expression-literals'),
     require.resolve('babel-plugin-transform-es3-property-literals'),
     require.resolve('babel-plugin-transform-object-assign'),
     require.resolve('babel-plugin-transform-class-properties'),
     require.resolve('babel-plugin-transform-object-rest-spread'),
   ];
-  plugins.push([require.resolve('babel-plugin-transform-runtime'), {
-    polyfill: false,
-  }]);
+  plugins.push([
+    require.resolve('babel-plugin-transform-runtime'),
+    {
+      polyfill: false,
+    },
+  ]);
   return {
     presets: [
       require.resolve('babel-preset-react'),
-      [require.resolve('babel-preset-env'), {
-        modules,
-        targets: {
-          browsers: [
-            'last 2 versions',
-            'Firefox ESR',
-            '> 1%',
-            'ie >= 9',
-            'iOS >= 8',
-            'Android >= 4',
-          ],
+      [
+        require.resolve('babel-preset-env'),
+        {
+          modules,
+          targets: {
+            browsers: [
+              'last 2 versions',
+              'Firefox ESR',
+              '> 1%',
+              'ie >= 9',
+              'iOS >= 8',
+              'Android >= 4',
+            ],
+          },
         },
-      }],
+      ],
     ],
     plugins,
   };

diff --git a/lib/getNpm.js b/lib/getNpm.js
@@ -2,12 +2,12 @@
 
 const runCmd = require('./runCmd');
 
-module.exports = function (done) {
+module.exports = function(done) {
   if (process.env.NPM_CLI) {
     done(process.env.NPM_CLI);
     return;
   }
-  runCmd('which', ['tnpm'], (code) => {
+  runCmd('which', ['tnpm'], code => {
     let npm = 'npm';
     if (!code) {
       npm = 'tnpm';

diff --git a/lib/getTSCommonConfig.js b/lib/getTSCommonConfig.js
@@ -4,19 +4,22 @@ const fs = require('fs');
 const path = require('path');
 const assign = require('object-assign');
 
-module.exports = function () {
+module.exports = function() {
   let my = {};
   if (fs.existsSync(path.join(process.cwd(), 'tsconfig.json'))) {
     my = require(path.join(process.cwd(), 'tsconfig.json'));
   }
-  return assign({
-    noUnusedParameters: true,
-    noUnusedLocals: true,
-    strictNullChecks: true,
-    target: 'es6',
-    jsx: 'preserve',
-    moduleResolution: 'node',
-    declaration: true,
-    allowSyntheticDefaultImports: true,
-  }, my.compilerOptions);
+  return assign(
+    {
+      noUnusedParameters: true,
+      noUnusedLocals: true,
+      strictNullChecks: true,
+      target: 'es6',
+      jsx: 'preserve',
+      moduleResolution: 'node',
+      declaration: true,
+      allowSyntheticDefaultImports: true,
+    },
+    my.compilerOptions
+  );
 };
diff --git a/lib/getWebpackConfig.js b/lib/getWebpackConfig.js
@@ -7,7 +7,7 @@ const deepAssign = require('deep-assign');
 const replaceLib = require('./replaceLib');
 const postcssConfig = require('./postcssConfig');
 
-module.exports = function (modules) {
+module.exports = function(modules) {
   const pkg = require(path.join(process.cwd(), 'package.json'));
   const babelConfig = require('./getBabelCommonConfig')(modules || false);
 
@@ -27,10 +27,7 @@ module.exports = function (modules) {
     });
   }
 
-  babelConfig.plugins.push([
-    require.resolve('babel-plugin-import'),
-    pluginImportOptions,
-  ]);
+  babelConfig.plugins.push([require.resolve('babel-plugin-import'), pluginImportOptions]);
 
   if (modules === false) {
     babelConfig.plugins.push(replaceLib);
@@ -111,11 +108,7 @@ module.exports = function (modules) {
               },
               {
                 loader: 'postcss-loader',
-                options: Object.assign(
-                  {},
-                  postcssConfig,
-                  { sourceMap: true }
-                ),
+                options: Object.assign({}, postcssConfig, { sourceMap: true }),
               },
             ],
           }),
@@ -132,11 +125,7 @@ module.exports = function (modules) {
               },
               {
                 loader: 'postcss-loader',
-                options: Object.assign(
-                  {},
-                  postcssConfig,
-                  { sourceMap: true }
-                ),
+                options: Object.assign({}, postcssConfig, { sourceMap: true }),
               },
               {
                 loader: 'less-loader',
@@ -215,9 +204,11 @@ All rights reserved.
       [pkg.name]: entry,
     };
 
-    uncompressedConfig.plugins.push(new webpack.DefinePlugin({
-      'process.env.NODE_ENV': JSON.stringify('development'),
-    }));
+    uncompressedConfig.plugins.push(
+      new webpack.DefinePlugin({
+        'process.env.NODE_ENV': JSON.stringify('development'),
+      })
+    );
 
     return [config, uncompressedConfig];
   }