Skip to content

Commit

Permalink
Update rollup (#457)
Browse files Browse the repository at this point in the history
  • Loading branch information
emmatown authored and Kye Hohenberger committed Nov 10, 2017
1 parent 721dcc8 commit 39e9a98
Show file tree
Hide file tree
Showing 8 changed files with 20 additions and 39 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
"react-dom": "^15.5.4",
"react-test-renderer": "^15.6.1",
"rimraf": "^2.6.1",
"rollup": "^0.43.0",
"rollup": "^0.51.3",
"rollup-plugin-alias": "^1.3.1",
"rollup-plugin-babel": "^2.7.1",
"rollup-plugin-commonjs": "^8.0.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/emotion-theming/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"dtslint": "^0.2.0",
"prop-types": "^15.5.8",
"rimraf": "^2.6.1",
"rollup": "^0.43.0"
"rollup": "^0.51.3"
},
"dependencies": {
"hoist-non-react-statics": "^2.3.1"
Expand Down
2 changes: 1 addition & 1 deletion packages/emotion-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,6 @@
"devDependencies": {
"npm-run-all": "^4.0.2",
"rimraf": "^2.6.1",
"rollup": "^0.47.2"
"rollup": "^0.51.3"
}
}
2 changes: 1 addition & 1 deletion packages/emotion/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"dtslint": "^0.2.0",
"npm-run-all": "^4.0.2",
"rimraf": "^2.6.1",
"rollup": "^0.43.0"
"rollup": "^0.51.3"
},
"author": "Kye Hohenberger",
"homepage": "https://emotion.sh",
Expand Down
2 changes: 1 addition & 1 deletion packages/preact-emotion/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"npm-run-all": "^4.0.2",
"react-emotion": "^8.0.10",
"rimraf": "^2.6.1",
"rollup": "^0.43.0"
"rollup": "^0.51.3"
},
"author": "Kye Hohenberger",
"homepage": "https://github.com/tkh44/emotion#readme",
Expand Down
2 changes: 1 addition & 1 deletion packages/react-emotion/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"emotion": "^8.0.10",
"npm-run-all": "^4.0.2",
"rimraf": "^2.6.1",
"rollup": "^0.43.0"
"rollup": "^0.51.3"
},
"author": "Kye Hohenberger",
"homepage": "https://github.com/tkh44/emotion#readme",
Expand Down
18 changes: 9 additions & 9 deletions rollup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import path from 'path'
const pkg = require(path.resolve(process.cwd(), './package.json'))

const config = {
entry: './src/index.js',
input: './src/index.js',
external: [
'react',
'emotion',
Expand All @@ -19,7 +19,7 @@ const config = {
'stylis-rule-sheet'
],
exports: 'named',
sourceMap: true,
sourcemap: true,
plugins: [
resolve(),
babel({
Expand All @@ -41,9 +41,9 @@ const config = {
}),
cjs()
],
targets: [
{ dest: pkg.main, format: 'cjs' },
{ dest: pkg.module, format: 'es' }
output: [
{ file: pkg.main, format: 'cjs' },
{ file: pkg.module, format: 'es' }
]
}

Expand All @@ -63,17 +63,17 @@ if (process.env.UMD) {
}),
uglify()
)
config.targets = [
config.output = [
{
dest: './dist/emotion.umd.min.js',
file: './dist/emotion.umd.min.js',
format: 'umd',
moduleName: pkg.name
name: pkg.name
}
]
}

if (pkg.name === 'preact-emotion') {
config.entry = '../react-emotion/src/index.js'
config.input = '../react-emotion/src/index.js'
config.external = ['preact', 'emotion-utils', 'emotion']
config.plugins.unshift(alias({ react: 'preact' }))
}
Expand Down
29 changes: 5 additions & 24 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1391,10 +1391,6 @@ binary-extensions@^1.0.0:
version "1.10.0"
resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.10.0.tgz#9aeb9a6c5e88638aad171e167f5900abe24835d0"

bindings@^1.2.1:
version "1.3.0"
resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.3.0.tgz#b346f6ecf6a95f5a815c5839fc7cdb22502f1ed7"

block-stream@*:
version "0.0.9"
resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a"
Expand Down Expand Up @@ -5869,7 +5865,7 @@ mz@^2.6.0:
object-assign "^4.0.1"
thenify-all "^1.0.0"

nan@^2.0.5, nan@^2.3.0:
nan@^2.3.0:
version "2.7.0"
resolved "https://registry.yarnpkg.com/nan/-/nan-2.7.0.tgz#d95bf721ec877e08db276ed3fc6eb78f9083ad46"

Expand Down Expand Up @@ -7490,17 +7486,9 @@ rollup-watch@^4.3.1:
require-relative "0.8.7"
rollup-pluginutils "^2.0.1"

rollup@^0.43.0:
version "0.43.1"
resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.43.1.tgz#a7770af9711bd21dda977e7cce3d0f63fdfdfa04"
dependencies:
source-map-support "^0.4.0"
optionalDependencies:
weak "^1.0.1"

rollup@^0.47.2:
version "0.47.6"
resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.47.6.tgz#83b90a1890dd3321a3f8d0b2bd216e88483f33de"
rollup@^0.51.3:
version "0.51.3"
resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.51.3.tgz#229e0004d6cf8f207f77a7a8dc76924155f4c1dd"

run-async@^2.2.0:
version "2.3.0"
Expand Down Expand Up @@ -7784,7 +7772,7 @@ source-map-resolve@^0.3.0:
source-map-url "~0.3.0"
urix "~0.1.0"

source-map-support@^0.4.0, source-map-support@^0.4.15:
source-map-support@^0.4.15:
version "0.4.18"
resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f"
dependencies:
Expand Down Expand Up @@ -8638,13 +8626,6 @@ wcwidth@^1.0.0:
dependencies:
defaults "^1.0.3"

weak@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/weak/-/weak-1.0.1.tgz#ab99aab30706959aa0200cb8cf545bb9cb33b99e"
dependencies:
bindings "^1.2.1"
nan "^2.0.5"

webidl-conversions@^3.0.0:
version "3.0.1"
resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
Expand Down

0 comments on commit 39e9a98

Please sign in to comment.