Merge pull request #2153 from StoDevX/tabs

Switch Prettier to using tabs instead of spaces 😈

Author: hawkrives

dangerfile.js

@@ -1,36 +1,36 @@
 body {
-  font-family: -apple-system, Roboto, sans-serif;
-  font-size: 16px;
-  margin: 0;
-  padding: 1em;
-  word-wrap: break-word;
+	font-family: -apple-system, Roboto, sans-serif;
+	font-size: 16px;
+	margin: 0;
+	padding: 1em;
+	word-wrap: break-word;
 }
 div,
 figure {
-  width: auto !important;
+	width: auto !important;
 }
 img {
-  max-width: 100%;
-  height: auto;
-  display: block;
-  margin: 12px auto;
+	max-width: 100%;
+	height: auto;
+	display: block;
+	margin: 12px auto;
 }
 p {
-  line-height: 1.2em;
-  margin-bottom: 0.25em;
+	line-height: 1.2em;
+	margin-bottom: 0.25em;
 }
 iframe {
-  max-width: 100%;
+	max-width: 100%;
 }
 .aao-header {
-  border-bottom: solid 2px #eaeaea;
-  margin: 0 0 1em;
-  padding-bottom: 1em;
-  font-weight: bold;
-  text-align: center;
+	border-bottom: solid 2px #eaeaea;
+	margin: 0 0 1em;
+	padding-bottom: 1em;
+	font-weight: bold;
+	text-align: center;
 }
 .aao-header h1 {
-  line-height: 1.1em;
-  font-size: 1.5em;
-  margin-bottom: 0;
+	line-height: 1.1em;
+	font-size: 1.5em;
+	margin-bottom: 0;
 }

data/news-styles.css

@@ -52,6 +52,7 @@
     "preset": "react-native"
   },
   "prettier": {
+    "useTabs": true,
     "singleQuote": true,
     "trailingComma": "all",
     "bracketSpacing": false,

package.json

@@ -7,40 +7,40 @@ const natsort = require('string-natural-compare')
 
 // run cli
 if (process.mainModule === module) {
-  const args = process.argv.slice(2)
-  const fromDir = args[0]
-  const toFile = args[1] || '-'
-  if (!fromDir || fromDir === '-h' || fromDir === '--help') {
-    console.error('usage: node bundle-data-dir.js <from-dir> [to-file]')
-    process.exit(1)
-  }
-  console.log(process.mainModule)
-  bundleDataDir({fromDir, toFile})
+	const args = process.argv.slice(2)
+	const fromDir = args[0]
+	const toFile = args[1] || '-'
+	if (!fromDir || fromDir === '-h' || fromDir === '--help') {
+		console.error('usage: node bundle-data-dir.js <from-dir> [to-file]')
+		process.exit(1)
+	}
+	console.log(process.mainModule)
+	bundleDataDir({fromDir, toFile})
 }
 
 // exported module
 module.exports = bundleDataDir
 function bundleDataDir({fromDir, toFile}) {
-  const files = fs
-    .readdirSync(fromDir)
-    .filter(junk.not)
-    .map(f => path.join(fromDir, f))
-  if (!files.length) {
-    return
-  }
+	const files = fs
+		.readdirSync(fromDir)
+		.filter(junk.not)
+		.map(f => path.join(fromDir, f))
+	if (!files.length) {
+		return
+	}
 
-  // sort the files so that 9 comes before 10
-  files.sort(natsort)
+	// sort the files so that 9 comes before 10
+	files.sort(natsort)
 
-  const loaded = files.map(fpath => {
-    console.log(fpath)
-    let contents = fs.readFileSync(fpath, 'utf-8')
-    return yaml.safeLoad(contents)
-  })
-  const dated = {data: loaded}
-  const output = JSON.stringify(dated) + '\n'
+	const loaded = files.map(fpath => {
+		console.log(fpath)
+		let contents = fs.readFileSync(fpath, 'utf-8')
+		return yaml.safeLoad(contents)
+	})
+	const dated = {data: loaded}
+	const output = JSON.stringify(dated) + '\n'
 
-  const outStream =
-    toFile === '-' ? process.stdout : fs.createWriteStream(toFile)
-  outStream.write(output)
+	const outStream =
+		toFile === '-' ? process.stdout : fs.createWriteStream(toFile)
+	outStream.write(output)
 }

scripts/bundle-data-dir.js

@@ -10,50 +10,50 @@ 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('_'))
+	fs
+		.readdirSync(pth)
+		.filter(junk.not)
+		.filter(entry => !entry.startsWith('_'))
 
 const findDirsIn = pth =>
