Skip to content

Commit 74f7fdb

Browse files
committed
Upgrade rollup
1 parent ab312d6 commit 74f7fdb

File tree

3 files changed

+102
-70
lines changed

3 files changed

+102
-70
lines changed

package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@
3838
},
3939
"devDependencies": {
4040
"fs-jetpack": "^0.13.0",
41-
"rollup": "^0.43.1",
42-
"rollup-plugin-buble": "^0.15.0",
41+
"rollup": "^0.54.1",
42+
"rollup-plugin-buble": "^0.18.0",
4343
"tap": "^10.7.3",
4444
"uglify-es": "^3.1.9"
4545
},

script/rollup.config.js

+27-15
Original file line numberDiff line numberDiff line change
@@ -7,30 +7,42 @@ const pjson = require('../package.json');
77
let banner = `
88
/*
99
* ${pjson.name} v${pjson.version}
10-
* (c) ${new Date().getFullYear()} @Johnny Wu
10+
* (c) ${new Date().getFullYear()} @gamedev-js
1111
* Released under the MIT License.
1212
*/
1313
`;
1414

1515
let dest = './dist';
1616
let file = 'geom-utils';
17-
let moduleName = 'geomUtils';
17+
let name = 'geomUtils';
18+
let sourcemap = true;
19+
let globals = {'vmath': 'window.vmath'};
1820

1921
// clear directory
2022
fsJetpack.dir(dest, { empty: true });
2123

2224
module.exports = {
23-
entry: './index.js',
24-
targets: [
25-
{ dest: `${dest}/${file}.dev.js`, format: 'iife' },
26-
{ dest: `${dest}/${file}.js`, format: 'cjs' },
27-
],
28-
moduleName,
29-
banner,
30-
external: ['vmath'],
31-
globals: {'vmath': 'window.vmath'},
32-
sourceMap: true,
33-
plugins: [
34-
buble(),
35-
]
25+
input: './index.js',
26+
external: ['vmath'],
27+
plugins: [
28+
buble(),
29+
],
30+
output: [
31+
{
32+
file: `${dest}/${file}.dev.js`,
33+
format: 'iife',
34+
name,
35+
banner,
36+
globals,
37+
sourcemap
38+
},
39+
{
40+
file: `${dest}/${file}.js`,
41+
format: 'cjs',
42+
name,
43+
banner,
44+
globals,
45+
sourcemap
46+
},
47+
],
3648
};

yarn.lock

+73-53
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,20 @@ acorn-jsx@^3.0.1:
88
dependencies:
99
acorn "^3.0.4"
1010

11-
acorn-object-spread@^1.0.0:
12-
version "1.0.0"
13-
resolved "https://registry.yarnpkg.com/acorn-object-spread/-/acorn-object-spread-1.0.0.tgz#48ead0f4a8eb16995a17a0db9ffc6acaada4ba68"
11+
acorn5-object-spread@^4.0.0:
12+
version "4.0.0"
13+
resolved "https://registry.yarnpkg.com/acorn5-object-spread/-/acorn5-object-spread-4.0.0.tgz#d5758081eed97121ab0be47e31caaef2aa399697"
1414
dependencies:
15-
acorn "^3.1.0"
15+
acorn "^5.1.2"
1616

17-
acorn@^3.0.4, acorn@^3.1.0, acorn@^3.3.0:
17+
acorn@^3.0.4:
1818
version "3.3.0"
1919
resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a"
2020

21+
acorn@^5.1.2:
22+
version "5.3.0"
23+
resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.3.0.tgz#7446d39459c54fb49a80e6ee6478149b940ec822"
24+
2125
align-text@^0.1.1, align-text@^0.1.3:
2226
version "0.1.4"
2327
resolved "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117"
@@ -42,6 +46,12 @@ ansi-styles@^2.2.1:
4246
version "2.2.1"
4347
resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
4448

49+
ansi-styles@^3.1.0:
50+
version "3.2.0"
51+
resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.0.tgz#c159b8d5be0f9e5a6f346dab94f16ce022161b88"
52+
dependencies:
53+
color-convert "^1.9.0"
54+
4555
append-transform@^0.4.0:
4656
version "0.4.0"
4757
resolved "https://registry.yarnpkg.com/append-transform/-/append-transform-0.4.0.tgz#d76ebf8ca94d276e247a36bad44a4b74ab611991"
@@ -189,10 +199,6 @@ bind-obj-methods@^1.0.0:
189199
version "1.0.0"
190200
resolved "https://registry.yarnpkg.com/bind-obj-methods/-/bind-obj-methods-1.0.0.tgz#4f5979cac15793adf70e488161e463e209ca509c"
191201

192-
bindings@^1.2.1:
193-
version "1.3.0"
194-
resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.3.0.tgz#b346f6ecf6a95f5a815c5839fc7cdb22502f1ed7"
195-
196202
bluebird@^3.5.1:
197203
version "3.5.1"
198204
resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.1.tgz#d9551f9de98f1fcda1e683d17ee91a0602ee2eb9"
@@ -218,17 +224,18 @@ braces@^1.8.2:
218224
preserve "^0.2.0"
219225
repeat-element "^1.1.2"
220226

