diff --git a/dist/main.css b/dist/main.css old mode 100755 new mode 100644 diff --git a/dist/main.js b/dist/main.js index a496c5e..e73ecad 100644 Binary files a/dist/main.js and b/dist/main.js differ diff --git a/dist/view.js b/dist/view.js index f396feb..7241a1d 100644 Binary files a/dist/view.js and b/dist/view.js differ diff --git a/docs/Changelog.md b/docs/Changelog.md index 4599e41..63cd607 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -1,3 +1,27 @@ +## v3.1.2 + +Released June 12, 2016 + +- `Improved` Added indexes to SQL fields to improve query execution time (Thanks @qligier, #533) +- `Improved` Protocol-relative URLs for open graph metadata (#546) +- `Improved` Remove metadata from medium-sized images and thumbnails (Imagick only) (#556) +- `Improved` Reduce quality of medium-sized images (Imagick only) (#556) +- `Improved` orientation-handling with Imagick (#556) + +## v3.1.1 + +Released April 30, 2016 + +- `New` share button when logged out (#473) +- `New` Import of IPTC photo tags (Thanks @qligier, #514) +- `New` Added reset username and password to FAQ (#500 #128) +- `Improved` Removed will-change from the main image to improve the image rendering in Chrome (#501) +- `Improved` scroll and rendering performance by removing will-change +- `Improved` Open Facebook and Twitter sharing sheet in new window +- `Improved` EXIF and IPTC extraction (Thanks @qligier, #518) +- `Fixed` broken URL in Update.md (#516) +- `Fixed` error 500 on database connect error (Thanks @tribut, #530) + ## v3.1.0 Released March 29, 2016 diff --git a/docs/Installation.md b/docs/Installation.md index 58d0175..aa64dd2 100644 --- a/docs/Installation.md +++ b/docs/Installation.md @@ -3,7 +3,7 @@ Everything you need is a web-server with PHP 5.5 or later and a MySQL-Database. The following PHP extensions must be activated: - exif, gd, json, mbstring, mysqli, zip + session, exif, mbstring, gd, mysqli, json, zip To use Lychee without restrictions, we recommend to increase the values of the following properties in `php.ini`: diff --git a/php/Modules/Album.php b/php/Modules/Album.php index 1c03ba5..758554d 100644 --- a/php/Modules/Album.php +++ b/php/Modules/Album.php @@ -99,22 +99,22 @@ final class Album { case 'f': $return['public'] = '0'; - $query = Database::prepare(Database::get(), "SELECT id, title, tags, public, star, album, thumbUrl, takestamp, url FROM ? WHERE star = 1 " . Settings::get()['sortingPhotos'], array(LYCHEE_TABLE_PHOTOS)); + $query = Database::prepare(Database::get(), "SELECT id, title, tags, public, star, album, thumbUrl, takestamp, url, medium FROM ? WHERE star = 1 " . Settings::get()['sortingPhotos'], array(LYCHEE_TABLE_PHOTOS)); break; case 's': $return['public'] = '0'; - $query = Database::prepare(Database::get(), "SELECT id, title, tags, public, star, album, thumbUrl, takestamp, url FROM ? WHERE public = 1 " . Settings::get()['sortingPhotos'], array(LYCHEE_TABLE_PHOTOS)); + $query = Database::prepare(Database::get(), "SELECT id, title, tags, public, star, album, thumbUrl, takestamp, url, medium FROM ? WHERE public = 1 " . Settings::get()['sortingPhotos'], array(LYCHEE_TABLE_PHOTOS)); break; case 'r': $return['public'] = '0'; - $query = Database::prepare(Database::get(), "SELECT id, title, tags, public, star, album, thumbUrl, takestamp, url FROM ? WHERE LEFT(id, 10) >= unix_timestamp(DATE_SUB(NOW(), INTERVAL 1 DAY)) " . Settings::get()['sortingPhotos'], array(LYCHEE_TABLE_PHOTOS)); + $query = Database::prepare(Database::get(), "SELECT id, title, tags, public, star, album, thumbUrl, takestamp, url, medium FROM ? WHERE LEFT(id, 10) >= unix_timestamp(DATE_SUB(NOW(), INTERVAL 1 DAY)) " . Settings::get()['sortingPhotos'], array(LYCHEE_TABLE_PHOTOS)); break; case '0': $return['public'] = '0'; - $query = Database::prepare(Database::get(), "SELECT id, title, tags, public, star, album, thumbUrl, takestamp, url FROM ? WHERE album = 0 " . Settings::get()['sortingPhotos'], array(LYCHEE_TABLE_PHOTOS)); + $query = Database::prepare(Database::get(), "SELECT id, title, tags, public, star, album, thumbUrl, takestamp, url, medium FROM ? WHERE album = 0 " . Settings::get()['sortingPhotos'], array(LYCHEE_TABLE_PHOTOS)); break; default: @@ -122,7 +122,7 @@ final class Album { $albums = Database::execute(Database::get(), $query, __METHOD__, __LINE__); $return = $albums->fetch_assoc(); $return = Album::prepareData($return); - $query = Database::prepare(Database::get(), "SELECT id, title, tags, public, star, album, thumbUrl, takestamp, url FROM ? WHERE album = '?' " . Settings::get()['sortingPhotos'], array(LYCHEE_TABLE_PHOTOS, $this->albumIDs)); + $query = Database::prepare(Database::get(), "SELECT id, title, tags, public, star, album, thumbUrl, takestamp, url, medium FROM ? WHERE album = '?' " . Settings::get()['sortingPhotos'], array(LYCHEE_TABLE_PHOTOS, $this->albumIDs)); break; } diff --git a/php/Modules/Database.php b/php/Modules/Database.php index 11afdff..11924b5 100755 --- a/php/Modules/Database.php +++ b/php/Modules/Database.php @@ -14,7 +14,8 @@ final class Database { '030000', // 3.0.0 '030001', // 3.0.1 '030003', // 3.0.3 - '030100' // 3.1.0 + '030100', // 3.1.0 + '030102' // 3.1.2 ); /** diff --git a/php/Modules/Photo.php b/php/Modules/Photo.php index 8870307..59fe4d0 100755 --- a/php/Modules/Photo.php +++ b/php/Modules/Photo.php @@ -238,7 +238,6 @@ final class Photo { } - // Save to DB $values = array(LYCHEE_TABLE_PHOTOS, $id, $info['title'], $photo_name, $info['description'], $info['tags'], $info['type'], $info['width'], $info['height'], $info['size'], $info['iso'], $info['aperture'], $info['make'], $info['model'], $info['shutter'], $info['focal'], $info['takestamp'], $path_thumb, $albumID, $public, $star, $checksum, $medium); $query = Database::prepare(Database::get(), "INSERT INTO ? (id, title, url, description, tags, type, width, height, size, iso, aperture, make, model, shutter, focal, takestamp, thumbUrl, album, public, star, checksum, medium) VALUES ('?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?')", $values); $result = Database::execute(Database::get(), $query, __METHOD__, __LINE__); @@ -296,7 +295,7 @@ final class Photo { Plugins::get()->activate(__METHOD__, 0, func_get_args()); // Quality of thumbnails - $thumbQuality = 90; + $quality = 90; // Size of the thumbnail $newWidth = 200; @@ -312,9 +311,12 @@ final class Photo { // Read image $thumb = new Imagick(); $thumb->readImage($url); - $thumb->setImageCompressionQuality($thumbQuality); + $thumb->setImageCompressionQuality($quality); $thumb->setImageFormat('jpeg'); + // Remove metadata to save some bytes + $thumb->stripImage(); + // Copy image for 2nd thumb version $thumb2x = clone $thumb; @@ -359,12 +361,12 @@ final class Photo { // Create thumb fastImageCopyResampled($thumb, $sourceImg, 0, 0, $startWidth, $startHeight, $newWidth, $newHeight, $newSize, $newSize); - imagejpeg($thumb, $newUrl, $thumbQuality); + imagejpeg($thumb, $newUrl, $quality); imagedestroy($thumb); // Create retina thumb fastImageCopyResampled($thumb2x, $sourceImg, 0, 0, $startWidth, $startHeight, $newWidth*2, $newHeight*2, $newSize, $newSize); - imagejpeg($thumb2x, $newUrl2x, $thumbQuality); + imagejpeg($thumb2x, $newUrl2x, $quality); imagedestroy($thumb2x); // Free memory @@ -395,6 +397,9 @@ final class Photo { // Call plugins Plugins::get()->activate(__METHOD__, 0, func_get_args()); + // Quality of medium-photo + $quality = 90; + // Set to true when creation of medium-photo failed $error = false; @@ -427,6 +432,8 @@ final class Photo { // Adjust image $medium->scaleImage($newWidth, $newHeight, true); + $medium->stripImage(); + $medium->setImageCompressionQuality($quality); // Save image try { $medium->writeImage($newUrl); } @@ -472,20 +479,50 @@ final class Photo { if (extension_loaded('imagick')&&Settings::get()['imagick']==='1') { - switch ($info['orientation']) { + $image = new Imagick(); + $image->readImage($path); - case 3: - $rotateImage = 180; + $orientation = $image->getImageOrientation(); + + switch ($orientation) { + + case Imagick::ORIENTATION_TOPLEFT: + return false; break; - case 6: - $rotateImage = 90; - $swapSize = true; + case Imagick::ORIENTATION_TOPRIGHT: + $image->flopImage(); break; - case 8: - $rotateImage = 270; - $swapSize = true; + case Imagick::ORIENTATION_BOTTOMRIGHT: + $image->rotateImage(new ImagickPixel(), 180); + break; + + case Imagick::ORIENTATION_BOTTOMLEFT: + $image->flopImage(); + $image->rotateImage(new ImagickPixel(), 180); + break; + + case Imagick::ORIENTATION_LEFTTOP: + $image->flopImage(); + $image->rotateImage(new ImagickPixel(), -90); + $swapSize = true; + break; + + case Imagick::ORIENTATION_RIGHTTOP: + $image->rotateImage(new ImagickPixel(), 90); + $swapSize = true; + break; + + case Imagick::ORIENTATION_RIGHTBOTTOM: + $image->flopImage(); + $image->rotateImage(new ImagickPixel(), 90); + $swapSize = true; + break; + + case Imagick::ORIENTATION_LEFTBOTTOM: + $image->rotateImage(new ImagickPixel(), -90); + $swapSize = true; break; default: @@ -494,15 +531,13 @@ final class Photo { } - if ($rotateImage!==0) { - $image = new Imagick(); - $image->readImage($path); - $image->rotateImage(new ImagickPixel(), $rotateImage); - $image->setImageOrientation(1); - $image->writeImage($path); - $image->clear(); - $image->destroy(); - } + // Adjust photo + $image->setImageOrientation(Imagick::ORIENTATION_TOPLEFT); + $image->writeImage($path); + + // Free memory + $image->clear(); + $image->destroy(); } else { @@ -512,6 +547,11 @@ final class Photo { switch ($info['orientation']) { + case 1: + // do nothing + return false; + break; + case 2: // mirror // not yet implemented @@ -561,6 +601,7 @@ final class Photo { } // Recreate photo + // In this step the photos also loses its metadata :( $newSourceImg = imagecreatetruecolor($newWidth, $newHeight); imagecopyresampled($newSourceImg, $sourceImg, 0, 0, 0, 0, $newWidth, $newHeight, $newWidth, $newHeight); imagejpeg($newSourceImg, $path, 100); @@ -593,7 +634,7 @@ final class Photo { public static function prepareData(array $data) { // Excepts the following: - // (array) $data = ['id', 'title', 'tags', 'public', 'star', 'album', 'thumbUrl', 'takestamp', 'url'] + // (array) $data = ['id', 'title', 'tags', 'public', 'star', 'album', 'thumbUrl', 'takestamp', 'url', 'medium'] // Init $photo = null; @@ -606,7 +647,11 @@ final class Photo { $photo['star'] = $data['star']; $photo['album'] = $data['album']; - // Parse urls + // Parse medium + if ($data['medium']==='1') $photo['medium'] = LYCHEE_URL_UPLOADS_MEDIUM . $data['url']; + else $photo['medium'] = ''; + + // Parse paths $photo['thumbUrl'] = LYCHEE_URL_UPLOADS_THUMB . $data['thumbUrl']; $photo['url'] = LYCHEE_URL_UPLOADS_BIG . $data['url']; diff --git a/php/database/albums_table.sql b/php/database/albums_table.sql index ea94d41..76c4272 100644 --- a/php/database/albums_table.sql +++ b/php/database/albums_table.sql @@ -2,7 +2,7 @@ # ------------------------------------------------------------ CREATE TABLE IF NOT EXISTS `?` ( - `id` bigint(14) NOT NULL, + `id` bigint(14) unsigned NOT NULL, `title` varchar(100) NOT NULL DEFAULT '', `description` varchar(1000) DEFAULT '', `sysstamp` int(11) NOT NULL, @@ -11,4 +11,4 @@ CREATE TABLE IF NOT EXISTS `?` ( `downloadable` tinyint(1) NOT NULL DEFAULT '0', `password` varchar(100) DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=MyISAM DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci; \ No newline at end of file +) ENGINE=MyISAM DEFAULT CHARSET=utf8; \ No newline at end of file diff --git a/php/database/log_table.sql b/php/database/log_table.sql index c5869bf..64d9c26 100644 --- a/php/database/log_table.sql +++ b/php/database/log_table.sql @@ -7,6 +7,6 @@ CREATE TABLE IF NOT EXISTS `?` ( `type` varchar(11) NOT NULL, `function` varchar(100) NOT NULL, `line` int(11) NOT NULL, - `text` TEXT, + `text` text, PRIMARY KEY (`id`) -) ENGINE=MyISAM DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci; +) ENGINE=MyISAM DEFAULT CHARSET=utf8; \ No newline at end of file diff --git a/php/database/photos_table.sql b/php/database/photos_table.sql index bd265e8..7e4f0fb 100644 --- a/php/database/photos_table.sql +++ b/php/database/photos_table.sql @@ -2,8 +2,8 @@ # ------------------------------------------------------------ CREATE TABLE IF NOT EXISTS `?` ( - `id` bigint(14) NOT NULL, - `title` varchar(100) NOT NULL, + `id` bigint(14) unsigned NOT NULL, + `title` varchar(100) NOT NULL DEFAULT '', `description` varchar(1000) DEFAULT '', `url` varchar(100) NOT NULL, `tags` varchar(1000) NOT NULL DEFAULT '', @@ -20,9 +20,11 @@ CREATE TABLE IF NOT EXISTS `?` ( `focal` varchar(20) NOT NULL, `takestamp` int(11) DEFAULT NULL, `star` tinyint(1) NOT NULL, - `thumbUrl` varchar(50) NOT NULL, - `album` varchar(30) NOT NULL DEFAULT '0', - `checksum` VARCHAR(100) DEFAULT NULL, + `thumbUrl` char(37) NOT NULL, + `album` bigint(20) unsigned NOT NULL, + `checksum` char(40) DEFAULT NULL, `medium` tinyint(1) NOT NULL DEFAULT '0', - PRIMARY KEY (`id`) -) ENGINE=MyISAM DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci; \ No newline at end of file + PRIMARY KEY (`id`), + KEY `Index_album` (`album`), + KEY `Index_star` (`star`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; \ No newline at end of file diff --git a/php/database/settings_table.sql b/php/database/settings_table.sql index bdc1cf2..55cb88c 100644 --- a/php/database/settings_table.sql +++ b/php/database/settings_table.sql @@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `?` ( `key` varchar(50) NOT NULL DEFAULT '', `value` varchar(200) DEFAULT '' -) ENGINE=MyISAM DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci; \ No newline at end of file +) ENGINE=MyISAM DEFAULT CHARSET=utf8; \ No newline at end of file diff --git a/php/database/update_030102.php b/php/database/update_030102.php new file mode 100644 index 0000000..cf89ddc --- /dev/null +++ b/php/database/update_030102.php @@ -0,0 +1,73 @@ +num_rows===0) { + + $query = Database::prepare($connection, "ALTER TABLE `?` ADD INDEX `Index_album` (`album`)", array(LYCHEE_TABLE_PHOTOS)); + $result = Database::execute($connection, $query, 'update_030102', __LINE__); + + if ($result===false) Response::error('Could not add index to the album id field!'); + +} + +// Add index to the star field +$query = Database::prepare($connection, "SHOW INDEX FROM `?` WHERE KEY_NAME = 'Index_star'", array(LYCHEE_TABLE_PHOTOS)); +$result = Database::execute($connection, $query, 'update_030102', __LINE__); + +if ($result===false) Response::error('Could not check if Index_star exists!'); + +if ($result->num_rows===0) { + + $query = Database::prepare($connection, "ALTER TABLE `?` ADD INDEX `Index_star` (`star`)", array(LYCHEE_TABLE_PHOTOS)); + $result = Database::execute($connection, $query, 'update_030102', __LINE__); + + if ($result===false) Response::error('Could not add index to the star field!'); + +} + +// Change type of the checksum field +$query = Database::prepare($connection, "ALTER TABLE `?` CHANGE `checksum` `checksum` CHAR(40) NULL DEFAULT NULL", array(LYCHEE_TABLE_PHOTOS)); +$result = Database::execute($connection, $query, 'update_030102', __LINE__); + +if ($result===false) Response::error('Could not change type of the checksum field!'); + +// Change type of the thumbUrl field +$query = Database::prepare($connection, "ALTER TABLE `?` CHANGE `thumbUrl` `thumbUrl` CHAR(37) NOT NULL", array(LYCHEE_TABLE_PHOTOS)); +$result = Database::execute($connection, $query, 'update_030102', __LINE__); + +if ($result===false) Response::error('Could not change type of the thumbUrl field!'); + +// Change type of the id field +$query = Database::prepare($connection, "ALTER TABLE `?` CHANGE `id` `id` BIGINT(14) UNSIGNED NOT NULL", array(LYCHEE_TABLE_PHOTOS)); +$result = Database::execute($connection, $query, 'update_030102', __LINE__); + +if ($result===false) Response::error('Could not change type of the id field!'); + +// Change type of the id field +$query = Database::prepare($connection, "ALTER TABLE `?` CHANGE `id` `id` BIGINT(14) UNSIGNED NOT NULL", array(LYCHEE_TABLE_ALBUMS)); +$result = Database::execute($connection, $query, 'update_030102', __LINE__); + +if ($result===false) Response::error('Could not change type of the id field!'); + +// Set version +if (Database::setVersion($connection, '030102')===false) Response::error('Could not update version of database!'); + +?> \ No newline at end of file diff --git a/php/helpers/getGraphHeader.php b/php/helpers/getGraphHeader.php index 77e48a7..c50b173 100644 --- a/php/helpers/getGraphHeader.php +++ b/php/helpers/getGraphHeader.php @@ -24,8 +24,8 @@ function getGraphHeader($photoID) { else $dir = 'big'; $parseUrl = parse_url('http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']); - $url = $parseUrl['scheme'] . '://' . $parseUrl['host'] . $parseUrl['path'] . '?' . $parseUrl['query']; - $picture = $parseUrl['scheme'] . '://' . $parseUrl['host'] . $parseUrl['path'] . '/../uploads/' . $dir . '/' . $row->url; + $url = '//' . $parseUrl['host'] . $parseUrl['path'] . '?' . $parseUrl['query']; + $picture = '//' . $parseUrl['host'] . $parseUrl['path'] . '/../uploads/' . $dir . '/' . $row->url; $url = htmlentities($url); $picture = htmlentities($picture); diff --git a/plugins/Diagnostics/index.php b/plugins/Diagnostics/index.php index c7cf963..eee1058 100644 --- a/plugins/Diagnostics/index.php +++ b/plugins/Diagnostics/index.php @@ -53,10 +53,13 @@ if (hasPermissions(LYCHEE_UPLOADS)===false) $error .= ('Error: \'uploads/ if (hasPermissions(LYCHEE_DATA)===false) $error .= ('Error: \'data/\' is missing or has insufficient read/write privileges' . PHP_EOL); // About GD -$gdVersion = gd_info(); -if (!$gdVersion['JPEG Support']) $error .= ('Error: PHP gd extension without jpeg support' . PHP_EOL); -if (!$gdVersion['PNG Support']) $error .= ('Error: PHP gd extension without png support' . PHP_EOL); -if (!$gdVersion['GIF Read Support'] || !$gdVersion['GIF Create Support']) $error .= ('Error: PHP gd extension without full gif support' . PHP_EOL); +$gdVersion = array('GD Version' => '-'); +if (function_exists('gd_info')) { + $gdVersion = gd_info(); + if (!$gdVersion['JPEG Support']) $error .= ('Error: PHP gd extension without jpeg support' . PHP_EOL); + if (!$gdVersion['PNG Support']) $error .= ('Error: PHP gd extension without png support' . PHP_EOL); + if (!$gdVersion['GIF Read Support'] || !$gdVersion['GIF Create Support']) $error .= ('Error: PHP gd extension without full gif support' . PHP_EOL); +} // Load config if (!file_exists(LYCHEE_CONFIG_FILE)) exit('Error: Configuration not found. Please install Lychee for additional tests'); @@ -96,6 +99,10 @@ if (empty(ini_get('allow_url_fopen'))) echo('Warning: You may experience problem // Check mysql version if ($database->server_version<50500) echo('Warning: Lychee uses the GBK charset to avoid sql injections on your MySQL version. Please update to MySQL 5.5 or higher to enable UTF-8 support.' . PHP_EOL); +// Check imagick +if (!extension_loaded('imagick')) echo('Warning: Pictures that are rotated lose their metadata! Please install Imagick to avoid that.' . PHP_EOL); +else if (!$settings['imagick']) echo('Warning: Pictures that are rotated lose their metadata! Please enable Imagick in settings to avoid that.' . PHP_EOL); + // Output if ($error==='') echo('No critical problems found. Lychee should work without problems!' . PHP_EOL); else echo $error; diff --git a/src/npm-shrinkwrap.json b/src/npm-shrinkwrap.json index 14be57f..0788375 100644 --- a/src/npm-shrinkwrap.json +++ b/src/npm-shrinkwrap.json @@ -1,11 +1,11 @@ { "name": "Lychee", - "version": "3.1.0", + "version": "3.1.2", "dependencies": { "abbrev": { - "version": "1.0.7", + "version": "1.0.9", "from": "abbrev@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.7.tgz" + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz" }, "align-text": { "version": "0.1.4", @@ -17,11 +17,6 @@ "from": "amdefine@>=0.0.4", "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz" }, - "ansi": { - "version": "0.3.1", - "from": "ansi@>=0.3.1 <0.4.0", - "resolved": "https://registry.npmjs.org/ansi/-/ansi-0.3.1.tgz" - }, "ansi-regex": { "version": "2.0.0", "from": "ansi-regex@>=2.0.0 <3.0.0", @@ -33,9 +28,14 @@ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.0.tgz" }, "any-promise": { - "version": "1.1.0", + "version": "1.3.0", "from": "any-promise@>=1.1.0 <2.0.0", - "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.1.0.tgz" + "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz" + }, + "aproba": { + "version": "1.0.4", + "from": "aproba@>=1.0.3 <2.0.0", + "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.0.4.tgz" }, "archy": { "version": "1.0.0", @@ -47,6 +47,11 @@ "from": "are-we-there-yet@>=1.1.2 <1.2.0", "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.2.tgz" }, + "arr-diff": { + "version": "2.0.0", + "from": "arr-diff@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz" + }, "arr-flatten": { "version": "1.0.1", "from": "arr-flatten@>=1.0.1 <2.0.0", @@ -67,16 +72,16 @@ "from": "array-index@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/array-index/-/array-index-1.0.0.tgz" }, - "array-union": { - "version": "1.0.1", - "from": "array-union@>=1.0.1 <2.0.0", - "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.1.tgz" - }, "array-uniq": { "version": "1.0.2", "from": "array-uniq@>=1.0.2 <2.0.0", "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.2.tgz" }, + "array-unique": { + "version": "0.2.1", + "from": "array-unique@>=0.2.1 <0.3.0", + "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz" + }, "arrify": { "version": "1.0.1", "from": "arrify@>=1.0.1 <2.0.0", @@ -113,16 +118,9 @@ "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz" }, "aws4": { - "version": "1.3.2", + "version": "1.4.1", "from": "aws4@>=1.2.1 <2.0.0", - "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.3.2.tgz", - "dependencies": { - "lru-cache": { - "version": "4.0.0", - "from": "lru-cache@>=4.0.0 <5.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.0.tgz" - } - } + "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.4.1.tgz" }, "babel-code-frame": { "version": "6.7.2", @@ -140,44 +138,390 @@ "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.7.2.tgz" }, "babel-helper-call-delegate": { - "version": "6.6.5", - "from": "babel-helper-call-delegate@>=6.6.5 <7.0.0", - "resolved": "https://registry.npmjs.org/babel-helper-call-delegate/-/babel-helper-call-delegate-6.6.5.tgz" + "version": "6.8.0", + "from": "babel-helper-call-delegate@>=6.8.0 <7.0.0", + "resolved": "https://registry.npmjs.org/babel-helper-call-delegate/-/babel-helper-call-delegate-6.8.0.tgz", + "dependencies": { + "babel-code-frame": { + "version": "6.11.0", + "from": "babel-code-frame@^6.8.0", + "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.11.0.tgz" + }, + "babel-messages": { + "version": "6.8.0", + "from": "babel-messages@^6.8.0", + "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.8.0.tgz" + }, + "babel-runtime": { + "version": "6.11.6", + "from": "babel-runtime@^6.0.0", + "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.11.6.tgz" + }, + "babel-traverse": { + "version": "6.13.0", + "from": "babel-traverse@^6.8.0", + "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.13.0.tgz" + }, + "babel-types": { + "version": "6.13.0", + "from": "babel-types@^6.8.0", + "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.13.0.tgz" + }, + "core-js": { + "version": "2.4.1", + "from": "core-js@^2.4.0", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz" + }, + "js-tokens": { + "version": "2.0.0", + "from": "js-tokens@^2.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-2.0.0.tgz" + }, + "lodash": { + "version": "4.14.2", + "from": "lodash@^4.2.0", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.14.2.tgz" + } + } }, "babel-helper-define-map": { - "version": "6.6.5", - "from": "babel-helper-define-map@>=6.6.5 <7.0.0", - "resolved": "https://registry.npmjs.org/babel-helper-define-map/-/babel-helper-define-map-6.6.5.tgz" + "version": "6.9.0", + "from": "babel-helper-define-map@>=6.9.0 <7.0.0", + "resolved": "https://registry.npmjs.org/babel-helper-define-map/-/babel-helper-define-map-6.9.0.tgz", + "dependencies": { + "babel-code-frame": { + "version": "6.11.0", + "from": "babel-code-frame@^6.8.0", + "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.11.0.tgz" + }, + "babel-messages": { + "version": "6.8.0", + "from": "babel-messages@^6.8.0", + "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.8.0.tgz" + }, + "babel-runtime": { + "version": "6.11.6", + "from": "babel-runtime@^6.9.0", + "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.11.6.tgz" + }, + "babel-traverse": { + "version": "6.13.0", + "from": "babel-traverse@^6.13.0", + "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.13.0.tgz" + }, + "babel-types": { + "version": "6.13.0", + "from": "babel-types@^6.9.0", + "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.13.0.tgz" + }, + "core-js": { + "version": "2.4.1", + "from": "core-js@^2.4.0", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz" + }, + "js-tokens": { + "version": "2.0.0", + "from": "js-tokens@^2.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-2.0.0.tgz" + }, + "lodash": { + "version": "4.14.2", + "from": "lodash@^4.2.0", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.14.2.tgz" + } + } }, "babel-helper-function-name": { - "version": "6.6.0", - "from": "babel-helper-function-name@>=6.6.0 <7.0.0", - "resolved": "https://registry.npmjs.org/babel-helper-function-name/-/babel-helper-function-name-6.6.0.tgz" + "version": "6.8.0", + "from": "babel-helper-function-name@>=6.8.0 <7.0.0", + "resolved": "https://registry.npmjs.org/babel-helper-function-name/-/babel-helper-function-name-6.8.0.tgz", + "dependencies": { + "babel-code-frame": { + "version": "6.11.0", + "from": "babel-code-frame@^6.8.0", + "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.11.0.tgz" + }, + "babel-messages": { + "version": "6.8.0", + "from": "babel-messages@^6.8.0", + "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.8.0.tgz" + }, + "babel-runtime": { + "version": "6.11.6", + "from": "babel-runtime@^6.0.0", + "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.11.6.tgz" + }, + "babel-template": { + "version": "6.9.0", + "from": "babel-template@^6.8.0", + "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.9.0.tgz" + }, + "babel-traverse": { + "version": "6.13.0", + "from": "babel-traverse@^6.8.0", + "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.13.0.tgz" + }, + "babel-types": { + "version": "6.13.0", + "from": "babel-types@^6.8.0", + "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.13.0.tgz" + }, + "core-js": { + "version": "2.4.1", + "from": "core-js@^2.4.0", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz" + }, + "js-tokens": { + "version": "2.0.0", + "from": "js-tokens@^2.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-2.0.0.tgz" + }, + "lodash": { + "version": "4.14.2", + "from": "lodash@^4.2.0", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.14.2.tgz" + } + } }, "babel-helper-get-function-arity": { - "version": "6.6.5", - "from": "babel-helper-get-function-arity@>=6.3.13 <7.0.0", - "resolved": "https://registry.npmjs.org/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.6.5.tgz" + "version": "6.8.0", + "from": "babel-helper-get-function-arity@>=6.8.0 <7.0.0", + "resolved": "https://registry.npmjs.org/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.8.0.tgz", + "dependencies": { + "babel-code-frame": { + "version": "6.11.0", + "from": "babel-code-frame@^6.8.0", + "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.11.0.tgz" + }, + "babel-messages": { + "version": "6.8.0", + "from": "babel-messages@^6.8.0", + "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.8.0.tgz" + }, + "babel-runtime": { + "version": "6.11.6", + "from": "babel-runtime@^6.0.0", + "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.11.6.tgz" + }, + "babel-traverse": { + "version": "6.13.0", + "from": "babel-traverse@^6.13.0", + "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.13.0.tgz" + }, + "babel-types": { + "version": "6.13.0", + "from": "babel-types@^6.8.0", + "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.13.0.tgz" + }, + "core-js": { + "version": "2.4.1", + "from": "core-js@^2.4.0", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz" + }, + "js-tokens": { + "version": "2.0.0", + "from": "js-tokens@^2.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-2.0.0.tgz" + }, + "lodash": { + "version": "4.14.2", + "from": "lodash@^4.2.0", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.14.2.tgz" + } + } }, "babel-helper-hoist-variables": { - "version": "6.6.5", - "from": "babel-helper-hoist-variables@>=6.6.5 <7.0.0", - "resolved": "https://registry.npmjs.org/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.6.5.tgz" + "version": "6.8.0", + "from": "babel-helper-hoist-variables@>=6.8.0 <7.0.0", + "resolved": "https://registry.npmjs.org/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.8.0.tgz", + "dependencies": { + "babel-code-frame": { + "version": "6.11.0", + "from": "babel-code-frame@^6.8.0", + "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.11.0.tgz" + }, + "babel-messages": { + "version": "6.8.0", + "from": "babel-messages@^6.8.0", + "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.8.0.tgz" + }, + "babel-runtime": { + "version": "6.11.6", + "from": "babel-runtime@^6.0.0", + "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.11.6.tgz" + }, + "babel-traverse": { + "version": "6.13.0", + "from": "babel-traverse@^6.13.0", + "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.13.0.tgz" + }, + "babel-types": { + "version": "6.13.0", + "from": "babel-types@^6.8.0", + "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.13.0.tgz" + }, + "core-js": { + "version": "2.4.1", + "from": "core-js@^2.4.0", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz" + }, + "js-tokens": { + "version": "2.0.0", + "from": "js-tokens@^2.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-2.0.0.tgz" + }, + "lodash": { + "version": "4.14.2", + "from": "lodash@^4.2.0", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.14.2.tgz" + } + } }, "babel-helper-optimise-call-expression": { - "version": "6.6.0", - "from": "babel-helper-optimise-call-expression@>=6.6.0 <7.0.0", - "resolved": "https://registry.npmjs.org/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.6.0.tgz" + "version": "6.8.0", + "from": "babel-helper-optimise-call-expression@>=6.8.0 <7.0.0", + "resolved": "https://registry.npmjs.org/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.8.0.tgz", + "dependencies": { + "babel-code-frame": { + "version": "6.11.0", + "from": "babel-code-frame@^6.8.0", + "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.11.0.tgz" + }, + "babel-messages": { + "version": "6.8.0", + "from": "babel-messages@^6.8.0", + "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.8.0.tgz" + }, + "babel-runtime": { + "version": "6.11.6", + "from": "babel-runtime@^6.0.0", + "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.11.6.tgz" + }, + "babel-traverse": { + "version": "6.13.0", + "from": "babel-traverse@^6.13.0", + "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.13.0.tgz" + }, + "babel-types": { + "version": "6.13.0", + "from": "babel-types@^6.8.0", + "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.13.0.tgz" + }, + "core-js": { + "version": "2.4.1", + "from": "core-js@^2.4.0", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz" + }, + "js-tokens": { + "version": "2.0.0", + "from": "js-tokens@^2.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-2.0.0.tgz" + }, + "lodash": { + "version": "4.14.2", + "from": "lodash@^4.2.0", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.14.2.tgz" + } + } }, "babel-helper-regex": { - "version": "6.6.5", - "from": "babel-helper-regex@>=6.3.13 <7.0.0", - "resolved": "https://registry.npmjs.org/babel-helper-regex/-/babel-helper-regex-6.6.5.tgz" + "version": "6.9.0", + "from": "babel-helper-regex@>=6.8.0 <7.0.0", + "resolved": "https://registry.npmjs.org/babel-helper-regex/-/babel-helper-regex-6.9.0.tgz", + "dependencies": { + "babel-code-frame": { + "version": "6.11.0", + "from": "babel-code-frame@^6.8.0", + "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.11.0.tgz" + }, + "babel-messages": { + "version": "6.8.0", + "from": "babel-messages@^6.8.0", + "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.8.0.tgz" + }, + "babel-runtime": { + "version": "6.11.6", + "from": "babel-runtime@^6.9.0", + "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.11.6.tgz" + }, + "babel-traverse": { + "version": "6.13.0", + "from": "babel-traverse@^6.13.0", + "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.13.0.tgz" + }, + "babel-types": { + "version": "6.13.0", + "from": "babel-types@^6.9.0", + "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.13.0.tgz" + }, + "core-js": { + "version": "2.4.1", + "from": "core-js@^2.4.0", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz" + }, + "js-tokens": { + "version": "2.0.0", + "from": "js-tokens@^2.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-2.0.0.tgz" + }, + "lodash": { + "version": "4.14.2", + "from": "lodash@^4.2.0", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.14.2.tgz" + } + } }, "babel-helper-replace-supers": { - "version": "6.7.0", - "from": "babel-helper-replace-supers@>=6.6.5 <7.0.0", - "resolved": "https://registry.npmjs.org/babel-helper-replace-supers/-/babel-helper-replace-supers-6.7.0.tgz" + "version": "6.8.0", + "from": "babel-helper-replace-supers@>=6.8.0 <7.0.0", + "resolved": "https://registry.npmjs.org/babel-helper-replace-supers/-/babel-helper-replace-supers-6.8.0.tgz", + "dependencies": { + "babel-code-frame": { + "version": "6.11.0", + "from": "babel-code-frame@^6.8.0", + "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.11.0.tgz" + }, + "babel-messages": { + "version": "6.8.0", + "from": "babel-messages@^6.8.0", + "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.8.0.tgz" + }, + "babel-runtime": { + "version": "6.11.6", + "from": "babel-runtime@^6.0.0", + "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.11.6.tgz" + }, + "babel-template": { + "version": "6.9.0", + "from": "babel-template@^6.8.0", + "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.9.0.tgz" + }, + "babel-traverse": { + "version": "6.13.0", + "from": "babel-traverse@^6.8.0", + "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.13.0.tgz" + }, + "babel-types": { + "version": "6.13.0", + "from": "babel-types@^6.8.0", + "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.13.0.tgz" + }, + "core-js": { + "version": "2.4.1", + "from": "core-js@^2.4.0", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz" + }, + "js-tokens": { + "version": "2.0.0", + "from": "js-tokens@^2.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-2.0.0.tgz" + }, + "lodash": { + "version": "4.14.2", + "from": "lodash@^4.2.0", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.14.2.tgz" + } + } }, "babel-helpers": { "version": "6.6.0", @@ -190,124 +534,929 @@ "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.7.2.tgz" }, "babel-plugin-check-es2015-constants": { - "version": "6.7.2", + "version": "6.8.0", "from": "babel-plugin-check-es2015-constants@>=6.3.13 <7.0.0", - "resolved": "https://registry.npmjs.org/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.7.2.tgz" + "resolved": "https://registry.npmjs.org/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.8.0.tgz", + "dependencies": { + "babel-runtime": { + "version": "6.11.6", + "from": "babel-runtime@>=6.0.0 <7.0.0", + "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.11.6.tgz" + }, + "core-js": { + "version": "2.4.1", + "from": "core-js@>=2.4.0 <3.0.0", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz" + } + } }, "babel-plugin-syntax-async-functions": { - "version": "6.5.0", - "from": "babel-plugin-syntax-async-functions@>=6.3.13 <7.0.0", - "resolved": "https://registry.npmjs.org/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.5.0.tgz" + "version": "6.13.0", + "from": "babel-plugin-syntax-async-functions@>=6.8.0 <7.0.0", + "resolved": "https://registry.npmjs.org/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz" }, "babel-plugin-transform-es2015-arrow-functions": { - "version": "6.5.2", + "version": "6.8.0", "from": "babel-plugin-transform-es2015-arrow-functions@>=6.3.13 <7.0.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.5.2.tgz" + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.8.0.tgz", + "dependencies": { + "babel-runtime": { + "version": "6.11.6", + "from": "babel-runtime@^6.0.0", + "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.11.6.tgz" + }, + "core-js": { + "version": "2.4.1", + "from": "core-js@^2.4.0", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz" + } + } }, "babel-plugin-transform-es2015-block-scoped-functions": { - "version": "6.6.5", + "version": "6.8.0", "from": "babel-plugin-transform-es2015-block-scoped-functions@>=6.3.13 <7.0.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.6.5.tgz" + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.8.0.tgz", + "dependencies": { + "babel-runtime": { + "version": "6.11.6", + "from": "babel-runtime@^6.0.0", + "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.11.6.tgz" + }, + "core-js": { + "version": "2.4.1", + "from": "core-js@^2.4.0", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz" + } + } }, "babel-plugin-transform-es2015-block-scoping": { - "version": "6.7.1", - "from": "babel-plugin-transform-es2015-block-scoping@>=6.6.0 <7.0.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.7.1.tgz" + "version": "6.10.1", + "from": "babel-plugin-transform-es2015-block-scoping@>=6.9.0 <7.0.0", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.10.1.tgz", + "dependencies": { + "babel-code-frame": { + "version": "6.11.0", + "from": "babel-code-frame@>=6.8.0 <7.0.0", + "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.11.0.tgz" + }, + "babel-messages": { + "version": "6.8.0", + "from": "babel-messages@>=6.8.0 <7.0.0", + "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.8.0.tgz" + }, + "babel-runtime": { + "version": "6.11.6", + "from": "babel-runtime@^6.9.0", + "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.11.6.tgz" + }, + "babel-template": { + "version": "6.9.0", + "from": "babel-template@>=6.9.0 <7.0.0", + "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.9.0.tgz" + }, + "babel-traverse": { + "version": "6.13.0", + "from": "babel-traverse@>=6.9.0 <7.0.0", + "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.13.0.tgz" + }, + "babel-types": { + "version": "6.13.0", + "from": "babel-types@>=6.10.0 <7.0.0", + "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.13.0.tgz" + }, + "core-js": { + "version": "2.4.1", + "from": "core-js@^2.4.0", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz" + }, + "js-tokens": { + "version": "2.0.0", + "from": "js-tokens@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-2.0.0.tgz" + }, + "lodash": { + "version": "4.14.2", + "from": "lodash@>=4.2.0 <5.0.0", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.14.2.tgz" + } + } }, "babel-plugin-transform-es2015-classes": { - "version": "6.6.5", - "from": "babel-plugin-transform-es2015-classes@>=6.6.0 <7.0.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.6.5.tgz" + "version": "6.9.0", + "from": "babel-plugin-transform-es2015-classes@>=6.9.0 <7.0.0", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.9.0.tgz", + "dependencies": { + "babel-code-frame": { + "version": "6.11.0", + "from": "babel-code-frame@^6.8.0", + "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.11.0.tgz" + }, + "babel-messages": { + "version": "6.8.0", + "from": "babel-messages@^6.8.0", + "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.8.0.tgz" + }, + "babel-runtime": { + "version": "6.11.6", + "from": "babel-runtime@^6.9.0", + "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.11.6.tgz" + }, + "babel-template": { + "version": "6.9.0", + "from": "babel-template@^6.9.0", + "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.9.0.tgz" + }, + "babel-traverse": { + "version": "6.13.0", + "from": "babel-traverse@^6.9.0", + "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.13.0.tgz" + }, + "babel-types": { + "version": "6.13.0", + "from": "babel-types@^6.9.0", + "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.13.0.tgz" + }, + "core-js": { + "version": "2.4.1", + "from": "core-js@^2.4.0", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz" + }, + "js-tokens": { + "version": "2.0.0", + "from": "js-tokens@^2.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-2.0.0.tgz" + }, + "lodash": { + "version": "4.14.2", + "from": "lodash@^4.2.0", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.14.2.tgz" + } + } }, "babel-plugin-transform-es2015-computed-properties": { - "version": "6.6.5", + "version": "6.8.0", "from": "babel-plugin-transform-es2015-computed-properties@>=6.3.13 <7.0.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.6.5.tgz" + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.8.0.tgz", + "dependencies": { + "babel-code-frame": { + "version": "6.11.0", + "from": "babel-code-frame@^6.8.0", + "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.11.0.tgz" + }, + "babel-messages": { + "version": "6.8.0", + "from": "babel-messages@^6.8.0", + "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.8.0.tgz" + }, + "babel-runtime": { + "version": "6.11.6", + "from": "babel-runtime@^6.0.0", + "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.11.6.tgz" + }, + "babel-template": { + "version": "6.9.0", + "from": "babel-template@^6.8.0", + "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.9.0.tgz" + }, + "babel-traverse": { + "version": "6.13.0", + "from": "babel-traverse@^6.9.0", + "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.13.0.tgz" + }, + "babel-types": { + "version": "6.13.0", + "from": "babel-types@^6.9.0", + "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.13.0.tgz" + }, + "core-js": { + "version": "2.4.1", + "from": "core-js@^2.4.0", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz" + }, + "js-tokens": { + "version": "2.0.0", + "from": "js-tokens@^2.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-2.0.0.tgz" + }, + "lodash": { + "version": "4.14.2", + "from": "lodash@^4.2.0", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.14.2.tgz" + } + } }, "babel-plugin-transform-es2015-destructuring": { - "version": "6.6.5", - "from": "babel-plugin-transform-es2015-destructuring@>=6.6.0 <7.0.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.6.5.tgz" + "version": "6.9.0", + "from": "babel-plugin-transform-es2015-destructuring@>=6.9.0 <7.0.0", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.9.0.tgz", + "dependencies": { + "babel-runtime": { + "version": "6.11.6", + "from": "babel-runtime@^6.9.0", + "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.11.6.tgz" + }, + "core-js": { + "version": "2.4.1", + "from": "core-js@^2.4.0", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz" + } + } }, "babel-plugin-transform-es2015-duplicate-keys": { - "version": "6.6.4", + "version": "6.8.0", "from": "babel-plugin-transform-es2015-duplicate-keys@>=6.6.0 <7.0.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.6.4.tgz" + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.8.0.tgz", + "dependencies": { + "babel-code-frame": { + "version": "6.11.0", + "from": "babel-code-frame@^6.8.0", + "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.11.0.tgz" + }, + "babel-messages": { + "version": "6.8.0", + "from": "babel-messages@^6.8.0", + "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.8.0.tgz" + }, + "babel-runtime": { + "version": "6.11.6", + "from": "babel-runtime@^6.0.0", + "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.11.6.tgz" + }, + "babel-traverse": { + "version": "6.13.0", + "from": "babel-traverse@^6.13.0", + "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.13.0.tgz" + }, + "babel-types": { + "version": "6.13.0", + "from": "babel-types@^6.8.0", + "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.13.0.tgz" + }, + "core-js": { + "version": "2.4.1", + "from": "core-js@^2.4.0", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz" + }, + "js-tokens": { + "version": "2.0.0", + "from": "js-tokens@^2.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-2.0.0.tgz" + }, + "lodash": { + "version": "4.14.2", + "from": "lodash@^4.2.0", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.14.2.tgz" + } + } }, "babel-plugin-transform-es2015-for-of": { - "version": "6.6.0", + "version": "6.8.0", "from": "babel-plugin-transform-es2015-for-of@>=6.6.0 <7.0.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.6.0.tgz" + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.8.0.tgz", + "dependencies": { + "babel-runtime": { + "version": "6.11.6", + "from": "babel-runtime@^6.0.0", + "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.11.6.tgz" + }, + "core-js": { + "version": "2.4.1", + "from": "core-js@^2.4.0", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz" + } + } }, "babel-plugin-transform-es2015-function-name": { - "version": "6.5.0", - "from": "babel-plugin-transform-es2015-function-name@>=6.3.13 <7.0.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.5.0.tgz" + "version": "6.9.0", + "from": "babel-plugin-transform-es2015-function-name@>=6.9.0 <7.0.0", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.9.0.tgz", + "dependencies": { + "babel-code-frame": { + "version": "6.11.0", + "from": "babel-code-frame@^6.8.0", + "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.11.0.tgz" + }, + "babel-messages": { + "version": "6.8.0", + "from": "babel-messages@^6.8.0", + "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.8.0.tgz" + }, + "babel-runtime": { + "version": "6.11.6", + "from": "babel-runtime@^6.9.0", + "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.11.6.tgz" + }, + "babel-traverse": { + "version": "6.13.0", + "from": "babel-traverse@^6.13.0", + "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.13.0.tgz" + }, + "babel-types": { + "version": "6.13.0", + "from": "babel-types@^6.9.0", + "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.13.0.tgz" + }, + "core-js": { + "version": "2.4.1", + "from": "core-js@^2.4.0", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz" + }, + "js-tokens": { + "version": "2.0.0", + "from": "js-tokens@^2.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-2.0.0.tgz" + }, + "lodash": { + "version": "4.14.2", + "from": "lodash@^4.2.0", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.14.2.tgz" + } + } }, "babel-plugin-transform-es2015-literals": { - "version": "6.5.0", + "version": "6.8.0", "from": "babel-plugin-transform-es2015-literals@>=6.3.13 <7.0.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.5.0.tgz" + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.8.0.tgz", + "dependencies": { + "babel-runtime": { + "version": "6.11.6", + "from": "babel-runtime@^6.0.0", + "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.11.6.tgz" + }, + "core-js": { + "version": "2.4.1", + "from": "core-js@^2.4.0", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz" + } + } + }, + "babel-plugin-transform-es2015-modules-amd": { + "version": "6.8.0", + "from": "babel-plugin-transform-es2015-modules-amd@>=6.8.0 <7.0.0", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.8.0.tgz", + "dependencies": { + "babel-code-frame": { + "version": "6.11.0", + "from": "babel-code-frame@^6.8.0", + "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.11.0.tgz" + }, + "babel-messages": { + "version": "6.8.0", + "from": "babel-messages@^6.8.0", + "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.8.0.tgz" + }, + "babel-runtime": { + "version": "6.11.6", + "from": "babel-runtime@^6.0.0", + "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.11.6.tgz" + }, + "babel-template": { + "version": "6.9.0", + "from": "babel-template@^6.8.0", + "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.9.0.tgz" + }, + "babel-traverse": { + "version": "6.13.0", + "from": "babel-traverse@^6.9.0", + "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.13.0.tgz" + }, + "babel-types": { + "version": "6.13.0", + "from": "babel-types@^6.9.0", + "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.13.0.tgz" + }, + "core-js": { + "version": "2.4.1", + "from": "core-js@^2.4.0", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz" + }, + "js-tokens": { + "version": "2.0.0", + "from": "js-tokens@^2.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-2.0.0.tgz" + }, + "lodash": { + "version": "4.14.2", + "from": "lodash@^4.2.0", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.14.2.tgz" + } + } }, "babel-plugin-transform-es2015-modules-commonjs": { - "version": "6.7.0", + "version": "6.11.5", "from": "babel-plugin-transform-es2015-modules-commonjs@>=6.6.0 <7.0.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.7.0.tgz" + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.11.5.tgz", + "dependencies": { + "babel-code-frame": { + "version": "6.11.0", + "from": "babel-code-frame@^6.8.0", + "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.11.0.tgz" + }, + "babel-messages": { + "version": "6.8.0", + "from": "babel-messages@^6.8.0", + "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.8.0.tgz" + }, + "babel-runtime": { + "version": "6.11.6", + "from": "babel-runtime@^6.0.0", + "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.11.6.tgz" + }, + "babel-template": { + "version": "6.9.0", + "from": "babel-template@^6.8.0", + "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.9.0.tgz" + }, + "babel-traverse": { + "version": "6.13.0", + "from": "babel-traverse@^6.9.0", + "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.13.0.tgz" + }, + "babel-types": { + "version": "6.13.0", + "from": "babel-types@^6.8.0", + "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.13.0.tgz" + }, + "core-js": { + "version": "2.4.1", + "from": "core-js@^2.4.0", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz" + }, + "js-tokens": { + "version": "2.0.0", + "from": "js-tokens@^2.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-2.0.0.tgz" + }, + "lodash": { + "version": "4.14.2", + "from": "lodash@^4.2.0", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.14.2.tgz" + } + } + }, + "babel-plugin-transform-es2015-modules-systemjs": { + "version": "6.12.0", + "from": "babel-plugin-transform-es2015-modules-systemjs@>=6.12.0 <7.0.0", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.12.0.tgz", + "dependencies": { + "babel-code-frame": { + "version": "6.11.0", + "from": "babel-code-frame@^6.8.0", + "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.11.0.tgz" + }, + "babel-messages": { + "version": "6.8.0", + "from": "babel-messages@^6.8.0", + "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.8.0.tgz" + }, + "babel-runtime": { + "version": "6.11.6", + "from": "babel-runtime@^6.11.6", + "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.11.6.tgz" + }, + "babel-template": { + "version": "6.9.0", + "from": "babel-template@^6.9.0", + "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.9.0.tgz" + }, + "babel-traverse": { + "version": "6.13.0", + "from": "babel-traverse@^6.9.0", + "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.13.0.tgz" + }, + "babel-types": { + "version": "6.13.0", + "from": "babel-types@^6.9.0", + "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.13.0.tgz" + }, + "core-js": { + "version": "2.4.1", + "from": "core-js@^2.4.0", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz" + }, + "js-tokens": { + "version": "2.0.0", + "from": "js-tokens@^2.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-2.0.0.tgz" + }, + "lodash": { + "version": "4.14.2", + "from": "lodash@^4.2.0", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.14.2.tgz" + } + } + }, + "babel-plugin-transform-es2015-modules-umd": { + "version": "6.12.0", + "from": "babel-plugin-transform-es2015-modules-umd@>=6.12.0 <7.0.0", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.12.0.tgz", + "dependencies": { + "babel-code-frame": { + "version": "6.11.0", + "from": "babel-code-frame@^6.8.0", + "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.11.0.tgz" + }, + "babel-messages": { + "version": "6.8.0", + "from": "babel-messages@^6.8.0", + "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.8.0.tgz" + }, + "babel-runtime": { + "version": "6.11.6", + "from": "babel-runtime@^6.0.0", + "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.11.6.tgz" + }, + "babel-template": { + "version": "6.9.0", + "from": "babel-template@^6.8.0", + "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.9.0.tgz" + }, + "babel-traverse": { + "version": "6.13.0", + "from": "babel-traverse@^6.9.0", + "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.13.0.tgz" + }, + "babel-types": { + "version": "6.13.0", + "from": "babel-types@^6.9.0", + "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.13.0.tgz" + }, + "core-js": { + "version": "2.4.1", + "from": "core-js@^2.4.0", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz" + }, + "js-tokens": { + "version": "2.0.0", + "from": "js-tokens@^2.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-2.0.0.tgz" + }, + "lodash": { + "version": "4.14.2", + "from": "lodash@^4.2.0", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.14.2.tgz" + } + } }, "babel-plugin-transform-es2015-object-super": { - "version": "6.6.5", + "version": "6.8.0", "from": "babel-plugin-transform-es2015-object-super@>=6.3.13 <7.0.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.6.5.tgz" + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.8.0.tgz", + "dependencies": { + "babel-runtime": { + "version": "6.11.6", + "from": "babel-runtime@^6.0.0", + "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.11.6.tgz" + }, + "core-js": { + "version": "2.4.1", + "from": "core-js@^2.4.0", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz" + } + } }, "babel-plugin-transform-es2015-parameters": { - "version": "6.7.0", - "from": "babel-plugin-transform-es2015-parameters@>=6.6.0 <7.0.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.7.0.tgz" + "version": "6.11.4", + "from": "babel-plugin-transform-es2015-parameters@>=6.9.0 <7.0.0", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.11.4.tgz", + "dependencies": { + "babel-code-frame": { + "version": "6.11.0", + "from": "babel-code-frame@^6.8.0", + "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.11.0.tgz" + }, + "babel-messages": { + "version": "6.8.0", + "from": "babel-messages@^6.8.0", + "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.8.0.tgz" + }, + "babel-runtime": { + "version": "6.11.6", + "from": "babel-runtime@^6.9.0", + "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.11.6.tgz" + }, + "babel-template": { + "version": "6.9.0", + "from": "babel-template@^6.9.0", + "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.9.0.tgz" + }, + "babel-traverse": { + "version": "6.13.0", + "from": "babel-traverse@^6.11.4", + "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.13.0.tgz" + }, + "babel-types": { + "version": "6.13.0", + "from": "babel-types@^6.9.0", + "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.13.0.tgz" + }, + "core-js": { + "version": "2.4.1", + "from": "core-js@^2.4.0", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz" + }, + "js-tokens": { + "version": "2.0.0", + "from": "js-tokens@^2.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-2.0.0.tgz" + }, + "lodash": { + "version": "4.14.2", + "from": "lodash@^4.2.0", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.14.2.tgz" + } + } }, "babel-plugin-transform-es2015-shorthand-properties": { - "version": "6.5.0", + "version": "6.8.0", "from": "babel-plugin-transform-es2015-shorthand-properties@>=6.3.13 <7.0.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.5.0.tgz" + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.8.0.tgz", + "dependencies": { + "babel-code-frame": { + "version": "6.11.0", + "from": "babel-code-frame@^6.8.0", + "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.11.0.tgz" + }, + "babel-messages": { + "version": "6.8.0", + "from": "babel-messages@^6.8.0", + "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.8.0.tgz" + }, + "babel-runtime": { + "version": "6.11.6", + "from": "babel-runtime@^6.0.0", + "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.11.6.tgz" + }, + "babel-traverse": { + "version": "6.13.0", + "from": "babel-traverse@^6.13.0", + "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.13.0.tgz" + }, + "babel-types": { + "version": "6.13.0", + "from": "babel-types@^6.8.0", + "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.13.0.tgz" + }, + "core-js": { + "version": "2.4.1", + "from": "core-js@^2.4.0", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz" + }, + "js-tokens": { + "version": "2.0.0", + "from": "js-tokens@^2.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-2.0.0.tgz" + }, + "lodash": { + "version": "4.14.2", + "from": "lodash@^4.2.0", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.14.2.tgz" + } + } }, "babel-plugin-transform-es2015-spread": { - "version": "6.6.5", + "version": "6.8.0", "from": "babel-plugin-transform-es2015-spread@>=6.3.13 <7.0.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.6.5.tgz" + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.8.0.tgz", + "dependencies": { + "babel-runtime": { + "version": "6.11.6", + "from": "babel-runtime@^6.0.0", + "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.11.6.tgz" + }, + "core-js": { + "version": "2.4.1", + "from": "core-js@^2.4.0", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz" + } + } }, "babel-plugin-transform-es2015-sticky-regex": { - "version": "6.5.0", + "version": "6.8.0", "from": "babel-plugin-transform-es2015-sticky-regex@>=6.3.13 <7.0.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.5.0.tgz" + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.8.0.tgz", + "dependencies": { + "babel-code-frame": { + "version": "6.11.0", + "from": "babel-code-frame@^6.8.0", + "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.11.0.tgz" + }, + "babel-messages": { + "version": "6.8.0", + "from": "babel-messages@^6.8.0", + "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.8.0.tgz" + }, + "babel-runtime": { + "version": "6.11.6", + "from": "babel-runtime@^6.0.0", + "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.11.6.tgz" + }, + "babel-traverse": { + "version": "6.13.0", + "from": "babel-traverse@^6.13.0", + "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.13.0.tgz" + }, + "babel-types": { + "version": "6.13.0", + "from": "babel-types@^6.8.0", + "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.13.0.tgz" + }, + "core-js": { + "version": "2.4.1", + "from": "core-js@^2.4.0", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz" + }, + "js-tokens": { + "version": "2.0.0", + "from": "js-tokens@^2.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-2.0.0.tgz" + }, + "lodash": { + "version": "4.14.2", + "from": "lodash@^4.2.0", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.14.2.tgz" + } + } }, "babel-plugin-transform-es2015-template-literals": { - "version": "6.6.5", + "version": "6.8.0", "from": "babel-plugin-transform-es2015-template-literals@>=6.6.0 <7.0.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.6.5.tgz" + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.8.0.tgz", + "dependencies": { + "babel-runtime": { + "version": "6.11.6", + "from": "babel-runtime@^6.0.0", + "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.11.6.tgz" + }, + "core-js": { + "version": "2.4.1", + "from": "core-js@^2.4.0", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz" + } + } }, "babel-plugin-transform-es2015-typeof-symbol": { - "version": "6.6.0", + "version": "6.8.0", "from": "babel-plugin-transform-es2015-typeof-symbol@>=6.6.0 <7.0.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.6.0.tgz" + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.8.0.tgz", + "dependencies": { + "babel-runtime": { + "version": "6.11.6", + "from": "babel-runtime@^6.0.0", + "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.11.6.tgz" + }, + "core-js": { + "version": "2.4.1", + "from": "core-js@^2.4.0", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz" + } + } }, "babel-plugin-transform-es2015-unicode-regex": { - "version": "6.5.0", + "version": "6.11.0", "from": "babel-plugin-transform-es2015-unicode-regex@>=6.3.13 <7.0.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.5.0.tgz" + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.11.0.tgz", + "dependencies": { + "babel-runtime": { + "version": "6.11.6", + "from": "babel-runtime@^6.0.0", + "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.11.6.tgz" + }, + "core-js": { + "version": "2.4.1", + "from": "core-js@^2.4.0", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz" + } + } }, "babel-plugin-transform-regenerator": { - "version": "6.6.5", - "from": "babel-plugin-transform-regenerator@>=6.6.0 <7.0.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.6.5.tgz" + "version": "6.11.4", + "from": "babel-plugin-transform-regenerator@>=6.9.0 <7.0.0", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.11.4.tgz", + "dependencies": { + "babel-code-frame": { + "version": "6.11.0", + "from": "babel-code-frame@^6.8.0", + "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.11.0.tgz" + }, + "babel-core": { + "version": "6.13.2", + "from": "babel-core@>=6.11.4 <7.0.0", + "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.13.2.tgz" + }, + "babel-generator": { + "version": "6.11.4", + "from": "babel-generator@>=6.11.4 <7.0.0", + "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.11.4.tgz" + }, + "babel-helpers": { + "version": "6.8.0", + "from": "babel-helpers@>=6.8.0 <7.0.0", + "resolved": "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.8.0.tgz" + }, + "babel-messages": { + "version": "6.8.0", + "from": "babel-messages@^6.8.0", + "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.8.0.tgz" + }, + "babel-register": { + "version": "6.11.6", + "from": "babel-register@>=6.9.0 <7.0.0", + "resolved": "https://registry.npmjs.org/babel-register/-/babel-register-6.11.6.tgz" + }, + "babel-runtime": { + "version": "6.11.6", + "from": "babel-runtime@^6.9.0", + "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.11.6.tgz" + }, + "babel-template": { + "version": "6.9.0", + "from": "babel-template@^6.9.0", + "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.9.0.tgz" + }, + "babel-traverse": { + "version": "6.13.0", + "from": "babel-traverse@^6.11.4", + "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.13.0.tgz" + }, + "babel-types": { + "version": "6.13.0", + "from": "babel-types@^6.9.0", + "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.13.0.tgz" + }, + "core-js": { + "version": "2.4.1", + "from": "core-js@^2.4.0", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz" + }, + "js-tokens": { + "version": "2.0.0", + "from": "js-tokens@^2.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-2.0.0.tgz" + }, + "lodash": { + "version": "4.14.2", + "from": "lodash@^4.2.0", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.14.2.tgz" + }, + "minimatch": { + "version": "3.0.3", + "from": "minimatch@>=3.0.2 <4.0.0", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz" + } + } }, "babel-plugin-transform-strict-mode": { - "version": "6.6.5", - "from": "babel-plugin-transform-strict-mode@>=6.6.5 <7.0.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.6.5.tgz" + "version": "6.11.3", + "from": "babel-plugin-transform-strict-mode@>=6.8.0 <7.0.0", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.11.3.tgz", + "dependencies": { + "babel-code-frame": { + "version": "6.11.0", + "from": "babel-code-frame@^6.8.0", + "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.11.0.tgz" + }, + "babel-messages": { + "version": "6.8.0", + "from": "babel-messages@^6.8.0", + "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.8.0.tgz" + }, + "babel-runtime": { + "version": "6.11.6", + "from": "babel-runtime@^6.0.0", + "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.11.6.tgz" + }, + "babel-traverse": { + "version": "6.13.0", + "from": "babel-traverse@^6.13.0", + "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.13.0.tgz" + }, + "babel-types": { + "version": "6.13.0", + "from": "babel-types@^6.8.0", + "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.13.0.tgz" + }, + "core-js": { + "version": "2.4.1", + "from": "core-js@^2.4.0", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz" + }, + "js-tokens": { + "version": "2.0.0", + "from": "js-tokens@^2.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-2.0.0.tgz" + }, + "lodash": { + "version": "4.14.2", + "from": "lodash@^4.2.0", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.14.2.tgz" + } + } }, "babel-preset-es2015": { - "version": "6.6.0", - "from": "babel-preset-es2015@>=6.6.0 <7.0.0", - "resolved": "https://registry.npmjs.org/babel-preset-es2015/-/babel-preset-es2015-6.6.0.tgz" + "version": "6.13.2", + "from": "babel-preset-es2015@>=6.13.2 <7.0.0", + "resolved": "https://registry.npmjs.org/babel-preset-es2015/-/babel-preset-es2015-6.13.2.tgz" }, "babel-register": { "version": "6.7.2", @@ -353,11 +1502,13 @@ }, "basiccontext": { "version": "3.5.1", - "from": "basiccontext@>=3.5.1 <4.0.0" + "from": "basiccontext@3.5.1", + "resolved": "https://registry.npmjs.org/basiccontext/-/basiccontext-3.5.1.tgz" }, "basicmodal": { - "version": "3.3.4", - "from": "basicmodal@>=3.3.4 <4.0.0" + "version": "3.3.7", + "from": "basicmodal@>=3.3.7 <4.0.0", + "resolved": "https://registry.npmjs.org/basicmodal/-/basicmodal-3.3.7.tgz" }, "beeper": { "version": "1.1.0", @@ -365,9 +1516,9 @@ "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.1.0.tgz" }, "bl": { - "version": "1.0.3", - "from": "bl@>=1.0.0 <1.1.0", - "resolved": "https://registry.npmjs.org/bl/-/bl-1.0.3.tgz", + "version": "1.1.2", + "from": "bl@>=1.1.2 <1.2.0", + "resolved": "https://registry.npmjs.org/bl/-/bl-1.1.2.tgz", "dependencies": { "isarray": { "version": "1.0.0", @@ -382,9 +1533,9 @@ } }, "block-stream": { - "version": "0.0.8", + "version": "0.0.9", "from": "block-stream@*", - "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.8.tgz" + "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz" }, "boom": { "version": "2.10.1", @@ -396,6 +1547,11 @@ "from": "brace-expansion@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.3.tgz" }, + "braces": { + "version": "1.8.5", + "from": "braces@>=1.8.2 <2.0.0", + "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz" + }, "browserslist": { "version": "1.1.3", "from": "browserslist@>=1.1.3 <1.2.0", @@ -454,9 +1610,9 @@ } }, "cliui": { - "version": "3.1.0", - "from": "cliui@>=3.0.3 <4.0.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.1.0.tgz" + "version": "3.2.0", + "from": "cliui@>=3.2.0 <4.0.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz" }, "clone": { "version": "1.0.2", @@ -493,32 +1649,15 @@ "from": "concat-map@0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz" }, - "concat-stream": { - "version": "1.5.1", - "from": "concat-stream@>=1.4.7 <2.0.0", - "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.1.tgz", - "dependencies": { - "isarray": { - "version": "1.0.0", - "from": "isarray@>=1.0.0 <1.1.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz" - }, - "readable-stream": { - "version": "2.0.6", - "from": "readable-stream@>=2.0.0 <2.1.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz" - } - } - }, "concat-with-sourcemaps": { "version": "1.0.4", "from": "concat-with-sourcemaps@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/concat-with-sourcemaps/-/concat-with-sourcemaps-1.0.4.tgz" }, - "config-chain": { - "version": "1.1.10", - "from": "config-chain@>=1.1.8 <1.2.0", - "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.10.tgz" + "console-control-strings": { + "version": "1.1.0", + "from": "console-control-strings@>=1.1.0 <1.2.0", + "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz" }, "convert-source-map": { "version": "1.2.0", @@ -536,19 +1675,14 @@ "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz" }, "cross-spawn": { - "version": "2.1.5", - "from": "cross-spawn@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-2.1.5.tgz" - }, - "cross-spawn-async": { - "version": "2.1.9", - "from": "cross-spawn-async@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/cross-spawn-async/-/cross-spawn-async-2.1.9.tgz", + "version": "3.0.1", + "from": "cross-spawn@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz", "dependencies": { "lru-cache": { - "version": "4.0.0", - "from": "lru-cache@>=4.0.0 <5.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.0.tgz" + "version": "4.0.1", + "from": "lru-cache@>=4.0.1 <5.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.1.tgz" } } }, @@ -563,9 +1697,9 @@ "resolved": "https://registry.npmjs.org/d/-/d-0.1.1.tgz" }, "dashdash": { - "version": "1.13.0", - "from": "dashdash@>=1.10.1 <2.0.0", - "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.13.0.tgz", + "version": "1.14.0", + "from": "dashdash@>=1.12.0 <2.0.0", + "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.0.tgz", "dependencies": { "assert-plus": { "version": "1.0.0", @@ -579,11 +1713,6 @@ "from": "dateformat@>=1.0.11 <2.0.0", "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz" }, - "deap": { - "version": "1.0.0", - "from": "deap@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/deap/-/deap-1.0.0.tgz" - }, "debug": { "version": "2.2.0", "from": "debug@>=2.2.0 <3.0.0", @@ -614,6 +1743,11 @@ "from": "deprecated@>=0.0.1 <0.0.2", "resolved": "https://registry.npmjs.org/deprecated/-/deprecated-0.0.1.tgz" }, + "detect-file": { + "version": "0.1.0", + "from": "detect-file@>=0.1.0 <0.2.0", + "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-0.1.0.tgz" + }, "detect-indent": { "version": "3.0.1", "from": "detect-indent@>=3.0.1 <4.0.0", @@ -670,15 +1804,35 @@ "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz" }, "event-stream": { - "version": "3.3.2", + "version": "3.3.4", "from": "event-stream@>=3.1.0 <4.0.0", - "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.2.tgz" + "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz" + }, + "expand-brackets": { + "version": "0.1.5", + "from": "expand-brackets@>=0.1.4 <0.2.0", + "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz" + }, + "expand-range": { + "version": "1.8.2", + "from": "expand-range@>=1.8.1 <2.0.0", + "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz" + }, + "expand-tilde": { + "version": "1.2.2", + "from": "expand-tilde@>=1.2.2 <2.0.0", + "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-1.2.2.tgz" }, "extend": { "version": "2.0.1", "from": "extend@>=2.0.1 <3.0.0", "resolved": "https://registry.npmjs.org/extend/-/extend-2.0.1.tgz" }, + "extglob": { + "version": "0.3.2", + "from": "extglob@>=0.3.1 <0.4.0", + "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz" + }, "extsprintf": { "version": "1.0.2", "from": "extsprintf@1.0.2", @@ -689,6 +1843,16 @@ "from": "fancy-log@>=1.1.0 <2.0.0", "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.2.0.tgz" }, + "filename-regex": { + "version": "2.0.0", + "from": "filename-regex@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.0.tgz" + }, + "fill-range": { + "version": "2.2.3", + "from": "fill-range@>=2.1.0 <3.0.0", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz" + }, "find-index": { "version": "0.1.1", "from": "find-index@>=0.1.1 <0.2.0", @@ -721,6 +1885,16 @@ "from": "flagged-respawn@>=0.3.1 <0.4.0", "resolved": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-0.3.1.tgz" }, + "for-in": { + "version": "0.1.5", + "from": "for-in@>=0.1.5 <0.2.0", + "resolved": "https://registry.npmjs.org/for-in/-/for-in-0.1.5.tgz" + }, + "for-own": { + "version": "0.1.4", + "from": "for-own@>=0.1.3 <0.2.0", + "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.4.tgz" + }, "forever-agent": { "version": "0.6.1", "from": "forever-agent@>=0.6.1 <0.7.0", @@ -736,15 +1910,37 @@ "from": "from@>=0.0.0 <1.0.0", "resolved": "https://registry.npmjs.org/from/-/from-0.1.3.tgz" }, + "fs-exists-sync": { + "version": "0.1.0", + "from": "fs-exists-sync@>=0.1.0 <0.2.0", + "resolved": "https://registry.npmjs.org/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz" + }, + "fs.realpath": { + "version": "1.0.0", + "from": "fs.realpath@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz" + }, "fstream": { - "version": "1.0.8", + "version": "1.0.10", "from": "fstream@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.8.tgz" + "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.10.tgz" }, "gauge": { - "version": "1.2.7", - "from": "gauge@>=1.2.5 <1.3.0", - "resolved": "https://registry.npmjs.org/gauge/-/gauge-1.2.7.tgz" + "version": "2.6.0", + "from": "gauge@>=2.6.0 <2.7.0", + "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.6.0.tgz", + "dependencies": { + "object-assign": { + "version": "4.1.0", + "from": "object-assign@>=4.1.0 <5.0.0", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz" + }, + "signal-exit": { + "version": "3.0.0", + "from": "signal-exit@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.0.tgz" + } + } }, "gaze": { "version": "0.5.2", @@ -761,20 +1957,30 @@ "from": "generate-object-property@>=1.1.0 <2.0.0", "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz" }, + "get-caller-file": { + "version": "1.0.2", + "from": "get-caller-file@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz" + }, "get-stdin": { "version": "4.0.1", "from": "get-stdin@>=4.0.1 <5.0.0", "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz" }, "get-value": { - "version": "1.3.1", - "from": "get-value@>=1.1.5 <2.0.0", - "resolved": "https://registry.npmjs.org/get-value/-/get-value-1.3.1.tgz", + "version": "2.0.6", + "from": "get-value@>=2.0.6 <3.0.0", + "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz" + }, + "getpass": { + "version": "0.1.6", + "from": "getpass@>=0.1.1 <0.2.0", + "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.6.tgz", "dependencies": { - "lazy-cache": { - "version": "0.2.7", - "from": "lazy-cache@>=0.2.4 <0.3.0", - "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-0.2.7.tgz" + "assert-plus": { + "version": "1.0.0", + "from": "assert-plus@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz" } } }, @@ -783,6 +1989,16 @@ "from": "glob@>=5.0.0 <5.1.0", "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz" }, + "glob-base": { + "version": "0.3.0", + "from": "glob-base@>=0.3.0 <0.4.0", + "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz" + }, + "glob-parent": { + "version": "2.0.0", + "from": "glob-parent@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz" + }, "glob-stream": { "version": "3.1.18", "from": "glob-stream@>=3.1.5 <4.0.0", @@ -815,6 +2031,16 @@ "from": "glob2base@>=0.0.12 <0.0.13", "resolved": "https://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz" }, + "global-modules": { + "version": "0.2.3", + "from": "global-modules@>=0.2.3 <0.3.0", + "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-0.2.3.tgz" + }, + "global-prefix": { + "version": "0.1.4", + "from": "global-prefix@>=0.1.4 <0.2.0", + "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-0.1.4.tgz" + }, "globals": { "version": "8.18.0", "from": "globals@>=8.3.0 <9.0.0", @@ -868,16 +2094,9 @@ "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz" }, "group-array": { - "version": "0.3.0", + "version": "0.3.1", "from": "group-array@>=0.3.0 <0.4.0", - "resolved": "https://registry.npmjs.org/group-array/-/group-array-0.3.0.tgz", - "dependencies": { - "kind-of": { - "version": "2.0.1", - "from": "kind-of@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-2.0.1.tgz" - } - } + "resolved": "https://registry.npmjs.org/group-array/-/group-array-0.3.1.tgz" }, "gulp": { "version": "3.9.1", @@ -919,24 +2138,19 @@ } }, "gulp-inject": { - "version": "4.0.0", - "from": "gulp-inject@>=4.0.0 <5.0.0", - "resolved": "https://registry.npmjs.org/gulp-inject/-/gulp-inject-4.0.0.tgz" + "version": "4.1.0", + "from": "gulp-inject@>=4.1.0 <5.0.0", + "resolved": "https://registry.npmjs.org/gulp-inject/-/gulp-inject-4.1.0.tgz" }, "gulp-load-plugins": { - "version": "1.2.0", - "from": "gulp-load-plugins@>=1.2.0 <2.0.0", - "resolved": "https://registry.npmjs.org/gulp-load-plugins/-/gulp-load-plugins-1.2.0.tgz", + "version": "1.2.4", + "from": "gulp-load-plugins@>=1.2.4 <2.0.0", + "resolved": "https://registry.npmjs.org/gulp-load-plugins/-/gulp-load-plugins-1.2.4.tgz", "dependencies": { "findup-sync": { - "version": "0.2.1", - "from": "findup-sync@>=0.2.1 <0.3.0", - "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.2.1.tgz" - }, - "glob": { - "version": "4.3.5", - "from": "glob@>=4.3.0 <4.4.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-4.3.5.tgz" + "version": "0.4.2", + "from": "findup-sync@>=0.4.0 <0.5.0", + "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.4.2.tgz" } } }, @@ -968,21 +2182,21 @@ "resolved": "https://registry.npmjs.org/gulp-rimraf/-/gulp-rimraf-0.2.0.tgz" }, "gulp-sass": { - "version": "2.2.0", - "from": "gulp-sass@>=2.2.0 <3.0.0", - "resolved": "https://registry.npmjs.org/gulp-sass/-/gulp-sass-2.2.0.tgz", - "dependencies": { - "object-assign": { - "version": "4.0.1", - "from": "object-assign@>=4.0.1 <5.0.0", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.0.1.tgz" - } - } + "version": "2.3.2", + "from": "gulp-sass@>=2.3.2 <3.0.0", + "resolved": "https://registry.npmjs.org/gulp-sass/-/gulp-sass-2.3.2.tgz" }, "gulp-uglify": { - "version": "1.5.3", - "from": "gulp-uglify@>=1.5.3 <2.0.0", - "resolved": "https://registry.npmjs.org/gulp-uglify/-/gulp-uglify-1.5.3.tgz" + "version": "2.0.0", + "from": "gulp-uglify@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/gulp-uglify/-/gulp-uglify-2.0.0.tgz", + "dependencies": { + "lodash": { + "version": "4.14.2", + "from": "lodash@^4.13.1", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.14.2.tgz" + } + } }, "gulp-util": { "version": "3.0.7", @@ -1011,6 +2225,11 @@ "from": "has-ansi@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz" }, + "has-color": { + "version": "0.1.7", + "from": "has-color@>=0.1.7 <0.2.0", + "resolved": "https://registry.npmjs.org/has-color/-/has-color-0.1.7.tgz" + }, "has-flag": { "version": "1.0.0", "from": "has-flag@>=1.0.0 <2.0.0", @@ -1022,9 +2241,9 @@ "resolved": "https://registry.npmjs.org/has-gulplog/-/has-gulplog-0.1.0.tgz" }, "has-unicode": { - "version": "2.0.0", + "version": "2.0.1", "from": "has-unicode@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.0.tgz" + "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz" }, "hawk": { "version": "3.1.3", @@ -1051,6 +2270,11 @@ "from": "http-signature@>=1.1.0 <1.2.0", "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz" }, + "in-publish": { + "version": "2.0.0", + "from": "in-publish@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/in-publish/-/in-publish-2.0.0.tgz" + }, "indent-string": { "version": "2.1.0", "from": "indent-string@>=2.1.0 <3.0.0", @@ -1093,31 +2317,41 @@ "from": "invert-kv@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz" }, - "is-absolute": { - "version": "0.1.7", - "from": "is-absolute@>=0.1.7 <0.2.0", - "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-0.1.7.tgz" - }, "is-arrayish": { "version": "0.2.1", "from": "is-arrayish@>=0.2.1 <0.3.0", "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz" }, "is-buffer": { - "version": "1.1.3", + "version": "1.1.4", "from": "is-buffer@>=1.0.2 <2.0.0", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.3.tgz" + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.4.tgz" }, "is-builtin-module": { "version": "1.0.0", "from": "is-builtin-module@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz" }, + "is-dotfile": { + "version": "1.0.2", + "from": "is-dotfile@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.2.tgz" + }, + "is-equal-shallow": { + "version": "0.1.3", + "from": "is-equal-shallow@>=0.1.3 <0.2.0", + "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz" + }, "is-extendable": { "version": "0.1.1", "from": "is-extendable@>=0.1.1 <0.2.0", "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz" }, + "is-extglob": { + "version": "1.0.0", + "from": "is-extglob@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz" + }, "is-finite": { "version": "1.0.1", "from": "is-finite@>=1.0.0 <2.0.0", @@ -1128,6 +2362,11 @@ "from": "is-fullwidth-code-point@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz" }, + "is-glob": { + "version": "2.0.1", + "from": "is-glob@>=2.0.1 <3.0.0", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz" + }, "is-integer": { "version": "1.0.6", "from": "is-integer@>=1.0.4 <2.0.0", @@ -1138,16 +2377,26 @@ "from": "is-my-json-valid@>=2.12.4 <3.0.0", "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.13.1.tgz" }, + "is-number": { + "version": "2.1.0", + "from": "is-number@>=2.1.0 <3.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz" + }, + "is-posix-bracket": { + "version": "0.1.1", + "from": "is-posix-bracket@>=0.1.0 <0.2.0", + "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz" + }, + "is-primitive": { + "version": "2.0.0", + "from": "is-primitive@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz" + }, "is-property": { "version": "1.0.2", "from": "is-property@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz" }, - "is-relative": { - "version": "0.1.3", - "from": "is-relative@>=0.1.0 <0.2.0", - "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-0.1.3.tgz" - }, "is-typedarray": { "version": "1.0.0", "from": "is-typedarray@>=1.0.0 <1.1.0", @@ -1158,6 +2407,11 @@ "from": "is-utf8@>=0.2.0 <0.3.0", "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz" }, + "is-windows": { + "version": "0.2.0", + "from": "is-windows@>=0.2.0 <0.3.0", + "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-0.2.0.tgz" + }, "isarray": { "version": "0.0.1", "from": "isarray@0.0.1", @@ -1169,9 +2423,16 @@ "resolved": "https://registry.npmjs.org/isexe/-/isexe-1.1.2.tgz" }, "isobject": { - "version": "2.0.0", + "version": "2.1.0", "from": "isobject@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.0.0.tgz" + "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz", + "dependencies": { + "isarray": { + "version": "1.0.0", + "from": "isarray@1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz" + } + } }, "isstream": { "version": "0.1.2", @@ -1184,9 +2445,9 @@ "resolved": "https://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz" }, "jquery": { - "version": "2.2.3", - "from": "jquery@>=2.2.3 <3.0.0", - "resolved": "https://registry.npmjs.org/jquery/-/jquery-2.2.3.tgz" + "version": "3.1.0", + "from": "jquery@>=3.1.0 <4.0.0", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.1.0.tgz" }, "js-base64": { "version": "2.1.9", @@ -1229,19 +2490,19 @@ "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-2.0.0.tgz" }, "jsprim": { - "version": "1.2.2", + "version": "1.3.0", "from": "jsprim@>=1.2.2 <2.0.0", - "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.2.2.tgz" + "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.3.0.tgz" }, "kind-of": { - "version": "3.0.2", - "from": "kind-of@>=3.0.2 <4.0.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.0.2.tgz" + "version": "3.0.4", + "from": "kind-of@>=3.0.3 <4.0.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.0.4.tgz" }, "lazy-cache": { - "version": "1.0.3", + "version": "1.0.4", "from": "lazy-cache@>=1.0.3 <2.0.0", - "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.3.tgz" + "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz" }, "lcid": { "version": "1.0.0", @@ -1318,6 +2579,16 @@ "from": "lodash._root@>=3.0.0 <4.0.0", "resolved": "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz" }, + "lodash.assign": { + "version": "4.1.0", + "from": "lodash.assign@>=4.0.3 <5.0.0", + "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.1.0.tgz" + }, + "lodash.clonedeep": { + "version": "4.4.1", + "from": "lodash.clonedeep@>=4.3.2 <5.0.0", + "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.4.1.tgz" + }, "lodash.escape": { "version": "3.2.0", "from": "lodash.escape@>=3.0.0 <4.0.0", @@ -1338,26 +2609,6 @@ "from": "lodash.keys@>=3.0.0 <4.0.0", "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz" }, - "lodash.pad": { - "version": "4.1.0", - "from": "lodash.pad@>=4.1.0 <5.0.0", - "resolved": "https://registry.npmjs.org/lodash.pad/-/lodash.pad-4.1.0.tgz" - }, - "lodash.padend": { - "version": "4.2.0", - "from": "lodash.padend@>=4.1.0 <5.0.0", - "resolved": "https://registry.npmjs.org/lodash.padend/-/lodash.padend-4.2.0.tgz" - }, - "lodash.padstart": { - "version": "4.2.0", - "from": "lodash.padstart@>=4.1.0 <5.0.0", - "resolved": "https://registry.npmjs.org/lodash.padstart/-/lodash.padstart-4.2.0.tgz" - }, - "lodash.repeat": { - "version": "4.0.0", - "from": "lodash.repeat@>=4.0.0 <5.0.0", - "resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-4.0.0.tgz" - }, "lodash.restparam": { "version": "3.6.1", "from": "lodash.restparam@>=3.0.0 <4.0.0", @@ -1373,11 +2624,6 @@ "from": "lodash.templatesettings@>=3.0.0 <4.0.0", "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz" }, - "lodash.tostring": { - "version": "4.1.2", - "from": "lodash.tostring@>=4.0.0 <5.0.0", - "resolved": "https://registry.npmjs.org/lodash.tostring/-/lodash.tostring-4.1.2.tgz" - }, "longest": { "version": "1.0.1", "from": "longest@>=1.0.1 <2.0.0", @@ -1398,6 +2644,16 @@ "from": "lru-cache@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz" }, + "make-error": { + "version": "1.2.0", + "from": "make-error@>=1.2.0 <2.0.0", + "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.2.0.tgz" + }, + "make-error-cause": { + "version": "1.2.1", + "from": "make-error-cause@>=1.1.1 <2.0.0", + "resolved": "https://registry.npmjs.org/make-error-cause/-/make-error-cause-1.2.1.tgz" + }, "map-obj": { "version": "1.0.1", "from": "map-obj@>=1.0.1 <2.0.0", @@ -1420,15 +2676,20 @@ } } }, + "micromatch": { + "version": "2.3.11", + "from": "micromatch@>=2.3.8 <3.0.0", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz" + }, "mime-db": { - "version": "1.22.0", - "from": "mime-db@>=1.22.0 <1.23.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.22.0.tgz" + "version": "1.23.0", + "from": "mime-db@>=1.23.0 <1.24.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.23.0.tgz" }, "mime-types": { - "version": "2.1.10", + "version": "2.1.11", "from": "mime-types@>=2.1.7 <2.2.0", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.10.tgz" + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.11.tgz" }, "minimatch": { "version": "2.0.10", @@ -1453,68 +2714,79 @@ } }, "mousetrap": { - "version": "1.5.3", - "from": "mousetrap@>=1.5.3 <2.0.0", - "resolved": "https://registry.npmjs.org/mousetrap/-/mousetrap-1.5.3.tgz" + "version": "1.6.0", + "from": "mousetrap@>=1.6.0 <2.0.0", + "resolved": "https://registry.npmjs.org/mousetrap/-/mousetrap-1.6.0.tgz" }, "ms": { "version": "0.7.1", "from": "ms@0.7.1", "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz" }, - "multimatch": { - "version": "2.0.0", - "from": "multimatch@2.0.0", - "resolved": "https://registry.npmjs.org/multimatch/-/multimatch-2.0.0.tgz" - }, "multipipe": { "version": "0.1.2", "from": "multipipe@>=0.1.2 <0.2.0", "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz" }, "nan": { - "version": "2.2.0", - "from": "nan@>=2.0.8 <3.0.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.2.0.tgz" + "version": "2.4.0", + "from": "nan@>=2.3.2 <3.0.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.4.0.tgz" }, "node-gyp": { - "version": "3.3.1", - "from": "node-gyp@>=3.0.1 <4.0.0", - "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.3.1.tgz", + "version": "3.4.0", + "from": "node-gyp@>=3.3.1 <4.0.0", + "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.4.0.tgz", "dependencies": { "glob": { - "version": "4.5.3", - "from": "glob@>=3.0.0 <4.0.0||>=4.0.0 <5.0.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz", - "dependencies": { - "minimatch": { - "version": "2.0.10", - "from": "minimatch@>=2.0.1 <3.0.0" - } - } + "version": "7.0.5", + "from": "glob@^7.0.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.0.5.tgz" }, "minimatch": { - "version": "1.0.0", - "from": "minimatch@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz" + "version": "3.0.3", + "from": "minimatch@^3.0.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz" } } }, "node-sass": { - "version": "3.4.2", - "from": "node-sass@>=3.4.1 <4.0.0", - "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-3.4.2.tgz" + "version": "3.8.0", + "from": "node-sass@>=3.4.2 <4.0.0", + "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-3.8.0.tgz", + "dependencies": { + "gaze": { + "version": "1.1.1", + "from": "gaze@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.1.tgz" + }, + "glob": { + "version": "7.0.5", + "from": "glob@>=7.0.3 <8.0.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.0.5.tgz" + }, + "globule": { + "version": "1.0.0", + "from": "globule@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/globule/-/globule-1.0.0.tgz" + }, + "lodash": { + "version": "4.9.0", + "from": "lodash@>=4.9.0 <4.10.0", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.9.0.tgz" + }, + "minimatch": { + "version": "3.0.3", + "from": "minimatch@~3.0.0", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz" + } + } }, "node-uuid": { "version": "1.4.7", "from": "node-uuid@>=1.4.7 <1.5.0", "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz" }, - "noncharacters": { - "version": "1.1.0", - "from": "noncharacters@>=1.1.0 <2.0.0", - "resolved": "https://registry.npmjs.org/noncharacters/-/noncharacters-1.1.0.tgz" - }, "nopt": { "version": "3.0.6", "from": "nopt@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0", @@ -1525,20 +2797,20 @@ "from": "normalize-package-data@>=2.3.4 <3.0.0", "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.5.tgz" }, + "normalize-path": { + "version": "2.0.1", + "from": "normalize-path@>=2.0.1 <3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.0.1.tgz" + }, "normalize-range": { "version": "0.1.2", "from": "normalize-range@>=0.1.2 <0.2.0", "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz" }, - "npmconf": { - "version": "2.1.2", - "from": "npmconf@>=2.1.2 <3.0.0", - "resolved": "https://registry.npmjs.org/npmconf/-/npmconf-2.1.2.tgz" - }, "npmlog": { - "version": "2.0.3", - "from": "npmlog@>=0.0.0 <1.0.0||>=1.0.0 <2.0.0||>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-2.0.3.tgz" + "version": "3.1.2", + "from": "npmlog@>=0.0.0 <1.0.0||>=1.0.0 <2.0.0||>=2.0.0 <3.0.0||>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-3.1.2.tgz" }, "num2fraction": { "version": "1.2.2", @@ -1551,15 +2823,20 @@ "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.0.tgz" }, "oauth-sign": { - "version": "0.8.1", - "from": "oauth-sign@>=0.8.0 <0.9.0", - "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.1.tgz" + "version": "0.8.2", + "from": "oauth-sign@>=0.8.1 <0.9.0", + "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz" }, "object-assign": { "version": "3.0.0", "from": "object-assign@>=3.0.0 <4.0.0", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz" }, + "object.omit": { + "version": "2.0.0", + "from": "object.omit@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.0.tgz" + }, "once": { "version": "1.3.3", "from": "once@>=1.3.0 <2.0.0", @@ -1585,11 +2862,6 @@ "from": "os-locale@>=1.4.0 <2.0.0", "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz" }, - "os-shim": { - "version": "0.1.3", - "from": "os-shim@>=0.1.2 <0.2.0", - "resolved": "https://registry.npmjs.org/os-shim/-/os-shim-0.1.3.tgz" - }, "os-tmpdir": { "version": "1.0.1", "from": "os-tmpdir@>=1.0.1 <2.0.0", @@ -1600,6 +2872,11 @@ "from": "osenv@>=0.0.0 <1.0.0", "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.3.tgz" }, + "parse-glob": { + "version": "3.0.4", + "from": "parse-glob@>=3.0.4 <4.0.0", + "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz" + }, "parse-json": { "version": "2.2.0", "from": "parse-json@>=2.2.0 <3.0.0", @@ -1662,6 +2939,11 @@ "from": "postcss-value-parser@>=3.2.3 <4.0.0", "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz" }, + "preserve": { + "version": "0.2.0", + "from": "preserve@>=0.2.0 <0.3.0", + "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz" + }, "pretty-hrtime": { "version": "1.0.2", "from": "pretty-hrtime@>=1.0.0 <2.0.0", @@ -1677,20 +2959,20 @@ "from": "process-nextick-args@>=1.0.6 <1.1.0", "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.6.tgz" }, - "proto-list": { - "version": "1.2.4", - "from": "proto-list@>=1.2.1 <1.3.0", - "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz" - }, "pseudomap": { "version": "1.0.2", "from": "pseudomap@>=1.0.1 <2.0.0", "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz" }, "qs": { - "version": "6.0.2", - "from": "qs@>=6.0.2 <6.1.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.0.2.tgz" + "version": "6.2.1", + "from": "qs@>=6.2.0 <6.3.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.2.1.tgz" + }, + "randomatic": { + "version": "1.1.5", + "from": "randomatic@>=1.1.3 <2.0.0", + "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.5.tgz" }, "read-pkg": { "version": "1.1.0", @@ -1718,14 +3000,24 @@ "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz" }, "regenerate": { - "version": "1.2.1", + "version": "1.3.1", "from": "regenerate@>=1.2.1 <2.0.0", - "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.2.1.tgz" + "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.3.1.tgz" + }, + "regenerator-runtime": { + "version": "0.9.5", + "from": "regenerator-runtime@>=0.9.5 <0.10.0", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.9.5.tgz" + }, + "regex-cache": { + "version": "0.4.3", + "from": "regex-cache@>=0.4.2 <0.5.0", + "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.3.tgz" }, "regexpu-core": { - "version": "1.0.0", - "from": "regexpu-core@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-1.0.0.tgz" + "version": "2.0.0", + "from": "regexpu-core@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-2.0.0.tgz" }, "regjsgen": { "version": "0.2.0", @@ -1737,6 +3029,11 @@ "from": "regjsparser@>=0.1.4 <0.2.0", "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz" }, + "repeat-element": { + "version": "1.1.2", + "from": "repeat-element@>=1.1.2 <2.0.0", + "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz" + }, "repeat-string": { "version": "1.5.4", "from": "repeat-string@>=1.5.2 <2.0.0", @@ -1753,9 +3050,9 @@ "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz" }, "request": { - "version": "2.69.0", + "version": "2.74.0", "from": "request@>=2.61.0 <3.0.0", - "resolved": "https://registry.npmjs.org/request/-/request-2.69.0.tgz", + "resolved": "https://registry.npmjs.org/request/-/request-2.74.0.tgz", "dependencies": { "extend": { "version": "3.0.0", @@ -1764,11 +3061,26 @@ } } }, + "require-directory": { + "version": "2.1.1", + "from": "require-directory@>=2.1.1 <3.0.0", + "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz" + }, + "require-main-filename": { + "version": "1.0.1", + "from": "require-main-filename@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz" + }, "resolve": { "version": "1.1.7", "from": "resolve@>=1.1.6 <2.0.0", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz" }, + "resolve-dir": { + "version": "0.1.1", + "from": "resolve-dir@>=0.1.0 <0.2.0", + "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-0.1.1.tgz" + }, "right-align": { "version": "0.1.3", "from": "right-align@>=0.1.1 <0.2.0", @@ -1787,19 +3099,24 @@ } }, "sass-graph": { - "version": "2.1.1", - "from": "sass-graph@>=2.0.1 <3.0.0", - "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.1.1.tgz", + "version": "2.1.2", + "from": "sass-graph@>=2.1.1 <3.0.0", + "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.1.2.tgz", "dependencies": { "glob": { - "version": "6.0.4", - "from": "glob@>=6.0.4 <7.0.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz" + "version": "7.0.5", + "from": "glob@^7.0.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.0.5.tgz" }, "lodash": { - "version": "4.6.1", - "from": "lodash@>=4.0.0 <5.0.0", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.6.1.tgz" + "version": "4.14.2", + "from": "lodash@^4.0.0", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.14.2.tgz" + }, + "minimatch": { + "version": "3.0.3", + "from": "minimatch@^3.0.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz" } } }, @@ -1813,6 +3130,11 @@ "from": "sequencify@>=0.0.7 <0.1.0", "resolved": "https://registry.npmjs.org/sequencify/-/sequencify-0.0.7.tgz" }, + "set-blocking": { + "version": "2.0.0", + "from": "set-blocking@>=2.0.0 <2.1.0", + "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz" + }, "shebang-regex": { "version": "1.0.0", "from": "shebang-regex@>=1.0.0 <2.0.0", @@ -1860,11 +3182,6 @@ "from": "sparkles@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.0.tgz" }, - "spawn-sync": { - "version": "1.0.15", - "from": "spawn-sync@>=1.0.15 <2.0.0", - "resolved": "https://registry.npmjs.org/spawn-sync/-/spawn-sync-1.0.15.tgz" - }, "spdx-correct": { "version": "1.0.2", "from": "spdx-correct@>=1.0.0 <1.1.0", @@ -1891,9 +3208,16 @@ "resolved": "https://registry.npmjs.org/split/-/split-0.3.3.tgz" }, "sshpk": { - "version": "1.7.4", + "version": "1.9.2", "from": "sshpk@>=1.7.0 <2.0.0", - "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.7.4.tgz" + "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.9.2.tgz", + "dependencies": { + "assert-plus": { + "version": "1.0.0", + "from": "assert-plus@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz" + } + } }, "stream-combiner": { "version": "0.0.4", @@ -1988,9 +3312,9 @@ "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.1.tgz" }, "tough-cookie": { - "version": "2.2.2", - "from": "tough-cookie@>=2.2.0 <2.3.0", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.2.tgz" + "version": "2.3.1", + "from": "tough-cookie@>=2.3.0 <2.4.0", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.1.tgz" }, "trim-newlines": { "version": "1.0.0", @@ -2003,24 +3327,19 @@ "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz" }, "tunnel-agent": { - "version": "0.4.2", + "version": "0.4.3", "from": "tunnel-agent@>=0.4.1 <0.5.0", - "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.2.tgz" + "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz" }, "tweetnacl": { - "version": "0.14.1", - "from": "tweetnacl@>=0.13.0 <1.0.0", - "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.1.tgz" - }, - "typedarray": { - "version": "0.0.6", - "from": "typedarray@>=0.0.5 <0.1.0", - "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz" + "version": "0.13.3", + "from": "tweetnacl@>=0.13.0 <0.14.0", + "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.13.3.tgz" }, "uglify-js": { - "version": "2.6.2", - "from": "uglify-js@2.6.2", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.6.2.tgz", + "version": "2.7.0", + "from": "uglify-js@2.7.0", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.0.tgz", "dependencies": { "async": { "version": "0.2.10", @@ -2059,11 +3378,6 @@ "from": "uglify-to-browserify@>=1.0.0 <1.1.0", "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz" }, - "uid-number": { - "version": "0.0.5", - "from": "uid-number@0.0.5", - "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.5.tgz" - }, "unique-stream": { "version": "1.0.0", "from": "unique-stream@>=1.0.0 <2.0.0", @@ -2147,14 +3461,24 @@ "resolved": "https://registry.npmjs.org/vinyl-sourcemaps-apply/-/vinyl-sourcemaps-apply-0.2.1.tgz" }, "which": { - "version": "1.2.4", - "from": "which@>=1.2.4 <2.0.0", - "resolved": "https://registry.npmjs.org/which/-/which-1.2.4.tgz" + "version": "1.2.10", + "from": "which@>=1.2.10 <2.0.0", + "resolved": "https://registry.npmjs.org/which/-/which-1.2.10.tgz" + }, + "which-module": { + "version": "1.0.0", + "from": "which-module@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz" + }, + "wide-align": { + "version": "1.1.0", + "from": "wide-align@>=1.1.0 <2.0.0", + "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.0.tgz" }, "window-size": { - "version": "0.1.4", - "from": "window-size@>=0.1.4 <0.2.0", - "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.4.tgz" + "version": "0.2.0", + "from": "window-size@>=0.2.0 <0.3.0", + "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.2.0.tgz" }, "wordwrap": { "version": "0.0.2", @@ -2162,9 +3486,9 @@ "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz" }, "wrap-ansi": { - "version": "1.0.0", - "from": "wrap-ansi@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-1.0.0.tgz" + "version": "2.0.0", + "from": "wrap-ansi@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.0.0.tgz" }, "wrappy": { "version": "1.0.1", @@ -2177,9 +3501,9 @@ "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz" }, "y18n": { - "version": "3.2.0", - "from": "y18n@>=3.2.0 <4.0.0", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.0.tgz" + "version": "3.2.1", + "from": "y18n@>=3.2.1 <4.0.0", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz" }, "yallist": { "version": "2.0.0", @@ -2187,9 +3511,21 @@ "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.0.0.tgz" }, "yargs": { - "version": "3.32.0", - "from": "yargs@>=3.8.0 <4.0.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.32.0.tgz" + "version": "4.8.1", + "from": "yargs@>=4.7.1 <5.0.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-4.8.1.tgz" + }, + "yargs-parser": { + "version": "2.4.1", + "from": "yargs-parser@>=2.4.1 <3.0.0", + "resolved": "https://registry.npmjs.com/yargs-parser/-/yargs-parser-2.4.1.tgz", + "dependencies": { + "camelcase": { + "version": "3.0.0", + "from": "camelcase@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz" + } + } } } } diff --git a/src/package.json b/src/package.json index c27d222..92eab67 100644 --- a/src/package.json +++ b/src/package.json @@ -1,6 +1,6 @@ { "name": "Lychee", - "version": "3.1.0", + "version": "3.1.2", "description": "Self-hosted photo-management done right.", "authors": "Tobias Reich ", "license": "MIT", @@ -14,20 +14,20 @@ "compile": "gulp" }, "dependencies": { - "babel-preset-es2015": "^6.6.0", + "babel-preset-es2015": "^6.13.2", "basiccontext": "^3.5.1", - "basicmodal": "^3.3.4", + "basicmodal": "^3.3.7", "gulp": "^3.9.1", "gulp-autoprefixer": "3.1.0", "gulp-babel": "^6.1.2", "gulp-concat": "^2.6.0", - "gulp-inject": "^4.0.0", - "gulp-load-plugins": "^1.2.0", + "gulp-inject": "^4.1.0", + "gulp-load-plugins": "^1.2.4", "gulp-minify-css": "^1.2.4", "gulp-rimraf": "^0.2.0", - "gulp-sass": "^2.2.0", - "gulp-uglify": "^1.5.3", - "jquery": "^2.2.3", - "mousetrap": "^1.5.3" + "gulp-sass": "^2.3.2", + "gulp-uglify": "^2.0.0", + "jquery": "^3.1.0", + "mousetrap": "^1.6.0" } } diff --git a/src/scripts/contextMenu.js b/src/scripts/contextMenu.js index cf58abd..806487d 100644 --- a/src/scripts/contextMenu.js +++ b/src/scripts/contextMenu.js @@ -306,10 +306,12 @@ contextMenu.sharePhoto = function(photoID, e) { { title: build.iconic('envelope-closed') + 'Mail', fn: () => photo.share(photoID, 'mail') }, { title: build.iconic('dropbox', iconClass) + 'Dropbox', visible: lychee.publicMode===false, fn: () => photo.share(photoID, 'dropbox') }, { title: build.iconic('link-intact') + 'Direct Link', fn: () => window.open(photo.getDirectLink()) }, - { visible: lychee.publicMode===false }, + { }, { title: build.iconic('ban') + 'Make Private', visible: lychee.publicMode===false, fn: () => photo.setPublic(photoID) } ] + if (lychee.publicMode===true) items.splice(7, 1) + basicContext.show(items, e.originalEvent) $('.basicContext input#link').focus().select() @@ -325,11 +327,13 @@ contextMenu.shareAlbum = function(albumID, e) { { title: build.iconic('twitter', iconClass) + 'Twitter', fn: () => album.share('twitter') }, { title: build.iconic('facebook', iconClass) + 'Facebook', fn: () => album.share('facebook') }, { title: build.iconic('envelope-closed') + 'Mail', fn: () => album.share('mail') }, - { visible: lychee.publicMode===false }, + { }, { title: build.iconic('pencil') + 'Edit Sharing', visible: lychee.publicMode===false, fn: () => album.setPublic(albumID, true, e) }, { title: build.iconic('ban') + 'Make Private', visible: lychee.publicMode===false, fn: () => album.setPublic(albumID, false) } ] + if (lychee.publicMode===true) items.splice(5, 1) + basicContext.show(items, e.originalEvent) $('.basicContext input#link').focus().select() diff --git a/src/scripts/header.js b/src/scripts/header.js index 6c4b81c..58f6f6e 100644 --- a/src/scripts/header.js +++ b/src/scripts/header.js @@ -67,8 +67,6 @@ header.bind = function() { header.show = function() { - clearTimeout($(window).data('timeout')) - lychee.imageview.removeClass('full') header.dom().removeClass('header--hidden') @@ -76,18 +74,12 @@ header.show = function() { } -header.hide = function(e, delay = 500) { +header.hide = function(e) { if (visible.photo() && !visible.sidebar() && !visible.contextMenu() && basicModal.visible()===false) { - clearTimeout($(window).data('timeout')) - - $(window).data('timeout', setTimeout(function() { - - lychee.imageview.addClass('full') - header.dom().addClass('header--hidden') - - }, delay)) + lychee.imageview.addClass('full') + header.dom().addClass('header--hidden') return true diff --git a/src/scripts/init.js b/src/scripts/init.js index 71520e5..de6211a 100755 --- a/src/scripts/init.js +++ b/src/scripts/init.js @@ -80,7 +80,7 @@ $(document).ready(function() { // Fullscreen on mobile .on('touchend', '#imageview #image', function(e) { if (swipe.obj==null || (swipe.offset>=-5&&swipe.offset<=5)) { - if (visible.header()) header.hide(e, 0) + if (visible.header()) header.hide(e) else header.show() } }) diff --git a/src/scripts/lychee.js b/src/scripts/lychee.js index 03bb681..105e5ba 100644 --- a/src/scripts/lychee.js +++ b/src/scripts/lychee.js @@ -6,8 +6,8 @@ lychee = { title : document.title, - version : '3.1.0', - versionCode : '030100', + version : '3.1.2', + versionCode : '030102', updatePath : '//update.electerious.com/index.json', updateURL : 'https://github.com/electerious/Lychee', diff --git a/src/scripts/multiselect.js b/src/scripts/multiselect.js index e9c60e2..7421def 100644 --- a/src/scripts/multiselect.js +++ b/src/scripts/multiselect.js @@ -159,7 +159,7 @@ multiselect.resize = function(e) { multiselect.stopResize = function() { - $(document).off('mousemove mouseup') + if (multiselect.position.top!==null) $(document).off('mousemove mouseup') } diff --git a/src/scripts/photo.js b/src/scripts/photo.js index 2552e7a..860ad68 100644 --- a/src/scripts/photo.js +++ b/src/scripts/photo.js @@ -82,10 +82,12 @@ photo.preloadNext = function(photoID) { album.json.content[photoID].nextPhoto!='') { let nextPhoto = album.json.content[photoID].nextPhoto - let url = album.json.content[nextPhoto].url + let medium = album.json.content[nextPhoto].medium - $('head [data-prefetch]').remove() - $('head').append(``) + if (medium!=null && medium!=='') { + $('head [data-prefetch]').remove() + $('head').append(``) + } } diff --git a/src/scripts/view.js b/src/scripts/view.js index 198a4fd..befae3f 100644 --- a/src/scripts/view.js +++ b/src/scripts/view.js @@ -309,9 +309,12 @@ view.photo = { $('body').css('overflow', 'hidden') // Fullscreen - $(document) - .bind('mouseenter', header.show) - .bind('mouseleave', header.hide) + var timeout + $(document).bind('mousemove', function() { + clearTimeout(timeout) + header.show() + timeout = setTimeout(header.hide, 1000) + }) lychee.animate(lychee.imageview, 'fadeIn') @@ -329,8 +332,7 @@ view.photo = { // Disable Fullscreen $(document) - .unbind('mouseenter') - .unbind('mouseleave') + .unbind('mousemove') // Hide Photo lychee.animate(lychee.imageview, 'fadeOut') diff --git a/src/scripts/view/main.js b/src/scripts/view/main.js index 566a605..107b2b8 100644 --- a/src/scripts/view/main.js +++ b/src/scripts/view/main.js @@ -60,6 +60,15 @@ lychee.html = function(literalSections, ...substs) { } +lychee.getEventName = function() { + + let touchendSupport = (/Android|iPhone|iPad|iPod/i).test(navigator.userAgent || navigator.vendor || window.opera) && ('ontouchend' in document.documentElement) + let eventName = (touchendSupport===true ? 'touchend' : 'click') + + return eventName + +} + // Sub-implementation of photo -------------------------------------------------------------- // let photo = {}