-  readDir(pth).filter(entry => isDir(path.join(pth, entry)))
+	readDir(pth).filter(entry => isDir(path.join(pth, entry)))
 
 const findFilesIn = pth =>
-  readDir(pth).filter(entry => isFile(path.join(pth, entry)))
+	readDir(pth).filter(entry => isFile(path.join(pth, entry)))
 
 const args = process.argv.slice(2)
 const fromDir = args[0]
 const toDir = args[1]
 if (!fromDir || !toDir || fromDir === '-h' || fromDir === '--help') {
-  console.error('usage: node bundle-data.js <from-dir> <to-dir>')
-  process.exit(1)
+	console.error('usage: node bundle-data.js <from-dir> <to-dir>')
+	process.exit(1)
 }
 
 mkdirp.sync(toDir)
 
 // Bundle each directory of yaml files into one big json file
 const dirs = findDirsIn(fromDir)
 dirs.forEach(dirname => {
-  const input = path.join(fromDir, dirname)
-  const output = path.join(toDir, dirname) + '.json'
-  console.log(`bundle-data-dir ${input} ${output}`)
-  console.time(`bundle-data-dir ${input} ${output}`)
-  bundleDataDir({fromDir: input, toFile: output})
-  console.timeEnd(`bundle-data-dir ${input} ${output}`)
+	const input = path.join(fromDir, dirname)
+	const output = path.join(toDir, dirname) + '.json'
+	console.log(`bundle-data-dir ${input} ${output}`)
+	console.time(`bundle-data-dir ${input} ${output}`)
+	bundleDataDir({fromDir: input, toFile: output})
+	console.timeEnd(`bundle-data-dir ${input} ${output}`)
 })
 
 // Convert these files into JSON equivalents
 const files = findFilesIn(fromDir)
 files.forEach(file => {
-  // Get the absolute paths to the input and output files
-  const input = path.join(fromDir, file)
-  const output = path.join(toDir, file).replace(/\.(.*)$/, '.json')
-  console.log(`convert-data-file ${input} ${output}`)
-  console.time(`convert-data-file ${input} ${output}`)
-  convertDataFile({fromFile: input, toFile: output})
-  if (file.endsWith('.css')) {
-    const dest = output.replace(/\.json/, '.css')
-    convertDataFile({fromFile: input, toFile: dest, toFileType: 'css'})
-  }
-  console.timeEnd(`convert-data-file ${input} ${output}`)
+	// Get the absolute paths to the input and output files
+	const input = path.join(fromDir, file)
+	const output = path.join(toDir, file).replace(/\.(.*)$/, '.json')
+	console.log(`convert-data-file ${input} ${output}`)
+	console.time(`convert-data-file ${input} ${output}`)
+	convertDataFile({fromFile: input, toFile: output})
+	if (file.endsWith('.css')) {
+		const dest = output.replace(/\.json/, '.css')
+		convertDataFile({fromFile: input, toFile: dest, toFileType: 'css'})
+	}
+	console.timeEnd(`convert-data-file ${input} ${output}`)
 })

scripts/bundle-data.js

