Merge pull request #13 from netlify/prettier

biilmann · web-flow · commit e499d2e18a87 · 2019-03-15T14:28:35.000-07:00
Set up and run prettier
diff --git a/.eslintrc b/.eslintrc
@@ -1,3 +1,6 @@
 {
-  "extends": "oclif"
+  "extends": ["oclif", "plugin:prettier/recommended"],
+  "rules": {
+    "prettier/prettier": "error"
+  }
 }
diff --git a/.prettierrc.json b/.prettierrc.json
@@ -0,0 +1,5 @@
+{
+  "semi": false,
+  "singleQuote": true,
+  "printWidth": 120
+}
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -24,9 +24,12 @@
     "chai": "^4",
     "eslint": "^5.5",
     "eslint-config-oclif": "^3.1",
+    "eslint-config-prettier": "^4.1.0",
+    "eslint-plugin-prettier": "^3.0.1",
     "globby": "^8",
     "mocha": "^5",
-    "nyc": "^13"
+    "nyc": "^13",
+    "prettier": "^1.16.4"
   },
   "engines": {
     "node": ">=8.0.0"
@@ -55,6 +58,8 @@
     "posttest": "eslint .",
     "prepack": "oclif-dev manifest && oclif-dev readme",
     "test": "nyc mocha --forbid-only \"test/**/*.test.js\"",
+    "format": "npm run format:prettier -- --write",
+    "format:prettier": "prettier \"{{src,test}/**/,}*.js\"",
     "version": "oclif-dev readme && git add README.md"
   }
 }
diff --git a/src/commands/functions/build.js b/src/commands/functions/build.js
@@ -1,12 +1,12 @@
 const fs = require('fs')
-const {flags} = require('@oclif/command')
+const { flags } = require('@oclif/command')
 const Command = require('@netlify/cli-utils')
-const {zipFunctions} = require('@netlify/zip-it-and-ship-it')
+const { zipFunctions } = require('@netlify/zip-it-and-ship-it')
 
 class FunctionsBuildCommand extends Command {
   async run() {
-    const {flags, args} = this.parse(FunctionsBuildCommand)
-    const {config} = this.netlify
+    const { flags, args } = this.parse(FunctionsBuildCommand)
+    const { config } = this.netlify
 
     const src = flags.src || config.build.functionsSource
     const dst = flags.functions || config.build.functions
@@ -26,10 +26,10 @@ class FunctionsBuildCommand extends Command {
       process.exit(1)
     }
 
-    fs.mkdirSync(dst, {recursive: true})
+    fs.mkdirSync(dst, { recursive: true })
 
     this.log('Building functions')
-    zipFunctions(src, dst, {skipGo: true})
+    zipFunctions(src, dst, { skipGo: true })
     this.log('Functions buildt to ', dst)
   }
 }
@@ -40,12 +40,12 @@ FunctionsBuildCommand.description = `build functions locally
 FunctionsBuildCommand.flags = {
   functions: flags.string({
     char: 'f',
-    description: 'Specify a functions folder to build to',
+    description: 'Specify a functions folder to build to'
   }),
   src: flags.string({
     char: 's',
-    description: 'Specify the source folder for the functions',
-  }),
+    description: 'Specify the source folder for the functions'
+  })
 }
 
 module.exports = FunctionsBuildCommand
diff --git a/src/commands/functions/index.js b/src/commands/functions/index.js
@@ -1,8 +1,8 @@
 const chalk = require('chalk')
-const {Command} = require('@oclif/command')
+const { Command } = require('@oclif/command')
 
 function showHelp(command) {
-  execSync(`netlify ${command} --help`, {stdio: [0, 1, 2]})
+  execSync(`netlify ${command} --help`, { stdio: [0, 1, 2] })
 }
 
 function isEmptyCommand(flags, args) {
@@ -22,7 +22,7 @@ function hasArgs(args) {
 
 class FunctionsCommand extends Command {
   async run() {
-    const {flags, args} = this.parse(FunctionsCommand)
+    const { flags, args } = this.parse(FunctionsCommand)
     // run help command if no args passed
     if (isEmptyCommand(flags, args)) {
       showHelp(this.id)
@@ -38,7 +38,7 @@ The ${name} command will help you manage the functions in this site
 `
 FunctionsCommand.examples = [
   'netlify functions:create --name function-xyz --runtime nodejs',
-  'netlify functions:update --name function-abc --timeout 30s',
+  'netlify functions:update --name function-abc --timeout 30s'
 ]
 
 // TODO make visible once implementation complete
diff --git a/src/commands/functions/serve.js b/src/commands/functions/serve.js
@@ -12,7 +12,7 @@ Extra documentation goes here
 `
 
 FunctionsServeCommand.flags = {
-  name: flags.string({char: 'n', description: 'name to print'}),
+  name: flags.string({ char: 'n', description: 'name to print' })
 }
 
 // TODO make visible once implementation complete
diff --git a/src/commands/functions/update.js b/src/commands/functions/update.js
@@ -12,7 +12,7 @@ Extra documentation goes here
 `
 
 FunctionsUpdateCommand.flags = {
-  name: flags.string({char: 'n', description: 'name to print'}),
+  name: flags.string({ char: 'n', description: 'name to print' })
 }
 
 // TODO make visible once implementation complete

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,6 @@`
`1`	`1`	`{`
`2`		`- "extends": "oclif"`
	`2`	`+ "extends": ["oclif", "plugin:prettier/recommended"],`
	`3`	`+ "rules": {`
	`4`	`+ "prettier/prettier": "error"`
	`5`	`+ }`
`3`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ Extra documentation goes here`
`12`	`12`	`
`13`	`13`
`14`	`14`	`FunctionsServeCommand.flags = {`
`15`		`- name: flags.string({char: 'n', description: 'name to print'}),`
	`15`	`+ name: flags.string({ char: 'n', description: 'name to print' })`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`// TODO make visible once implementation complete`