From 064da9a6449305b6ccd46dac99580b130fff482c Mon Sep 17 00:00:00 2001 From: Mattia Astorino Date: Sun, 11 Feb 2018 12:22:56 +0100 Subject: [PATCH 1/6] chore: Update README --- README.md | 47 +++++++++++++++++++++++++++++++++++----- extensions/defaults.json | 2 +- package.json | 4 ++-- 3 files changed, 44 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index da48c41..ad014a1 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,24 @@ The most epic theme meets Visual Studio Code. You can help by reporting issues [here](https://github.com/equinusocio/vsc-material-theme/issues) + + +- [Getting started](#getting-started) + - [Installation](#installation) + - [Packaged VSIX Extension](#packaged-vsix-extension) + - [GitHub Repository Clone](#github-repository-clone) + - [Activate theme](#activate-theme) + - [Activate File Icons](#activate-file-icons) + - [Set the accent color](#set-the-accent-color) + - [Override theme colors](#override-theme-colors) +- [Recommended settings for a better experience](#recommended-settings-for-a-better-experience) +- [Other resources](#other-resources) + - [Contributors](#contributors) + - [Backers](#backers) + - [Sponsors](#sponsors) + + + # Getting started You can install this awesome theme through the [Visual Studio Code Marketplace](https://marketplace.visualstudio.com/items?itemName=Equinusocio.vsc-material-theme). @@ -26,7 +44,7 @@ Paste the following command and press `Enter`: ext install vsc-material-theme ``` -#### Packaged VSIX Extension [↑](#getting-started) +#### Packaged VSIX Extension [Download the latest .vsix release](https://github.com/equinusocio/vsc-material-theme/releases/latest) file from the GitHub repository and install it from the command line @@ -36,7 +54,7 @@ code --install-extension vsc-material-theme-*.*.*.vsix or from within VS Code by launching *Quick Open* and running the *Install from VSIX...* command. -##### GitHub Repository Clone [↑](#getting-started) +##### GitHub Repository Clone Change to your `.vscode/extensions` [VS Code extensions directory](https://code.visualstudio.com/docs/extensions/install-extension#_side-loading). Depending on your platform it is located in the following folders: @@ -52,7 +70,7 @@ git clone https://github.com/equinusocio/vsc-material-theme.git Equinusocio.vsc- ``` -## Activate theme [↑](#getting-started) +## Activate theme Launch *Quick Open*, @@ -64,7 +82,7 @@ Type `theme` and choose `Preferences: Color Theme`, then select Material Theme f This theme provides different color variants, to change the active theme variant type `Material Theme` and choose `Material Theme: Settings`, then select `Change color variant` and pick one theme from the list. -## Activate File Icons [↑](#getting-started) +## Activate File Icons Launch *Quick Open*, @@ -84,8 +102,25 @@ Launch *Quick Open*, Type `Material Theme` and choose `Material Theme: Settings`, then select `Change accent color` and pick one color from the list. +## Override theme colors +You can override the material theme ui and schemes colors by adding these theme-specific settings to your configuration. -# Recommended settings for a better experience [↑](#getting-started) +```json +"editor.tokenColorCustomizations": { + "[Material Theme]": { + "comments": "#229977" + }, + "..." +}, +"workbench.colorCustomizations": { + "[Material Theme]": { + "sideBar.background": "#347890" + }, + "..." +} +``` + +# Recommended settings for a better experience ```json // Controls the font family. @@ -98,7 +133,7 @@ Type `Material Theme` and choose `Material Theme: Settings`, then select `Change "explorer.decorations.badges": false, ``` -# Other resources [↑](#getting-started) +# Other resources - **AppIcon:** [Download](https://github.com/equinusocio/vsc-material-theme/files/989048/vsc-material-theme-appicon.zip) the official Material Theme app icon for Visual Studio code diff --git a/extensions/defaults.json b/extensions/defaults.json index ae8bb9c..e22c751 100644 --- a/extensions/defaults.json +++ b/extensions/defaults.json @@ -35,7 +35,7 @@ "_folder_ci_open" ], "changelog": { - "lastversion": "1.2.0" + "lastversion": "1.3.0" }, "icons": { "theme": { diff --git a/package.json b/package.json index ed8b19b..ad07563 100644 --- a/package.json +++ b/package.json @@ -71,7 +71,7 @@ "themes": [ { "label": "Material Theme", - "path": "./themes/Material-Theme-Default.json", + "path": "./themes/Material-Theme-Palenight.json", "uiTheme": "vs-dark" } ], @@ -136,4 +136,4 @@ "url": "https://opencollective.com/vsc-material-theme", "logo": "https://opencollective.com/opencollective/logo.txt" } -} +} \ No newline at end of file From 405000e0871dff08d0525ff84af3b5cccd847fab Mon Sep 17 00:00:00 2001 From: Mattia Astorino Date: Sun, 11 Feb 2018 12:38:25 +0100 Subject: [PATCH 2/6] feat: Add a subtle highlight on tab hover --- src/themes/theme-template-color-theme.json | Bin 27377 -> 27440 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/src/themes/theme-template-color-theme.json b/src/themes/theme-template-color-theme.json index 289fafe882cfcf51e0bba7244f19d86caff78b42..9597e818eff9fc715b92e6b348c44043653b3659 100644 GIT binary patch literal 27440 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≥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 z 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 literal 27377 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 o8^$4$49|3MK0G1IZ@u1rV?pIaYS(C{< Date: Sun, 11 Feb 2018 12:54:55 +0100 Subject: [PATCH 3/6] chore: update tests --- test/source.php | 55 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 54 insertions(+), 1 deletion(-) diff --git a/test/source.php b/test/source.php index 387254a..c20c54a 100644 --- a/test/source.php +++ b/test/source.php @@ -1,4 +1,57 @@ edible = $edible; + $this->color = $color; + } + + function is_edible() + { + return $this->edible; + } + + function what_color() + { + return $this->color; + } + +} // end of class Vegetable + +// extends the base class +class Spinach extends Vegetable { + + + var $cooked = false; + + function Spinach() + { + $this->Vegetable(true, "green"); + } + + function cook_it() + { + $this->cooked = true; + } + + function is_cooked() + { + return $this->cooked; + } + +} // end of class Spinach + +?> + From 81399a5a4f0deaa132ac3cac2fd7a24b1e14f323 Mon Sep 17 00:00:00 2001 From: Mattia Astorino Date: Sun, 11 Feb 2018 14:09:54 +0100 Subject: [PATCH 4/6] chore: Update deps --- package-lock.json | 2414 +++++++++++++++++++++++++++------------------ package.json | 42 +- 2 files changed, 1451 insertions(+), 1005 deletions(-) diff --git a/package-lock.json b/package-lock.json index 79abd00..afa2eb1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,83 +5,125 @@ "requires": true, "dependencies": { "@types/chalk": { - "version": "0.4.31", - "resolved": "https://registry.npmjs.org/@types/chalk/-/chalk-0.4.31.tgz", - "integrity": "sha1-ox10JBprHtu5c8822XooloNKUfk=", - "dev": true - }, - "@types/chokidar": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/@types/chokidar/-/chokidar-1.7.0.tgz", - "integrity": "sha512-cSHtjB7Qgy6TvoYXVSRQJdsiUba62cwlAxvQ5mah2nfnuqcWcSZk1svZZu1JbWPWwQrwqvzDmjoozDhsKW6ewQ==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@types/chalk/-/chalk-2.2.0.tgz", + "integrity": "sha512-1zzPV9FDe1I/WHhRkf9SNgqtRJWZqrBWgu7JGveuHmmyR9CnAPCie2N/x+iHrgnpYBIcCJWHBoMRv2TRWktsvw==", "dev": true, "requires": { + "chalk": "1.1.3" + } + }, + "@types/chokidar": { + "version": "1.7.4", + "resolved": "https://registry.npmjs.org/@types/chokidar/-/chokidar-1.7.4.tgz", + "integrity": "sha512-QVuksEzbvU22DJg9vFW9O++u0yT6aXnn64qq/KzaUUWuf+E2IAEzAM90qGlgWpLq3pPHbUfvmlJz1TZnUePQUg==", + "dev": true, + "requires": { + "@types/events": "1.1.0", "@types/node": "8.0.14" } }, + "@types/events": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@types/events/-/events-1.1.0.tgz", + "integrity": "sha512-y3bR98mzYOo0pAZuiLari+cQyiKk3UXRuT45h1RjhfeCzqkjaVsfZJNaxdgtk7/3tzOm1ozLTqEqMP3VbI48jw==", + "dev": true + }, "@types/glob": { - "version": "5.0.30", - "resolved": "https://registry.npmjs.org/@types/glob/-/glob-5.0.30.tgz", - "integrity": "sha1-ECZAnFYlqGiQdGAoCNCCsoZ7ilE=", + "version": "5.0.35", + "resolved": "https://registry.npmjs.org/@types/glob/-/glob-5.0.35.tgz", + "integrity": "sha512-wc+VveszMLyMWFvXLkloixT4n0harUIVZjnpzztaZ0nKLuul7Z32iMt2fUFGAaZ4y1XWjFRMtCI5ewvyh4aIeg==", "dev": true, "requires": { - "@types/minimatch": "2.0.29", + "@types/events": "1.1.0", + "@types/minimatch": "3.0.3", "@types/node": "8.0.14" } }, "@types/glob-stream": { - "version": "3.1.30", - "resolved": "https://registry.npmjs.org/@types/glob-stream/-/glob-stream-3.1.30.tgz", - "integrity": "sha1-uFOZC0Ckz+aoDsDS+t9o2AYPeLE=", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/@types/glob-stream/-/glob-stream-6.1.0.tgz", + "integrity": "sha512-RHv6ZQjcTncXo3thYZrsbAVwoy4vSKosSWhuhuQxLOTv74OJuFQxXkmUuZCr3q9uNBEVCvIzmZL/FeRNbHZGUg==", "dev": true, "requires": { - "@types/glob": "5.0.30", + "@types/glob": "5.0.35", "@types/node": "8.0.14" } }, "@types/gulp": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/@types/gulp/-/gulp-4.0.4.tgz", - "integrity": "sha512-5hGc57snkSvGEkUQ42tcYAQmQrU9E41XQJNglP6FtDg7ou9QGyF1HfPZ5POGnrl7ee7uYq0Om0gh1bAmykxaxA==", + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/@types/gulp/-/gulp-4.0.5.tgz", + "integrity": "sha512-nx1QjPTiRpvLfYsZ7MBu7bT6Cm7tAXyLbY0xbdx2IEMxCK2v2urIhJMQZHW0iV1TskM71Xl6p2uRRuWDbk+/7g==", "dev": true, "requires": { - "@types/chokidar": "1.7.0", - "@types/undertaker": "1.1.2", - "@types/vinyl-fs": "2.4.5" + "@types/chokidar": "1.7.4", + "@types/undertaker": "1.1.4", + "@types/vinyl-fs": "2.4.8" } }, "@types/gulp-if": { - "version": "0.0.31", - "resolved": "https://registry.npmjs.org/@types/gulp-if/-/gulp-if-0.0.31.tgz", - "integrity": "sha1-//Qf67BBXDJktr8D7eFjXLMbW4I=", + "version": "0.0.33", + "resolved": "https://registry.npmjs.org/@types/gulp-if/-/gulp-if-0.0.33.tgz", + "integrity": "sha512-J5lzff21X7r1x/4hSzn02GgIUEyjCqYIXZ9GgGBLhbsD3RiBdqwnkFWgF16/0jO5rcVZ52Zp+6MQMQdvIsWuKg==", "dev": true, "requires": { "@types/node": "8.0.14", - "@types/vinyl": "2.0.0" + "@types/vinyl": "2.0.2" } }, "@types/gulp-util": { - "version": "3.0.31", - "resolved": "https://registry.npmjs.org/@types/gulp-util/-/gulp-util-3.0.31.tgz", - "integrity": "sha1-Jy4pgiA2Vxfh9/l5tQ6620QpfL8=", + "version": "3.0.34", + "resolved": "https://registry.npmjs.org/@types/gulp-util/-/gulp-util-3.0.34.tgz", + "integrity": "sha512-E06WN1OfqL5UsMwJ1T7ClgnaXgaPipb7Ee8euMc3KRHLNqxdvWrDir9KA6uevgzBgT7XbjgmzZA2pkzDqBBX7A==", "dev": true, "requires": { - "@types/chalk": "0.4.31", "@types/node": "8.0.14", "@types/through2": "2.0.33", - "@types/vinyl": "2.0.0" + "@types/vinyl": "2.0.2", + "chalk": "2.3.0" + }, + "dependencies": { + "ansi-styles": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz", + "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==", + "dev": true, + "requires": { + "color-convert": "1.9.1" + } + }, + "chalk": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz", + "integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==", + "dev": true, + "requires": { + "ansi-styles": "3.2.0", + "escape-string-regexp": "1.0.5", + "supports-color": "4.5.0" + } + }, + "supports-color": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz", + "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=", + "dev": true, + "requires": { + "has-flag": "2.0.0" + } + } } }, "@types/minimatch": { - "version": "2.0.29", - "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-2.0.29.tgz", - "integrity": "sha1-UALhT3Xi1x5WQoHfBDHIwbSio2o=", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz", + "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==", "dev": true }, "@types/mustache": { - "version": "0.8.29", - "resolved": "https://registry.npmjs.org/@types/mustache/-/mustache-0.8.29.tgz", - "integrity": "sha1-em8T6PI/9by6rsSEiIQAsqRCe0E=", + "version": "0.8.30", + "resolved": "https://registry.npmjs.org/@types/mustache/-/mustache-0.8.30.tgz", + "integrity": "sha512-z80ZxL9CwGlyyuZ7fz3RBtsxzSasf8R8LeSQYF5xrdFVlkV4fsdJ51U1F1lSFAL+Xwk9Jxe7aueeeBedAi52Eg==", "dev": true }, "@types/node": { @@ -91,12 +133,12 @@ "dev": true }, "@types/run-sequence": { - "version": "0.0.29", - "resolved": "https://registry.npmjs.org/@types/run-sequence/-/run-sequence-0.0.29.tgz", - "integrity": "sha1-atD3ODE24TklMi5p/EHbd7MLIHU=", + "version": "0.0.30", + "resolved": "https://registry.npmjs.org/@types/run-sequence/-/run-sequence-0.0.30.tgz", + "integrity": "sha512-XwGr1b4yCGUILKeBkzmeWcxmGHQ0vFFFpA6D6y1yLO6gKmYorF+PHqdU5KG+nWt38OvtrkDptmrSmlHX/XtpLw==", "dev": true, "requires": { - "@types/gulp": "4.0.4", + "@types/gulp": "4.0.5", "@types/node": "8.0.14" } }, @@ -110,38 +152,39 @@ } }, "@types/undertaker": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@types/undertaker/-/undertaker-1.1.2.tgz", - "integrity": "sha512-cfqbNE5SKyXIWKaWdeThRgZewNUX5D1yp4xPnFkuTvr93l6EreBxO9FS3bAluiadarKMBGq6aiFosLZkMsolLw==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/@types/undertaker/-/undertaker-1.1.4.tgz", + "integrity": "sha512-LhkjHZmh7zDJm4SRn59+LN7rYMy41s+GkKmMiaoXpnsWijkYTLPnOG4z8s2SLS5PE/fEZrQXhLBTR+iImM3feA==", "dev": true, "requires": { - "@types/undertaker-registry": "1.0.0" + "@types/events": "1.1.0", + "@types/undertaker-registry": "1.0.1" } }, "@types/undertaker-registry": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@types/undertaker-registry/-/undertaker-registry-1.0.0.tgz", - "integrity": "sha1-b2GgvnWiLp72LfaLSAxovONE/l8=", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@types/undertaker-registry/-/undertaker-registry-1.0.1.tgz", + "integrity": "sha512-Z4TYuEKn9+RbNVk1Ll2SS4x1JeLHecolIbM/a8gveaHsW0Hr+RQMraZACwTO2VD7JvepgA6UO1A1VrbktQrIbQ==", "dev": true }, "@types/vinyl": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@types/vinyl/-/vinyl-2.0.0.tgz", - "integrity": "sha1-/SE79/QTbd4h/hiVUAsSwYb4wmg=", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/@types/vinyl/-/vinyl-2.0.2.tgz", + "integrity": "sha512-2iYpNuOl98SrLPBZfEN9Mh2JCJ2EI9HU35SfgBEb51DcmaHkhp8cKMblYeBqMQiwXMgAD3W60DbQ4i/UdLiXhw==", "dev": true, "requires": { "@types/node": "8.0.14" } }, "@types/vinyl-fs": { - "version": "2.4.5", - "resolved": "https://registry.npmjs.org/@types/vinyl-fs/-/vinyl-fs-2.4.5.tgz", - "integrity": "sha1-c7ISuxg49f/xQ0Hj436VbwVgABs=", + "version": "2.4.8", + "resolved": "https://registry.npmjs.org/@types/vinyl-fs/-/vinyl-fs-2.4.8.tgz", + "integrity": "sha512-yE2pN9OOrxJVeO7IZLHAHrh5R4Q0osbn5WQRuQU6GdXoK7dNFrMK3K7YhATkzf3z0yQBkol3+gafs7Rp0s7dDg==", "dev": true, "requires": { - "@types/glob-stream": "3.1.30", + "@types/glob-stream": "6.1.0", "@types/node": "8.0.14", - "@types/vinyl": "2.0.0" + "@types/vinyl": "2.0.2" } }, "@types/yamljs": { @@ -151,15 +194,15 @@ "dev": true }, "@types/yargs": { - "version": "6.6.0", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-6.6.0.tgz", - "integrity": "sha1-kfjiWAqAgwSfeDEcBZqlfWlJ32s=", + "version": "10.0.1", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-10.0.1.tgz", + "integrity": "sha512-EvK+v8864qaRCjtqcJa7iUKWYTIvbdSZ4MJd99QTcBpq2FbVllwW7ldRBesBYINgj2Mn0yMQ2yZZJPej1DcJFA==", "dev": true }, "JSONStream": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.1.tgz", - "integrity": "sha1-cH92HgHa6eFvG8+TcDt4xwlmV5o=", + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.2.tgz", + "integrity": "sha1-wQI3G27Dp887hHygDCC7D85Mbeo=", "dev": true, "requires": { "jsonparse": "1.3.1", @@ -167,9 +210,9 @@ } }, "acorn": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.1.1.tgz", - "integrity": "sha512-vOk6uEMctu0vQrvuSqFdJyqj1Q0S5VTDL79qtjo+DhRr+1mmaD+tluFSCZqhvi/JUhXSzoZN2BhtstaPEeE8cw==", + "version": "5.4.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.4.1.tgz", + "integrity": "sha512-XLmq3H/BVvW6/GbxKryGxWORz1ebilSsUDlyC27bXhWGWAZWkGwS6FLHjOlwFXNFoWFQEO/Df4u0YYd0K3BQgQ==", "dev": true }, "acorn-jsx": { @@ -196,19 +239,21 @@ "dev": true }, "ajv": { - "version": "4.11.8", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz", - "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=", + "version": "5.5.2", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz", + "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=", "dev": true, "requires": { "co": "4.6.0", - "json-stable-stringify": "1.0.1" + "fast-deep-equal": "1.0.0", + "fast-json-stable-stringify": "2.0.0", + "json-schema-traverse": "0.3.1" } }, "ajv-keywords": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-1.5.1.tgz", - "integrity": "sha1-MU3QpLM2j609/NxU7eYXG4htrzw=", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.1.tgz", + "integrity": "sha1-YXmX/F9gV2iUxDX5QNgZ4TW4B2I=", "dev": true }, "align-text": { @@ -228,6 +273,15 @@ "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=", "dev": true }, + "ansi-colors": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.0.1.tgz", + "integrity": "sha512-yopkAU0ZD/WQ56Tms3xLn6jRuX3SyUMAVi0FdmDIbmmnHW3jHiI1sQFdUl3gfVddjnrsP3Y6ywFKvCRopvoVIA==", + "dev": true, + "requires": { + "ansi-wrap": "0.1.0" + } + }, "ansi-cyan": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/ansi-cyan/-/ansi-cyan-0.1.1.tgz", @@ -238,11 +292,20 @@ } }, "ansi-escapes": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-2.0.0.tgz", - "integrity": "sha1-W65SvkJIeN2Xg+iRDj/Cki6DyBs=", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.0.0.tgz", + "integrity": "sha512-O/klc27mWNUigtv0F8NJWbLF00OcegQalkqKURWdosW08YZKi4m6CnSUSvIZG1otNJbTWhN01Hhz389DW7mvDQ==", "dev": true }, + "ansi-gray": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz", + "integrity": "sha1-KWLPVOyXksSFEKPetSRDaGHvclE=", + "dev": true, + "requires": { + "ansi-wrap": "0.1.0" + } + }, "ansi-red": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/ansi-red/-/ansi-red-0.1.1.tgz", @@ -401,6 +464,12 @@ "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ=", "dev": true }, + "assign-symbols": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz", + "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=", + "dev": true + }, "async": { "version": "1.5.2", "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", @@ -443,22 +512,22 @@ } }, "babel-core": { - "version": "6.25.0", - "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.25.0.tgz", - "integrity": "sha1-fdQrBGPHQunVKW3rPsZ6kyLa1yk=", + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.26.0.tgz", + "integrity": "sha1-rzL3izGm/O8RnIew/Y2XU/A6C7g=", "dev": true, "requires": { - "babel-code-frame": "6.22.0", - "babel-generator": "6.25.0", + "babel-code-frame": "6.26.0", + "babel-generator": "6.26.1", "babel-helpers": "6.24.1", "babel-messages": "6.23.0", - "babel-register": "6.24.1", - "babel-runtime": "6.23.0", - "babel-template": "6.25.0", - "babel-traverse": "6.25.0", - "babel-types": "6.25.0", - "babylon": "6.17.4", - "convert-source-map": "1.5.0", + "babel-register": "6.26.0", + "babel-runtime": "6.26.0", + "babel-template": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0", + "babylon": "6.18.0", + "convert-source-map": "1.5.1", "debug": "2.6.8", "json5": "0.5.1", "lodash": "4.17.4", @@ -466,23 +535,130 @@ "path-is-absolute": "1.0.1", "private": "0.1.7", "slash": "1.0.0", - "source-map": "0.5.6" + "source-map": "0.5.7" + }, + "dependencies": { + "babel-code-frame": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz", + "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=", + "dev": true, + "requires": { + "chalk": "1.1.3", + "esutils": "2.0.2", + "js-tokens": "3.0.2" + } + }, + "babel-runtime": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz", + "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", + "dev": true, + "requires": { + "core-js": "2.4.1", + "regenerator-runtime": "0.11.1" + } + }, + "babel-template": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz", + "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=", + "dev": true, + "requires": { + "babel-runtime": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0", + "babylon": "6.18.0", + "lodash": "4.17.4" + } + }, + "babel-traverse": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz", + "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=", + "dev": true, + "requires": { + "babel-code-frame": "6.26.0", + "babel-messages": "6.23.0", + "babel-runtime": "6.26.0", + "babel-types": "6.26.0", + "babylon": "6.18.0", + "debug": "2.6.8", + "globals": "9.18.0", + "invariant": "2.2.2", + "lodash": "4.17.4" + } + }, + "babel-types": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz", + "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=", + "dev": true, + "requires": { + "babel-runtime": "6.26.0", + "esutils": "2.0.2", + "lodash": "4.17.4", + "to-fast-properties": "1.0.3" + } + }, + "babylon": { + "version": "6.18.0", + "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz", + "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==", + "dev": true + }, + "regenerator-runtime": { + "version": "0.11.1", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz", + "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==", + "dev": true + } } }, "babel-generator": { - "version": "6.25.0", - "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.25.0.tgz", - "integrity": "sha1-M6GvcNXyiQrrRlpKd5PB32qeqfw=", + "version": "6.26.1", + "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.1.tgz", + "integrity": "sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==", "dev": true, "requires": { "babel-messages": "6.23.0", - "babel-runtime": "6.23.0", - "babel-types": "6.25.0", + "babel-runtime": "6.26.0", + "babel-types": "6.26.0", "detect-indent": "4.0.0", "jsesc": "1.3.0", "lodash": "4.17.4", - "source-map": "0.5.6", + "source-map": "0.5.7", "trim-right": "1.0.1" + }, + "dependencies": { + "babel-runtime": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz", + "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", + "dev": true, + "requires": { + "core-js": "2.4.1", + "regenerator-runtime": "0.11.1" + } + }, + "babel-types": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz", + "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=", + "dev": true, + "requires": { + "babel-runtime": "6.26.0", + "esutils": "2.0.2", + "lodash": "4.17.4", + "to-fast-properties": "1.0.3" + } + }, + "regenerator-runtime": { + "version": "0.11.1", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz", + "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==", + "dev": true + } } }, "babel-helper-call-delegate": { @@ -901,18 +1077,42 @@ } }, "babel-register": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-register/-/babel-register-6.24.1.tgz", - "integrity": "sha1-fhDhOi9xBlvfrVoXh7pFvKbe118=", + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-register/-/babel-register-6.26.0.tgz", + "integrity": "sha1-btAhFz4vy0htestFxgCahW9kcHE=", "dev": true, "requires": { - "babel-core": "6.25.0", - "babel-runtime": "6.23.0", - "core-js": "2.4.1", + "babel-core": "6.26.0", + "babel-runtime": "6.26.0", + "core-js": "2.5.3", "home-or-tmp": "2.0.0", "lodash": "4.17.4", "mkdirp": "0.5.1", - "source-map-support": "0.4.15" + "source-map-support": "0.4.18" + }, + "dependencies": { + "babel-runtime": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz", + "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", + "dev": true, + "requires": { + "core-js": "2.5.3", + "regenerator-runtime": "0.11.1" + } + }, + "core-js": { + "version": "2.5.3", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.3.tgz", + "integrity": "sha1-isw4NFgk8W2DZbfJtCWRaOjtYD4=", + "dev": true + }, + "regenerator-runtime": { + "version": "0.11.1", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz", + "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==", + "dev": true + } } }, "babel-root-import": { @@ -1018,6 +1218,12 @@ "inherits": "2.0.3" } }, + "boolbase": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", + "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=", + "dev": true + }, "boom": { "version": "2.10.1", "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz", @@ -1067,19 +1273,19 @@ "dev": true }, "bump-regex": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/bump-regex/-/bump-regex-2.7.0.tgz", - "integrity": "sha1-SiHiU3ETR2wCa+WIuKfd3vGTRkE=", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/bump-regex/-/bump-regex-3.1.0.tgz", + "integrity": "sha512-pgiPDUHh6bT/MDBU/nA1dU67337qD4MbrpQHmpDMiBChEsPEZwNelO25GenJrRYUXbWZuvsIZGLBChtN8Nxb+g==", "dev": true, "requires": { - "semver": "5.3.0", + "semver": "5.5.0", "xtend": "4.0.1" }, "dependencies": { "semver": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz", - "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=", + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz", + "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", "dev": true } } @@ -1162,20 +1368,11 @@ } }, "circular-json": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.1.tgz", - "integrity": "sha1-vos2rvzN6LPKeqLWr8B6NyQsDS0=", + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz", + "integrity": "sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==", "dev": true }, - "clap": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/clap/-/clap-1.2.0.tgz", - "integrity": "sha1-WckP4+E3EEdG/xlGmiemNP9oyFc=", - "dev": true, - "requires": { - "chalk": "1.1.3" - } - }, "cli-cursor": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz", @@ -1246,12 +1443,12 @@ "dev": true }, "coa": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/coa/-/coa-1.0.4.tgz", - "integrity": "sha1-qe8VNmDWqGqL3sAomlxoTSF0Mv0=", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/coa/-/coa-2.0.1.tgz", + "integrity": "sha512-5wfTTO8E2/ja4jFSxePXlG5nRu5bBtL/r1HCIpJW/lzT6yDtKl0u0Z4o/Vpz32IpKmBn7HerheEZQgA9N2DarQ==", "dev": true, "requires": { - "q": "1.5.0" + "q": "1.5.1" } }, "code-point-at": { @@ -1261,9 +1458,9 @@ "dev": true }, "color-convert": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.0.tgz", - "integrity": "sha1-Gsz5fdc5uYO/mU1W/sj5WFNkG3o=", + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.1.tgz", + "integrity": "sha512-mjGanIiwQJskCC18rPR6OmrZ6fm2Lc7PeGFYwCmy5J34wC6F1PzdGL6xeMfmgicfYcNLGuVFA3WzXtIDCQSZxQ==", "dev": true, "requires": { "color-name": "1.1.3" @@ -1275,6 +1472,12 @@ "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", "dev": true }, + "color-support": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz", + "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==", + "dev": true + }, "colors": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz", @@ -1291,9 +1494,9 @@ } }, "commander": { - "version": "2.11.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz", - "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==", + "version": "2.14.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.14.1.tgz", + "integrity": "sha512-+YR16o3rK53SmWHU3rEM3tPAh2rwb1yPcQX5irVn7mb0gXbwuCCrnkbV5+PBfETdfg1vui07nM6PCG1zndcjQw==", "dev": true }, "compare-func": { @@ -1324,128 +1527,67 @@ } }, "conventional-changelog": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/conventional-changelog/-/conventional-changelog-1.1.4.tgz", - "integrity": "sha1-EIvHUMKjF+IA4vm0E8qqH4x++js=", + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/conventional-changelog/-/conventional-changelog-1.1.11.tgz", + "integrity": "sha512-GQgcaBhuTKTNGAZM5mQgTO76G9FJTPwdrT1AeFuXQpQ9v+FbaWKRjWyT9wvCYNNCQnpiSJBsg+2537iuG4bnQQ==", "dev": true, "requires": { - "conventional-changelog-angular": "1.4.0", - "conventional-changelog-atom": "0.1.1", - "conventional-changelog-codemirror": "0.1.0", - "conventional-changelog-core": "1.9.0", - "conventional-changelog-ember": "0.2.6", - "conventional-changelog-eslint": "0.1.0", - "conventional-changelog-express": "0.1.0", + "conventional-changelog-angular": "1.6.2", + "conventional-changelog-atom": "0.2.0", + "conventional-changelog-codemirror": "0.3.0", + "conventional-changelog-core": "2.0.1", + "conventional-changelog-ember": "0.3.2", + "conventional-changelog-eslint": "1.0.0", + "conventional-changelog-express": "0.3.0", "conventional-changelog-jquery": "0.1.0", "conventional-changelog-jscs": "0.1.0", - "conventional-changelog-jshint": "0.1.0" + "conventional-changelog-jshint": "0.3.0" } }, "conventional-changelog-angular": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-1.4.0.tgz", - "integrity": "sha512-ukKX22lJl9ewogze1hKbBuff/dGMG2uyGpOhhw0ehhlv6GtdeCxj51YfGOZ5qC89WwsHT7SDXFzBKidwH3pwmQ==", + "version": "1.6.2", + "resolved": "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-1.6.2.tgz", + "integrity": "sha512-LiGZkMJOCJFLNzDlZo3f+DpblcDSzsaYHUWhC+kzsqq+no4qwDP3uW0HVIHueXT4jJDhYNaE9t/XCD7vu7xR1g==", "dev": true, "requires": { "compare-func": "1.3.2", - "github-url-from-git": "1.5.0", - "q": "1.5.0", - "read-pkg-up": "2.0.0" - }, - "dependencies": { - "find-up": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", - "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", - "dev": true, - "requires": { - "locate-path": "2.0.0" - } - }, - "load-json-file": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz", - "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=", - "dev": true, - "requires": { - "graceful-fs": "4.1.11", - "parse-json": "2.2.0", - "pify": "2.3.0", - "strip-bom": "3.0.0" - } - }, - "path-type": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz", - "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=", - "dev": true, - "requires": { - "pify": "2.3.0" - } - }, - "read-pkg": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz", - "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=", - "dev": true, - "requires": { - "load-json-file": "2.0.0", - "normalize-package-data": "2.4.0", - "path-type": "2.0.0" - } - }, - "read-pkg-up": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz", - "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=", - "dev": true, - "requires": { - "find-up": "2.1.0", - "read-pkg": "2.0.0" - } - }, - "strip-bom": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", - "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=", - "dev": true - } + "q": "1.5.1" } }, "conventional-changelog-atom": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/conventional-changelog-atom/-/conventional-changelog-atom-0.1.1.tgz", - "integrity": "sha512-6Nlu/+MiD4gi7k3Z+N1vMJWpaPSdvFPWzPGnH4OXewHAxiAl0L/TT9CGgA01fosPxmYr4hMNtD7kyN0tkg8vIA==", + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/conventional-changelog-atom/-/conventional-changelog-atom-0.2.0.tgz", + "integrity": "sha1-cvGOXHTj2IB0ESUv4BOBjd/6cVc=", "dev": true, "requires": { - "q": "1.5.0" + "q": "1.5.1" } }, "conventional-changelog-codemirror": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/conventional-changelog-codemirror/-/conventional-changelog-codemirror-0.1.0.tgz", - "integrity": "sha1-dXelkdv5tTjnoVCn7mL2WihyszQ=", + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/conventional-changelog-codemirror/-/conventional-changelog-codemirror-0.3.0.tgz", + "integrity": "sha1-TdirufUhpjjKtJ9oNJbCa4pcbTE=", "dev": true, "requires": { - "q": "1.5.0" + "q": "1.5.1" } }, "conventional-changelog-core": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-1.9.0.tgz", - "integrity": "sha1-3l37wJGEdlZQjUo4njXJobxJ5/Q=", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-2.0.1.tgz", + "integrity": "sha512-XxgSDsCUGXT4j3uVpYkz17D1AoWzO8BOC0VO1fSwvvXJB5Q32zhPGXObvu7vTb0GE0OS15eDgzYN32fU3mOzYA==", "dev": true, "requires": { - "conventional-changelog-writer": "1.4.1", - "conventional-commits-parser": "1.3.0", + "conventional-changelog-writer": "3.0.0", + "conventional-commits-parser": "2.1.1", "dateformat": "1.0.12", "get-pkg-repo": "1.4.0", - "git-raw-commits": "1.2.0", + "git-raw-commits": "1.3.0", "git-remote-origin-url": "2.0.0", - "git-semver-tags": "1.2.1", + "git-semver-tags": "1.3.0", "lodash": "4.17.4", "normalize-package-data": "2.4.0", - "q": "1.5.0", + "q": "1.5.1", "read-pkg": "1.1.0", "read-pkg-up": "1.0.1", "through2": "2.0.3" @@ -1464,30 +1606,30 @@ } }, "conventional-changelog-ember": { - "version": "0.2.6", - "resolved": "https://registry.npmjs.org/conventional-changelog-ember/-/conventional-changelog-ember-0.2.6.tgz", - "integrity": "sha1-i3NVQZ9RJ0k8TFYkc6svx5LxwrY=", + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/conventional-changelog-ember/-/conventional-changelog-ember-0.3.2.tgz", + "integrity": "sha512-ZigC7cz6rLzHk4YHnhfd85mxCyRQqiI8CMwalCVC8jIsplxswm+u3F16dIx5Z/P/A5VYFtv4H4ndhccTKS13jw==", "dev": true, "requires": { - "q": "1.5.0" + "q": "1.5.1" } }, "conventional-changelog-eslint": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/conventional-changelog-eslint/-/conventional-changelog-eslint-0.1.0.tgz", - "integrity": "sha1-pSQR6ZngUBzlALhWsKZD0DMJB+I=", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/conventional-changelog-eslint/-/conventional-changelog-eslint-1.0.0.tgz", + "integrity": "sha1-xjzZ1vCdTiBFMK5zadeiChZ7xrw=", "dev": true, "requires": { - "q": "1.5.0" + "q": "1.5.1" } }, "conventional-changelog-express": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/conventional-changelog-express/-/conventional-changelog-express-0.1.0.tgz", - "integrity": "sha1-VcbIQcgRliA2wDe9vZZKVK4xD84=", + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/conventional-changelog-express/-/conventional-changelog-express-0.3.0.tgz", + "integrity": "sha1-XtAG9IaC2GFe4KtfU8rLJvvT4cg=", "dev": true, "requires": { - "q": "1.5.0" + "q": "1.5.1" } }, "conventional-changelog-jquery": { @@ -1496,7 +1638,7 @@ "integrity": "sha1-Agg5cWLjhGmG5xJztsecW1+A9RA=", "dev": true, "requires": { - "q": "1.5.0" + "q": "1.5.1" } }, "conventional-changelog-jscs": { @@ -1505,34 +1647,34 @@ "integrity": "sha1-BHnrRDzH1yxYvwvPDvHURKkvDlw=", "dev": true, "requires": { - "q": "1.5.0" + "q": "1.5.1" } }, "conventional-changelog-jshint": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/conventional-changelog-jshint/-/conventional-changelog-jshint-0.1.0.tgz", - "integrity": "sha1-AMq46aMxdIer2UxNhGcTQpGNKgc=", + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/conventional-changelog-jshint/-/conventional-changelog-jshint-0.3.0.tgz", + "integrity": "sha1-A5P9RoETuvc8upEdF8WCZCM2aig=", "dev": true, "requires": { "compare-func": "1.3.2", - "q": "1.5.0" + "q": "1.5.1" } }, "conventional-changelog-writer": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-1.4.1.tgz", - "integrity": "sha1-P0y00APrtWmJ0w00WJO1KkNjnI4=", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-3.0.0.tgz", + "integrity": "sha1-4QYVTtlDQeOH1xe2G+IYH/UyVMw=", "dev": true, "requires": { "compare-func": "1.3.2", - "conventional-commits-filter": "1.0.0", + "conventional-commits-filter": "1.1.1", "dateformat": "1.0.12", - "handlebars": "4.0.10", + "handlebars": "4.0.11", "json-stringify-safe": "5.0.1", "lodash": "4.17.4", "meow": "3.7.0", - "semver": "5.3.0", - "split": "1.0.0", + "semver": "5.5.0", + "split": "1.0.1", "through2": "2.0.3" }, "dependencies": { @@ -1547,17 +1689,17 @@ } }, "semver": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz", - "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=", + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz", + "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", "dev": true } } }, "conventional-commits-filter": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-1.0.0.tgz", - "integrity": "sha1-b8KmWTcrw/IznPn//34bA0S5MDk=", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-1.1.1.tgz", + "integrity": "sha512-bQyatySNKHhcaeKVr9vFxYWA1W1Tdz6ybVMYDmv4/FhOXY1+fchiW07TzRbIQZhVa4cvBwrEaEUQBbCncFSdJQ==", "dev": true, "requires": { "is-subset": "0.1.1", @@ -1565,114 +1707,39 @@ } }, "conventional-commits-parser": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-1.3.0.tgz", - "integrity": "sha1-4ye1MZThp61dxjR57pCZpSsCSGU=", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-2.1.1.tgz", + "integrity": "sha512-Qqxaul7TELPnTrm7KhWGjVTFTs7T9yUblzXugtXEff2C2uXFK4S0uVGqsyX7feQZzoFbXnJ1KdEs+IMmSxGbqQ==", "dev": true, "requires": { - "JSONStream": "1.3.1", + "JSONStream": "1.3.2", "is-text-path": "1.0.1", "lodash": "4.17.4", "meow": "3.7.0", - "split2": "2.1.1", + "split2": "2.2.0", "through2": "2.0.3", "trim-off-newlines": "1.0.1" } }, "conventional-recommended-bump": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/conventional-recommended-bump/-/conventional-recommended-bump-1.1.0.tgz", - "integrity": "sha512-WK0HnYnXd9e8J1YezUlfle+Pz7HB1RYvIH6gPLAXoroQTzDSfNfGM1tHHmdrJw0/4BMr+zw0U9V1WzFEfQwE3w==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/conventional-recommended-bump/-/conventional-recommended-bump-1.2.1.tgz", + "integrity": "sha512-oJjG6DkRgtnr/t/VrPdzmf4XZv8c4xKVJrVT4zrSHd92KEL+EYxSbYoKq8lQ7U5yLMw7130wrcQTLRjM/T+d4w==", "dev": true, "requires": { "concat-stream": "1.6.0", "conventional-commits-filter": "1.1.1", - "conventional-commits-parser": "2.1.0", + "conventional-commits-parser": "2.1.1", "git-raw-commits": "1.3.0", - "git-semver-tags": "1.2.3", + "git-semver-tags": "1.3.0", "meow": "3.7.0", "object-assign": "4.1.1" - }, - "dependencies": { - "conventional-commits-filter": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-1.1.1.tgz", - "integrity": "sha512-bQyatySNKHhcaeKVr9vFxYWA1W1Tdz6ybVMYDmv4/FhOXY1+fchiW07TzRbIQZhVa4cvBwrEaEUQBbCncFSdJQ==", - "dev": true, - "requires": { - "is-subset": "0.1.1", - "modify-values": "1.0.0" - } - }, - "conventional-commits-parser": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-2.1.0.tgz", - "integrity": "sha512-8MD05yN0Zb6aRsZnFX1ET+8rHWfWJk+my7ANCJZBU2mhz7TSB1fk2vZhkrwVy/PCllcTYAP/1T1NiWQ7Z01mKw==", - "dev": true, - "requires": { - "JSONStream": "1.3.1", - "is-text-path": "1.0.1", - "lodash": "4.17.4", - "meow": "3.7.0", - "split2": "2.1.1", - "through2": "2.0.3", - "trim-off-newlines": "1.0.1" - } - }, - "git-raw-commits": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/git-raw-commits/-/git-raw-commits-1.3.0.tgz", - "integrity": "sha1-C8hZbpDV/+c29/VUa9LRL3OrqsY=", - "dev": true, - "requires": { - "dargs": "4.1.0", - "lodash.template": "4.4.0", - "meow": "3.7.0", - "split2": "2.1.1", - "through2": "2.0.3" - } - }, - "git-semver-tags": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/git-semver-tags/-/git-semver-tags-1.2.3.tgz", - "integrity": "sha1-GItFOIK/nXojr9Mbq6U32rc4jV0=", - "dev": true, - "requires": { - "meow": "3.7.0", - "semver": "5.4.1" - } - }, - "lodash.template": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-4.4.0.tgz", - "integrity": "sha1-5zoDhcg1VZF0bgILmWecaQ5o+6A=", - "dev": true, - "requires": { - "lodash._reinterpolate": "3.0.0", - "lodash.templatesettings": "4.1.0" - } - }, - "lodash.templatesettings": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.1.0.tgz", - "integrity": "sha1-K01OlbpEDZFf8IvImeRVNmZxMxY=", - "dev": true, - "requires": { - "lodash._reinterpolate": "3.0.0" - } - }, - "semver": { - "version": "5.4.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz", - "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==", - "dev": true - } } }, "convert-source-map": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.0.tgz", - "integrity": "sha1-ms1whRxtXf3ZPZKC5e35SgP/RrU=", + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.1.tgz", + "integrity": "sha1-uCeAl7m8IpNl3lxiz1/K7YtVmeU=", "dev": true }, "core-js": { @@ -1706,12 +1773,13 @@ } }, "cross-spawn": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz", - "integrity": "sha1-e5JHYhwjrf3ThWAEqCPL45dCTUE=", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", + "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=", "dev": true, "requires": { "lru-cache": "4.1.1", + "shebang-command": "1.2.0", "which": "1.2.14" }, "dependencies": { @@ -1736,6 +1804,67 @@ "boom": "2.10.1" } }, + "css-select": { + "version": "1.3.0-rc0", + "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.3.0-rc0.tgz", + "integrity": "sha1-b5MZaqrnN2ZuoQNqjLFKj8t6kjE=", + "dev": true, + "requires": { + "boolbase": "1.0.0", + "css-what": "2.1.0", + "domutils": "1.5.1", + "nth-check": "1.0.1" + } + }, + "css-select-base-adapter": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/css-select-base-adapter/-/css-select-base-adapter-0.1.0.tgz", + "integrity": "sha1-AQKz0UYw34bD65+p9UVicBBs+ZA=", + "dev": true + }, + "css-tree": { + "version": "1.0.0-alpha25", + "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha25.tgz", + "integrity": "sha512-XC6xLW/JqIGirnZuUWHXCHRaAjje2b3OIB0Vj5RIJo6mIi/AdJo30quQl5LxUl0gkXDIrTrFGbMlcZjyFplz1A==", + "dev": true, + "requires": { + "mdn-data": "1.1.0", + "source-map": "0.5.7" + } + }, + "css-url-regex": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/css-url-regex/-/css-url-regex-1.1.0.tgz", + "integrity": "sha1-g4NCMMyfdMRX3lnuvRVD/uuDt+w=", + "dev": true + }, + "css-what": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.0.tgz", + "integrity": "sha1-lGfQMsOM+u+58teVASUwYvh/ob0=", + "dev": true + }, + "csso": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/csso/-/csso-3.5.0.tgz", + "integrity": "sha512-WtJjFP3ZsSdWhiZr4/k1B9uHPgYjFYnDxfbaJxk1hz5PDLIJ5BCRWkJqaztZ0DbP8d2ZIVwUPIJb2YmCwkPaMw==", + "dev": true, + "requires": { + "css-tree": "1.0.0-alpha.27" + }, + "dependencies": { + "css-tree": { + "version": "1.0.0-alpha.27", + "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.27.tgz", + "integrity": "sha512-BAYp9FyN4jLXjfvRpTDchBllDptqlK9I7OsagXCG9Am5C+5jc8eRZHgqb9x500W2OKS14MMlpQc/nmh/aA7TEQ==", + "dev": true, + "requires": { + "mdn-data": "1.1.0", + "source-map": "0.5.7" + } + } + } + }, "currently-unhandled": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz", @@ -1816,6 +1945,16 @@ "clone": "1.0.2" } }, + "define-properties": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz", + "integrity": "sha1-g6c/L+pWmJj7c3GTyPhzyvbUXJQ=", + "dev": true, + "requires": { + "foreach": "2.0.5", + "object-keys": "1.0.11" + } + }, "del": { "version": "2.2.2", "resolved": "https://registry.npmjs.org/del/-/del-2.2.2.tgz", @@ -1828,7 +1967,7 @@ "object-assign": "4.1.1", "pify": "2.3.0", "pinkie-promise": "2.0.1", - "rimraf": "2.6.1" + "rimraf": "2.6.2" } }, "delayed-stream": { @@ -1862,19 +2001,52 @@ } }, "diff": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/diff/-/diff-3.2.0.tgz", - "integrity": "sha1-yc45Okt8vQsFinJck98pkCeGj/k=", + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/diff/-/diff-3.3.1.tgz", + "integrity": "sha512-MKPHZDMB0o6yHyDryUOScqZibp914ksXwAMYMTHj6KO8UeKsRYNJD3oNCKjTqZon+V488P7N/HzXF8t7ZR95ww==", "dev": true }, "doctrine": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.0.0.tgz", - "integrity": "sha1-xz2NKQnSIpHhoAejlYBNqLZl/mM=", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", + "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", "dev": true, "requires": { - "esutils": "2.0.2", - "isarray": "1.0.0" + "esutils": "2.0.2" + } + }, + "dom-serializer": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz", + "integrity": "sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=", + "dev": true, + "requires": { + "domelementtype": "1.1.3", + "entities": "1.1.1" + }, + "dependencies": { + "domelementtype": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz", + "integrity": "sha1-vSh3PiZCiBrsUVRJJCmcXNgiGFs=", + "dev": true + } + } + }, + "domelementtype": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz", + "integrity": "sha1-sXrtguirWeUt2cGbF1bg/BhyBMI=", + "dev": true + }, + "domutils": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz", + "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=", + "dev": true, + "requires": { + "dom-serializer": "0.1.0", + "domelementtype": "1.3.0" } }, "dot-prop": { @@ -1886,6 +2058,27 @@ "is-obj": "1.0.1" } }, + "dotgitignore": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/dotgitignore/-/dotgitignore-1.0.3.tgz", + "integrity": "sha512-eu5XjSstm0WXQsARgo6kPjkINYZlOUW+z/KtAAIBjHa5mUpMPrxJytbPIndWz6GubBuuuH5ljtVcXKnVnH5q8w==", + "dev": true, + "requires": { + "find-up": "2.1.0", + "minimatch": "3.0.4" + }, + "dependencies": { + "find-up": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", + "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", + "dev": true, + "requires": { + "locate-path": "2.0.0" + } + } + } + }, "duplexer": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz", @@ -1997,6 +2190,12 @@ } } }, + "entities": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz", + "integrity": "sha1-blwtClYhtdra7O+AuQ7ftc13cvA=", + "dev": true + }, "error-ex": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz", @@ -2006,37 +2205,63 @@ "is-arrayish": "0.2.1" } }, + "es-abstract": { + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.10.0.tgz", + "integrity": "sha512-/uh/DhdqIOSkAWifU+8nG78vlQxdLckUdI/sPgy0VhuXi2qJ7T8czBmqIYtLQVpCIFYafChnsRsB5pyb1JdmCQ==", + "dev": true, + "requires": { + "es-to-primitive": "1.1.1", + "function-bind": "1.1.1", + "has": "1.0.1", + "is-callable": "1.1.3", + "is-regex": "1.0.4" + } + }, + "es-to-primitive": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.1.1.tgz", + "integrity": "sha1-RTVSSKiJeQNLZ5Lhm7gfK3l13Q0=", + "dev": true, + "requires": { + "is-callable": "1.1.3", + "is-date-object": "1.0.1", + "is-symbol": "1.0.1" + } + }, "escape-string-regexp": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=" }, "eslint": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-4.1.1.tgz", - "integrity": "sha1-+svfz+Pg+s06i4DcmMTmwTrlgt8=", + "version": "4.17.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-4.17.0.tgz", + "integrity": "sha512-AyxBUCANU/o/xC0ijGMKavo5Ls3oK6xykiOITlMdjFjrKOsqLrA7Nf5cnrDgcKrHzBirclAZt63XO7YZlVUPwA==", "dev": true, "requires": { + "ajv": "5.5.2", "babel-code-frame": "6.22.0", - "chalk": "1.1.3", + "chalk": "2.3.0", "concat-stream": "1.6.0", - "debug": "2.6.8", - "doctrine": "2.0.0", + "cross-spawn": "5.1.0", + "debug": "3.1.0", + "doctrine": "2.1.0", "eslint-scope": "3.7.1", - "espree": "3.4.3", + "eslint-visitor-keys": "1.0.0", + "espree": "3.5.3", "esquery": "1.0.0", - "estraverse": "4.2.0", "esutils": "2.0.2", "file-entry-cache": "2.0.0", + "functional-red-black-tree": "1.0.1", "glob": "7.1.2", - "globals": "9.18.0", - "ignore": "3.3.3", + "globals": "11.3.0", + "ignore": "3.3.7", "imurmurhash": "0.1.4", - "inquirer": "3.2.0", - "is-my-json-valid": "2.16.0", - "is-resolvable": "1.0.0", - "js-yaml": "3.9.0", - "json-stable-stringify": "1.0.1", + "inquirer": "3.3.0", + "is-resolvable": "1.1.0", + "js-yaml": "3.10.0", + "json-stable-stringify-without-jsonify": "1.0.1", "levn": "0.3.0", "lodash": "4.17.4", "minimatch": "3.0.4", @@ -2044,12 +2269,81 @@ "natural-compare": "1.4.0", "optionator": "0.8.2", "path-is-inside": "1.0.2", - "pluralize": "4.0.0", + "pluralize": "7.0.0", "progress": "2.0.0", "require-uncached": "1.0.3", + "semver": "5.5.0", + "strip-ansi": "4.0.0", "strip-json-comments": "2.0.1", - "table": "4.0.1", + "table": "4.0.2", "text-table": "0.2.0" + }, + "dependencies": { + "ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", + "dev": true + }, + "ansi-styles": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz", + "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==", + "dev": true, + "requires": { + "color-convert": "1.9.1" + } + }, + "chalk": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz", + "integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==", + "dev": true, + "requires": { + "ansi-styles": "3.2.0", + "escape-string-regexp": "1.0.5", + "supports-color": "4.5.0" + } + }, + "debug": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", + "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, + "globals": { + "version": "11.3.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-11.3.0.tgz", + "integrity": "sha512-kkpcKNlmQan9Z5ZmgqKH/SMbSmjxQ7QjyNqfXVc8VJcoBV2UEg+sxQD15GQofGRh2hfpwUb70VC31DR7Rq5Hdw==", + "dev": true + }, + "semver": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz", + "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", + "dev": true + }, + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "dev": true, + "requires": { + "ansi-regex": "3.0.0" + } + }, + "supports-color": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz", + "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=", + "dev": true, + "requires": { + "has-flag": "2.0.0" + } + } } }, "eslint-plugin-standard": { @@ -2068,13 +2362,19 @@ "estraverse": "4.2.0" } }, + "eslint-visitor-keys": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz", + "integrity": "sha512-qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ==", + "dev": true + }, "espree": { - "version": "3.4.3", - "resolved": "https://registry.npmjs.org/espree/-/espree-3.4.3.tgz", - "integrity": "sha1-KRC1zNSc6JPC//+qtP2LOjG4I3Q=", + "version": "3.5.3", + "resolved": "https://registry.npmjs.org/espree/-/espree-3.5.3.tgz", + "integrity": "sha512-Zy3tAJDORxQZLl2baguiRU1syPERAIg0L+JB2MWorORgTu/CplzvxS9WWA7Xh4+Q+eOQihNs/1o1Xep8cvCxWQ==", "dev": true, "requires": { - "acorn": "5.1.1", + "acorn": "5.4.1", "acorn-jsx": "3.0.1" } }, @@ -2142,13 +2442,13 @@ } }, "execa": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/execa/-/execa-0.5.1.tgz", - "integrity": "sha1-3j+4XLjW6RyFvLzrFkWBeFy1ezY=", + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz", + "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=", "dev": true, "requires": { - "cross-spawn": "4.0.2", - "get-stream": "2.3.1", + "cross-spawn": "5.1.0", + "get-stream": "3.0.0", "is-stream": "1.1.0", "npm-run-path": "2.0.2", "p-finally": "1.0.0", @@ -2226,9 +2526,9 @@ } }, "extsprintf": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz", - "integrity": "sha1-4QgOBljjALBilJkMxw4VAiNf1VA=", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", + "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=", "dev": true }, "fancy-log": { @@ -2282,7 +2582,7 @@ "integrity": "sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=", "dev": true, "requires": { - "flat-cache": "1.2.2", + "flat-cache": "1.3.0", "object-assign": "4.1.1" } }, @@ -2370,12 +2670,12 @@ "dev": true }, "flat-cache": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.2.2.tgz", - "integrity": "sha1-+oZxTnLCHbiGAXYezy9VXRq8a5Y=", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.0.tgz", + "integrity": "sha1-0wMLMrOBVPTjt+nHCfSQ9++XxIE=", "dev": true, "requires": { - "circular-json": "0.3.1", + "circular-json": "0.3.3", "del": "2.2.2", "graceful-fs": "4.1.11", "write": "0.2.1" @@ -2396,6 +2696,12 @@ "for-in": "1.0.2" } }, + "foreach": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz", + "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=", + "dev": true + }, "forever-agent": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", @@ -2416,7 +2722,7 @@ "requires": { "asynckit": "0.4.0", "combined-stream": "1.0.5", - "mime-types": "2.1.15" + "mime-types": "2.1.17" } }, "from": { @@ -3354,9 +3660,21 @@ "graceful-fs": "4.1.11", "inherits": "2.0.3", "mkdirp": "0.5.1", - "rimraf": "2.6.1" + "rimraf": "2.6.2" } }, + "function-bind": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", + "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", + "dev": true + }, + "functional-red-black-tree": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz", + "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=", + "dev": true + }, "gaze": { "version": "0.5.2", "resolved": "https://registry.npmjs.org/gaze/-/gaze-0.5.2.tgz", @@ -3396,7 +3714,7 @@ "hosted-git-info": "2.5.0", "meow": "3.7.0", "normalize-package-data": "2.4.0", - "parse-github-repo-url": "1.4.0", + "parse-github-repo-url": "1.4.1", "through2": "2.0.3" } }, @@ -3407,14 +3725,10 @@ "dev": true }, "get-stream": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz", - "integrity": "sha1-Xzj5PzRgCWZu4BUKBUFn+Rvdld4=", - "dev": true, - "requires": { - "object-assign": "4.1.1", - "pinkie-promise": "2.0.1" - } + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", + "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=", + "dev": true }, "getpass": { "version": "0.1.7", @@ -3434,15 +3748,15 @@ } }, "git-raw-commits": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/git-raw-commits/-/git-raw-commits-1.2.0.tgz", - "integrity": "sha1-DzqL/ZmuDy2LkiTViJKXXppS0Dw=", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/git-raw-commits/-/git-raw-commits-1.3.0.tgz", + "integrity": "sha1-C8hZbpDV/+c29/VUa9LRL3OrqsY=", "dev": true, "requires": { "dargs": "4.1.0", "lodash.template": "4.4.0", "meow": "3.7.0", - "split2": "2.1.1", + "split2": "2.2.0", "through2": "2.0.3" }, "dependencies": { @@ -3478,19 +3792,19 @@ } }, "git-semver-tags": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/git-semver-tags/-/git-semver-tags-1.2.1.tgz", - "integrity": "sha512-fFyxtzTHCTQKwB4clA2AInVrlflBbVbbJD4NWwmxKXHUgsU/K9kmHNlkPLqFiuy9xu9q3lNopghR4VXeQwZbTQ==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/git-semver-tags/-/git-semver-tags-1.3.0.tgz", + "integrity": "sha1-sVSDOmq1w2DArTsaqbjxLqBt6Rk=", "dev": true, "requires": { "meow": "3.7.0", - "semver": "5.3.0" + "semver": "5.5.0" }, "dependencies": { "semver": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz", - "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=", + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz", + "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", "dev": true } } @@ -3504,12 +3818,6 @@ "ini": "1.3.4" } }, - "github-url-from-git": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/github-url-from-git/-/github-url-from-git-1.5.0.tgz", - "integrity": "sha1-+YX+3MCpqledyI16/waNVcxiUaA=", - "dev": true - }, "glob": { "version": "7.1.2", "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", @@ -3741,16 +4049,10 @@ "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=", "dev": true }, - "graceful-readlink": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz", - "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=", - "dev": true - }, "growl": { - "version": "1.9.2", - "resolved": "https://registry.npmjs.org/growl/-/growl-1.9.2.tgz", - "integrity": "sha1-Dqd0NxXbjY3ixe3hd14bRayFwC8=", + "version": "1.10.3", + "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.3.tgz", + "integrity": "sha512-hKlsbA5Vu3xsh1Cg3J7jSmX/WaW6A5oBeqzM88oNbCRQFz+zUaXm6yxS4RVytp1scBoJzSYl4YAEOQIt6O8V1Q==", "dev": true }, "gulp": { @@ -3783,22 +4085,22 @@ } }, "gulp-bump": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/gulp-bump/-/gulp-bump-2.7.0.tgz", - "integrity": "sha1-TDdQvOk8XYFv6aFU5mGd1QmoUtg=", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/gulp-bump/-/gulp-bump-3.1.0.tgz", + "integrity": "sha512-v5FN3TGstRqkqWTPrp1jcUyCM4YbUIvYzJy/lG2YWFXk5HvFgTucBcVhhpH1nJcnI9Y3skPnpTzYoaBQO1qBzA==", "dev": true, "requires": { - "bump-regex": "2.7.0", + "bump-regex": "3.1.0", "plugin-error": "0.1.2", "plugin-log": "0.1.0", - "semver": "5.3.0", + "semver": "5.5.0", "through2": "2.0.3" }, "dependencies": { "semver": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz", - "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=", + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz", + "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", "dev": true } } @@ -3815,34 +4117,91 @@ } }, "gulp-conventional-changelog": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/gulp-conventional-changelog/-/gulp-conventional-changelog-1.1.3.tgz", - "integrity": "sha1-uIxpwpoq0t3fvt3p3ti5UKEW9EA=", + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/gulp-conventional-changelog/-/gulp-conventional-changelog-1.1.11.tgz", + "integrity": "sha512-1squYUFPUO1oyesPVNlvcPzytFL0CH9R7y6q1vnVvs3SCBXdNokbxdxM2OyKfkGzqh9KDJdruLCp6jKpQLAhTA==", "dev": true, "requires": { "add-stream": "1.0.0", "concat-stream": "1.6.0", - "conventional-changelog": "1.1.4", - "gulp-util": "3.0.8", + "conventional-changelog": "1.1.11", + "fancy-log": "1.3.2", "object-assign": "4.1.1", + "plugin-error": "1.0.1", "through2": "2.0.3" + }, + "dependencies": { + "arr-diff": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz", + "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=", + "dev": true + }, + "arr-union": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz", + "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=", + "dev": true + }, + "extend-shallow": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", + "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", + "dev": true, + "requires": { + "assign-symbols": "1.0.0", + "is-extendable": "1.0.1" + } + }, + "fancy-log": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.2.tgz", + "integrity": "sha1-9BEl49hPLn2JpD0G2VjI94vha+E=", + "dev": true, + "requires": { + "ansi-gray": "0.1.1", + "color-support": "1.1.3", + "time-stamp": "1.1.0" + } + }, + "is-extendable": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", + "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", + "dev": true, + "requires": { + "is-plain-object": "2.0.4" + } + }, + "plugin-error": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz", + "integrity": "sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==", + "dev": true, + "requires": { + "ansi-colors": "1.0.1", + "arr-diff": "4.0.0", + "arr-union": "3.1.0", + "extend-shallow": "3.0.2" + } + } } }, "gulp-filter": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/gulp-filter/-/gulp-filter-5.0.1.tgz", - "integrity": "sha512-5olRzAhFdXB2klCu1lnazP65aO9YdA/5WfC9VdInIc8PrUeDIoZfaA3Edb0yUBGhVdHv4eHKL9Fg5tUoEJ9z5A==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/gulp-filter/-/gulp-filter-5.1.0.tgz", + "integrity": "sha1-oF4Rr/sHz33PQafeHLe2OsN4PnM=", "dev": true, "requires": { - "gulp-util": "3.0.8", "multimatch": "2.1.0", - "streamfilter": "1.0.5" + "plugin-error": "0.1.2", + "streamfilter": "1.0.7" } }, "gulp-gunzip": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/gulp-gunzip/-/gulp-gunzip-0.0.3.tgz", - "integrity": "sha1-e24HsPWP09QlFcSOrVpj3wVy9i8=", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/gulp-gunzip/-/gulp-gunzip-1.0.0.tgz", + "integrity": "sha1-FbdBFF6Dqcb1CIYkG1fMWHHxUak=", "dev": true, "requires": { "through2": "0.6.5", @@ -3965,13 +4324,13 @@ "is-typedarray": "1.0.0", "isstream": "0.1.2", "json-stringify-safe": "5.0.1", - "mime-types": "2.1.15", + "mime-types": "2.1.17", "oauth-sign": "0.8.2", "qs": "6.3.2", "stringstream": "0.0.5", - "tough-cookie": "2.3.2", + "tough-cookie": "2.3.3", "tunnel-agent": "0.4.3", - "uuid": "3.1.0" + "uuid": "3.2.1" } }, "vinyl": { @@ -3997,7 +4356,7 @@ "integrity": "sha1-uG/zSdgBzrVuHZ59x7vLS33uYAw=", "dev": true, "requires": { - "convert-source-map": "1.5.0", + "convert-source-map": "1.5.1", "graceful-fs": "4.1.11", "strip-bom": "2.0.0", "through2": "2.0.3", @@ -4311,24 +4670,30 @@ } }, "gulp-vinyl-zip": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/gulp-vinyl-zip/-/gulp-vinyl-zip-1.4.0.tgz", - "integrity": "sha1-VjgvLMtXIxuwR4x4c3zNVylzvuE=", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/gulp-vinyl-zip/-/gulp-vinyl-zip-2.1.0.tgz", + "integrity": "sha1-JOQGhdwFtxSZlSRQmeBZAmO+ja0=", "dev": true, "requires": { "event-stream": "3.3.4", - "queue": "3.1.0", - "through2": "0.6.5", - "vinyl": "0.4.6", + "queue": "4.4.2", + "through2": "2.0.3", + "vinyl": "2.1.0", "vinyl-fs": "2.4.4", - "yauzl": "2.8.0", - "yazl": "2.4.2" + "yauzl": "2.9.1", + "yazl": "2.4.3" }, "dependencies": { "clone": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz", - "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.1.tgz", + "integrity": "sha1-0hfR6WERjjrJpLi7oyhVU79kfNs=", + "dev": true + }, + "clone-stats": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz", + "integrity": "sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=", "dev": true }, "glob": { @@ -4368,6 +4733,30 @@ "through2": "0.6.5", "to-absolute-glob": "0.1.1", "unique-stream": "2.2.1" + }, + "dependencies": { + "readable-stream": { + "version": "1.0.34", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", + "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "0.0.1", + "string_decoder": "0.10.31" + } + }, + "through2": { + "version": "0.6.5", + "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz", + "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=", + "dev": true, + "requires": { + "readable-stream": "1.0.34", + "xtend": "4.0.1" + } + } } }, "is-extglob": { @@ -4399,52 +4788,23 @@ "requires": { "is-stream": "1.1.0", "readable-stream": "2.3.3" - }, - "dependencies": { - "isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", - "dev": true - }, - "readable-stream": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz", - "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==", - "dev": true, - "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", - "isarray": "1.0.0", - "process-nextick-args": "1.0.7", - "safe-buffer": "5.1.1", - "string_decoder": "1.0.3", - "util-deprecate": "1.0.2" - } - }, - "string_decoder": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", - "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", - "dev": true, - "requires": { - "safe-buffer": "5.1.1" - } - } } }, - "readable-stream": { - "version": "1.0.34", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", - "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", + "queue": { + "version": "4.4.2", + "resolved": "https://registry.npmjs.org/queue/-/queue-4.4.2.tgz", + "integrity": "sha512-fSMRXbwhMwipcDZ08enW2vl+YDmAmhcNcr43sCJL8DIg+CFOsoRLG23ctxA+fwNk1w55SePSiS7oqQQSgQoVJQ==", "dev": true, "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", - "isarray": "0.0.1", - "string_decoder": "0.10.31" + "inherits": "2.0.3" } }, + "replace-ext": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz", + "integrity": "sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=", + "dev": true + }, "string_decoder": { "version": "0.10.31", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", @@ -4460,16 +4820,6 @@ "is-utf8": "0.2.1" } }, - "through2": { - "version": "0.6.5", - "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz", - "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=", - "dev": true, - "requires": { - "readable-stream": "1.0.34", - "xtend": "4.0.1" - } - }, "unique-stream": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.2.1.tgz", @@ -4481,13 +4831,17 @@ } }, "vinyl": { - "version": "0.4.6", - "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz", - "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.1.0.tgz", + "integrity": "sha1-Ah+cLPlR1rk5lDyJ617lrdT9kkw=", "dev": true, "requires": { - "clone": "0.2.0", - "clone-stats": "0.0.1" + "clone": "2.1.1", + "clone-buffer": "1.0.0", + "clone-stats": "1.0.0", + "cloneable-readable": "1.0.0", + "remove-trailing-separator": "1.0.2", + "replace-ext": "1.0.0" } }, "vinyl-fs": { @@ -4521,45 +4875,17 @@ "integrity": "sha1-KY1+IjFmD0DAA8LtMUDezz9TCF8=", "dev": true }, - "isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "clone-stats": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz", + "integrity": "sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=", "dev": true }, - "readable-stream": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz", - "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==", - "dev": true, - "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", - "isarray": "1.0.0", - "process-nextick-args": "1.0.7", - "safe-buffer": "5.1.1", - "string_decoder": "1.0.3", - "util-deprecate": "1.0.2" - } - }, - "string_decoder": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", - "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", - "dev": true, - "requires": { - "safe-buffer": "5.1.1" - } - }, - "through2": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz", - "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=", - "dev": true, - "requires": { - "readable-stream": "2.3.3", - "xtend": "4.0.1" - } + "replace-ext": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz", + "integrity": "sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=", + "dev": true }, "vinyl": { "version": "1.2.0", @@ -4586,9 +4912,9 @@ } }, "handlebars": { - "version": "4.0.10", - "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.10.tgz", - "integrity": "sha1-PTDHGLCaPZbyPqTMH0A8TTup/08=", + "version": "4.0.11", + "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.11.tgz", + "integrity": "sha1-Ywo13+ApS8KB7a5v/F0yn8eYLcw=", "dev": true, "requires": { "async": "1.5.2", @@ -4621,11 +4947,20 @@ "dev": true, "requires": { "chalk": "1.1.3", - "commander": "2.11.0", - "is-my-json-valid": "2.16.0", + "commander": "2.14.1", + "is-my-json-valid": "2.17.1", "pinkie-promise": "2.0.1" } }, + "has": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/has/-/has-1.0.1.tgz", + "integrity": "sha1-hGFzP1OLCDfJNh45qauelwTcLyg=", + "dev": true, + "requires": { + "function-bind": "1.1.1" + } + }, "has-ansi": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", @@ -4705,7 +5040,7 @@ "dev": true, "requires": { "assert-plus": "0.2.0", - "jsprim": "1.4.0", + "jsprim": "1.4.1", "sshpk": "1.13.1" } }, @@ -4715,9 +5050,9 @@ "integrity": "sha512-sr1ZQph3UwHTR0XftSbK85OvBbxe/abLGzEnPENCQwmHf7sck8Oyu4ob3LgBxWWxRoM+QszeUyl7jbqapu2TqA==" }, "ignore": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.3.tgz", - "integrity": "sha1-QyNS5XrM2HqzEQ6C0/6g5HgSFW0=", + "version": "3.3.7", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.7.tgz", + "integrity": "sha512-YGG3ejvBNHRqu0559EOxxNFihD0AjpvHlC/pdGKd3X3ofe+CoJkYazwNJYTNebqpPKN+VVQbh4ZFn1DivMNuHA==", "dev": true }, "imurmurhash": { @@ -4758,13 +5093,13 @@ "dev": true }, "inquirer": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-3.2.0.tgz", - "integrity": "sha512-4CyUYMP7lOBkiUU1rR24WGrfRX6SucwbY2Mqb1PdApU24wnTIk4TsnkQwV72dDdIKZ2ycLP+fWCV+tA7wwgoew==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-3.3.0.tgz", + "integrity": "sha512-h+xtnyk4EwKvFWHrUYsWErEVR+igKtLdchu+o0Z1RL7VU/jVMFbYir2bp6bAj8efFNxWqHX0dIss6fJQ+/+qeQ==", "dev": true, "requires": { - "ansi-escapes": "2.0.0", - "chalk": "2.0.1", + "ansi-escapes": "3.0.0", + "chalk": "2.3.0", "cli-cursor": "2.1.0", "cli-width": "2.1.0", "external-editor": "2.0.4", @@ -4786,23 +5121,23 @@ "dev": true }, "ansi-styles": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.1.0.tgz", - "integrity": "sha1-CcIC1ckX7CMYjKpcnLkXnNlUd1A=", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz", + "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==", "dev": true, "requires": { - "color-convert": "1.9.0" + "color-convert": "1.9.1" } }, "chalk": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.0.1.tgz", - "integrity": "sha512-Mp+FXEI+FrwY/XYV45b2YD3E8i3HwnEAoFcM0qlZzq/RZ9RwWitt2Y/c7cqRAz70U7hfekqx6qNYthuKFO6K0g==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz", + "integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==", "dev": true, "requires": { - "ansi-styles": "3.1.0", + "ansi-styles": "3.2.0", "escape-string-regexp": "1.0.5", - "supports-color": "4.2.0" + "supports-color": "4.5.0" } }, "strip-ansi": { @@ -4815,9 +5150,9 @@ } }, "supports-color": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.2.0.tgz", - "integrity": "sha512-Ts0Mu/A1S1aZxEJNG88I4Oc9rcZSBFNac5e27yh4j2mqbhZSSzR1Ah79EYwSn9Zuh7lrlGD2cVGzw1RKGzyLSg==", + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz", + "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=", "dev": true, "requires": { "has-flag": "2.0.0" @@ -4892,6 +5227,18 @@ "builtin-modules": "1.1.1" } }, + "is-callable": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.3.tgz", + "integrity": "sha1-hut1OSgF3cM69xySoO7fdO52BLI=", + "dev": true + }, + "is-date-object": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz", + "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=", + "dev": true + }, "is-dotfile": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz", @@ -4943,9 +5290,9 @@ } }, "is-my-json-valid": { - "version": "2.16.0", - "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.16.0.tgz", - "integrity": "sha1-8Hndm/2uZe4gOKrorLyGqxCeNpM=", + "version": "2.17.1", + "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.17.1.tgz", + "integrity": "sha512-Q2khNw+oBlWuaYvEEHtKSw/pCxD2L5Rc1C+UQme9X6JdRDh7m5D7HkozA0qa3DUkQ6VzCnEm8mVIQPyIRkI5sQ==", "dev": true, "requires": { "generate-function": "2.0.0", @@ -4981,13 +5328,13 @@ "integrity": "sha1-ZHdYK4IU1gI0YJRWcAO+ip6sBNw=", "dev": true, "requires": { - "is-path-inside": "1.0.0" + "is-path-inside": "1.0.1" } }, "is-path-inside": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.0.tgz", - "integrity": "sha1-/AbloWg/vaE95mev9xe7wQpI838=", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz", + "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=", "dev": true, "requires": { "path-is-inside": "1.0.2" @@ -5033,6 +5380,15 @@ "integrity": "sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ=", "dev": true }, + "is-regex": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz", + "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=", + "dev": true, + "requires": { + "has": "1.0.1" + } + }, "is-relative": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-0.2.1.tgz", @@ -5043,13 +5399,10 @@ } }, "is-resolvable": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.0.0.tgz", - "integrity": "sha1-jfV8YeouPFAUCNEA+wE8+NbgzGI=", - "dev": true, - "requires": { - "tryit": "1.0.3" - } + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz", + "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==", + "dev": true }, "is-stream": { "version": "1.1.0", @@ -5062,13 +5415,19 @@ "integrity": "sha1-ilkRfZMt4d4A8kX83TnOQ/HpOaY=", "dev": true }, + "is-symbol": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.1.tgz", + "integrity": "sha1-PMWfAAJRlLarLjjbrmaJJWtmBXI=", + "dev": true + }, "is-text-path": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/is-text-path/-/is-text-path-1.0.1.tgz", "integrity": "sha1-Thqg+1G/vLPpJogAE5cgLBd1tm4=", "dev": true, "requires": { - "text-extensions": "1.5.0" + "text-extensions": "1.7.0" } }, "is-typedarray": { @@ -5138,9 +5497,9 @@ "dev": true }, "js-yaml": { - "version": "3.9.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.9.0.tgz", - "integrity": "sha512-0LoUNELX4S+iofCT8f4uEHIiRBR+c2AINyC8qRWfC6QNruLtxVZRJaPcu/xwMgFIgDxF25tGHaDjvxzJCNE9yw==", + "version": "3.10.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.10.0.tgz", + "integrity": "sha512-O2v52ffjLa9VeM43J4XocZE//WT9N0IiwDa3KSHH7Tu8CtH+1qM8SIZvnsTh6v+4yFy5KUY3BHUVwjpfAWsjIA==", "dev": true, "requires": { "argparse": "1.0.9", @@ -5192,18 +5551,18 @@ "jsonify": "0.0.0" } }, + "json-stable-stringify-without-jsonify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", + "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=", + "dev": true + }, "json-stringify-safe": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=", "dev": true }, - "json3": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz", - "integrity": "sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE=", - "dev": true - }, "json5": { "version": "0.5.1", "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz", @@ -5229,15 +5588,15 @@ "dev": true }, "jsprim": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.0.tgz", - "integrity": "sha1-o7h+QCmNjDgFUtjMdiigu5WiKRg=", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", + "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=", "dev": true, "requires": { "assert-plus": "1.0.0", - "extsprintf": "1.0.2", + "extsprintf": "1.3.0", "json-schema": "0.2.3", - "verror": "1.3.6" + "verror": "1.10.0" }, "dependencies": { "assert-plus": { @@ -5356,28 +5715,12 @@ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz", "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=" }, - "lodash._baseassign": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz", - "integrity": "sha1-jDigmVAPIVrQnlnxci/QxSv+Ck4=", - "dev": true, - "requires": { - "lodash._basecopy": "3.0.1", - "lodash.keys": "3.1.2" - } - }, "lodash._basecopy": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz", "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=", "dev": true }, - "lodash._basecreate": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/lodash._basecreate/-/lodash._basecreate-3.0.3.tgz", - "integrity": "sha1-G8ZhYU2qf8MRt9A78WgGoCE8+CE=", - "dev": true - }, "lodash._basetostring": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz", @@ -5426,17 +5769,6 @@ "integrity": "sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI=", "dev": true }, - "lodash.create": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/lodash.create/-/lodash.create-3.1.1.tgz", - "integrity": "sha1-1/KEnw29p+BGgruM1yqwIkYd6+c=", - "dev": true, - "requires": { - "lodash._baseassign": "3.2.0", - "lodash._basecreate": "3.0.3", - "lodash._isiterateecall": "3.0.9" - } - }, "lodash.escape": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz", @@ -5575,6 +5907,12 @@ "integrity": "sha1-5WqpTEyAVaFkBKBnS3jyFffI4ZQ=", "dev": true }, + "mdn-data": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-1.1.0.tgz", + "integrity": "sha512-jC6B3BFC07cCOU8xx1d+sQtDkVIpGKWv4TzK7pN7PyObdbwlIFJbHYk8ofvr0zrU8SkV1rSi87KAHhWCdLGw1Q==", + "dev": true + }, "mem": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz", @@ -5641,18 +5979,18 @@ } }, "mime-db": { - "version": "1.27.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.27.0.tgz", - "integrity": "sha1-gg9XIpa70g7CXtVeW13oaeVDbrE=", + "version": "1.30.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz", + "integrity": "sha1-dMZD2i3Z1qRTmZY0ZbJtXKfXHwE=", "dev": true }, "mime-types": { - "version": "2.1.15", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.15.tgz", - "integrity": "sha1-pOv1BkCUVpI3uM9wBGd20J/JKu0=", + "version": "2.1.17", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz", + "integrity": "sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo=", "dev": true, "requires": { - "mime-db": "1.27.0" + "mime-db": "1.30.0" } }, "mimic-fn": { @@ -5685,61 +6023,45 @@ } }, "mocha": { - "version": "3.5.3", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-3.5.3.tgz", - "integrity": "sha512-/6na001MJWEtYxHOV1WLfsmR4YIynkUEhBwzsb+fk2qmQ3iqsi258l/Q2MWHJMImAcNpZ8DEdYAK72NHoIQ9Eg==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-4.1.0.tgz", + "integrity": "sha512-0RVnjg1HJsXY2YFDoTNzcc1NKhYuXKRrBAG2gDygmJJA136Cs2QlRliZG1mA0ap7cuaT30mw16luAeln+4RiNA==", "dev": true, "requires": { "browser-stdout": "1.3.0", - "commander": "2.9.0", - "debug": "2.6.8", - "diff": "3.2.0", + "commander": "2.11.0", + "debug": "3.1.0", + "diff": "3.3.1", "escape-string-regexp": "1.0.5", - "glob": "7.1.1", - "growl": "1.9.2", + "glob": "7.1.2", + "growl": "1.10.3", "he": "1.1.1", - "json3": "3.3.2", - "lodash.create": "3.1.1", "mkdirp": "0.5.1", - "supports-color": "3.1.2" + "supports-color": "4.4.0" }, "dependencies": { "commander": { - "version": "2.9.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz", - "integrity": "sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=", - "dev": true, - "requires": { - "graceful-readlink": "1.0.1" - } - }, - "glob": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz", - "integrity": "sha1-gFIR3wT6rxxjo2ADBs31reULLsg=", - "dev": true, - "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" - } - }, - "has-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", - "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", + "version": "2.11.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz", + "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==", "dev": true }, - "supports-color": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.1.2.tgz", - "integrity": "sha1-cqJiiU2dQIuVbKBf83su2KbiotU=", + "debug": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", + "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", "dev": true, "requires": { - "has-flag": "1.0.0" + "ms": "2.0.0" + } + }, + "supports-color": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz", + "integrity": "sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ==", + "dev": true, + "requires": { + "has-flag": "2.0.0" } } } @@ -5855,6 +6177,15 @@ "path-key": "2.0.1" } }, + "nth-check": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.1.tgz", + "integrity": "sha1-mSms32KPwsQQmN6rgqxYDPFJquQ=", + "dev": true, + "requires": { + "boolbase": "1.0.0" + } + }, "null-check": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/null-check/-/null-check-1.0.0.tgz", @@ -5878,6 +6209,12 @@ "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" }, + "object-keys": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.11.tgz", + "integrity": "sha1-xUYBd4rVYPEULODgG8yotW0TQm0=", + "dev": true + }, "object.defaults": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz", @@ -5907,6 +6244,16 @@ } } }, + "object.getownpropertydescriptors": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz", + "integrity": "sha1-h1jIRvW0B62rDyNuCYbxSwUcqhY=", + "dev": true, + "requires": { + "define-properties": "1.1.2", + "es-abstract": "1.10.0" + } + }, "object.omit": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz", @@ -5926,6 +6273,18 @@ "isobject": "2.1.0" } }, + "object.values": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.0.4.tgz", + "integrity": "sha1-5STaCbT2b/Bd9FdUbscqyZ8TBpo=", + "dev": true, + "requires": { + "define-properties": "1.1.2", + "es-abstract": "1.10.0", + "function-bind": "1.1.1", + "has": "1.0.1" + } + }, "once": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", @@ -6053,12 +6412,12 @@ "dev": true }, "os-locale": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.0.0.tgz", - "integrity": "sha1-FZGN7VEFIrge565aMJ1U9jn8OaQ=", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz", + "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==", "dev": true, "requires": { - "execa": "0.5.1", + "execa": "0.7.0", "lcid": "1.0.0", "mem": "1.1.0" } @@ -6075,10 +6434,13 @@ "dev": true }, "p-limit": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.1.0.tgz", - "integrity": "sha1-sH/y2aXYi+yAYDWJWiurZqJ5iLw=", - "dev": true + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.2.0.tgz", + "integrity": "sha512-Y/OtIaXtUPr4/YpMv1pCL5L5ed0rumAaAeBSj12F+bSlMdys7i8oQF/GUJmfpTS/QoaRrS/k6pma29haJpsMng==", + "dev": true, + "requires": { + "p-try": "1.0.0" + } }, "p-locate": { "version": "2.0.0", @@ -6086,9 +6448,15 @@ "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", "dev": true, "requires": { - "p-limit": "1.1.0" + "p-limit": "1.2.0" } }, + "p-try": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", + "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=", + "dev": true + }, "parse-filepath": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.1.tgz", @@ -6101,9 +6469,9 @@ } }, "parse-github-repo-url": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/parse-github-repo-url/-/parse-github-repo-url-1.4.0.tgz", - "integrity": "sha1-KGxT4smWLgZBZJ7jrJUI/KTdlZw=", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/parse-github-repo-url/-/parse-github-repo-url-1.4.1.tgz", + "integrity": "sha1-nn2LslKmy2ukJZUGC3v23z28H1A=", "dev": true }, "parse-glob": { @@ -6292,9 +6660,9 @@ } }, "pluralize": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-4.0.0.tgz", - "integrity": "sha1-WbcIwcAZCi9pLxx2GMRGsFL9F2I=", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-7.0.0.tgz", + "integrity": "sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow==", "dev": true }, "prelude-ls": { @@ -6346,9 +6714,9 @@ "dev": true }, "q": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/q/-/q-1.5.0.tgz", - "integrity": "sha1-3QG6ydBtMObyGa7LglPunr3DCPE=", + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz", + "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=", "dev": true }, "qs": { @@ -6606,21 +6974,9 @@ "stringstream": "0.0.5", "tough-cookie": "2.3.3", "tunnel-agent": "0.6.0", - "uuid": "3.1.0" + "uuid": "3.2.1" }, "dependencies": { - "ajv": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.3.0.tgz", - "integrity": "sha1-RBT/dKUIecII7l/cgm4ywwNUnto=", - "dev": true, - "requires": { - "co": "4.6.0", - "fast-deep-equal": "1.0.0", - "fast-json-stable-stringify": "2.0.0", - "json-schema-traverse": "0.3.1" - } - }, "assert-plus": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", @@ -6685,7 +7041,7 @@ "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=", "dev": true, "requires": { - "ajv": "5.3.0", + "ajv": "5.5.2", "har-schema": "2.0.0" } }, @@ -6714,25 +7070,10 @@ "dev": true, "requires": { "assert-plus": "1.0.0", - "jsprim": "1.4.0", + "jsprim": "1.4.1", "sshpk": "1.13.1" } }, - "mime-db": { - "version": "1.30.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz", - "integrity": "sha1-dMZD2i3Z1qRTmZY0ZbJtXKfXHwE=", - "dev": true - }, - "mime-types": { - "version": "2.1.17", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz", - "integrity": "sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo=", - "dev": true, - "requires": { - "mime-db": "1.30.0" - } - }, "qs": { "version": "6.5.1", "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz", @@ -6748,15 +7089,6 @@ "hoek": "4.2.0" } }, - "tough-cookie": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz", - "integrity": "sha1-C2GKVWW23qkL80JdBNVe3EdadWE=", - "dev": true, - "requires": { - "punycode": "1.4.1" - } - }, "tunnel-agent": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", @@ -6841,9 +7173,9 @@ } }, "rimraf": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz", - "integrity": "sha1-wjOOxkPfeht/5cVPqG9XQopV8z0=", + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz", + "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==", "dev": true, "requires": { "glob": "7.1.2" @@ -6858,13 +7190,27 @@ } }, "run-sequence": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/run-sequence/-/run-sequence-1.2.2.tgz", - "integrity": "sha1-UJWgvr6YczsBQL0I3YDsAw3azes=", + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/run-sequence/-/run-sequence-2.2.1.tgz", + "integrity": "sha512-qkzZnQWMZjcKbh3CNly2srtrkaO/2H/SI5f2eliMCapdRD3UhMrwjfOAZJAnZ2H8Ju4aBzFZkBGXUqFs9V0yxw==", "dev": true, "requires": { "chalk": "1.1.3", - "gulp-util": "3.0.8" + "fancy-log": "1.3.2", + "plugin-error": "0.1.2" + }, + "dependencies": { + "fancy-log": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.2.tgz", + "integrity": "sha1-9BEl49hPLn2JpD0G2VjI94vha+E=", + "dev": true, + "requires": { + "ansi-gray": "0.1.1", + "color-support": "1.1.3", + "time-stamp": "1.1.0" + } + } } }, "rx": { @@ -6923,6 +7269,21 @@ "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=", "dev": true }, + "shebang-command": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", + "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", + "dev": true, + "requires": { + "shebang-regex": "1.0.0" + } + }, + "shebang-regex": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz", + "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=", + "dev": true + }, "shell-quote": { "version": "1.6.1", "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.6.1.tgz", @@ -6953,10 +7314,13 @@ "dev": true }, "slice-ansi": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-0.0.4.tgz", - "integrity": "sha1-7b+JA/ZvfOL46v1s7tZeJkyDGzU=", - "dev": true + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-1.0.0.tgz", + "integrity": "sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==", + "dev": true, + "requires": { + "is-fullwidth-code-point": "2.0.0" + } }, "sntp": { "version": "1.0.9", @@ -6968,18 +7332,18 @@ } }, "source-map": { - "version": "0.5.6", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz", - "integrity": "sha1-dc449SvwczxafwwRjYEzSiu19BI=", + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", "dev": true }, "source-map-support": { - "version": "0.4.15", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.15.tgz", - "integrity": "sha1-AyAt9lwG0r2MfsI2KhkwVv7407E=", + "version": "0.4.18", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz", + "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==", "dev": true, "requires": { - "source-map": "0.5.6" + "source-map": "0.5.7" } }, "sparkles": { @@ -7010,18 +7374,18 @@ "dev": true }, "split": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/split/-/split-1.0.0.tgz", - "integrity": "sha1-xDlc5oOrzSVLwo/h2rtuXCfc/64=", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/split/-/split-1.0.1.tgz", + "integrity": "sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==", "dev": true, "requires": { "through": "2.3.8" } }, "split2": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/split2/-/split2-2.1.1.tgz", - "integrity": "sha1-eh9VHhdqkOzTNF9yRqDP4XXvT9A=", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/split2/-/split2-2.2.0.tgz", + "integrity": "sha512-RAb22TG39LhI31MbreBgIuKiIKhVsawfTgEGqKHTK87aG+ul/PB8Sqoi3I7kVdRWiCfrKxK3uo4/YUkpNvhPbw==", "dev": true, "requires": { "through2": "2.0.3" @@ -7057,21 +7421,58 @@ } } }, + "stable": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.6.tgz", + "integrity": "sha1-kQ9dKu17Ugxud3SZwfMuE5/eyxA=", + "dev": true + }, "standard-version": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/standard-version/-/standard-version-4.2.0.tgz", - "integrity": "sha1-MBfoxc7SqS23UBeQJVw7qFFXN10=", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/standard-version/-/standard-version-4.3.0.tgz", + "integrity": "sha512-2UJ2BIUNa7+41PH4FvYicSQED2LCt2RXjmNFis+JZlxZtwzNnGn4uuL8WBUqHoC9b+bJ0AHIAX/bilzm+pGPeA==", "dev": true, "requires": { "chalk": "1.1.3", - "conventional-changelog": "1.1.4", - "conventional-recommended-bump": "1.1.0", + "conventional-changelog": "1.1.11", + "conventional-recommended-bump": "1.2.1", + "dotgitignore": "1.0.3", "figures": "1.7.0", "fs-access": "1.0.1", - "semver": "5.4.1", + "semver": "5.5.0", "yargs": "8.0.2" }, "dependencies": { + "camelcase": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", + "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=", + "dev": true + }, + "cliui": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz", + "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=", + "dev": true, + "requires": { + "string-width": "1.0.2", + "strip-ansi": "3.0.1", + "wrap-ansi": "2.1.0" + }, + "dependencies": { + "string-width": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", + "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", + "dev": true, + "requires": { + "code-point-at": "1.1.0", + "is-fullwidth-code-point": "1.0.0", + "strip-ansi": "3.0.1" + } + } + } + }, "figures": { "version": "1.7.0", "resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz", @@ -7082,11 +7483,98 @@ "object-assign": "4.1.1" } }, + "find-up": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", + "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", + "dev": true, + "requires": { + "locate-path": "2.0.0" + } + }, + "is-fullwidth-code-point": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", + "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", + "dev": true, + "requires": { + "number-is-nan": "1.0.1" + } + }, + "load-json-file": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz", + "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=", + "dev": true, + "requires": { + "graceful-fs": "4.1.11", + "parse-json": "2.2.0", + "pify": "2.3.0", + "strip-bom": "3.0.0" + } + }, + "path-type": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz", + "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=", + "dev": true, + "requires": { + "pify": "2.3.0" + } + }, + "read-pkg": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz", + "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=", + "dev": true, + "requires": { + "load-json-file": "2.0.0", + "normalize-package-data": "2.4.0", + "path-type": "2.0.0" + } + }, + "read-pkg-up": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz", + "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=", + "dev": true, + "requires": { + "find-up": "2.1.0", + "read-pkg": "2.0.0" + } + }, "semver": { - "version": "5.4.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz", - "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==", + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz", + "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", "dev": true + }, + "strip-bom": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", + "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=", + "dev": true + }, + "yargs": { + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-8.0.2.tgz", + "integrity": "sha1-YpmpBVsc78lp/355wdkY3Osiw2A=", + "dev": true, + "requires": { + "camelcase": "4.1.0", + "cliui": "3.2.0", + "decamelize": "1.2.0", + "get-caller-file": "1.0.2", + "os-locale": "2.1.0", + "read-pkg-up": "2.0.0", + "require-directory": "2.1.1", + "require-main-filename": "1.0.1", + "set-blocking": "2.0.0", + "string-width": "2.1.1", + "which-module": "2.0.0", + "y18n": "3.2.1", + "yargs-parser": "7.0.0" + } } } }, @@ -7118,9 +7606,9 @@ "dev": true }, "streamfilter": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/streamfilter/-/streamfilter-1.0.5.tgz", - "integrity": "sha1-h1BxEb644phFFxe1Ec/tjwAqv1M=", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/streamfilter/-/streamfilter-1.0.7.tgz", + "integrity": "sha512-Gk6KZM+yNA1JpW0KzlZIhjo3EaBJDkYfXtYSbOwNIQ7Zd6006E6+sCFlW1NDvFG/vnXhKmw6TJJgiEQg/8lXfQ==", "dev": true, "requires": { "readable-stream": "2.3.3" @@ -7254,60 +7742,70 @@ "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=" }, "svgo": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/svgo/-/svgo-0.7.1.tgz", - "integrity": "sha1-KHMg/tlyywl+csK7FoX5b+CPgDQ=", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/svgo/-/svgo-1.0.4.tgz", + "integrity": "sha512-DR9ieoaBoeySY4pnIJMM3Hez6kcVj+Uzj8AUJkr3435qstozP9i+mZ9yzcbq64A44i9YKh3I1Laex+mAyc69Rg==", "dev": true, "requires": { - "coa": "1.0.4", + "coa": "2.0.1", "colors": "1.1.2", - "csso": "2.2.1", - "js-yaml": "3.6.1", + "css-select": "1.3.0-rc0", + "css-select-base-adapter": "0.1.0", + "css-tree": "1.0.0-alpha25", + "css-url-regex": "1.1.0", + "csso": "3.5.0", + "js-yaml": "3.10.0", "mkdirp": "0.5.1", + "object.values": "1.0.4", "sax": "1.2.4", - "whet.extend": "0.9.9" - }, - "dependencies": { - "csso": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/csso/-/csso-2.2.1.tgz", - "integrity": "sha1-Ufu1NH5Q6B5u1RZopISQrm/ir+I=", - "dev": true, - "requires": { - "clap": "1.2.0", - "source-map": "0.5.6" - } - }, - "esprima": { - "version": "2.7.3", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz", - "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=", - "dev": true - }, - "js-yaml": { - "version": "3.6.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.6.1.tgz", - "integrity": "sha1-bl/mfYsgXOTSL60Ft3geja3MSzA=", - "dev": true, - "requires": { - "argparse": "1.0.9", - "esprima": "2.7.3" - } - } + "stable": "0.1.6", + "unquote": "1.1.1", + "util.promisify": "1.0.0" } }, "table": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/table/-/table-4.0.1.tgz", - "integrity": "sha1-qBFsEz+sLGH0pCCrbN9cTWHw5DU=", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/table/-/table-4.0.2.tgz", + "integrity": "sha512-UUkEAPdSGxtRpiV9ozJ5cMTtYiqz7Ni1OGqLXRCynrvzdtR1p+cfOWe2RJLwvUG8hNanaSRjecIqwOjqeatDsA==", "dev": true, "requires": { - "ajv": "4.11.8", - "ajv-keywords": "1.5.1", - "chalk": "1.1.3", + "ajv": "5.5.2", + "ajv-keywords": "2.1.1", + "chalk": "2.3.0", "lodash": "4.17.4", - "slice-ansi": "0.0.4", + "slice-ansi": "1.0.0", "string-width": "2.1.1" + }, + "dependencies": { + "ansi-styles": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz", + "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==", + "dev": true, + "requires": { + "color-convert": "1.9.1" + } + }, + "chalk": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz", + "integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==", + "dev": true, + "requires": { + "ansi-styles": "3.2.0", + "escape-string-regexp": "1.0.5", + "supports-color": "4.5.0" + } + }, + "supports-color": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz", + "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=", + "dev": true, + "requires": { + "has-flag": "2.0.0" + } + } } }, "tar": { @@ -7334,9 +7832,9 @@ } }, "text-extensions": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/text-extensions/-/text-extensions-1.5.0.tgz", - "integrity": "sha1-0cstFLXQvEW/3Kigikc/aMfrDLw=", + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/text-extensions/-/text-extensions-1.7.0.tgz", + "integrity": "sha512-AKXZeDq230UaSzaO5s3qQUZOaC7iKbzq0jOFL614R7d9R593HLqAOL0cYoqLdkNrjBSOdmoQI06yigq1TSBXAg==", "dev": true }, "text-table": { @@ -7420,9 +7918,9 @@ "dev": true }, "tough-cookie": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz", - "integrity": "sha1-8IH3bkyFcg5sN6X6ztc3FQ2EByo=", + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz", + "integrity": "sha1-C2GKVWW23qkL80JdBNVe3EdadWE=", "dev": true, "requires": { "punycode": "1.4.1" @@ -7446,12 +7944,6 @@ "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=", "dev": true }, - "tryit": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/tryit/-/tryit-1.0.3.tgz", - "integrity": "sha1-OTvnMKlEb9Hq1tpZoBQwjzbCics=", - "dev": true - }, "tunnel-agent": { "version": "0.4.3", "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz", @@ -7481,9 +7973,9 @@ "dev": true }, "typescript": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.4.1.tgz", - "integrity": "sha1-w8yxbdqgsjFN4DHn5v7onlujRrw=", + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.7.1.tgz", + "integrity": "sha512-bqB1yS6o9TNA9ZC/MJxM0FZzPnZdtHj0xWK/IZ5khzVqdpGul/R/EIiHRgFXlwTD7PSIaYVnGKq1QgMCu2mnqw==", "dev": true }, "uglify-js": { @@ -7493,7 +7985,7 @@ "dev": true, "optional": true, "requires": { - "source-map": "0.5.6", + "source-map": "0.5.7", "uglify-to-browserify": "1.0.2", "yargs": "3.10.0" }, @@ -7539,10 +8031,16 @@ "integrity": "sha1-1ZpKdUJ0R9mqbJHnAmP40mpLEEs=", "dev": true }, + "unquote": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/unquote/-/unquote-1.1.1.tgz", + "integrity": "sha1-j97XMk7G6IoP+LkF58CYzcCG1UQ=", + "dev": true + }, "url-parse": { - "version": "1.1.9", - "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.1.9.tgz", - "integrity": "sha1-xn8dd11R8KGJEd17P/rSe7nlvRk=", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.2.0.tgz", + "integrity": "sha512-DT1XbYAfmQP65M/mE6OALxmXzZ/z1+e5zk2TcSKe/KiYbNGZxgtttzC0mR/sjopbpOXcbniq7eIKmocJnUWlEw==", "dev": true, "requires": { "querystringify": "1.0.0", @@ -7561,10 +8059,20 @@ "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", "dev": true }, + "util.promisify": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz", + "integrity": "sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==", + "dev": true, + "requires": { + "define-properties": "1.1.2", + "object.getownpropertydescriptors": "2.0.3" + } + }, "uuid": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz", - "integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g==", + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz", + "integrity": "sha512-jZnMwlb9Iku/O3smGWvZhauCf6cvvpKi4BKRiliS3cxnI+Gz9j5MEpTz2UFuXiKPJocb7gnsLHwiS05ige5BEA==", "dev": true }, "v8flags": { @@ -7593,12 +8101,22 @@ } }, "verror": { - "version": "1.3.6", - "resolved": "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz", - "integrity": "sha1-z/XfEpRtKX0rqu+qJoniW+AcAFw=", + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", + "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", "dev": true, "requires": { - "extsprintf": "1.0.2" + "assert-plus": "1.0.0", + "core-util-is": "1.0.2", + "extsprintf": "1.3.0" + }, + "dependencies": { + "assert-plus": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", + "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", + "dev": true + } } }, "vinyl": { @@ -7690,12 +8208,12 @@ } }, "vinyl-source-stream": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/vinyl-source-stream/-/vinyl-source-stream-1.1.0.tgz", - "integrity": "sha1-RMvlEIIFJ53rDFZTwJSiiHk4sas=", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/vinyl-source-stream/-/vinyl-source-stream-1.1.2.tgz", + "integrity": "sha1-YrU6E1YQqJbpjKlr7jqH8Aio54A=", "dev": true, "requires": { - "through2": "0.6.5", + "through2": "2.0.3", "vinyl": "0.4.6" }, "dependencies": { @@ -7705,40 +8223,6 @@ "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=", "dev": true }, - "isarray": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", - "dev": true - }, - "readable-stream": { - "version": "1.0.34", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", - "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", - "dev": true, - "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", - "isarray": "0.0.1", - "string_decoder": "0.10.31" - } - }, - "string_decoder": { - "version": "0.10.31", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", - "dev": true - }, - "through2": { - "version": "0.6.5", - "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz", - "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=", - "dev": true, - "requires": { - "readable-stream": "1.0.34", - "xtend": "4.0.1" - } - }, "vinyl": { "version": "0.4.6", "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz", @@ -7752,41 +8236,50 @@ } }, "vscode": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/vscode/-/vscode-1.1.1.tgz", - "integrity": "sha1-LAztdumYZc0oKTxJ5tXF9d9t0HE=", + "version": "1.1.10", + "resolved": "https://registry.npmjs.org/vscode/-/vscode-1.1.10.tgz", + "integrity": "sha512-MvFXXSGuhw0Q6GC6dQrnRc0ES+63wpttGIoYGBMQnoS9JFCCNC/rWfX0lBCHJyuKL2Q8CYg0ROsMEHbHVwEtVw==", "dev": true, "requires": { "glob": "7.1.2", "gulp-chmod": "2.0.0", - "gulp-filter": "5.0.1", - "gulp-gunzip": "0.0.3", + "gulp-filter": "5.1.0", + "gulp-gunzip": "1.0.0", "gulp-remote-src": "0.4.3", "gulp-symdest": "1.1.0", "gulp-untar": "0.0.6", - "gulp-vinyl-zip": "1.4.0", - "mocha": "3.5.3", + "gulp-vinyl-zip": "2.1.0", + "mocha": "4.1.0", "request": "2.83.0", - "semver": "5.4.1", - "source-map-support": "0.4.15", - "url-parse": "1.1.9", - "vinyl-source-stream": "1.1.0" + "semver": "5.5.0", + "source-map-support": "0.5.3", + "url-parse": "1.2.0", + "vinyl-source-stream": "1.1.2" }, "dependencies": { "semver": { - "version": "5.4.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz", - "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==", + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz", + "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", "dev": true + }, + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + }, + "source-map-support": { + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.3.tgz", + "integrity": "sha512-eKkTgWYeBOQqFGXRfKabMFdnWepo51vWqEdoeikaEPFiJC7MCU5j2h4+6Q8npkZTeLGbSyecZvRxiSoWl3rh+w==", + "dev": true, + "requires": { + "source-map": "0.6.1" + } } } }, - "whet.extend": { - "version": "0.9.9", - "resolved": "https://registry.npmjs.org/whet.extend/-/whet.extend-0.9.9.tgz", - "integrity": "sha1-+HfVv2SMl+WqVC+twW1qJZucEaE=", - "dev": true - }, "which": { "version": "1.2.14", "resolved": "https://registry.npmjs.org/which/-/which-1.2.14.tgz", @@ -7891,26 +8384,31 @@ } }, "yargs": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-8.0.2.tgz", - "integrity": "sha1-YpmpBVsc78lp/355wdkY3Osiw2A=", + "version": "11.0.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-11.0.0.tgz", + "integrity": "sha512-Rjp+lMYQOWtgqojx1dEWorjCofi1YN7AoFvYV7b1gx/7dAAeuI4kN5SZiEvr0ZmsZTOpDRcCqrpI10L31tFkBw==", "dev": true, "requires": { - "camelcase": "4.1.0", - "cliui": "3.2.0", + "cliui": "4.0.0", "decamelize": "1.2.0", + "find-up": "2.1.0", "get-caller-file": "1.0.2", - "os-locale": "2.0.0", - "read-pkg-up": "2.0.0", + "os-locale": "2.1.0", "require-directory": "2.1.1", "require-main-filename": "1.0.1", "set-blocking": "2.0.0", "string-width": "2.1.1", "which-module": "2.0.0", "y18n": "3.2.1", - "yargs-parser": "7.0.0" + "yargs-parser": "9.0.2" }, "dependencies": { + "ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", + "dev": true + }, "camelcase": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", @@ -7918,27 +8416,14 @@ "dev": true }, "cliui": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz", - "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.0.0.tgz", + "integrity": "sha512-nY3W5Gu2racvdDk//ELReY+dHjb9PlIcVDFXP72nVIhq2Gy3LuVXYwJoPVudwQnv1shtohpgkdCKT2YaKY0CKw==", "dev": true, "requires": { - "string-width": "1.0.2", - "strip-ansi": "3.0.1", + "string-width": "2.1.1", + "strip-ansi": "4.0.0", "wrap-ansi": "2.1.0" - }, - "dependencies": { - "string-width": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", - "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", - "dev": true, - "requires": { - "code-point-at": "1.1.0", - "is-fullwidth-code-point": "1.0.0", - "strip-ansi": "3.0.1" - } - } } }, "find-up": { @@ -7950,62 +8435,23 @@ "locate-path": "2.0.0" } }, - "is-fullwidth-code-point": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", - "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "number-is-nan": "1.0.1" + "ansi-regex": "3.0.0" } }, - "load-json-file": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz", - "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=", + "yargs-parser": { + "version": "9.0.2", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-9.0.2.tgz", + "integrity": "sha1-nM9qQ0YP5O1Aqbto9I1DuKaMwHc=", "dev": true, "requires": { - "graceful-fs": "4.1.11", - "parse-json": "2.2.0", - "pify": "2.3.0", - "strip-bom": "3.0.0" + "camelcase": "4.1.0" } - }, - "path-type": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz", - "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=", - "dev": true, - "requires": { - "pify": "2.3.0" - } - }, - "read-pkg": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz", - "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=", - "dev": true, - "requires": { - "load-json-file": "2.0.0", - "normalize-package-data": "2.4.0", - "path-type": "2.0.0" - } - }, - "read-pkg-up": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz", - "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=", - "dev": true, - "requires": { - "find-up": "2.1.0", - "read-pkg": "2.0.0" - } - }, - "strip-bom": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", - "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=", - "dev": true } } }, @@ -8027,9 +8473,9 @@ } }, "yauzl": { - "version": "2.8.0", - "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.8.0.tgz", - "integrity": "sha1-eUUK/yKyqcWkHvVOAtuQfM+/nuI=", + "version": "2.9.1", + "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.9.1.tgz", + "integrity": "sha1-qBmB6nCleUYTOIPwKcWCGok1mn8=", "dev": true, "requires": { "buffer-crc32": "0.2.13", @@ -8037,9 +8483,9 @@ } }, "yazl": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/yazl/-/yazl-2.4.2.tgz", - "integrity": "sha1-FMsZCD4eJacAksFYiqvg9OTdTYg=", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/yazl/-/yazl-2.4.3.tgz", + "integrity": "sha1-7CblzIfVYBud+EMtvdPNLlFzoHE=", "dev": true, "requires": { "buffer-crc32": "0.2.13" diff --git a/package.json b/package.json index ad07563..790556b 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ }, "scripts": { "build": "npm run build-icons && npm run build-themes && npm run build-icons-accents && npm run build-icons-variants", - "minimize-icons": "svgo -f src/icons/svgs -o icons", + "minimize-icons": "svgo -f src/icons/svgs", "minimize-json": "json-minify themes/.material-theme-icons.tmp > themes/Material-Theme-Icons.json && npm run remove-icons-tmp", "remove-icons": "rimraf icons && rimraf themes/Material-Theme-Icons.json", "remove-icons-tmp": "rimraf themes/.material-theme-icons.tmp", @@ -71,7 +71,7 @@ "themes": [ { "label": "Material Theme", - "path": "./themes/Material-Theme-Palenight.json", + "path": "./themes/Material-Theme-Darker.json", "uiTheme": "vs-dark" } ], @@ -91,37 +91,37 @@ } ], "devDependencies": { - "@types/chalk": "0.4.31", - "@types/gulp": "4.0.4", - "@types/gulp-if": "0.0.31", - "@types/gulp-util": "3.0.31", - "@types/mustache": "0.8.29", - "@types/run-sequence": "0.0.29", + "@types/chalk": "2.2.0", + "@types/gulp": "4.0.5", + "@types/gulp-if": "0.0.33", + "@types/gulp-util": "3.0.34", + "@types/mustache": "0.8.30", + "@types/run-sequence": "0.0.30", "@types/through2": "2.0.33", "@types/yamljs": "0.2.30", - "@types/yargs": "6.6.0", - "babel-core": "6.25.0", + "@types/yargs": "10.0.1", + "babel-core": "6.26.0", "babel-preset-es2015": "6.24.1", "babel-root-import": "4.1.8", "cpx": "1.5.0", - "eslint": "4.1.1", + "eslint": "4.17.0", "eslint-plugin-standard": "3.0.1", "gulp": "3.9.1", - "gulp-bump": "2.7.0", - "gulp-conventional-changelog": "1.1.3", + "gulp-bump": "3.1.0", + "gulp-conventional-changelog": "1.1.11", "gulp-if": "2.0.2", "gulp-stats": "0.0.4", "gulp-util": "3.0.8", "json-minify": "1.0.0", "mustache": "2.3.0", - "rimraf": "2.6.1", - "run-sequence": "1.2.2", - "standard-version": "4.2.0", - "svgo": "0.7.1", - "typescript": "2.4.1", - "vscode": "1.1.1", + "rimraf": "2.6.2", + "run-sequence": "2.2.1", + "standard-version": "4.3.0", + "svgo": "1.0.4", + "typescript": "2.7.1", + "vscode": "1.1.10", "yamljs": "0.3.0", - "yargs": "8.0.2" + "yargs": "11.0.0" }, "__metadata": { "id": "dffaf5a1-2219-434b-9d87-cb586fd59260", @@ -136,4 +136,4 @@ "url": "https://opencollective.com/vsc-material-theme", "logo": "https://opencollective.com/opencollective/logo.txt" } -} \ No newline at end of file +} From 0eeb5ea5000528ed83f895a3f45f4b3aa8a23d52 Mon Sep 17 00:00:00 2001 From: Mattia Astorino Date: Sun, 11 Feb 2018 14:19:32 +0100 Subject: [PATCH 5/6] chore: Fix builder (wip) --- package.json | 14 +++++++------- src/icons/svgs/folder_gulp.svg | Bin 4786 -> 4778 bytes 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index 790556b..db6a9bb 100644 --- a/package.json +++ b/package.json @@ -25,12 +25,12 @@ "vscode": "^1.19.0" }, "scripts": { - "build": "npm run build-icons && npm run build-themes && npm run build-icons-accents && npm run build-icons-variants", - "minimize-icons": "svgo -f src/icons/svgs", - "minimize-json": "json-minify themes/.material-theme-icons.tmp > themes/Material-Theme-Icons.json && npm run remove-icons-tmp", - "remove-icons": "rimraf icons && rimraf themes/Material-Theme-Icons.json", + "build": "yarn build-icons && yarn build-themes && yarn build-icons-accents && yarn build-icons-variants", + "minimize-icons": "svgo -f src/icons/svgs -o icons/", + "minimize-json": "json-minify themes/.material-theme-icons.tmp > themes/Material-Theme-Icons.json && yarn remove-icons-tmp", + "remove-icons": "rimraf icons/* && rimraf themes/Material-Theme-Icons.json", "remove-icons-tmp": "rimraf themes/.material-theme-icons.tmp", - "build-icons": "npm run remove-icons && npm run minimize-icons && yarn gulp build:icons && npm run minimize-json", + "build-icons": "yarn remove-icons && yarn minimize-icons && yarn gulp build:icons && yarn minimize-json", "build-icons-accents": "yarn gulp build:icons.accents", "build-icons-variants": "yarn gulp build:icons.variants", "build-themes": "yarn gulp build:themes", @@ -71,7 +71,7 @@ "themes": [ { "label": "Material Theme", - "path": "./themes/Material-Theme-Darker.json", + "path": "./themes/Material-Theme-Palenight.json", "uiTheme": "vs-dark" } ], @@ -136,4 +136,4 @@ "url": "https://opencollective.com/vsc-material-theme", "logo": "https://opencollective.com/opencollective/logo.txt" } -} +} \ No newline at end of file diff --git a/src/icons/svgs/folder_gulp.svg b/src/icons/svgs/folder_gulp.svg index 8c33fdcab1b80abaa52e448c6248eda8a81650e6..e3c7c9c863f128e02e25a248c569a937806cb936 100644 GIT binary patch literal 4778 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 E|5<4-Z~y=R literal 4786 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 MViz%ym2Prlo=Hn&KmY&$ From a12c8621bd90bad9e476cbbd2753718688f0efde Mon Sep 17 00:00:00 2001 From: Mattia Astorino Date: Sun, 11 Feb 2018 14:36:43 +0100 Subject: [PATCH 6/6] chore: Update README --- README.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index ad014a1..07362d5 100644 --- a/README.md +++ b/README.md @@ -105,7 +105,7 @@ Type `Material Theme` and choose `Material Theme: Settings`, then select `Change ## Override theme colors You can override the material theme ui and schemes colors by adding these theme-specific settings to your configuration. -```json +```js "editor.tokenColorCustomizations": { "[Material Theme]": { "comments": "#229977" @@ -122,7 +122,8 @@ You can override the material theme ui and schemes colors by adding these theme- # Recommended settings for a better experience -```json +```js +{ // Controls the font family. "editor.fontFamily": "Operator Mono", // Controls the line height. Use 0 to compute the lineHeight from the fontSize. @@ -130,7 +131,8 @@ You can override the material theme ui and schemes colors by adding these theme- // Enables font ligatures "editor.fontLigatures": true, // Controls if file decorations should use badges. - "explorer.decorations.badges": false, + "explorer.decorations.badges": false +} ``` # Other resources