diff --git a/CHANGELOG.md b/CHANGELOG.md index 45c5396be0..c410099d1e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,5 @@ ### HEAD +* Move required theme files to `sage/resources` ([#1877](https://github.com/roots/sage/pull/1877)) * Move `src/` to `app/` ([#1868](https://github.com/roots/sage/pull/1868)) * Move `templates/` to `resources/views/`, move `assets/` to `resources/assets/`, rename `base.blade.php` to `app.blade.php` ([#1864](https://github.com/roots/sage/pull/1864)) * Add option to configure build settings ([#1822](https://github.com/roots/sage/pull/1822)) diff --git a/README.md b/README.md index 9cce3f20e8..5260fb9be2 100644 --- a/README.md +++ b/README.md @@ -53,31 +53,31 @@ During theme installation you will have the options to: ```shell themes/your-theme-name/ # → Root of your Sage based theme ├── app/ # → Theme PHP -│   ├── lib/Sage/ # → Blade implementation, asset manifest -│   ├── admin.php # → Theme customizer setup -│   ├── filters.php # → Theme filters -│   ├── helpers.php # → Helper functions -│   └── setup.php # → Theme setup +│ ├── lib/Sage/ # → Blade implementation, asset manifest +│ ├── admin.php # → Theme customizer setup +│ ├── filters.php # → Theme filters +│ ├── helpers.php # → Helper functions +│ └── setup.php # → Theme setup ├── composer.json # → Autoloading for `app/` files ├── composer.lock # → Composer lock file (never edit) ├── dist/ # → Built theme assets (never edit) -├── functions.php # → Composer autoloader, theme includes -├── index.php # → Never manually edit ├── node_modules/ # → Node.js packages (never edit) ├── package.json # → Node.js dependencies and scripts -├── screenshot.png # → Theme screenshot for WP admin -├── style.css # → Theme meta information ├── resources/ # → Theme assets and templates │ ├── assets/ # → Front-end assets -│   │ ├── config.json # → Settings for compiled assets -│   │ ├── build/ # → Webpack and ESLint config -│   │ ├── fonts/ # → Theme fonts -│   │ ├── images/ # → Theme images -│   │ ├── scripts/ # → Theme JS -│   │ └── styles/ # → Theme stylesheets -│   └── views/ # → Theme templates -│   ├── layouts/ # → Base templates -│   └── partials/ # → Partial templates +│ │ ├── config.json # → Settings for compiled assets +│ │ ├── build/ # → Webpack and ESLint config +│ │ ├── fonts/ # → Theme fonts +│ │ ├── images/ # → Theme images +│ │ ├── scripts/ # → Theme JS +│ │ └── styles/ # → Theme stylesheets +│ ├── functions.php # → Composer autoloader, theme includes +│ ├── index.php # → Never manually edit +│ ├── screenshot.png # → Theme screenshot for WP admin +│ ├── style.css # → Theme meta information +│ └── views/ # → Theme templates +│ ├── layouts/ # → Base templates +│ └── partials/ # → Partial templates └── vendor/ # → Composer packages (never edit) ``` diff --git a/app/filters.php b/app/filters.php index 270b531a2c..050bf8facf 100644 --- a/app/filters.php +++ b/app/filters.php @@ -6,19 +6,24 @@ * Add classes */ add_filter('body_class', function (array $classes) { - // Add page slug if it doesn't exist + /** Add page slug if it doesn't exist */ if (is_single() || is_page() && !is_front_page()) { if (!in_array(basename(get_permalink()), $classes)) { $classes[] = basename(get_permalink()); } } - // Add class if sidebar is active + /** Add class if sidebar is active */ if (display_sidebar()) { $classes[] = 'sidebar-primary'; } - return $classes; + /** Clean up class names for custom templates */ + $classes = array_map(function ($class) { + return preg_replace(['/-blade(-php)?$/', '/^page-template-views/'], '', $class); + }, $classes); + + return array_filter($classes); }); /** @@ -31,31 +36,30 @@ /** * Template Hierarchy should search for .blade.php files */ -array_map(function ($type) { +collect([ + 'index', '404', 'archive', 'author', 'category', 'tag', 'taxonomy', 'date', 'home', + 'frontpage', 'page', 'paged', 'search', 'single', 'singular', 'attachment' +])->map(function ($type) { add_filter("{$type}_template_hierarchy", function ($templates) { - return call_user_func_array('array_merge', array_map(function ($template) { + return collect($templates)->flatMap(function ($template) { $transforms = [ - '%^/?(resources/views)?/?%' => config('sage.disable_option_hack') ? 'resources/views/' : '', + '%^/?(resources[\\/]views)?[\\/]?%' => '', '%(\.blade)?(\.php)?$%' => '' ]; $normalizedTemplate = preg_replace(array_keys($transforms), array_values($transforms), $template); return ["{$normalizedTemplate}.blade.php", "{$normalizedTemplate}.php"]; - }, $templates)); + })->toArray(); }); -}, [ - 'index', '404', 'archive', 'author', 'category', 'tag', 'taxonomy', 'date', 'home', - 'frontpage', 'page', 'paged', 'search', 'single', 'singular', 'attachment' -]); +}); /** * Render page using Blade */ add_filter('template_include', function ($template) { - $data = array_reduce(get_body_class(), function ($data, $class) use ($template) { + $data = collect(get_body_class())->reduce(function ($data, $class) use ($template) { return apply_filters("sage/template/{$class}/data", $data, $template); }, []); echo template($template, $data); - // Return a blank file to make WordPress happy return get_theme_file_path('index.php'); }, PHP_INT_MAX); diff --git a/app/lib/Sage/PostCreateProject.php b/app/lib/Sage/PostCreateProject.php index 0dac4fccb9..4499598ac3 100755 --- a/app/lib/Sage/PostCreateProject.php +++ b/app/lib/Sage/PostCreateProject.php @@ -31,7 +31,7 @@ public static function updateHeaders(Event $event) 'author_uri' => $io->ask('Theme Author URI ['.$theme_headers_default['author_uri'].']: ', $theme_headers_default['author_uri']) ]; - file_put_contents('style.css', str_replace($theme_headers_default, $theme_headers, file_get_contents('style.css'))); + file_put_contents('resources/style.css', str_replace($theme_headers_default, $theme_headers, file_get_contents('resources/style.css'))); } } diff --git a/composer.json b/composer.json index a57ec66c65..0eccc7eaf6 100644 --- a/composer.json +++ b/composer.json @@ -35,7 +35,7 @@ "illuminate/config": "~5.4.0" }, "require-dev": { - "squizlabs/php_codesniffer": "^2.5.1" + "squizlabs/php_codesniffer": "^2.8.0" }, "scripts": { "test": [ diff --git a/composer.lock b/composer.lock index 7fdcbc96af..97a25cbd43 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "9fa5c6956d3ed29ca107f717891465c6", - "content-hash": "f00026ba7588607051943fd388bead9b", + "content-hash": "ea9fa1afa3655447aadf2168ebe1d9b4", "packages": [ { "name": "composer/installers", @@ -112,7 +111,7 @@ "zend", "zikula" ], - "time": "2016-08-13 20:53:52" + "time": "2016-08-13T20:53:52+00:00" }, { "name": "doctrine/inflector", @@ -179,11 +178,11 @@ "singularize", "string" ], - "time": "2015-11-06 14:35:42" + "time": "2015-11-06T14:35:42+00:00" }, { "name": "illuminate/config", - "version": "v5.4.13", + "version": "v5.4.17", "source": { "type": "git", "url": "https://github.com/illuminate/config.git", @@ -223,20 +222,20 @@ ], "description": "The Illuminate Config package.", "homepage": "https://laravel.com", - "time": "2017-02-04 20:27:32" + "time": "2017-02-04T20:27:32+00:00" }, { "name": "illuminate/container", - "version": "v5.4.13", + "version": "v5.4.17", "source": { "type": "git", "url": "https://github.com/illuminate/container.git", - "reference": "ccbfa2c69369a11b419d071ad11147b59eb9f052" + "reference": "1fc0d2451e23d2ea73c10462d74add4767e2b74c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/container/zipball/ccbfa2c69369a11b419d071ad11147b59eb9f052", - "reference": "ccbfa2c69369a11b419d071ad11147b59eb9f052", + "url": "https://api.github.com/repos/illuminate/container/zipball/1fc0d2451e23d2ea73c10462d74add4767e2b74c", + "reference": "1fc0d2451e23d2ea73c10462d74add4767e2b74c", "shasum": "" }, "require": { @@ -266,20 +265,20 @@ ], "description": "The Illuminate Container package.", "homepage": "https://laravel.com", - "time": "2017-01-28 17:55:54" + "time": "2017-03-13T14:14:19+00:00" }, { "name": "illuminate/contracts", - "version": "v5.4.13", + "version": "v5.4.17", "source": { "type": "git", "url": "https://github.com/illuminate/contracts.git", - "reference": "dd256891c80fd94a58ab83d7989d6da2f50e30ea" + "reference": "ab2825726bee46a67c8cc66789852189dbef74a9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/contracts/zipball/dd256891c80fd94a58ab83d7989d6da2f50e30ea", - "reference": "dd256891c80fd94a58ab83d7989d6da2f50e30ea", + "url": "https://api.github.com/repos/illuminate/contracts/zipball/ab2825726bee46a67c8cc66789852189dbef74a9", + "reference": "ab2825726bee46a67c8cc66789852189dbef74a9", "shasum": "" }, "require": { @@ -308,20 +307,20 @@ ], "description": "The Illuminate Contracts package.", "homepage": "https://laravel.com", - "time": "2017-02-21 14:21:59" + "time": "2017-03-29T13:17:47+00:00" }, { "name": "illuminate/events", - "version": "v5.4.13", + "version": "v5.4.17", "source": { "type": "git", "url": "https://github.com/illuminate/events.git", - "reference": "e31e5be1d704a3a001b6cf7ebf457a208e9a8a60" + "reference": "e8337bde9cc65409d5fa7548ff11d360a4b4ae2b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/events/zipball/e31e5be1d704a3a001b6cf7ebf457a208e9a8a60", - "reference": "e31e5be1d704a3a001b6cf7ebf457a208e9a8a60", + "url": "https://api.github.com/repos/illuminate/events/zipball/e8337bde9cc65409d5fa7548ff11d360a4b4ae2b", + "reference": "e8337bde9cc65409d5fa7548ff11d360a4b4ae2b", "shasum": "" }, "require": { @@ -353,20 +352,20 @@ ], "description": "The Illuminate Events package.", "homepage": "https://laravel.com", - "time": "2017-02-10 21:05:38" + "time": "2017-03-16T14:12:50+00:00" }, { "name": "illuminate/filesystem", - "version": "v5.4.13", + "version": "v5.4.17", "source": { "type": "git", "url": "https://github.com/illuminate/filesystem.git", - "reference": "9e74fd5bef124640852da3ec71ec6365408de417" + "reference": "3ed8b9a35880a9619141e2965fd5cbbe2e1c0da1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/filesystem/zipball/9e74fd5bef124640852da3ec71ec6365408de417", - "reference": "9e74fd5bef124640852da3ec71ec6365408de417", + "url": "https://api.github.com/repos/illuminate/filesystem/zipball/3ed8b9a35880a9619141e2965fd5cbbe2e1c0da1", + "reference": "3ed8b9a35880a9619141e2965fd5cbbe2e1c0da1", "shasum": "" }, "require": { @@ -403,20 +402,20 @@ ], "description": "The Illuminate Filesystem package.", "homepage": "https://laravel.com", - "time": "2017-01-03 14:19:43" + "time": "2017-03-01T21:44:04+00:00" }, { "name": "illuminate/support", - "version": "v5.4.13", + "version": "v5.4.17", "source": { "type": "git", "url": "https://github.com/illuminate/support.git", - "reference": "904f63003fd67ede2ec3be018b322d1c29415465" + "reference": "c7e7c9daf5044e76b46085b8351f8235a3e979c6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/support/zipball/904f63003fd67ede2ec3be018b322d1c29415465", - "reference": "904f63003fd67ede2ec3be018b322d1c29415465", + "url": "https://api.github.com/repos/illuminate/support/zipball/c7e7c9daf5044e76b46085b8351f8235a3e979c6", + "reference": "c7e7c9daf5044e76b46085b8351f8235a3e979c6", "shasum": "" }, "require": { @@ -460,20 +459,20 @@ ], "description": "The Illuminate Support package.", "homepage": "https://laravel.com", - "time": "2017-02-15 19:29:24" + "time": "2017-03-28T12:49:45+00:00" }, { "name": "illuminate/view", - "version": "v5.4.13", + "version": "v5.4.17", "source": { "type": "git", "url": "https://github.com/illuminate/view.git", - "reference": "0152506ccc2815e12e2daf8a01946b627db1efe0" + "reference": "45932749b21aeee7a5f60601a2ceafb36d032a94" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/view/zipball/0152506ccc2815e12e2daf8a01946b627db1efe0", - "reference": "0152506ccc2815e12e2daf8a01946b627db1efe0", + "url": "https://api.github.com/repos/illuminate/view/zipball/45932749b21aeee7a5f60601a2ceafb36d032a94", + "reference": "45932749b21aeee7a5f60601a2ceafb36d032a94", "shasum": "" }, "require": { @@ -508,20 +507,20 @@ ], "description": "The Illuminate View package.", "homepage": "https://laravel.com", - "time": "2017-02-22 15:30:41" + "time": "2017-03-30T14:26:45+00:00" }, { "name": "paragonie/random_compat", - "version": "v2.0.7", + "version": "v2.0.10", "source": { "type": "git", "url": "https://github.com/paragonie/random_compat.git", - "reference": "b5ea1ef3d8ff10c307ba8c5945c2f134e503278f" + "reference": "634bae8e911eefa89c1abfbf1b66da679ac8f54d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/paragonie/random_compat/zipball/b5ea1ef3d8ff10c307ba8c5945c2f134e503278f", - "reference": "b5ea1ef3d8ff10c307ba8c5945c2f134e503278f", + "url": "https://api.github.com/repos/paragonie/random_compat/zipball/634bae8e911eefa89c1abfbf1b66da679ac8f54d", + "reference": "634bae8e911eefa89c1abfbf1b66da679ac8f54d", "shasum": "" }, "require": { @@ -556,7 +555,7 @@ "pseudorandom", "random" ], - "time": "2017-02-27 17:11:23" + "time": "2017-03-13T16:27:32+00:00" }, { "name": "psr/log", @@ -603,20 +602,20 @@ "psr", "psr-3" ], - "time": "2016-10-10 12:19:37" + "time": "2016-10-10T12:19:37+00:00" }, { "name": "symfony/debug", - "version": "v3.2.4", + "version": "v3.2.7", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "9b98854cb45bc59d100b7d4cc4cf9e05f21026b9" + "reference": "56f613406446a4a0a031475cfd0a01751de22659" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/9b98854cb45bc59d100b7d4cc4cf9e05f21026b9", - "reference": "9b98854cb45bc59d100b7d4cc4cf9e05f21026b9", + "url": "https://api.github.com/repos/symfony/debug/zipball/56f613406446a4a0a031475cfd0a01751de22659", + "reference": "56f613406446a4a0a031475cfd0a01751de22659", "shasum": "" }, "require": { @@ -660,20 +659,20 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2017-02-16 16:34:18" + "time": "2017-03-28T21:38:24+00:00" }, { "name": "symfony/finder", - "version": "v3.2.4", + "version": "v3.2.7", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "8c71141cae8e2957946b403cc71a67213c0380d6" + "reference": "b20900ce5ea164cd9314af52725b0bb5a758217a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/8c71141cae8e2957946b403cc71a67213c0380d6", - "reference": "8c71141cae8e2957946b403cc71a67213c0380d6", + "url": "https://api.github.com/repos/symfony/finder/zipball/b20900ce5ea164cd9314af52725b0bb5a758217a", + "reference": "b20900ce5ea164cd9314af52725b0bb5a758217a", "shasum": "" }, "require": { @@ -709,22 +708,22 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "time": "2017-01-02 20:32:22" + "time": "2017-03-20T09:32:19+00:00" } ], "packages-dev": [ { "name": "squizlabs/php_codesniffer", - "version": "2.8.0", + "version": "2.8.1", "source": { "type": "git", "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", - "reference": "86dd55a522238211f9f3631e3361703578941d9a" + "reference": "d7cf0d894e8aa4c73712ee4a331cc1eaa37cdc7d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/86dd55a522238211f9f3631e3361703578941d9a", - "reference": "86dd55a522238211f9f3631e3361703578941d9a", + "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/d7cf0d894e8aa4c73712ee4a331cc1eaa37cdc7d", + "reference": "d7cf0d894e8aa4c73712ee4a331cc1eaa37cdc7d", "shasum": "" }, "require": { @@ -789,7 +788,7 @@ "phpcs", "standards" ], - "time": "2017-02-02 03:30:00" + "time": "2017-03-01T22:17:45+00:00" } ], "aliases": [], diff --git a/package.json b/package.json index 647a3b64b4..e857796105 100644 --- a/package.json +++ b/package.json @@ -37,29 +37,29 @@ "buble-loader": "^0.4.1", "clean-webpack-plugin": "^0.1.16", "copy-globs-webpack-plugin": "^0.2.0", - "css-loader": "^0.27.3", + "css-loader": "^0.28.0", "cssnano": "^3.10.0", - "eslint": "^3.18.0", - "eslint-loader": "^1.7.0", + "eslint": "^3.19.0", + "eslint-loader": "^1.7.1", "eslint-plugin-import": "^2.2.0", "extract-text-webpack-plugin": "^2.1.0", - "file-loader": "^0.10.1", + "file-loader": "^0.11.1", "imagemin-mozjpeg": "^6.0.0", "imagemin-webpack-plugin": "^1.4.4", "node-sass": "^4.5.1", - "optimize-css-assets-webpack-plugin": "^1.3.0", + "optimize-css-assets-webpack-plugin": "^1.3.1", "postcss-loader": "^1.3.3", "resolve-url-loader": "^2.0.2", "rimraf": "^2.6.1", "sass-loader": "^6.0.3", "style-loader": "^0.16.0", "url-loader": "^0.5.8", - "webpack": "^2.3.1", + "webpack": "^2.4.1", "webpack-assets-manifest": "^0.6.2", "webpack-dev-middleware": "^1.10.1", - "webpack-hot-middleware": "^2.17.1", + "webpack-hot-middleware": "^2.18.0", "webpack-merge": "^4.1.0", - "yargs": "^7.0.2" + "yargs": "^7.1.0" }, "dependencies": { "bootstrap": "^4.0.0-alpha.6", diff --git a/phpcs.xml b/phpcs.xml index e3a334dfd3..8e52177045 100644 --- a/phpcs.xml +++ b/phpcs.xml @@ -3,8 +3,8 @@ Roots Coding Standards - functions.php - index.php + resources/functions.php + resources/index.php app resources/views diff --git a/functions.php b/resources/functions.php similarity index 84% rename from functions.php rename to resources/functions.php index b2ee7c2c1d..a92aa275af 100644 --- a/functions.php +++ b/resources/functions.php @@ -35,7 +35,7 @@ * Ensure dependencies are loaded */ if (!class_exists('Roots\\Sage\\Container')) { - if (!file_exists($composer = __DIR__.'/vendor/autoload.php')) { + if (!file_exists($composer = __DIR__.'/../vendor/autoload.php')) { $sage_error( __('You must run composer install from the Sage directory.', 'sage'), __('Autoloader not found.', 'sage') @@ -51,7 +51,7 @@ * Add or remove files to the array as needed. Supports child theme overrides. */ array_map(function ($file) use ($sage_error) { - $file = "app/{$file}.php"; + $file = "../app/{$file}.php"; if (!locate_template($file, true, true)) { $sage_error(sprintf(__('Error locating %s for inclusion.', 'sage'), $file), 'File not found'); } @@ -68,20 +68,24 @@ * * This is not compatible with the WordPress Customizer theme preview prior to theme activation * - * get_template_directory() -> /srv/www/example.com/current/web/app/themes/sage - * get_stylesheet_directory() -> /srv/www/example.com/current/web/app/themes/sage + * get_template_directory() -> /srv/www/example.com/current/web/app/themes/sage/resources + * get_stylesheet_directory() -> /srv/www/example.com/current/web/app/themes/sage/resources * locate_template() - * ├── STYLESHEETPATH -> /srv/www/example.com/current/web/app/themes/sage - * └── TEMPLATEPATH -> /srv/www/example.com/current/web/app/themes/sage/resources/views + * ├── STYLESHEETPATH -> /srv/www/example.com/current/web/app/themes/sage/resources/views + * └── TEMPLATEPATH -> /srv/www/example.com/current/web/app/themes/sage/resources */ if (is_customize_preview() && isset($_GET['theme'])) { $sage_error(__('Theme must be activated prior to using the customizer.', 'sage')); } -add_filter('template', function ($stylesheet) { - return dirname(dirname($stylesheet)); +$sage_views = basename(dirname(__DIR__)).'/'.basename(__DIR__).'/views'; +add_filter('stylesheet', function () use ($sage_views) { + return dirname($sage_views); }); -if (($sage_views = basename(__DIR__).'/resources/views') !== get_option('template')) { - update_option('template', $sage_views); +add_filter('stylesheet_directory_uri', function ($uri) { + return dirname($uri); +}); +if ($sage_views !== get_option('stylesheet')) { + update_option('stylesheet', $sage_views); wp_redirect($_SERVER['REQUEST_URI']); exit(); } diff --git a/index.php b/resources/index.php similarity index 100% rename from index.php rename to resources/index.php diff --git a/screenshot.png b/resources/screenshot.png similarity index 100% rename from screenshot.png rename to resources/screenshot.png diff --git a/style.css b/resources/style.css similarity index 100% rename from style.css rename to resources/style.css diff --git a/resources/views/partials/content-single.blade.php b/resources/views/partials/content-single.blade.php index 653804b4e6..ff5aea1e86 100644 --- a/resources/views/partials/content-single.blade.php +++ b/resources/views/partials/content-single.blade.php @@ -9,5 +9,5 @@ - @php(comments_template('/resources/views/partials/comments.blade.php')) + @php(comments_template('/partials/comments.blade.php')) diff --git a/yarn.lock b/yarn.lock index cbf7ea363d..b19051b7b4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -37,10 +37,6 @@ acorn-object-spread@^1.0.0: dependencies: acorn "^3.1.0" -acorn@4.0.4: - version "4.0.4" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.4.tgz#17a8d6a7a6c4ef538b814ec9abac2779293bf30a" - acorn@^2.1.0, acorn@^2.4.0: version "2.7.0" resolved "https://registry.yarnpkg.com/acorn/-/acorn-2.7.0.tgz#ab6e7d9d886aaca8b085bc3312b79a198433f0e7" @@ -49,10 +45,14 @@ acorn@^3.0.4, acorn@^3.1.0, acorn@^3.3.0: version "3.3.0" resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a" -acorn@^4.0.3, acorn@^4.0.4: +acorn@^4.0.3: version "4.0.11" resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.11.tgz#edcda3bd937e7556410d42ed5860f67399c794c0" +acorn@^5.0.0, acorn@^5.0.1: + version "5.0.3" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.0.3.tgz#c460df08491463f028ccb82eab3730bf01087b3d" + adjust-sourcemap-loader@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/adjust-sourcemap-loader/-/adjust-sourcemap-loader-1.1.0.tgz#412d92404eb61e4113635012cba53a33d008e0e2" @@ -74,8 +74,8 @@ ajv-keywords@^1.0.0, ajv-keywords@^1.1.1: resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-1.5.1.tgz#314dd0a4b3368fad3dfcdc54ede6171b886daf3c" ajv@^4.11.2, ajv@^4.7.0, ajv@^4.9.1: - version "4.11.5" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.5.tgz#b6ee74657b993a01dce44b7944d56f485828d5bd" + version "4.11.6" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.6.tgz#947e93049790942b2a2d60a8289b28924d39f987" dependencies: co "^4.6.0" json-stable-stringify "^1.0.1" @@ -149,8 +149,8 @@ arr-diff@^2.0.0: arr-flatten "^1.0.1" arr-flatten@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.0.1.tgz#e5ffe54d45e19f32f216e91eb99c8ce892bb604b" + version "1.0.2" + resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.0.2.tgz#1ec1e63439c54f67d6f72bb4299c3d4f73b2d996" array-differ@^1.0.0: version "1.0.0" @@ -233,8 +233,8 @@ async@1.5.2: resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a" async@^2.1.2, async@^2.1.5: - version "2.2.0" - resolved "https://registry.yarnpkg.com/async/-/async-2.2.0.tgz#c324eba010a237e4fbd55a12dee86367d5c0ef32" + version "2.3.0" + resolved "https://registry.yarnpkg.com/async/-/async-2.3.0.tgz#1013d1051047dd320fe24e494d5c66ecaf6147d9" dependencies: lodash "^4.14.0" @@ -406,8 +406,8 @@ bootstrap@^4.0.0-alpha.6: tether "^1.4.0" brace-expansion@^1.0.0: - version "1.1.6" - resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.6.tgz#7197d7eaa9b87e648390ea61fc66c84427420df9" + version "1.1.7" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.7.tgz#3effc3c50e000531fb720eaff80f0ae8ef23cf59" dependencies: balanced-match "^0.4.1" concat-map "0.0.1" @@ -528,7 +528,7 @@ browserify-zlib@^0.1.4: dependencies: pako "~0.2.0" -browserslist@^1.0.1, browserslist@^1.5.2, browserslist@^1.7.6: +browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.6: version "1.7.7" resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-1.7.7.tgz#0bd76704258be829b2398bb50e4b62d1a166b0b9" dependencies: @@ -601,7 +601,7 @@ buffer-crc32@~0.2.3: version "0.2.13" resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242" -buffer-shims@^1.0.0: +buffer-shims@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/buffer-shims/-/buffer-shims-1.0.0.tgz#9978ce317388c649ad8793028c3477ef044a8b51" @@ -668,21 +668,21 @@ camelcase@^3.0.0: resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a" camelcase@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.0.0.tgz#8b0f90d44be5e281b903b9887349b92595ef07f2" + version "4.1.0" + resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd" caniuse-api@^1.5.2: - version "1.5.3" - resolved "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-1.5.3.tgz#5018e674b51c393e4d50614275dc017e27c4a2a2" + version "1.6.1" + resolved "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-1.6.1.tgz#b534e7c734c4f81ec5fbe8aca2ad24354b962c6c" dependencies: - browserslist "^1.0.1" - caniuse-db "^1.0.30000346" - lodash.memoize "^4.1.0" - lodash.uniq "^4.3.0" + browserslist "^1.3.6" + caniuse-db "^1.0.30000529" + lodash.memoize "^4.1.2" + lodash.uniq "^4.5.0" -caniuse-db@^1.0.30000346, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639: - version "1.0.30000646" - resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000646.tgz#c724b90d61df24286e015fc528d062073c00def4" +caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639: + version "1.0.30000655" + resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000655.tgz#e40b6287adc938848d6708ef83d65b5f54ac1874" capture-stack-trace@^1.0.0: version "1.0.0" @@ -1061,9 +1061,9 @@ css-color-names@0.0.4: version "0.0.4" resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.4.tgz#808adc2e79cf84738069b646cb20ec27beb629e0" -css-loader@^0.27.3: - version "0.27.3" - resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-0.27.3.tgz#69ab6f47b69bfb1b5acee61bac2aab14302ff0dc" +css-loader@^0.28.0: + version "0.28.0" + resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-0.28.0.tgz#417cfa9789f8cde59a30ccbf3e4da7a806889bad" dependencies: babel-code-frame "^6.11.0" css-selector-tokenizer "^0.7.0" @@ -1453,8 +1453,8 @@ ee-first@1.1.1: resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" electron-to-chromium@^1.2.7: - version "1.3.2" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.2.tgz#b8ce5c93b308db0e92f6d0435c46ddec8f6363ab" + version "1.3.3" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.3.tgz#651eb63fe89f39db70ffc8dbd5d9b66958bc6a0e" elliptic@^6.0.0: version "6.4.0" @@ -1480,12 +1480,18 @@ encodeurl@~1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.1.tgz#79e3d58655346909fe6f0f45a5de68103b294d20" -end-of-stream@1.0.0, end-of-stream@^1.0.0: +end-of-stream@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.0.0.tgz#d4596e702734a93e40e9af864319eabd99ff2f0e" dependencies: once "~1.3.0" +end-of-stream@^1.0.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.0.tgz#7a90d833efda6cfa6eac0f4949dbb0fad3a63206" + dependencies: + once "^1.4.0" + engine.io-client@1.8.0: version "1.8.0" resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-1.8.0.tgz#7b730e4127414087596d9be3c88d2bc5fdb6cf5c" @@ -1638,9 +1644,9 @@ eslint-import-resolver-node@^0.2.0: object-assign "^4.0.1" resolve "^1.1.6" -eslint-loader@^1.7.0: - version "1.7.0" - resolved "https://registry.yarnpkg.com/eslint-loader/-/eslint-loader-1.7.0.tgz#9813e77046730191ab399938732dff7960c639cb" +eslint-loader@^1.7.1: + version "1.7.1" + resolved "https://registry.yarnpkg.com/eslint-loader/-/eslint-loader-1.7.1.tgz#50b158dd6272dcefb97e984254837f81a5802ce0" dependencies: find-cache-dir "^0.1.1" loader-fs-cache "^1.0.0" @@ -1671,9 +1677,9 @@ eslint-plugin-import@^2.2.0: minimatch "^3.0.3" pkg-up "^1.0.0" -eslint@^3.18.0: - version "3.18.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-3.18.0.tgz#647e985c4ae71502d20ac62c109f66d5104c8a4b" +eslint@^3.19.0: + version "3.19.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-3.19.0.tgz#c8fc6201c7f40dd08941b87c085767386a679acc" dependencies: babel-code-frame "^6.16.0" chalk "^1.1.3" @@ -1712,10 +1718,10 @@ eslint@^3.18.0: user-home "^2.0.0" espree@^3.4.0: - version "3.4.0" - resolved "https://registry.yarnpkg.com/espree/-/espree-3.4.0.tgz#41656fa5628e042878025ef467e78f125cb86e1d" + version "3.4.1" + resolved "https://registry.yarnpkg.com/espree/-/espree-3.4.1.tgz#28a83ab4aaed71ed8fe0f5efe61b76a05c13c4d2" dependencies: - acorn "4.0.4" + acorn "^5.0.1" acorn-jsx "^3.0.0" esprima@^2.6.0, esprima@^2.7.1: @@ -1908,9 +1914,9 @@ file-entry-cache@^2.0.0: flat-cache "^1.2.1" object-assign "^4.0.1" -file-loader@^0.10.1: - version "0.10.1" - resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-0.10.1.tgz#815034119891fc6441fb5a64c11bc93c22ddd842" +file-loader@^0.11.1: + version "0.11.1" + resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-0.11.1.tgz#6b328ee1234a729e4e47d36375dd6d35c0e1db84" dependencies: loader-utils "^1.0.2" @@ -2014,8 +2020,8 @@ forever-agent@~0.6.1: resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" form-data@~2.1.1: - version "2.1.2" - resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.1.2.tgz#89c3534008b97eada4cbb157d58f6f5df025eae4" + version "2.1.4" + resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.1.4.tgz#33c183acf193276ecaa98143a69e94bfee1750d1" dependencies: asynckit "^0.4.0" combined-stream "^1.0.5" @@ -2374,8 +2380,8 @@ hawk@~3.1.3: sntp "1.x.x" hmac-drbg@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.0.tgz#3db471f45aae4a994a0688322171f51b8b91bee5" + version "1.0.1" + resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1" dependencies: hash.js "^1.0.3" minimalistic-assert "^1.0.0" @@ -2386,8 +2392,8 @@ hoek@2.x.x: resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed" hosted-git-info@^2.1.4: - version "2.4.1" - resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.4.1.tgz#4b0445e41c004a8bd1337773a4ff790ca40318c8" + version "2.4.2" + resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.4.2.tgz#0076b9f46a270506ddbaaea56496897460612a67" html-comment-regex@^1.1.0: version "1.1.1" @@ -2444,8 +2450,8 @@ ieee754@^1.1.4: resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.8.tgz#be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4" ignore@^3.2.0: - version "3.2.6" - resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.2.6.tgz#26e8da0644be0bb4cb39516f6c79f0e0f4ffe48c" + version "3.2.7" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.2.7.tgz#4810ca5f1d8eca5595213a34b94f2eb4ed926bbd" imagemin-gifsicle@^5.1.0: version "5.1.0" @@ -2585,8 +2591,8 @@ inquirer@^0.12.0: through "^2.3.6" interpret@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.0.1.tgz#d579fb7f693b858004947af39fa0db49f795602c" + version "1.0.2" + resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.0.2.tgz#f4f623f0bb7122f15f5717c8e254b8161b5c5b2d" invert-kv@^1.0.0: version "1.0.0" @@ -2869,8 +2875,8 @@ js-tokens@^3.0.0: resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.1.tgz#08e9f132484a2c45a30907e9dc4d5567b7f114d7" js-yaml@^3.4.3, js-yaml@^3.5.1: - version "3.8.2" - resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.8.2.tgz#02d3e2c0f6beab20248d412c352203827d786721" + version "3.8.3" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.8.3.tgz#33a05ec481c850c8875929166fe1beb61c728766" dependencies: argparse "^1.0.7" esprima "^3.1.1" @@ -2933,7 +2939,7 @@ json3@3.3.2: version "3.3.2" resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.2.tgz#3c0434743df93e2f5c42aee7b19bcb483575f4e1" -json5@^0.5.0: +json5@^0.5.0, json5@^0.5.1: version "0.5.1" resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821" @@ -3196,7 +3202,7 @@ lodash.map@^4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/lodash.map/-/lodash.map-4.6.0.tgz#771ec7839e3473d9c4cde28b19394c3562f4f6d3" -lodash.memoize@^4.1.0: +lodash.memoize@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe" @@ -3241,7 +3247,7 @@ lodash.templatesettings@^3.0.0: lodash._reinterpolate "^3.0.0" lodash.escape "^3.0.0" -lodash.uniq@^4.3.0: +lodash.uniq@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" @@ -3454,8 +3460,8 @@ mute-stream@0.0.5: resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.5.tgz#8fbfabb0a98a253d3184331f9e8deb7372fac6c0" nan@^2.3.0, nan@^2.3.2: - version "2.5.1" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.5.1.tgz#d5b01691253326a97a2bbee9e61c55d8d60351e2" + version "2.6.2" + resolved "https://registry.yarnpkg.com/nan/-/nan-2.6.2.tgz#e4ff34e6c95fdfb5aecc08de6596f43605a7db45" natural-compare@^1.4.0: version "1.4.0" @@ -3579,8 +3585,10 @@ normalize-package-data@^2.3.2, normalize-package-data@^2.3.4: validate-npm-package-license "^3.0.1" normalize-path@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.0.1.tgz#47886ac1662760d4261b7d979d241709d3ce3f7a" + version "2.1.1" + resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9" + dependencies: + remove-trailing-separator "^1.0.1" normalize-range@^0.1.2: version "0.1.2" @@ -3647,8 +3655,8 @@ object-component@0.0.3: resolved "https://registry.yarnpkg.com/object-component/-/object-component-0.0.3.tgz#f0c69aa50efc95b866c186f400a33769cb2f1291" object-hash@^1.1.4: - version "1.1.7" - resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-1.1.7.tgz#a8d83fdf5d4583a4e2e7ffc18e8915e08482ef52" + version "1.1.8" + resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-1.1.8.tgz#28a659cf987d96a4dabe7860289f3b5326c4a03c" object-path@^0.9.0, object-path@^0.9.2: version "0.9.2" @@ -3667,7 +3675,7 @@ on-finished@~2.3.0: dependencies: ee-first "1.1.1" -once@^1.3.0, once@^1.3.3: +once@^1.3.0, once@^1.3.3, once@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" dependencies: @@ -3694,9 +3702,9 @@ opn@4.0.2: object-assign "^4.0.1" pinkie-promise "^2.0.0" -optimize-css-assets-webpack-plugin@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/optimize-css-assets-webpack-plugin/-/optimize-css-assets-webpack-plugin-1.3.0.tgz#331b3dc7ac0b2b3597f68d18fd555f5a0c81b15c" +optimize-css-assets-webpack-plugin@^1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/optimize-css-assets-webpack-plugin/-/optimize-css-assets-webpack-plugin-1.3.1.tgz#e2f198cdf63fe92ac2e3e321f1ade8faf1b59179" dependencies: cssnano "^3.4.0" underscore "^1.8.3" @@ -3718,8 +3726,8 @@ options@>=0.0.5: resolved "https://registry.yarnpkg.com/options/-/options-0.0.6.tgz#ec22d312806bb53e731773e7cdaefcf1c643128f" optipng-bin@^3.0.0: - version "3.1.2" - resolved "https://registry.yarnpkg.com/optipng-bin/-/optipng-bin-3.1.2.tgz#18c5a3388ed5d6f1e6ef1998ab0a6bcc8bdd0ca0" + version "3.1.4" + resolved "https://registry.yarnpkg.com/optipng-bin/-/optipng-bin-3.1.4.tgz#95d34f2c488704f6fd70606bfea0c659f1d95d84" dependencies: bin-build "^2.0.0" bin-wrapper "^3.0.0" @@ -4179,8 +4187,8 @@ postcss-zindex@^2.0.1: uniqs "^2.0.0" postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0.14, postcss@^5.0.16, postcss@^5.0.2, postcss@^5.0.4, postcss@^5.0.5, postcss@^5.0.6, postcss@^5.0.8, postcss@^5.2.15, postcss@^5.2.16: - version "5.2.16" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-5.2.16.tgz#732b3100000f9ff8379a48a53839ed097376ad57" + version "5.2.17" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-5.2.17.tgz#cf4f597b864d65c8a492b2eabe9d706c879c388b" dependencies: chalk "^1.1.3" js-base64 "^2.1.9" @@ -4292,8 +4300,8 @@ range-parser@^1.0.3, range-parser@~1.2.0: resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e" rc@^1.1.2, rc@^1.1.7: - version "1.1.7" - resolved "https://registry.yarnpkg.com/rc/-/rc-1.1.7.tgz#c5ea564bb07aff9fd3a5b32e906c1d3a65940fea" + version "1.2.1" + resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.1.tgz#2e03e8e42ee450b8cb3dce65be1bf8974e1dfd95" dependencies: deep-extend "~0.4.0" ini "~1.3.0" @@ -4331,16 +4339,16 @@ read-pkg@^1.0.0: isarray "0.0.1" string_decoder "~0.10.x" -readable-stream@^2.0.0, "readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.5, readable-stream@^2.1.0, readable-stream@^2.1.4, readable-stream@^2.1.5, readable-stream@^2.2.2: - version "2.2.6" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.6.tgz#8b43aed76e71483938d12a8d46c6cf1a00b1f816" +readable-stream@^2.0.0, "readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.5, readable-stream@^2.1.4, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.2.6: + version "2.2.9" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.9.tgz#cf78ec6f4a6d1eb43d26488cac97f042e74b7fc8" dependencies: - buffer-shims "^1.0.0" + buffer-shims "~1.0.0" core-util-is "~1.0.0" inherits "~2.0.1" isarray "~1.0.0" process-nextick-args "~1.0.6" - string_decoder "~0.10.x" + string_decoder "~1.0.0" util-deprecate "~1.0.1" readable-stream@~1.1.9: @@ -4433,6 +4441,10 @@ regjsparser@^0.1.4: dependencies: jsesc "~0.5.0" +remove-trailing-separator@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.0.1.tgz#615ebb96af559552d4bf4057c8436d486ab63cc4" + repeat-element@^1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.2.tgz#ef089a178d1483baae4d93eb98b4f9e4e11d990a" @@ -4879,8 +4891,8 @@ squeak@^1.0.0: lpad-align "^1.0.1" sshpk@^1.7.0: - version "1.11.0" - resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.11.0.tgz#2d8d5ebb4a6fab28ffba37fa62a90f4a3ea59d77" + version "1.13.0" + resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.13.0.tgz#ff2a3e4fd04497555fed97b39a0fd82fafb3a33c" dependencies: asn1 "~0.2.3" assert-plus "^1.0.0" @@ -4922,12 +4934,12 @@ stream-combiner2@^1.1.1: readable-stream "^2.0.2" stream-http@^2.3.1: - version "2.6.3" - resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.6.3.tgz#4c3ddbf9635968ea2cfd4e48d43de5def2625ac3" + version "2.7.0" + resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.7.0.tgz#cec1f4e3b494bc4a81b451808970f8b20b4ed5f6" dependencies: builtin-status-codes "^3.0.0" inherits "^2.0.1" - readable-stream "^2.1.0" + readable-stream "^2.2.6" to-arraybuffer "^1.0.0" xtend "^4.0.0" @@ -4965,6 +4977,12 @@ string_decoder@^0.10.25, string_decoder@~0.10.x: version "0.10.31" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94" +string_decoder@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.0.tgz#f06f41157b664d86069f84bdbdc9b0d8ab281667" + dependencies: + buffer-shims "~1.0.0" + stringstream@~0.0.4: version "0.0.5" resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878" @@ -5238,8 +5256,8 @@ ua-parser-js@0.7.12: resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.12.tgz#04c81a99bdd5dc52263ea29d24c6bf8d4818a4bb" uglify-js@^2.8.5: - version "2.8.18" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.18.tgz#925d14bae48ab62d1883b41afe6e2261662adb8e" + version "2.8.22" + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.22.tgz#d54934778a8da14903fa29a326fb24c0ab51a1a0" dependencies: source-map "~0.5.1" yargs "~3.10.0" @@ -5427,8 +5445,8 @@ vinyl@^1.0.0: replace-ext "0.0.1" vlq@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/vlq/-/vlq-0.2.1.tgz#14439d711891e682535467f8587c5630e4222a6c" + version "0.2.2" + resolved "https://registry.yarnpkg.com/vlq/-/vlq-0.2.2.tgz#e316d5257b40b86bb43cb8d5fea5d7f54d6b0ca1" vm-browserify@0.0.4: version "0.0.4" @@ -5471,9 +5489,9 @@ webpack-dev-middleware@^1.10.1: path-is-absolute "^1.0.0" range-parser "^1.0.3" -webpack-hot-middleware@^2.17.1: - version "2.17.1" - resolved "https://registry.yarnpkg.com/webpack-hot-middleware/-/webpack-hot-middleware-2.17.1.tgz#0c8fbf6f93ff29c095d684b07ab6d6c0f2f951d7" +webpack-hot-middleware@^2.17.1, webpack-hot-middleware@^2.18.0: + version "2.18.0" + resolved "https://registry.yarnpkg.com/webpack-hot-middleware/-/webpack-hot-middleware-2.18.0.tgz#a16bb535b83a6ac94a78ac5ebce4f3059e8274d3" dependencies: ansi-html "0.0.7" html-entities "^1.2.0" @@ -5500,11 +5518,11 @@ webpack-sources@^0.2.3: source-list-map "^1.1.1" source-map "~0.5.3" -webpack@*, webpack@^2.3.1: - version "2.3.2" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-2.3.2.tgz#7d521e6f0777a3a58985c69425263fdfe977b458" +webpack@*, webpack@^2.4.1: + version "2.4.1" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-2.4.1.tgz#15a91dbe34966d8a4b99c7d656efd92a2e5a6f6a" dependencies: - acorn "^4.0.4" + acorn "^5.0.0" acorn-dynamic-import "^2.0.0" ajv "^4.7.0" ajv-keywords "^1.1.1" @@ -5512,6 +5530,7 @@ webpack@*, webpack@^2.3.1: enhanced-resolve "^3.0.0" interpret "^1.0.0" json-loader "^0.5.4" + json5 "^0.5.1" loader-runner "^2.3.0" loader-utils "^0.2.16" memory-fs "~0.4.1" @@ -5709,9 +5728,9 @@ yargs@^4.7.1: y18n "^3.2.1" yargs-parser "^2.4.1" -yargs@^7.0.2: - version "7.0.2" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.0.2.tgz#115b97df1321823e8b8648e8968c782521221f67" +yargs@^7.1.0: + version "7.1.0" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.1.0.tgz#6ba318eb16961727f5d284f8ea003e8d6154d0c8" dependencies: camelcase "^3.0.0" cliui "^3.2.0"