From aed108e8d58808afe189349c894cbbee45a9d813 Mon Sep 17 00:00:00 2001 From: Churchill Lee Date: Mon, 6 Nov 2017 21:47:50 +0800 Subject: [PATCH] chore(package.json): update package.json (#17) * chore(package.json): update dependencies * chore(package.json): update devDependencies * fix(): mergeSink breaking change update * chore(package.json): fix build for examples --- package-lock.json | 247 ++++++++++++++++++++++++---------------------- package.json | 20 ++-- src/modalify.ts | 4 +- 3 files changed, 141 insertions(+), 130 deletions(-) diff --git a/package-lock.json b/package-lock.json index c755ca8..a9445ee 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,40 +1,40 @@ { "name": "cyclejs-modal", - "version": "3.0.0", + "version": "4.0.0", "lockfileVersion": 1, "requires": true, "dependencies": { "@cycle/dom": { - "version": "18.3.0", - "resolved": "https://registry.npmjs.org/@cycle/dom/-/dom-18.3.0.tgz", - "integrity": "sha1-N7n1XGsPYp0baJ7OV2N3aPvu0rA=", + "version": "19.2.0", + "resolved": "https://registry.npmjs.org/@cycle/dom/-/dom-19.2.0.tgz", + "integrity": "sha512-2HtIcBlxH/82SLGHc8k8rseYe9hpbySrtOgK1upmIunrUX7Pt27V8rEEi+2Znniha0hdoZHJ7WqD50mLH9aySA==", "requires": { - "@cycle/run": "3.3.0", + "@cycle/run": "3.4.0", "es6-map": "0.1.5", "snabbdom": "0.7.0", "snabbdom-selector": "1.2.1" } }, "@cycle/isolate": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@cycle/isolate/-/isolate-3.1.0.tgz", - "integrity": "sha1-+xWBdQ1BP4DCMGN+F/wki+ff0W8=" + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/@cycle/isolate/-/isolate-3.2.0.tgz", + "integrity": "sha512-R3q2aHyxhx5RI/QXSLyLcgZy7L4/jWx0Nqv7MIRDuEUu218iqVaF8+Jyj/UOhBGIwrUwuUXZ9nZYfHttAjM5Xg==" }, "@cycle/run": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/@cycle/run/-/run-3.3.0.tgz", - "integrity": "sha1-oA3WOODpNJ/PDXt2KPnzcwlVm58=", + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/@cycle/run/-/run-3.4.0.tgz", + "integrity": "sha512-YUZyPu0nC4YDC31mLH5PGxbMoPEH5dNEV+nmgt34GgGgJ0ykDd4PrY7/ph5MAEpQE6rOfov0VN44qQRs6beQow==", "requires": { "xstream": "11.0.0" } }, "@cycle/rxjs-run": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/@cycle/rxjs-run/-/rxjs-run-7.1.0.tgz", - "integrity": "sha1-AXgl9VLL2CdZhPVNDffTlrTqRDY=", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/@cycle/rxjs-run/-/rxjs-run-7.2.0.tgz", + "integrity": "sha512-rpkYZvmBzi/oW0rax+IsBgb5G8f+yivXNJwN1C8Yyu59wU85545M3K5aHZEp7MFmcCpFAu1178FEDN8yjNatAw==", "dev": true, "requires": { - "@cycle/run": "3.3.0" + "@cycle/run": "3.4.0" } }, "@types/fs-extra": { @@ -43,7 +43,7 @@ "integrity": "sha512-PlKJw6ujJXLJjbvB3T0UCbY3jibKM6/Ya5cc9j1q+mYDeK3aR4Dp+20ZwxSuvJr9mIoPxp7+IL4aMOEvsscRTA==", "dev": true, "requires": { - "@types/node": "8.0.34" + "@types/node": "8.0.47" } }, "@types/handlebars": { @@ -77,9 +77,9 @@ "dev": true }, "@types/node": { - "version": "8.0.34", - "resolved": "https://registry.npmjs.org/@types/node/-/node-8.0.34.tgz", - "integrity": "sha512-Jnmm57+nHqvJUPwUzt1CLoLzFtF2B2vgG7cWFut+a4nqTp9/L6pL0N+o0Jt3V7AQnCKMsPEqQpLFZYleBCdq3w==", + "version": "8.0.47", + "resolved": "https://registry.npmjs.org/@types/node/-/node-8.0.47.tgz", + "integrity": "sha512-kOwL746WVvt/9Phf6/JgX/bsGQvbrK5iUgzyfwZNcKVFcjAUVSpF9HxevLTld2SG9aywYHOILj38arDdY1r/iQ==", "dev": true }, "@types/shelljs": { @@ -88,7 +88,7 @@ "integrity": "sha1-IpwVfGvB5n1rmQ5sXhjb0v9Yz/A=", "dev": true, "requires": { - "@types/node": "8.0.34" + "@types/node": "8.0.47" } }, "JSONStream": { @@ -282,9 +282,17 @@ "lodash": "4.17.4", "minimatch": "3.0.4", "path-is-absolute": "1.0.1", - "private": "0.1.7", + "private": "0.1.8", "slash": "1.0.0", "source-map": "0.5.7" + }, + "dependencies": { + "convert-source-map": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.0.tgz", + "integrity": "sha1-ms1whRxtXf3ZPZKC5e35SgP/RrU=", + "dev": true + } } }, "babel-generator": { @@ -906,14 +914,10 @@ } }, "babelify": { - "version": "7.3.0", - "resolved": "https://registry.npmjs.org/babelify/-/babelify-7.3.0.tgz", - "integrity": "sha1-qlau3nBn/XvVSWZu4W3ChQh+iOU=", - "dev": true, - "requires": { - "babel-core": "6.26.0", - "object-assign": "4.1.1" - } + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/babelify/-/babelify-8.0.0.tgz", + "integrity": "sha512-xVr63fKEvMWUrrIbqlHYsMcc5Zdw4FSVesAHgkgajyCE1W8gbm9rbMakqavhxKvikGYMhEcqxTwB/gQmQ6lBtw==", + "dev": true }, "babylon": { "version": "6.18.0", @@ -992,16 +996,16 @@ } }, "browserify": { - "version": "14.4.0", - "resolved": "https://registry.npmjs.org/browserify/-/browserify-14.4.0.tgz", - "integrity": "sha1-CJo0Y69Y0OSNjNQHCz90ZU1avKk=", + "version": "14.5.0", + "resolved": "https://registry.npmjs.org/browserify/-/browserify-14.5.0.tgz", + "integrity": "sha512-gKfOsNQv/toWz+60nSPfYzuwSEdzvV2WdxrVPUbPD/qui44rAkB3t3muNtmmGYHqrG56FGwX9SUEQmzNLAeS7g==", "dev": true, "requires": { "JSONStream": "1.3.1", "assert": "1.4.1", "browser-pack": "6.0.2", "browser-resolve": "1.11.2", - "browserify-zlib": "0.1.4", + "browserify-zlib": "0.2.0", "buffer": "5.0.8", "cached-path-relative": "1.0.1", "concat-stream": "1.5.2", @@ -1021,7 +1025,7 @@ "insert-module-globals": "7.0.1", "labeled-stream-splicer": "2.0.0", "module-deps": "4.1.1", - "os-browserify": "0.1.2", + "os-browserify": "0.3.0", "parents": "1.0.1", "path-browserify": "0.0.0", "process": "0.11.10", @@ -1029,7 +1033,7 @@ "querystring-es3": "0.2.1", "read-only-stream": "2.0.0", "readable-stream": "2.3.3", - "resolve": "1.4.0", + "resolve": "1.5.0", "shasum": "1.0.2", "shell-quote": "1.6.1", "stream-browserify": "2.0.1", @@ -1047,9 +1051,9 @@ } }, "browserify-aes": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.0.8.tgz", - "integrity": "sha512-WYCMOT/PtGTlpOKFht0YJFYcPy6pLCR98CtWfzK13zoynLlBMvAdEMSRGmgnJCw2M2j/5qxBkinZQFobieM8dQ==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.1.1.tgz", + "integrity": "sha512-UGnTYAnB2a3YuYKIRy1/4FB2HdM866E0qC46JXvVTYKlBlZlnvfpSfY6OKfXZAkv70eJ2a1SqzpAo5CRhZGDFg==", "dev": true, "requires": { "buffer-xor": "1.0.3", @@ -1066,7 +1070,7 @@ "integrity": "sha1-mYgkSHS/XtTijalWZtzWasj8Njo=", "dev": true, "requires": { - "browserify-aes": "1.0.8", + "browserify-aes": "1.1.1", "browserify-des": "1.0.0", "evp_bytestokey": "1.0.3" } @@ -1108,12 +1112,12 @@ } }, "browserify-zlib": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz", - "integrity": "sha1-uzX4pRn2AOD6a4SFJByXnQFB+y0=", + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz", + "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==", "dev": true, "requires": { - "pako": "0.2.9" + "pako": "1.0.6" } }, "browserslist": { @@ -1318,14 +1322,6 @@ "inline-source-map": "0.6.2", "lodash.memoize": "3.0.4", "source-map": "0.5.7" - }, - "dependencies": { - "convert-source-map": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.1.3.tgz", - "integrity": "sha1-SCnId+n+SbMWHzvzZziI4gRpmGA=", - "dev": true - } } }, "concat-map": { @@ -1383,9 +1379,9 @@ "dev": true }, "convert-source-map": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.0.tgz", - "integrity": "sha1-ms1whRxtXf3ZPZKC5e35SgP/RrU=", + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.1.3.tgz", + "integrity": "sha1-SCnId+n+SbMWHzvzZziI4gRpmGA=", "dev": true }, "core-js": { @@ -1525,17 +1521,30 @@ "array-find-index": "1.0.2" } }, + "cycle-onionify": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/cycle-onionify/-/cycle-onionify-4.0.0.tgz", + "integrity": "sha1-mu3diN7fb9qfu5ix55qziBC33do=", + "requires": { + "@cycle/isolate": "3.2.0", + "@cycle/run": "3.4.0", + "xstream": "11.0.0" + } + }, "cyclejs-utils": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/cyclejs-utils/-/cyclejs-utils-1.0.4.tgz", - "integrity": "sha1-A3BZJxXqNrl9GFlfVBemIrDsqVc=" + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/cyclejs-utils/-/cyclejs-utils-3.0.4.tgz", + "integrity": "sha512-+0rcmQKj7ZmhCYH4Prhpr0Q9olhgPQgyFGIHGFC9083vfhv2Ybu+70Yr39TQV6OZVzaT95BzAaCgFpjaeDvByg==", + "requires": { + "cycle-onionify": "4.0.0" + } }, "d": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/d/-/d-1.0.0.tgz", "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=", "requires": { - "es5-ext": "0.10.31" + "es5-ext": "0.10.35" } }, "date-now": { @@ -1663,21 +1672,21 @@ } }, "es5-ext": { - "version": "0.10.31", - "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.31.tgz", - "integrity": "sha1-e7k4yVp/G59ygJLcCcQe3MOY7v4=", + "version": "0.10.35", + "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.35.tgz", + "integrity": "sha1-GO6FjOajxFx9eekcFfzKnsVoSU8=", "requires": { - "es6-iterator": "2.0.1", + "es6-iterator": "2.0.3", "es6-symbol": "3.1.1" } }, "es6-iterator": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.1.tgz", - "integrity": "sha1-jjGcnwRTv1ddN0lAplWSDlnKVRI=", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz", + "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=", "requires": { "d": "1.0.0", - "es5-ext": "0.10.31", + "es5-ext": "0.10.35", "es6-symbol": "3.1.1" } }, @@ -1687,8 +1696,8 @@ "integrity": "sha1-kTbgUD3MBqMBaQ8LsU/042TpSfA=", "requires": { "d": "1.0.0", - "es5-ext": "0.10.31", - "es6-iterator": "2.0.1", + "es5-ext": "0.10.35", + "es6-iterator": "2.0.3", "es6-set": "0.1.5", "es6-symbol": "3.1.1", "event-emitter": "0.3.5" @@ -1700,8 +1709,8 @@ "integrity": "sha1-0rPsXU2ADO2BjbU40ol02wpzzLE=", "requires": { "d": "1.0.0", - "es5-ext": "0.10.31", - "es6-iterator": "2.0.1", + "es5-ext": "0.10.35", + "es6-iterator": "2.0.3", "es6-symbol": "3.1.1", "event-emitter": "0.3.5" } @@ -1712,7 +1721,7 @@ "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=", "requires": { "d": "1.0.0", - "es5-ext": "0.10.31" + "es5-ext": "0.10.35" } }, "escape-string-regexp": { @@ -1733,7 +1742,7 @@ "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=", "requires": { "d": "1.0.0", - "es5-ext": "0.10.31" + "es5-ext": "0.10.35" } }, "events": { @@ -1911,9 +1920,9 @@ "dev": true }, "handlebars": { - "version": "4.0.10", - "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.10.tgz", - "integrity": "sha1-PTDHGLCaPZbyPqTMH0A8TTup/08=", + "version": "4.0.11", + "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.11.tgz", + "integrity": "sha1-Ywo13+ApS8KB7a5v/F0yn8eYLcw=", "dev": true, "requires": { "async": "1.5.2", @@ -2161,7 +2170,7 @@ "JSONStream": "1.3.1", "combine-source-map": "0.7.2", "concat-stream": "1.5.2", - "is-buffer": "1.1.5", + "is-buffer": "1.1.6", "lexical-scope": "1.2.0", "process": "0.11.10", "through2": "2.0.3", @@ -2196,9 +2205,9 @@ "dev": true }, "is-buffer": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.5.tgz", - "integrity": "sha1-Hzsm72E7IUuIy8ojzGwB2Hlh7sw=", + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", + "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", "dev": true }, "is-builtin-module": { @@ -2318,7 +2327,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "1.1.5" + "is-buffer": "1.1.6" } }, "labeled-stream-splicer": { @@ -2544,12 +2553,6 @@ "strip-bom": "2.0.0" } }, - "minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", - "dev": true - }, "path-exists": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz", @@ -2646,9 +2649,9 @@ } }, "minimist": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", "dev": true }, "mkdirp": { @@ -2658,6 +2661,14 @@ "dev": true, "requires": { "minimist": "0.0.8" + }, + "dependencies": { + "minimist": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", + "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", + "dev": true + } } }, "module-deps": { @@ -2676,7 +2687,7 @@ "inherits": "2.0.3", "parents": "1.0.1", "readable-stream": "2.3.3", - "resolve": "1.4.0", + "resolve": "1.5.0", "stream-combiner2": "1.1.1", "subarg": "1.0.0", "through2": "2.0.3", @@ -2790,8 +2801,16 @@ "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", "dev": true, "requires": { - "minimist": "0.0.8", + "minimist": "0.0.10", "wordwrap": "0.0.3" + }, + "dependencies": { + "minimist": { + "version": "0.0.10", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz", + "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=", + "dev": true + } } }, "ora": { @@ -2807,9 +2826,9 @@ } }, "os-browserify": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.1.2.tgz", - "integrity": "sha1-ScoCk+CxlZCl9d4Qx/JlphfY/lQ=", + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz", + "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=", "dev": true }, "os-homedir": { @@ -2857,9 +2876,9 @@ } }, "pako": { - "version": "0.2.9", - "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz", - "integrity": "sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU=", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.6.tgz", + "integrity": "sha512-lQe48YPsMJAig+yngZ87Lus+NF+3mtu7DVOBu6b/gHO1YpKwIj5AWjZ/TOS7i46HD/UixzWb1zeWDZfGZ3iYcg==", "dev": true }, "parents": { @@ -2878,7 +2897,7 @@ "dev": true, "requires": { "asn1.js": "4.9.1", - "browserify-aes": "1.0.8", + "browserify-aes": "1.1.1", "create-hash": "1.1.3", "evp_bytestokey": "1.0.3", "pbkdf2": "3.0.14" @@ -2979,9 +2998,9 @@ } }, "private": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/private/-/private-0.1.7.tgz", - "integrity": "sha1-aM5eih7woju1cMwoU3tTMqumPvE=", + "version": "0.1.8", + "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz", + "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==", "dev": true }, "process": { @@ -3099,7 +3118,7 @@ "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=", "dev": true, "requires": { - "resolve": "1.4.0" + "resolve": "1.5.0" } }, "redent": { @@ -3132,7 +3151,7 @@ "requires": { "babel-runtime": "6.26.0", "babel-types": "6.26.0", - "private": "0.1.7" + "private": "0.1.8" } }, "regexpu-core": { @@ -3268,9 +3287,9 @@ "dev": true }, "resolve": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.4.0.tgz", - "integrity": "sha512-aW7sVKPufyHqOmyyLzg/J+8606v5nevBgaliIlV7nUpVMsDnoBGV/cbSLNjZAg9q0Cfd/+easKVKQ8vOu8fn1Q==", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.5.0.tgz", + "integrity": "sha512-hgoSGrc3pjzAPHNBg+KnFcK2HwlHTs/YrAGUr6qgTVUZmXv1UEXXl0bZNBKMA9fud6lRYFdPGz0xXxycPzmmiw==", "dev": true, "requires": { "path-parse": "1.0.5" @@ -3346,9 +3365,9 @@ } }, "rxjs": { - "version": "5.4.3", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.4.3.tgz", - "integrity": "sha512-fSNi+y+P9ss+EZuV0GcIIqPUK07DEaMRUtLJvdcvMyFjc9dizuDjere+A4V7JrLGnm9iCc+nagV/4QdMTkqC4A==", + "version": "5.5.2", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.5.2.tgz", + "integrity": "sha512-oRYoIKWBU3Ic37fLA5VJu31VqQO4bWubRntcHSJ+cwaDQBwdnZ9x4zmhJfm/nFQ2E82/I4loSioHnACamrKGgA==", "dev": true, "requires": { "symbol-observable": "1.0.4" @@ -3627,14 +3646,6 @@ "dev": true, "requires": { "minimist": "1.2.0" - }, - "dependencies": { - "minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", - "dev": true - } } }, "supports-color": { @@ -3775,7 +3786,7 @@ "@types/minimatch": "2.0.29", "@types/shelljs": "0.7.0", "fs-extra": "4.0.2", - "handlebars": "4.0.10", + "handlebars": "4.0.11", "highlight.js": "9.12.0", "lodash": "4.17.4", "marked": "0.3.6", diff --git a/package.json b/package.json index 416d5ec..6eec866 100644 --- a/package.json +++ b/package.json @@ -12,8 +12,8 @@ "documentation": "typedoc --out docs src && cp-cli .nojekyll docs/.nojekyll", "prepublishOnly": "npm run build && npm run documentation", "examples": "npm run build:examples && npm run examples:simple", - "examples:simple": "browserify build/examples/simple/src/index.js -o examples/simple/build/index.js && opn examples/simple/index.html", - "examples:rxjs": "browserify build/examples/rxjs/src/index.js -o examples/rxjs/build/index.js && opn examples/rxjs/index.html" + "examples:simple": "browserify build/cjs/examples/simple/src/index.js -o examples/simple/build/index.js && opn examples/simple/index.html", + "examples:rxjs": "browserify build/cjs/examples/rxjs/src/index.js -o examples/rxjs/build/index.js && opn examples/rxjs/index.html" }, "repository": { "type": "git", @@ -30,23 +30,23 @@ }, "homepage": "https://github.com/cyclejs-community/cyclejs-modal#readme", "dependencies": { - "@cycle/dom": "^18.3.0", - "@cycle/isolate": "^3.1.0", - "@cycle/run": "^3.3.0", - "cyclejs-utils": "^1.0.4", + "@cycle/dom": "^19.2.0", + "@cycle/isolate": "^3.2.0", + "@cycle/run": "^3.4.0", + "cyclejs-utils": "^3.0.4", "xstream": "^11.0.0" }, "devDependencies": { - "@cycle/rxjs-run": "^7.1.0", + "@cycle/rxjs-run": "^7.2.0", "babel-preset-es2015": "^6.24.1", - "babelify": "^7.3.0", - "browserify": "^14.4.0", + "babelify": "^8.0.0", + "browserify": "^14.5.0", "cp-cli": "^1.1.0", "mkdirp": "^0.5.1", "opn-cli": "^3.1.0", "release-it": "^3.1.2", "rimraf": "^2.6.2", - "rxjs": "^5.4.3", + "rxjs": "^5.5.2", "typedoc": "^0.9.0", "typescript": "^2.5.3" } diff --git a/src/modalify.ts b/src/modalify.ts index e5c1262..b5503e9 100644 --- a/src/modalify.ts +++ b/src/modalify.ts @@ -97,7 +97,7 @@ export function modalify(main : Component, { ])); const extractedSinks : Sinks = extractSinks( - modalStack$.map(arr => mergeSinks(...arr)), + modalStack$.map(mergeSinks), Object.keys(sinks) ); @@ -105,7 +105,7 @@ export function modalify(main : Component, { messageProxy$.imitate(extractedSinks.modal.filter(a => a.type === 'message')); const newSinks = { - ...mergeSinks(extractedSinks, sinks), + ...mergeSinks([ extractedSinks, sinks ]), [DOMDriverKey]: mergedVDom$ };