Skip to content

Commit b0b6b7e

Browse files
committed
build: upgrade rollup
1 parent 0a9aab5 commit b0b6b7e

File tree

3 files changed

+23
-22
lines changed

3 files changed

+23
-22
lines changed

Diff for: build/build.js

+17-16
Original file line numberDiff line numberDiff line change
@@ -42,22 +42,23 @@ function build (builds) {
4242

4343
function buildEntry (config) {
4444
const isProd = /min\.js$/.test(config.dest)
45-
return rollup.rollup(config).then(bundle => {
46-
const code = bundle.generate(config).code
47-
if (isProd) {
48-
var minified = (config.banner ? config.banner + '\n' : '') + uglify.minify(code, {
49-
output: {
50-
ascii_only: true
51-
},
52-
compress: {
53-
pure_funcs: ['makeMap']
54-
}
55-
}).code
56-
return write(config.dest, minified, true)
57-
} else {
58-
return write(config.dest, code)
59-
}
60-
})
45+
return rollup.rollup(config)
46+
.then(bundle => bundle.generate(config))
47+
.then(({ code }) => {
48+
if (isProd) {
49+
var minified = (config.banner ? config.banner + '\n' : '') + uglify.minify(code, {
50+
output: {
51+
ascii_only: true
52+
},
53+
compress: {
54+
pure_funcs: ['makeMap']
55+
}
56+
}).code
57+
return write(config.dest, minified, true)
58+
} else {
59+
return write(config.dest, code)
60+
}
61+
})
6162
}
6263

6364
function write (dest, code, zip) {

Diff for: package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
"nightwatch-helpers": "^1.2.0",
107107
"phantomjs-prebuilt": "^2.1.14",
108108
"resolve": "^1.3.3",
109-
"rollup": "^0.43.0",
109+
"rollup": "^0.45.1",
110110
"rollup-plugin-alias": "^1.3.1",
111111
"rollup-plugin-babel": "^2.7.1",
112112
"rollup-plugin-buble": "^0.15.0",

Diff for: yarn.lock

+5-5
Original file line numberDiff line numberDiff line change
@@ -4714,9 +4714,9 @@ rollup-watch@^4.0.0:
47144714
chokidar "^1.7.0"
47154715
require-relative "0.8.7"
47164716

4717-
rollup@^0.43.0:
4718-
version "0.43.0"
4719-
resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.43.0.tgz#b36bdb75fa5e0823b6de8aee18ff7b5655520543"
4717+
rollup@^0.45.1:
4718+
version "0.45.1"
4719+
resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.45.1.tgz#af67ded79974079095b5fede8817b4ec26d610e1"
47204720
dependencies:
47214721
source-map-support "^0.4.0"
47224722

@@ -4816,15 +4816,15 @@ shebang-regex@^1.0.0:
48164816
version "1.0.0"
48174817
resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
48184818

4819-
[email protected], shelljs@^0.7.5:
4819+
48204820
version "0.7.6"
48214821
resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.7.6.tgz#379cccfb56b91c8601e4793356eb5382924de9ad"
48224822
dependencies:
48234823
glob "^7.0.0"
48244824
interpret "^1.0.0"
48254825
rechoir "^0.6.2"
48264826

4827-
shelljs@^0.7.8:
4827+
shelljs@^0.7.5, shelljs@^0.7.8:
48284828
version "0.7.8"
48294829
resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.7.8.tgz#decbcf874b0d1e5fb72e14b164a9683048e9acb3"
48304830
dependencies:

0 commit comments

Comments
 (0)