221-
buble@^0.15.0:
222-
version "0.15.2"
223-
resolved "https://registry.yarnpkg.com/buble/-/buble-0.15.2.tgz#547fc47483f8e5e8176d82aa5ebccb183b02d613"
227+
buble@^0.18.0:
228+
version "0.18.0"
229+
resolved "https://registry.yarnpkg.com/buble/-/buble-0.18.0.tgz#63b338b8248c474b46fd3e3546560ae08d8abe91"
224230
dependencies:
225-
acorn "^3.3.0"
231+
acorn "^5.1.2"
226232
acorn-jsx "^3.0.1"
227-
acorn-object-spread "^1.0.0"
228-
chalk "^1.1.3"
229-
magic-string "^0.14.0"
233+
acorn5-object-spread "^4.0.0"
234+
chalk "^2.1.0"
235+
magic-string "^0.22.4"
230236
minimist "^1.2.0"
231237
os-homedir "^1.0.1"
238+
vlq "^0.2.2"
232239

233240
builtin-modules@^1.0.0:
234241
version "1.1.1"
@@ -271,6 +278,14 @@ chalk@^1.1.1, chalk@^1.1.3:
271278
strip-ansi "^3.0.0"
272279
supports-color "^2.0.0"
273280

281+
chalk@^2.1.0:
282+
version "2.3.0"
283+
resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.0.tgz#b5ea48efc9c1793dccc9b4767c93914d3f2d52ba"
284+
dependencies:
285+
ansi-styles "^3.1.0"
286+
escape-string-regexp "^1.0.5"
287+
supports-color "^4.0.0"
288+
274289
clean-yaml-object@^0.1.0:
275290
version "0.1.0"
276291
resolved "https://registry.yarnpkg.com/clean-yaml-object/-/clean-yaml-object-0.1.0.tgz#63fb110dc2ce1a84dc21f6d9334876d010ae8b68"
@@ -295,6 +310,16 @@ code-point-at@^1.0.0:
295310
version "1.1.0"
296311
resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
297312

313+
color-convert@^1.9.0:
314+
version "1.9.1"
315+
resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.1.tgz#c1261107aeb2f294ebffec9ed9ecad529a6097ed"
316+
dependencies:
317+
color-name "^1.1.1"
318+
319+
color-name@^1.1.1:
320+
version "1.1.3"
321+
resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
322+
298323
color-support@^1.1.0:
299324
version "1.1.3"
300325
resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2"
@@ -418,7 +443,7 @@ error-ex@^1.2.0:
418443
dependencies:
419444
is-arrayish "^0.2.1"
420445

421-
escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.3:
446+
escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.3, escape-string-regexp@^1.0.5:
422447
version "1.0.5"
423448
resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
424449

@@ -430,9 +455,9 @@ esprima@^4.0.0:
430455
version "4.0.0"
431456
resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.0.tgz#4499eddcd1110e0b218bacf2fa7f7f59f55ca804"
432457

433-
estree-walker@^0.2.1:
434-
version "0.2.1"
435-
resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.2.1.tgz#bdafe8095383d8414d5dc2ecf4c9173b6db9412e"
458+
estree-walker@^0.3.0:
459+
version "0.3.1"
460+
resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.3.1.tgz#e6b1a51cf7292524e7237c312e5fe6660c1ce1aa"
436461

437462
esutils@^2.0.2:
438463
version "2.0.2"
@@ -647,6 +672,10 @@ has-flag@^1.0.0:
647672
version "1.0.0"
648673
resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-1.0.0.tgz#9d9e793165ce017a00f00418c43f942a7b1d11fa"
649674

675+
has-flag@^2.0.0:
676+
version "2.0.0"
677+
resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-2.0.0.tgz#e8207af1cc7b30d446cc70b734b5e8be18f88d51"
678+
650679
hawk@~3.1.3:
651680
version "3.1.3"
652681
resolved "https://registry.yarnpkg.com/hawk/-/hawk-3.1.3.tgz#078444bd7c1640b0fe540d2c9b73d59678e8e1c4"
@@ -976,9 +1005,9 @@ lru-cache@^4.0.1:
9761005
pseudomap "^1.0.2"
9771006
yallist "^2.1.2"
9781007

979-
magic-string@^0.14.0:
980-
version "0.14.0"
981-
resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.14.0.tgz#57224aef1701caeed273b17a39a956e72b172462"
1008+
magic-string@^0.22.4:
1009+
version "0.22.4"
1010+
resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.22.4.tgz#31039b4e40366395618c1d6cf8193c53917475ff"
9821011
dependencies:
9831012
vlq "^0.2.1"
9841013

@@ -1068,10 +1097,6 @@ [email protected]:
10681097
version "2.0.0"
10691098
resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
10701099

