Skip to content

Commit

Permalink
feat: Update dependencies (#144)
Browse files Browse the repository at this point in the history
  • Loading branch information
MichaelDeBoey committed May 21, 2020
1 parent 5aefe40 commit d3bf8b4
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 14 deletions.
13 changes: 6 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,11 @@
"@babel/preset-react": "^7.9.4",
"@babel/preset-typescript": "^7.9.0",
"@babel/runtime": "^7.9.6",
"@rollup/plugin-commonjs": "^11.1.0",
"@rollup/plugin-babel": "^5.0.2",
"@rollup/plugin-commonjs": "^12.0.0",
"@rollup/plugin-json": "^4.0.3",
"@rollup/plugin-node-resolve": "^7.1.3",
"@rollup/plugin-node-resolve": "^8.0.0",
"@rollup/plugin-replace": "^2.3.2",
"@types/jest": "^25.2.1",
"arrify": "^2.0.1",
"babel-jest": "^26.0.1",
"babel-plugin-macros": "^2.8.0",
Expand All @@ -60,14 +60,14 @@
"cross-spawn": "^7.0.2",
"doctoc": "^1.4.0",
"eslint": "^6.8.0",
"eslint-config-kentcdodds": "^14.11.0",
"eslint-config-kentcdodds": "^14.13.0",
"eslint-config-prettier": "^6.11.0",
"glob": "^7.1.6",
"husky": "^4.2.5",
"is-ci": "^2.0.0",
"jest": "^26.0.1",
"jest-watch-typeahead": "^0.6.0",
"lint-staged": "^10.2.2",
"lint-staged": "^10.2.4",
"lodash.camelcase": "^4.3.0",
"lodash.has": "^4.5.2",
"lodash.omit": "^4.5.0",
Expand All @@ -76,8 +76,7 @@
"read-pkg-up": "^7.0.1",
"resolve": "^1.17.0",
"rimraf": "^3.0.2",
"rollup": "^2.7.6",
"rollup-plugin-babel": "^4.4.0",
"rollup": "^2.10.5",
"rollup-plugin-node-builtins": "^2.1.2",
"rollup-plugin-node-globals": "^1.4.0",
"rollup-plugin-size-snapshot": "^0.11.0",
Expand Down
15 changes: 8 additions & 7 deletions src/config/rollup.config.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
const path = require('path')
const {babel: rollupBabel} = require('@rollup/plugin-babel')
const commonjs = require('@rollup/plugin-commonjs')
const json = require('@rollup/plugin-json')
const nodeResolve = require('@rollup/plugin-node-resolve')
const {
DEFAULTS: nodeResolveDefaults,
nodeResolve,
} = require('@rollup/plugin-node-resolve')
const replace = require('@rollup/plugin-replace')
const glob = require('glob')
const camelcase = require('lodash.camelcase')
const rollupBabel = require('rollup-plugin-babel')
const {terser} = require('rollup-plugin-terser')
const nodeBuiltIns = require('rollup-plugin-node-builtins')
const nodeGlobals = require('rollup-plugin-node-globals')
Expand Down Expand Up @@ -143,11 +146,9 @@ const replacements = Object.entries(
return acc
}, {})

// TODO: reuse `defaults` from `node-resolve` plugin when this issue is resolved https://github.com/rollup/plugins/issues/299
const defaultExtensions = ['.mjs', '.js', '.json', '.node']
const extensions = hasTypescript
? defaultExtensions.concat(['.ts', '.tsx'])
: defaultExtensions
? [...nodeResolveDefaults.extensions, '.ts', '.tsx']
: nodeResolveDefaults.extensions

module.exports = {
input: codeSplitting ? input : input[0],
Expand All @@ -166,7 +167,7 @@ module.exports = {
rollupBabel({
presets: babelPresets,
babelrc: !useBuiltinConfig,
runtimeHelpers: hasDep('@babel/runtime'),
babelHelpers: hasDep('@babel/runtime') ? 'runtime' : 'bundled',
extensions,
}),
replace(replacements),
Expand Down

0 comments on commit d3bf8b4

Please sign in to comment.