@@ -4,61 +4,61 @@ const yaml = require('js-yaml')
 
 // run cli
 if (process.mainModule === module) {
-  const args = process.argv.slice(2)
-  const fromFile = args[0]
-  const toFile = args[1] || '-'
-  if (!fromFile || fromFile === '-h' || fromFile === '--help') {
-    console.error(
-      'usage: node convert-data-file.js <from-file.{md,yaml,css}> [to-file]',
-    )
-    process.exit(1)
-  }
-  convertDataFile({fromFile, toFile})
+	const args = process.argv.slice(2)
+	const fromFile = args[0]
+	const toFile = args[1] || '-'
+	if (!fromFile || fromFile === '-h' || fromFile === '--help') {
+		console.error(
+			'usage: node convert-data-file.js <from-file.{md,yaml,css}> [to-file]',
+		)
+		process.exit(1)
+	}
+	convertDataFile({fromFile, toFile})
 }
 
 // exported module
 module.exports = convertDataFile
 function convertDataFile({fromFile, toFile, toFileType = 'json'}) {
-  const contents = fs.readFileSync(fromFile, 'utf-8')
-  let output = contents
+	const contents = fs.readFileSync(fromFile, 'utf-8')
+	let output = contents
 
-  const fileType = fromFile.split('.').slice(-1)[0]
-  switch (fileType) {
-    case 'md':
-      output = processMarkdown(contents)
-      break
-    case 'yaml':
-      output = processYaml(contents)
-      break
-    case 'css':
-      if (toFileType === 'css') {
-        output = contents
-      } else {
-        output = processCSS(contents)
-      }
-      break
-    default:
-      throw new Error(
-        `unexpected filetype "${fileType}; expected "md", "yaml", or "css"`,
-      )
-  }
+	const fileType = fromFile.split('.').slice(-1)[0]
+	switch (fileType) {
+		case 'md':
+			output = processMarkdown(contents)
+			break
+		case 'yaml':
+			output = processYaml(contents)
+			break
+		case 'css':
+			if (toFileType === 'css') {
+				output = contents
+			} else {
+				output = processCSS(contents)
+			}
+			break
+		default:
+			throw new Error(
+				`unexpected filetype "${fileType}; expected "md", "yaml", or "css"`,
+			)
+	}
 
-  output = output + '\n'
+	output = output + '\n'
 
-  const outStream =
-    toFile === '-' ? process.stdout : fs.createWriteStream(toFile)
-  outStream.write(output)
+	const outStream =
+		toFile === '-' ? process.stdout : fs.createWriteStream(toFile)
+	outStream.write(output)
 }
 
 function processYaml(fileContents) {
-  let loaded = yaml.safeLoad(fileContents)
-  return JSON.stringify({data: loaded})
+	let loaded = yaml.safeLoad(fileContents)
+	return JSON.stringify({data: loaded})
 }
 
 function processMarkdown(fileContents) {
-  return JSON.stringify({text: fileContents})
+	return JSON.stringify({text: fileContents})
 }
 
 function processCSS(fileContents) {
-  return JSON.stringify({css: fileContents})
+	return JSON.stringify({css: fileContents})
 }

scripts/convert-data-file.js

@@ -2,40 +2,40 @@ const childSpawn = require('child_process').spawnSync
 const source = 'icon-source.png'
 
 const spawn = (cmd, ...args) => {
-  console.log(cmd, ...args)
-  childSpawn(cmd, args)
+	console.log(cmd, ...args)
+	childSpawn(cmd, args)
 }
 
 const resize = (img, width, toFile) =>
-  spawn('convert', img, '-resize', `${width}x${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
 const itunes = [[512, 1], [1024, 2], [1536, 3]]
 for (const [width, density] of itunes) {
-  resize(source, width, `icons/ios/iTunesArtwork@${density}x.png`)
+	resize(source, width, `icons/ios/iTunesArtwork@${density}x.png`)
 }
 
 // Android app icons
 const androidSizes = [
-  ['ldpi', 36],
-  ['mdpi', 48],
-  ['hdpi', 72],
-  ['xhdpi', 96],
-  ['xxhdpi', 144],
-  ['xxxhdpi', 192],
+	['ldpi', 36],
+	['mdpi', 48],
+	['hdpi', 72],
+	['xhdpi', 96],
+	['xxhdpi', 144],
+	['xxxhdpi', 192],
 ]
 for (const [label, size] of androidSizes) {
-  resize(source, size, `icons/android/mipmap-${label}/ic_launcher.png`)
+	resize(source, size, `icons/android/mipmap-${label}/ic_launcher.png`)
 }
 
 resize(source, '512', 'icons/android/playstore-icon.png')