Skip to content

Commit

Permalink
fix: make config full path
Browse files Browse the repository at this point in the history
  • Loading branch information
Kent C. Dodds committed Sep 5, 2017
1 parent 0f123d9 commit b659a64
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 14 deletions.
23 changes: 15 additions & 8 deletions src/config/babelrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const treeshake = isRollup || isWebpack
module.exports = {
presets: [
[
'env',
require.resolve('babel-preset-env'),
treeshake
? {modules: false}
: {
Expand All @@ -18,18 +18,25 @@ module.exports = {
},
},
],
ifAnyDep('react'),
ifAnyDep('react', require.resolve('babel-preset-react')),
].filter(Boolean),
plugins: [
isRollup ? 'external-helpers' : null,
isRollup ? require.resolve('babel-plugin-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}]
? [require.resolve('babel-plugin-transform-react-jsx'), {pragma: 'h'}]
: null,
isTest || isRollup ? 'transform-inline-environment-variables' : null,
'transform-class-properties',
'transform-object-rest-spread',
isPreact
? [
require.resolve('babel-plugin-transform-react-remove-prop-types'),
{removeImport: true},
]
: null,
isTest || isRollup
? require.resolve('babel-plugin-transform-inline-environment-variables')
: null,
require.resolve('babel-plugin-transform-class-properties'),
require.resolve('babel-plugin-transform-object-rest-spread'),
].filter(Boolean),
}
12 changes: 6 additions & 6 deletions src/config/eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ const {ifAnyDep} = require('../utils')

module.exports = {
extends: [
'kentcdodds',
'kentcdodds/jest',
ifAnyDep('react', 'kentcdodds/jsx-a11y'),
ifAnyDep('react', 'kentcdodds/react'),
'kentcdodds/prettier',
'prettier',
require.resolve('eslint-config-kentcdodds'),
require.resolve('eslint-config-kentcdodds/jest'),
ifAnyDep('react', require.resolve('eslint-config-kentcdodds/jsx-a11y')),
ifAnyDep('react', require.resolve('eslint-config-kentcdodds/react')),
require.resolve('eslint-config-kentcdodds/prettier'),
require.resolve('eslint-config-prettier'),
].filter(Boolean),
rules: {
// stuff I haven't gotten around to updating in my config
Expand Down

0 comments on commit b659a64

Please sign in to comment.