Merge pull request #1719 from StoDevX/prettier-1.7

Update Prettier to v1.7

Author: hawkrives

data/news-styles.css

@@ -5,7 +5,8 @@ body {
   padding: 1em;
   word-wrap: break-word;
 }
-div, figure {
+div,
+figure {
   width: auto !important;
 }
 img {

package-lock.json

@@ -2,9 +2,6 @@
   "name": "all-about-olaf",
   "version": "2.4.0-beta.16",
   "private": true,
-  "config": {
-    "prettier_args": "--single-quote --trailing-comma all --no-bracket-spacing --no-semi"
-  },
   "scripts": {
     "android": "react-native run-android",
     "android:release": "react-native run-android --variant=release",
@@ -20,9 +17,9 @@
     "ios:release": "react-native run-ios --configuration Release",
     "ios-simulator": "xcrun instruments -s devices | peco --select-1 --query 'Simulator iPhone' --on-cancel error | sed  's~.*\\[\\(.*\\)\\].*~\\1~' | xargs open -n -a Simulator --args -CurrentDeviceUDID",
     "lint": "eslint --cache source/ *.js",
-    "prettier": "prettier --write $npm_package_config_prettier_args 'source/**/*.js' 'data/**/*.css' '*.js'",
-    "prettier:changed": "FILES=$(git status -u --porcelain | cut -c4- | grep '\\.js$'); prettier --write $npm_package_config_prettier_args $FILES",
-    "prettier:since-master": "FILES=$(git diff --name-only master | grep '\\.js$'); prettier --write $npm_package_config_prettier_args $FILES",
+    "prettier": "prettier --write '{source,scripts}/**/*.js' 'data/**/*.css' '*.js'",
+    "prettier:changed": "FILES=$(git status -u --porcelain | cut -c4- | grep '\\.js$'); prettier --write $FILES",
+    "prettier:since-master": "FILES=$(git diff --name-only master | grep '\\.js$'); prettier --write $FILES",
     "start": "react-native start",
     "test": "jest",
     "validate-data": "node scripts/validate-data.js"
@@ -45,6 +42,12 @@
     ],
     "preset": "react-native"
   },
+  "prettier": {
+    "singleQuote": true,
+    "trailingComma": "all",
+    "bracketSpacing": false,
+    "semi": false
+  },
   "dependencies": {
     "buffer": "5.0.7",
     "bugsnag-react-native": "2.3.2",
@@ -114,7 +117,7 @@
     "marked": "0.3.6",
     "minimist": "1.2.0",
     "pify": "3.0.0",
-    "prettier": "1.4.4",
+    "prettier": "1.7.2",
     "react-native-view-shot": "1.12.0",
     "react-test-renderer": "16.0.0-alpha.12",
     "string-natural-compare": "2.0.2"

package.json

@@ -21,7 +21,10 @@ if (process.mainModule === module) {
 // exported module
 module.exports = bundleDataDir
 function bundleDataDir({fromDir, toFile}) {
-  const files = fs.readdirSync(fromDir).filter(junk.not).map(f => path.join(fromDir, f))
+  const files = fs
+    .readdirSync(fromDir)
+    .filter(junk.not)
+    .map(f => path.join(fromDir, f))
   if (!files.length) {
     return
   }
@@ -37,6 +40,7 @@ function bundleDataDir({fromDir, toFile}) {
   const dated = {data: loaded}
   const output = JSON.stringify(dated, null, 2) + '\n'
 
-  const outStream = toFile === '-' ? process.stdout : fs.createWriteStream(toFile)
+  const outStream =
+    toFile === '-' ? process.stdout : fs.createWriteStream(toFile)
   outStream.write(output)
 }

scripts/bundle-data-dir.js

@@ -8,9 +8,18 @@ const convertDataFile = require('./convert-data-file')
 
 const isDir = pth => fs.statSync(pth).isDirectory()
 const isFile = pth => fs.statSync(pth).isFile()
-const readDir = pth => fs.readdirSync(pth).filter(junk.not).filter(entry => !entry.startsWith('_'))
-const findDirsIn = pth => readDir(pth).filter(entry => isDir(path.join(pth, entry)))
-const findFilesIn = pth => readDir(pth).filter(entry => isFile(path.join(pth, entry)))
+
+const readDir = pth =>
+  fs
+    .readdirSync(pth)
+    .filter(junk.not)
+    .filter(entry => !entry.startsWith('_'))
+
+const findDirsIn = pth =>
+  readDir(pth).filter(entry => isDir(path.join(pth, entry)))
+
+const findFilesIn = pth =>
+  readDir(pth).filter(entry => isFile(path.join(pth, entry)))
 
 const args = process.argv.slice(2)
 const fromDir = args[0]

scripts/bundle-data.js

@@ -19,7 +19,7 @@ if (process.mainModule === module) {
 
 // exported module
 module.exports = convertDataFile
-function convertDataFile({fromFile, toFile, toFileType="json"}) {
+function convertDataFile({fromFile, toFile, toFileType = 'json'}) {
   const contents = fs.readFileSync(fromFile, 'utf-8')
   let output = contents
 
@@ -32,7 +32,7 @@ function convertDataFile({fromFile, toFile, toFileType="json"}) {
       output = processYaml(contents)
       break
     case 'css':
-      if (toFileType === "css") {
+      if (toFileType === 'css') {
         output = contents
       } else {
         output = processCSS(contents)
@@ -46,9 +46,8 @@ function convertDataFile({fromFile, toFile, toFileType="json"}) {
 
   output = output + '\n'
 
-  const outStream = toFile === '-'
-    ? process.stdout
-    : fs.createWriteStream(toFile)
+  const outStream =
+    toFile === '-' ? process.stdout : fs.createWriteStream(toFile)
   outStream.write(output)
 }
 

scripts/convert-data-file.js

@@ -6,12 +6,17 @@ const spawn = (cmd, ...args) => {
   childSpawn(cmd, args)
 }
 
-const resize = (img, width, toFile) => spawn('convert', img, '-resize', `${width}x${width}`, toFile)
+const resize = (img, width, toFile) =>
+  spawn('convert', img, '-resize', `${width}x${width}`, toFile)
 
 // iOS app icons
 const iosSizes = [[29, 1], [29, 2], [29, 3], [40, 2], [40, 3], [60, 2], [60, 3]]
 for (const [width, density] of iosSizes) {
-  resize(source, width * density, `icons/ios/AppIcon.appiconset/Icon-${width}@${density}x.png`)
+  resize(
+    source,
+    width * density,
+    `icons/ios/AppIcon.appiconset/Icon-${width}@${density}x.png`,
+  )
 }
 
 // iTunes icons

scripts/make-icons.js

@@ -11,8 +11,18 @@ const SCHEMA_BASE = path.join(__dirname, '..', 'data', '_schemas')
 const DATA_BASE = path.join(__dirname, '..', 'data')
 
 const isDir = pth => tryBoolean(() => fs.statSync(pth).isDirectory())
-const readYaml = pth => JSON.parse(JSON.stringify(yaml.safeLoad(fs.readFileSync(pth, 'utf-8'), {filename: pth})))
-const readDir = pth => fs.readdirSync(pth).filter(junk.not).filter(entry => !entry.startsWith('_'))
+const readYaml = pth =>
+  JSON.parse(
+    JSON.stringify(
+      yaml.safeLoad(fs.readFileSync(pth, 'utf-8'), {filename: pth}),
+    ),
+  )
+
+const readDir = pth =>
+  fs
+    .readdirSync(pth)
+    .filter(junk.not)
+    .filter(entry => !entry.startsWith('_'))
 
 /// MARK: program
 
@@ -78,20 +88,26 @@ function parseArgs(argv) {
     console.error()
     console.error('Arguments:')
     console.error('  <blank>: validates all schemas and data')
-    console.error('  [schema-name]+: validates the schema and data for the given schema')
+    console.error(
+      '  [schema-name]+: validates the schema and data for the given schema',
+    )
     console.error()
     console.error('Options:')
     console.error('  --no-bail: continue past the first error')
     console.error('  -d, --data: use this as the data file (requires --schema)')
     console.error('  -s, --schema: use this as the schema (requires --data)')
     console.error()
-    console.error(`By default, the program looks for schema files in ${SCHEMA_BASE}`)
+    console.error(
+      `By default, the program looks for schema files in ${SCHEMA_BASE}`,
+    )
     process.exit(1)
   }
 
   if ((args.data && !args.schema) || (args.schema && !args.data)) {
     console.error('Usage: node validate-compiled-data.js [options] [args]')
-    console.error('If either --data or --schema are provided, both are required')
+    console.error(
+      'If either --data or --schema are provided, both are required',
+    )
     process.exit(1)
   }
 
@@ -145,7 +161,9 @@ function formatError(err, data) {
   const dataPath = err.dataPath.replace(/^\./, '')
   switch (err.keyword) {
     case 'enum': {
-      contents = `Given value "${get(data, dataPath)}" ${err.message} [${err.params.allowedValues.join(', ')}]`
+      const value = get(data, dataPath)
+      const allowed = err.params.allowedValues.join(', ')
+      contents = `Given value "${value}" ${err.message} [${allowed}]`
       break
     }
     case 'type': {
@@ -156,8 +174,5 @@ function formatError(err, data) {
       return JSON.stringify(err, null, 2)
     }
   }
-  return [
-    `Error at ${err.dataPath}:`,
-    contents,
-  ].join('\n')
+  return [`Error at ${err.dataPath}:`, contents].join('\n')
 }

scripts/validate-data.js

@@ -7,9 +7,8 @@ import {stringifyFilters} from './views/components/filter'
 
 import {getAnalyticsOptOut} from './lib/storage'
 
-const trackerId = process.env.NODE_ENV === 'development'
-  ? 'UA-90234209-1'
-  : 'UA-90234209-2'
+const trackerId =
+  process.env.NODE_ENV === 'development' ? 'UA-90234209-1' : 'UA-90234209-2'
 export const tracker = new GoogleAnalyticsTracker(trackerId)
 
 function disableIfOptedOut() {

source/analytics.js

@@ -80,9 +80,8 @@ function parseDeptNum(deptNumString: string): Error | string {
     return new Error(`Problem parsing ${deptNumString}: no matches found`)
   }
 
-  let department = matches[1].indexOf('/') !== -1
-    ? [matches[2], matches[3]]
-    : [matches[1]]
+  let department =
+    matches[1].indexOf('/') !== -1 ? [matches[2], matches[3]] : [matches[1]]
   department = department.join('/')
 
   let number = parseInt(matches[4], 10)