1071-
nan@^2.0.5:
1072-
version "2.8.0"
1073-
resolved "https://registry.yarnpkg.com/nan/-/nan-2.8.0.tgz#ed715f3fe9de02b57a5e6252d90a96675e1f085a"
1074-
10751100
normalize-package-data@^2.3.2:
10761101
version "2.4.0"
10771102
resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f"
@@ -1391,27 +1416,23 @@ rimraf@^2.3.3, rimraf@^2.5.4, rimraf@^2.6.1:
13911416
dependencies:
13921417
glob "^7.0.5"
13931418

1394-
rollup-plugin-buble@^0.15.0:
1395-
version "0.15.0"
1396-
resolved "https://registry.yarnpkg.com/rollup-plugin-buble/-/rollup-plugin-buble-0.15.0.tgz#83c3e89c7fd2266c7918f41ba3980313519c7fd0"
1419+
rollup-plugin-buble@^0.18.0:
1420+
version "0.18.0"
1421+
resolved "https://registry.yarnpkg.com/rollup-plugin-buble/-/rollup-plugin-buble-0.18.0.tgz#6e20d1b2840c59eb496b9f954f75243e51786ac1"
13971422
dependencies:
1398-
buble "^0.15.0"
1399-
rollup-pluginutils "^1.5.0"
1423+
buble "^0.18.0"
1424+
rollup-pluginutils "^2.0.1"
14001425

1401-
rollup-pluginutils@^1.5.0:
1402-
version "1.5.2"
1403-
resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-1.5.2.tgz#1e156e778f94b7255bfa1b3d0178be8f5c552408"
1426+
rollup-pluginutils@^2.0.1:
1427+
version "2.0.1"
1428+
resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.0.1.tgz#7ec95b3573f6543a46a6461bd9a7c544525d0fc0"
14041429
dependencies:
1405-
estree-walker "^0.2.1"
1406-
minimatch "^3.0.2"
1430+
estree-walker "^0.3.0"
1431+
micromatch "^2.3.11"
14071432

1408-
rollup@^0.43.1:
1409-
version "0.43.1"
1410-
resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.43.1.tgz#a7770af9711bd21dda977e7cce3d0f63fdfdfa04"
1411-
dependencies:
1412-
source-map-support "^0.4.0"
1413-
optionalDependencies:
1414-
weak "^1.0.1"
1433+
rollup@^0.54.1:
1434+
version "0.54.1"
1435+
resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.54.1.tgz#415a5d999421502646cf54b873fc4ce1a7393970"
14151436

14161437
safe-buffer@~5.1.0, safe-buffer@~5.1.1:
14171438
version "5.1.1"
@@ -1449,7 +1470,7 @@ [email protected]:
14491470
dependencies:
14501471
hoek "2.x.x"
14511472

1452-
source-map-support@^0.4.0, source-map-support@^0.4.18:
1473+
source-map-support@^0.4.18:
14531474
version "0.4.18"
14541475
resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f"
14551476
dependencies:
@@ -1573,6 +1594,12 @@ supports-color@^3.1.2:
15731594
dependencies:
15741595
has-flag "^1.0.0"
15751596

1597+
supports-color@^4.0.0:
1598+
version "4.5.0"
1599+
resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.5.0.tgz#be7a0de484dec5c5cddf8b3d59125044912f635b"
1600+
dependencies:
1601+
has-flag "^2.0.0"
1602+
15761603
tap-mocha-reporter@^3.0.6:
15771604
version "3.0.6"
15781605
resolved "https://registry.yarnpkg.com/tap-mocha-reporter/-/tap-mocha-reporter-3.0.6.tgz#12abe97ff409a5a6ecc3d70b6dba34d82184a770"
@@ -1722,21 +1749,14 @@ [email protected]:
17221749
core-util-is "1.0.2"
17231750
extsprintf "^1.2.0"
17241751

1725-
vlq@^0.2.1:
1752+
vlq@^0.2.1, vlq@^0.2.2:
17261753
version "0.2.3"
17271754
resolved "https://registry.yarnpkg.com/vlq/-/vlq-0.2.3.tgz#8f3e4328cf63b1540c0d67e1b2778386f8975b26"
17281755

17291756
vmath@^1.4.7:
17301757
version "1.4.7"
17311758
resolved "https://registry.yarnpkg.com/vmath/-/vmath-1.4.7.tgz#6604b7d749423cad7d0708e5b89aa3f7183e22ff"
17321759

1733-
weak@^1.0.1:
1734-
version "1.0.1"
1735-
resolved "https://registry.yarnpkg.com/weak/-/weak-1.0.1.tgz#ab99aab30706959aa0200cb8cf545bb9cb33b99e"
1736-
dependencies:
1737-
bindings "^1.2.1"
1738-
nan "^2.0.5"
1739-
17401760
which-module@^2.0.0:
17411761
version "2.0.0"
17421762
resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"

0 commit comments

Comments
 (0)