Prettier + ESLint setup

.eslintrc.js

@@ -0,0 +1,33 @@
+module.exports = {
+  extends: [
+    '@elastic/eslint-config-kibana',
+    '@elastic/eslint-config-kibana/jest',
+  ],
+
+  settings: {
+    'import/resolver': {
+      '@elastic/eslint-import-resolver-kibana': {
+        rootPackageName: 'kibana',
+        kibanaPath: '.',
+      },
+    },
+  },
+
+  overrides: [
+    // Enable Prettier
+    {
+      files: [
+        '.eslintrc.js',
+        'packages/kbn-build/**/*.js',
+      ],
+      plugins: [
+        'prettier',
+      ],
+      rules: Object.assign(
+        { 'prettier/prettier': 'error' },
+        require('eslint-config-prettier').rules,
+        require('eslint-config-prettier/react').rules,
+      ),
+    },
+  ]
+}

.prettierrc

@@ -0,0 +1,4 @@
+{
+  "singleQuote": true,
+  "trailingComma": "es5"
+}

package.json

@@ -75,13 +75,13 @@
     "url": "https://github.com/elastic/kibana.git"
   },
   "dependencies": {
-    "@kbn/babel-preset": "link:packages/kbn-babel-preset",
     "@elastic/datemath": "4.0.2",
     "@elastic/eui": "0.0.18",
     "@elastic/filesaver": "1.1.2",
     "@elastic/numeral": "2.3.1",
     "@elastic/test-subj-selector": "0.2.1",
     "@elastic/ui-ace": "0.2.3",
+    "@kbn/babel-preset": "link:packages/kbn-babel-preset",
     "JSONStream": "1.1.1",
     "accept-language-parser": "1.2.0",
     "angular": "1.6.5",
@@ -233,11 +233,13 @@
     "enzyme-adapter-react-16": "^1.1.1",
     "enzyme-to-json": "3.1.4",
     "eslint": "4.14.0",
+    "eslint-config-prettier": "^2.9.0",
     "eslint-plugin-babel": "4.1.2",
     "eslint-plugin-import": "2.8.0",
     "eslint-plugin-jest": "^21.6.2",
     "eslint-plugin-mocha": "4.11.0",
     "eslint-plugin-prefer-object-spread": "1.2.1",
+    "eslint-plugin-prettier": "^2.6.0",
     "eslint-plugin-react": "7.5.1",
     "event-stream": "3.3.2",
     "expect.js": "0.3.1",
@@ -286,6 +288,7 @@
     "nock": "8.0.0",
     "node-sass": "4.5.3",
     "pixelmatch": "4.0.2",
+    "prettier": "^1.10.2",
     "proxyquire": "1.7.10",
     "sass-loader": "6.0.6",
     "simple-git": "1.37.0",

packages/kbn-build/src/cli.js

@@ -45,8 +45,8 @@ export async function run(argv) {
 
   const options = getopts(argv, {
     alias: {
-      h: 'help'
-    }
+      h: 'help',
+    },
   });
 
   const args = options._;

packages/kbn-build/src/production/__tests__/index.js

@@ -11,8 +11,8 @@ import { getProjects } from '../../utils/projects';
 // and more integration-y, as we're trying to not add very slow tests to our
 // Jest unit tests.
 
-describe('kbn-build production', function () {
-  it('builds and copies projects for production', async function () {
+describe('kbn-build production', function() {
+  it('builds and copies projects for production', async function() {
     this.timeout(60 * 1000);
 
     const tmpDir = tempy.directory();
@@ -26,22 +26,22 @@ describe('kbn-build production', function () {
       cwd: fixturesPath,
       parents: true,
       nodir: true,
-      dot: true
+      dot: true,
     });
 
     const projects = await getProjects(tmpDir, ['./packages/*']);
 
     for (const project of projects.values()) {
       // This will both install dependencies and generate `yarn.lock` files
       await project.installDependencies({
-        extraArgs: ['--silent', '--no-progress']
+        extraArgs: ['--silent', '--no-progress'],
       });
     }
 
     await buildProductionProjects({ kibanaRoot: tmpDir, buildRoot });
 
     const files = await globby(['**/*', '!**/node_modules/**'], {
-      cwd: buildRoot
+      cwd: buildRoot,
     });
 
     expect(files).to.eql([
@@ -52,7 +52,7 @@ describe('kbn-build production', function () {
       'packages/foo/package.json',
       'packages/foo/src/index.js',
       'packages/foo/target/index.js',
-      'packages/foo/yarn.lock'
+      'packages/foo/yarn.lock',
     ]);
   });
 });

packages/kbn-build/src/production/index.js

@@ -6,18 +6,18 @@ import { getProjectPaths } from '../config';
 import {
   getProjects,
   buildProjectGraph,
-  topologicallyBatchProjects
+  topologicallyBatchProjects,
 } from '../utils/projects';
 import {
   createProductionPackageJson,
-  writePackageJson
+  writePackageJson,
 } from '../utils/package_json';
 import { isDirectory } from '../utils/fs';
 
 export async function buildProductionProjects({ kibanaRoot, buildRoot }) {
   const projectPaths = getProjectPaths(kibanaRoot, {
     'skip-kibana': true,
-    'skip-kibana-extra': true
+    'skip-kibana-extra': true,
   });
 
   const projects = await getProductionProjects(kibanaRoot, projectPaths);
@@ -81,7 +81,7 @@ async function copyToBuild(project, kibanaRoot, buildRoot) {
     cwd: project.path,
     parents: true,
     nodir: true,
-    dot: true
+    dot: true,
   });
 
   const packageJson = project.json;

packages/kbn-build/src/utils/child_process.js

@@ -16,7 +16,7 @@ function generateColors() {
 export function spawn(command, args, opts) {
   return execa(command, args, {
     ...opts,
-    stdio: 'inherit'
+    stdio: 'inherit',
   });
 }
 
@@ -25,14 +25,14 @@ const nextColor = generateColors();
 export function spawnStreaming(command, args, opts, { prefix }) {
   const spawned = execa(command, args, {
     ...opts,
-    stdio: ['ignore', 'pipe', 'pipe']
+    stdio: ['ignore', 'pipe', 'pipe'],
   });
 
   const color = nextColor();
   const prefixedStdout = logTransformer({ tag: `${color.bold(prefix)}:` });
   const prefixedStderr = logTransformer({
     tag: `${logSymbols.error} ${color.bold(prefix)}:`,
-    mergeMultiline: true
+    mergeMultiline: true,
   });
 
   spawned.stdout.pipe(prefixedStdout).pipe(process.stdout);

packages/kbn-build/src/utils/package_json.js

@@ -12,7 +12,7 @@ export function writePackageJson(path, json) {
 
 export const createProductionPackageJson = pkgJson => ({
   ...pkgJson,
-  dependencies: transformDependencies(pkgJson.dependencies)
+  dependencies: transformDependencies(pkgJson.dependencies),
 });
 
 /**

packages/kbn-build/src/utils/project.js

@@ -4,7 +4,7 @@ import chalk from 'chalk';
 import {
   installInDir,
   runScriptInPackage,
-  runScriptInPackageStreaming
+  runScriptInPackageStreaming,
 } from './scripts';
 import { readPackageJson } from './package_json';
 import { CliError } from './errors';
@@ -27,7 +27,7 @@ export class Project {
 
     this.allDependencies = {
       ...(this.json.devDependencies || {}),
-      ...(this.json.dependencies || {})
+      ...(this.json.dependencies || {}),
     };
 
     this.scripts = this.json.scripts || {};
@@ -53,7 +53,7 @@ export class Project {
     const meta = {
       package: `${this.name} (${this.packageJsonLocation})`,
       expected: `"${project.name}": "${expectedVersionInPackageJson}"`,
-      actual: `"${project.name}": "${versionInPackageJson}"`
+      actual: `"${project.name}": "${versionInPackageJson}"`,
     };
 
     if (versionInPackageJson.startsWith(PREFIX)) {

packages/kbn-build/src/utils/project.test.js

@@ -9,7 +9,7 @@ const createProjectWith = (fields, path = '') =>
     {
       name: 'kibana',
       version: '1.0.0',
-      ...fields
+      ...fields,
     },
     join(rootPath, path)
   );
@@ -25,11 +25,11 @@ describe('fromPath', () => {
 test('fields', async () => {
   const kibana = createProjectWith({
     scripts: {
-      test: 'jest'
+      test: 'jest',
     },
     dependencies: {
-      foo: '1.2.3'
-    }
+      foo: '1.2.3',
+    },
   });
 
   expect(kibana.name).toBe('kibana');
@@ -45,13 +45,13 @@ describe('#ensureValidProjectDependency', () => {
   test('valid link: version', async () => {
     const root = createProjectWith({
       dependencies: {
-        foo: 'link:packages/foo'
-      }
+        foo: 'link:packages/foo',
+      },
     });
 
     const foo = createProjectWith(
       {
-        name: 'foo'
+        name: 'foo',
       },
       'packages/foo'
     );
@@ -63,15 +63,15 @@ describe('#ensureValidProjectDependency', () => {
     const root = createProjectWith(
       {
         dependencies: {
-          foo: 'link:wrong/path'
-        }
+          foo: 'link:wrong/path',
+        },
       },
       rootPath
     );
 
     const foo = createProjectWith(
       {
-        name: 'foo'
+        name: 'foo',
       },
       'packages/foo'
     );
@@ -85,15 +85,15 @@ describe('#ensureValidProjectDependency', () => {
     const root = createProjectWith(
       {
         dependencies: {
-          foo: '1.0.0'
-        }
+          foo: '1.0.0',
+        },
       },
       rootPath
     );
 
     const foo = createProjectWith(
       {
-        name: 'foo'
+        name: 'foo',
       },
       'packages/foo'
     );

packages/kbn-build/src/utils/projects.js

@@ -19,7 +19,7 @@ export async function getProjects(rootPath, projectsPaths) {
 
     // Do not match ** against multiple filenames
     // (This is only specified because we currently don't have a need for it.)
-    noglobstar: true
+    noglobstar: true,
   };
   const projects = new Map();
 
@@ -36,7 +36,7 @@ export async function getProjects(rootPath, projectsPaths) {
           `There are multiple projects with the same name [${project.name}]`,
           {
             name: project.name,
-            paths: [project.path, projects.get(project.name).path]
+            paths: [project.path, projects.get(project.name).path],
           }
         );
       }

packages/kbn-build/src/utils/projects.test.js

@@ -3,7 +3,7 @@ import { resolve } from 'path';
 import {
   getProjects,
   buildProjectGraph,
-  topologicallyBatchProjects
+  topologicallyBatchProjects,
 } from './projects';
 
 const rootPath = resolve(`${__dirname}/__fixtures__/kibana`);
@@ -53,7 +53,7 @@ describe('#buildProjectGraph', () => {
     const projects = await getProjects(rootPath, [
       '.',
       'packages/*',
-      '../plugins/*'
+      '../plugins/*',
     ]);
     const graph = buildProjectGraph(projects);
 
@@ -71,7 +71,7 @@ describe('#topologicallyBatchProjects', () => {
     const projects = await getProjects(rootPath, [
       '.',
       'packages/*',
-      '../plugins/*'
+      '../plugins/*',
     ]);
     const graph = buildProjectGraph(projects);
 

packages/kbn-build/src/utils/scripts.js

@@ -9,13 +9,13 @@ export function installInDir(directory, extraArgs = []) {
     'install',
     '--non-interactive',
     '--mutex file',
-    ...extraArgs
+    ...extraArgs,
   ];
 
   // We pass the mutex flag to ensure only one instance of yarn runs at any
   // given time (e.g. to avoid conflicts).
   return spawn(yarnPath, options, {
-    cwd: directory
+    cwd: directory,
   });
 }
 
@@ -24,7 +24,7 @@ export function installInDir(directory, extraArgs = []) {
  */
 export function runScriptInPackage(script, args, pkg) {
   const execOpts = {
-    cwd: pkg.path
+    cwd: pkg.path,
   };
 
   return spawn(yarnPath, ['run', script, ...args], execOpts);
@@ -35,10 +35,10 @@ export function runScriptInPackage(script, args, pkg) {
  */
 export function runScriptInPackageStreaming(script, args, pkg) {
   const execOpts = {
-    cwd: pkg.path
+    cwd: pkg.path,
   };
 
   return spawnStreaming(yarnPath, ['run', script, ...args], execOpts, {
-    prefix: pkg.name
+    prefix: pkg.name,
   });
 }