Skip to content

Commit 885e5c7

Browse files
committed
merged from master
2 parents 9da3c86 + 28d84f9 commit 885e5c7

File tree

3 files changed

+12
-44
lines changed

3 files changed

+12
-44
lines changed

package.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,7 @@
3434
"devDependencies": {
3535
"fs-jetpack": "^0.13.2",
3636
"rollup": "^0.54.1",
37-
"rollup-watch": "^3.2.2",
3837
"rollup-plugin-buble": "^0.18.0",
39-
"rollup-plugin-commonjs": "^8.2.6",
4038
"tap": "^10.3.0",
4139
"uglify-js": "^3.3.7"
4240
},

script/rollup.config.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,33 +16,33 @@ let dest = './dist';
1616
let file = 'event-sys';
1717
let name = 'eventsys';
1818
let sourcemap = true;
19-
let globals = {};
19+
let globals = { 'memop': 'window.memop' };
2020

2121
// clear directory
2222
fsJetpack.dir(dest, { empty: true });
2323

2424
module.exports = {
2525
input: './index.js',
26+
external: [],
27+
plugins: [
28+
buble(),
29+
],
2630
output: [
2731
{
2832
file: `${dest}/${file}.dev.js`,
2933
format: 'iife',
3034
name,
3135
banner,
3236
globals,
33-
sourcemap,
37+
sourcemap
3438
},
3539
{
3640
file: `${dest}/${file}.js`,
3741
format: 'cjs',
3842
name,
3943
banner,
4044
globals,
41-
sourcemap,
45+
sourcemap
4246
},
4347
],
44-
external: [],
45-
plugins: [
46-
buble(),
47-
]
4848
};

yarn.lock

Lines changed: 5 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ 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, acorn@^5.2.1:
22-
version "5.4.1"
23-
resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.4.1.tgz#fdc58d9d17f4a4e98d102ded826a9b9759125102"
21+
acorn@^5.1.2:
22+
version "5.3.0"
23+
resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.3.0.tgz#7446d39459c54fb49a80e6ee6478149b940ec822"
2424

2525
align-text@^0.1.1, align-text@^0.1.3:
2626
version "0.1.4"
@@ -474,10 +474,6 @@ estree-walker@^0.3.0:
474474
version "0.3.1"
475475
resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.3.1.tgz#e6b1a51cf7292524e7237c312e5fe6660c1ce1aa"
476476

477-
estree-walker@^0.5.0:
478-
version "0.5.1"
479-
resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.5.1.tgz#64fc375053abc6f57d73e9bd2f004644ad3c5854"
480-
481477
esutils@^2.0.2:
482478
version "2.0.2"
483479
resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
@@ -1458,20 +1454,10 @@ require-main-filename@^1.0.1:
14581454
version "1.0.1"
14591455
resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
14601456

1461-
1462-
version "0.8.7"
1463-
resolved "https://registry.yarnpkg.com/require-relative/-/require-relative-0.8.7.tgz#7999539fc9e047a37928fa196f8e1563dabd36de"
1464-
14651457
resolve-from@^2.0.0:
14661458
version "2.0.0"
14671459
resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-2.0.0.tgz#9480ab20e94ffa1d9e80a804c7ea147611966b57"
14681460

1469-
resolve@^1.4.0:
1470-
version "1.5.0"
1471-
resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.5.0.tgz#1f09acce796c9a762579f31b2c1cc4c3cddf9f36"
1472-
dependencies:
1473-
path-parse "^1.0.5"
1474-
14751461
right-align@^0.1.1:
14761462
version "0.1.3"
14771463
resolved "https://registry.yarnpkg.com/right-align/-/right-align-0.1.3.tgz#61339b722fe6a3515689210d24e14c96148613ef"
@@ -1491,29 +1477,13 @@ rollup-plugin-buble@^0.18.0:
14911477
buble "^0.18.0"
14921478
rollup-pluginutils "^2.0.1"
14931479

1494-
rollup-plugin-commonjs@^8.2.6:
1495-
version "8.3.0"
1496-
resolved "https://registry.yarnpkg.com/rollup-plugin-commonjs/-/rollup-plugin-commonjs-8.3.0.tgz#91b4ba18f340951e39ed7b1901f377a80ab3f9c3"
1497-
dependencies:
1498-
acorn "^5.2.1"
1499-
estree-walker "^0.5.0"
1500-
magic-string "^0.22.4"
1501-
resolve "^1.4.0"
1502-
rollup-pluginutils "^2.0.1"
1503-
15041480
rollup-pluginutils@^2.0.1:
15051481
version "2.0.1"
15061482
resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.0.1.tgz#7ec95b3573f6543a46a6461bd9a7c544525d0fc0"
15071483
dependencies:
15081484
estree-walker "^0.3.0"
15091485
micromatch "^2.3.11"
15101486

1511-
rollup-watch@^3.2.2:
1512-
version "3.2.2"
1513-
resolved "https://registry.yarnpkg.com/rollup-watch/-/rollup-watch-3.2.2.tgz#5e574232e9ef36da9177f46946d8080cb267354b"
1514-
dependencies:
1515-
require-relative "0.8.7"
1516-
15171487
rollup@^0.54.1:
15181488
version "0.54.1"
15191489
resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.54.1.tgz#415a5d999421502646cf54b873fc4ce1a7393970"
@@ -1798,8 +1768,8 @@ uglify-js@^2.6:
17981768
uglify-to-browserify "~1.0.0"
17991769

18001770
uglify-js@^3.3.7:
1801-
version "3.3.9"
1802-
resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.3.9.tgz#33869666c8ab7f7658ce3d22f0f1ced40097d33a"
1771+
version "3.3.8"
1772+
resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.3.8.tgz#51e9a5db73afb53ac98603d08224edcd0be45fd8"
18031773
dependencies:
18041774
commander "~2.13.0"
18051775
source-map "~0.6.1"

0 commit comments

Comments
 (0)