bunches of updates and stuff

Kent C. Dodds · Kent C. Dodds · commit 3172c720f6e4 · 2017-09-03T23:25:51.000-06:00
diff --git a/.babelrc b/.babelrc
@@ -1,13 +1,3 @@
 {
-  "presets": [
-    ["env", {
-      "targets": {
-        "node": "4.5"
-      }
-    }]
-  ],
-  "plugins": [
-    "transform-class-properties",
-    "transform-object-rest-spread"
-  ]
+  "presets": ["./src/config/babelrc"]
 }
diff --git a/.eslintrc b/.eslintrc
@@ -1,15 +1,11 @@
 {
-  "extends": [
-    "kentcdodds",
-    "kentcdodds/jest",
-    "kentcdodds/prettier"
-  ],
+  "extends": ["./src/config/eslintrc.js"],
   "rules": {
     // stuff I haven't gotten around to updating in my config
-    "no-unused-vars": ["error", { "argsIgnorePattern": "^_", "varsIgnorePattern": "^ignored" }],
     "func-style": "off",
     "no-process-exit": "off",
     "import/no-dynamic-require": "off",
+    "import/no-unassigned-import": "off",
 
     // prettier does this for us
     "max-len": "off",
diff --git a/babel.js b/babel.js
@@ -0,0 +1 @@
+module.exports = require('./dist/config/babelrc')
diff --git a/config.js b/config.js
@@ -0,0 +1 @@
+module.exports = require('./dist/config')
diff --git a/eslint.js b/eslint.js
@@ -0,0 +1 @@
+module.exports = require('./dist/config/eslintrc')
diff --git a/jest.config.js b/jest.config.js
@@ -1 +1,8 @@
-module.exports = require('./src/config/jest.config')
+const {jest: jestConfig} = require('./src/config')
+
+module.exports = Object.assign(jestConfig, {
+  coverageThreshold: null,
+  coveragePathIgnorePatterns: jestConfig.coveragePathIgnorePatterns.concat(
+    '/scripts/',
+  ),
+})
diff --git a/package.json b/package.json
@@ -12,51 +12,51 @@
   "scripts": {
     "start": "nps",
     "test": "node src test",
-    "precommit":
-      "lint-staged && opt --in pre-commit --exec \"npm start validate\""
+    "test:update": "node src test --updateSnapshot",
+    "build": "node src build",
+    "lint": "node src lint",
+    "validate": "node src validate",
+    "install": "node src install",
+    "uninstall": "node src uninstall",
+    "precommit": "node src precommit"
   },
-  "files": ["dist"],
+  "files": ["dist", "babel", "eslint", "config"],
   "keywords": [],
   "author": "Kent C. Dodds <kent@doddsfamily.us> (http://kentcdodds.com/)",
   "license": "MIT",
   "dependencies": {
     "all-contributors-cli": "^4.3.0",
-    "babel-cli": "^6.24.1",
-    "babel-preset-env": "^1.6.0",
+    "arrify": "^1.0.1",
+    "babel-cli": "^6.26.0",
     "babel-jest": "^20.0.3",
+    "babel-plugin-external-helpers": "^6.22.0",
     "babel-plugin-transform-class-properties": "^6.24.1",
-    "babel-plugin-transform-object-rest-spread": "^6.23.0",
+    "babel-plugin-transform-inline-environment-variables": "^0.2.0",
+    "babel-plugin-transform-object-rest-spread": "^6.26.0",
+    "babel-plugin-transform-react-jsx": "^6.24.1",
+    "babel-plugin-transform-react-remove-prop-types": "^0.4.8",
+    "babel-preset-env": "^1.6.0",
+    "babel-preset-react": "^6.24.1",
     "concurrently": "^3.5.0",
     "cross-spawn": "^5.1.0",
-    "eslint-config-kentcdodds": "^12.4.1",
     "eslint": "^4.2.0",
+    "eslint-config-kentcdodds": "^12.4.1",
+    "eslint-config-prettier": "^2.4.0",
     "husky": "^0.14.3",
     "jest": "^20.0.4",
     "lint-staged": "^4.0.1",
-    "lodash": "^4.17.4",
+    "lodash.merge": "^4.6.0",
     "opt-cli": "^1.5.1",
     "prettier": "^1.6.1",
     "read-pkg-up": "^2.0.0",
+    "resolve": "^1.4.0",
     "resolve-bin": "^0.4.0",
     "rimraf": "^2.6.1"
   },
   "devDependencies": {
     "nps": "^5.4.0",
     "nps-utils": "^1.2.0"
   },
-  "lint-staged": {
-    "*.+(js|json)": ["prettier --write", "git add"]
-  },
-  "prettier": {
-    "printWidth": 80,
-    "tabWidth": 2,
-    "useTabs": false,
-    "semi": false,
-    "singleQuote": true,
-    "trailingComma": "es5",
-    "bracketSpacing": false,
-    "jsxBraketSameLine": false
-  },
   "repository": {
     "type": "git",
     "url": "https://github.com/kentcdodds/kcd-scripts.git"
diff --git a/src/config/babel-transform.js b/src/config/babel-transform.js
@@ -0,0 +1,5 @@
+const babelJest = require('babel-jest')
+
+module.exports = babelJest.createTransformer({
+  presets: [require.resolve('./babelrc')],
+})
diff --git a/src/config/babelrc.js b/src/config/babelrc.js
@@ -0,0 +1,26 @@
+const {ifAnyDep} = require('../utils')
+
+const isTest = process.env.NODE_ENV === 'test'
+const isPreact = process.env.LIBRARY === 'preact'
+const isRollup = Boolean(JSON.parse(process.env.ROLLUP_BUILD || '"false"'))
+const isWebpack = Boolean(JSON.parse(process.env.WEBPACK_BUILD || '"false"'))
+const treeshake = isRollup || isWebpack
+
+module.exports = {
+  presets: [
+    ['env', treeshake ? {modules: false} : {}],
+    ifAnyDep('react'),
+  ].filter(Boolean),
+  plugins: [
+    isRollup ? 'external-helpers' : null,
+    // we're actually not using JSX at all, but I'm leaving this
+    // in here just in case we ever do (this would be easy to miss).
+    isPreact ? ['transform-react-jsx', {pragma: 'h'}] : null,
+    isPreact
+      ? ['transform-react-remove-prop-types', {removeImport: true}]
+      : null,
+    isTest || isRollup ? 'transform-inline-environment-variables' : null,
+    'transform-class-properties',
+    'transform-object-rest-spread',
+  ].filter(Boolean),
+}
diff --git a/src/config/eslintrc.js b/src/config/eslintrc.js
@@ -1,17 +1,17 @@
-const {applyOverrides, ifDevDep} = require('../utils')
+const {ifAnyDep} = require('../utils')
 
-const config = applyOverrides({
-  type: 'eslint',
-  config: {
-    extends: [
-      'kentcdodds',
-      ifDevDep('jest', 'kentcdodds/jest'),
-      ifDevDep('webpack', 'kentcdodds/webpack'),
-      ifDevDep('react', 'kentcdodds/jsx-a11y'),
-      ifDevDep('react', 'kentcdodds/react'),
-      ifDevDep('prettier', 'kentcdodds/prettier'),
-    ].filter(Boolean),
-    rules: {
+module.exports = {
+  extends: [
+    'kentcdodds',
+    ifAnyDep('jest', 'kentcdodds/jest'),
+    ifAnyDep('webpack', 'kentcdodds/webpack'),
+    ifAnyDep('react', 'kentcdodds/jsx-a11y'),
+    ifAnyDep('react', 'kentcdodds/react'),
+    'prettier',
+    ifAnyDep('prettier', 'kentcdodds/prettier'),
+  ].filter(Boolean),
+  rules: Object.assign(
+    {
       // stuff I haven't gotten around to updating in my config
       'no-unused-vars': [
         'error',
@@ -21,21 +21,19 @@ const config = applyOverrides({
       'no-process-exit': 'off',
 
       // prettier does this for us
-      ...ifDevDep(
-        'prettier',
-        {
-          'max-len': 'off',
-          semi: 'off',
-          quotes: 'off',
-          'comma-dangle': 'off',
-          'no-console': 'off',
-          indent: 'off',
-          'babel/object-curly-spacing': 'off',
-        },
-        {}
-      ),
     },
-  },
-})
-
-module.exports = config
+    ifAnyDep(
+      'prettier',
+      {
+        'max-len': 'off',
+        semi: 'off',
+        quotes: 'off',
+        'comma-dangle': 'off',
+        'no-console': 'off',
+        indent: 'off',
+        'babel/object-curly-spacing': 'off',
+      },
+      {},
+    ),
+  ),
+}
diff --git a/src/config/index.js b/src/config/index.js
@@ -0,0 +1,7 @@
+module.exports = {
+  babel: require('./babelrc'),
+  eslint: require('./eslintrc'),
+  jest: require('./jest.config'),
+  lintStaged: require('./lintstagedrc'),
+  prettier: require('./prettierrc'),
+}
diff --git a/src/config/jest.config.js b/src/config/jest.config.js
@@ -1,4 +1,7 @@
-const {ifDevDep, applyOverrides} = require('../utils')
+const path = require('path')
+const {ifDevDep} = require('../utils')
+
+const here = p => path.join(__dirname, p)
 
 const ignores = [
   '/node_modules/',
@@ -7,23 +10,22 @@ const ignores = [
   '__mocks__',
 ]
 
-const config = applyOverrides({
-  type: 'jest',
-  config: {
-    testEnvironment: ifDevDep('webpack', 'jsdom', 'node'),
-    collectCoverageFrom: ['src/**/*.js'],
-    testMatch: ['**/__tests__/**/*.js'],
-    testPathIgnorePatterns: ignores,
-    coveragePathIgnorePatterns: ignores,
-    coverageThreshold: {
-      global: {
-        branches: 100,
-        functions: 100,
-        lines: 100,
-        statements: 100,
-      },
+module.exports = {
+  testEnvironment: ifDevDep(['webpack', 'rollup'], 'jsdom', 'node'),
+  collectCoverageFrom: ['src/**/*.js'],
+  testMatch: ['**/__tests__/**/*.js'],
+  testPathIgnorePatterns: ignores,
+  coveragePathIgnorePatterns: ignores,
+  transform: {
+    '^.+\\.js$': here('./babel-transform'),
+  },
+  transformIgnorePatterns: ['[/\\\\]node_modules[/\\\\].+\\.(js|jsx)$'],
+  coverageThreshold: {
+    global: {
+      branches: 100,
+      functions: 100,
+      lines: 100,
+      statements: 100,
     },
   },
-})
-
-module.exports = config
+}
diff --git a/src/config/lintstagedrc.js b/src/config/lintstagedrc.js
@@ -0,0 +1,10 @@
+const [executor] = process.argv
+
+module.exports = {
+  linters: {
+    '**/*.+(js|json|less|css|ts)': [
+      `${executor} ${require.resolve('../')} format`,
+      'git add',
+    ],
+  },
+}
diff --git a/src/config/prettierignore b/src/config/prettierignore
@@ -0,0 +1,6 @@
+node_modules/
+coverage/
+dist/
+build/
+out/
+.next/
diff --git a/src/config/prettierrc.js b/src/config/prettierrc.js
@@ -1,17 +1,10 @@
-const {applyOverrides} = require('../utils')
-
-const config = applyOverrides({
-  type: 'prettier',
-  config: {
-    printWidth: 80,
-    tabWidth: 2,
-    useTabs: false,
-    semi: false,
-    singleQuote: true,
-    trailingComma: 'all',
-    bracketSpacing: false,
-    jsxBraketSameLine: false,
-  },
-})
-
-module.exports = config
+module.exports = {
+  printWidth: 80,
+  tabWidth: 2,
+  useTabs: false,
+  semi: false,
+  singleQuote: true,
+  trailingComma: 'all',
+  bracketSpacing: false,
+  jsxBraketSameLine: false,
+}
diff --git a/src/scripts/build.js b/src/scripts/build.js
@@ -16,7 +16,7 @@ const result = spawn.sync(
     '--ignore', '__tests__,__mocks__',
     'src',
   ].concat(argv),
-  {stdio: 'inherit'}
+  {stdio: 'inherit'},
 )
 
-process.exit(result)
+process.exit(result.status)
diff --git a/src/scripts/format.js b/src/scripts/format.js
@@ -1,20 +1,34 @@
+const fs = require('fs')
 const path = require('path')
 const resolveBin = require('resolve-bin')
 const spawn = require('cross-spawn')
+const {fromRoot} = require('../paths')
+const {hasPkgProp} = require('../utils')
 
-const argv = process.argv.slice(2)
+const args = process.argv.slice(2)
 
 const here = p => path.join(__dirname, p)
 
+const useBuiltinConfig =
+  !args.includes('--config') &&
+  !fs.existsSync(fromRoot('.prettierrc')) &&
+  !hasPkgProp('prettierrc')
+const config = useBuiltinConfig
+  ? ['--config', here('../config/prettierrc.js')]
+  : []
+
+const useBuiltinIgnore =
+  !args.includes('--ignore-path') && !fs.existsSync(fromRoot('.prettierignore'))
+const ignore = useBuiltinIgnore
+  ? ['--ignore-path', here('../config/prettierignore')]
+  : []
+
+const write = args.includes('--no-write') ? [] : ['--write']
+
 const result = spawn.sync(
   resolveBin.sync('prettier'),
-  // prettier-ignore
-  [
-    '--write',
-    '--config', here('../config/prettierrc.js'),
-    '--ignore-path', here('../config/eslintignore'),
-  ].concat(argv),
-  {stdio: 'inherit'}
+  [...config, ...ignore, ...write].concat(args),
+  {stdio: 'inherit'},
 )
 
-process.exit(result)
+process.exit(result.status)
diff --git a/src/scripts/install.js b/src/scripts/install.js
@@ -0,0 +1 @@
+require('husky/bin/install')
diff --git a/src/scripts/lint.js b/src/scripts/lint.js
diff --git a/src/scripts/precommit/index.js b/src/scripts/precommit/index.js
diff --git a/src/scripts/precommit/lint-staged.js b/src/scripts/precommit/lint-staged.js
diff --git a/src/scripts/test.js b/src/scripts/test.js
diff --git a/src/scripts/uninstall.js b/src/scripts/uninstall.js
diff --git a/src/scripts/validate.js b/src/scripts/validate.js
diff --git a/src/utils.js b/src/utils.js

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+module.exports = require('./dist/config/babelrc')`