From de4965dd471502da811f028fdb24b343206ed74e Mon Sep 17 00:00:00 2001 From: benjtinsley Date: Thu, 18 Jan 2018 15:03:25 -0700 Subject: [PATCH 01/33] removes additional init tasks and cleans extras directory --- extras/craft/ASSETS-README.md | 27 ---- extras/craft/config/path-config.json | 29 ----- extras/craft/config/task-config.js | 32 ----- .../craft/plugins/gulprev/GulpRevPlugin.php | 51 -------- .../plugins/gulprev/templates/settings.html | 20 --- .../twigextensions/GulpRevTwigExtension.php | 113 ----------------- extras/docker/.dockerignore | 1 - extras/docker/Dockerfile | 18 --- extras/docker/README.md | 46 ------- extras/drupal/README.md | 4 - extras/drupal/THEMENAME.info.yml | 8 -- extras/drupal/THEMENAME.libraries.yml | 15 --- extras/drupal/THEMENAME.theme | 6 - .../config/install/THEMENAME.settings.yml | 12 -- extras/drupal/config/path-config.json | 34 ----- .../drupal/config/schema/THEMENAME.schema.yml | 5 - extras/drupal/config/task-config.js | 27 ---- extras/drupal/src/fonts/.gitkeep | 0 extras/drupal/src/icons/.gitkeep | 0 extras/drupal/src/images/.gitkeep | 0 extras/drupal/src/javascripts/app.js | 3 - .../drupal/src/javascripts/modules/example.js | 6 - .../drupal/src/javascripts/modules/index.js | 31 ----- extras/drupal/src/static/favicon.ico | Bin 34494 -> 0 bytes extras/drupal/src/static/logo.svg | 22 ---- extras/drupal/src/stylesheets/app.scss | 1 - .../src/stylesheets/base/_typography.scss | 3 - extras/drupal/templates/.gitkeep | 0 extras/http2/config/task-config.js | 37 ------ .../components/example-component/index.html | 8 -- extras/http2/src/html/data/global.json | 7 -- extras/http2/src/html/index.html | 13 -- .../http2/src/html/layouts/application.html | 19 --- extras/http2/src/html/macros/helpers.html | 10 -- extras/http2/src/javascripts/app.js | 5 - .../http2/src/javascripts/modules/example.js | 6 - extras/http2/src/javascripts/modules/index.js | 33 ----- .../src/stylesheets/components/README.md | 29 ----- .../example-component/_example-component.scss | 24 ---- .../components/example-component/index.scss | 6 - .../stylesheets/config/functions/_color.scss | 3 - .../http2/src/stylesheets/config/index.scss | 3 - .../src/stylesheets/config/mixins/_hover.scss | 11 -- .../stylesheets/config/variables/_colors.scss | 7 -- .../src/stylesheets/global/_headings.scss | 4 - .../http2/src/stylesheets/global/index.scss | 6 - extras/rails/ASSETS-README.md | 117 ------------------ .../rails/app/helpers/blendid_asset_helper.rb | 43 ------- extras/rails/assets/fonts/.gitkeep | 0 extras/rails/assets/icons/.gitkeep | 0 extras/rails/assets/images/.gitkeep | 13 -- extras/rails/assets/javascripts/app.js | 3 - .../assets/javascripts/modules/example.js | 6 - .../rails/assets/javascripts/modules/index.js | 31 ----- extras/rails/assets/stylesheets/app.scss | 1 - .../rails/assets/stylesheets/base/_reset.scss | 60 --------- extras/rails/config/deploy.rb.example | 9 -- extras/rails/config/initializers/blendid.rb | 8 -- extras/rails/config/path-config.json | 29 ----- extras/rails/config/task-config.js | 19 --- extras/react/README.md | 1 - extras/shopify/.gitignore | 1 - extras/shopify/README.md | 39 ------ extras/shopify/shopify_api.json.example | 5 - extras/shopify/tasks/shopify.js | 39 ------ gulpfile.js/tasks/init.js | 4 +- 66 files changed, 2 insertions(+), 1171 deletions(-) delete mode 100644 extras/craft/ASSETS-README.md delete mode 100644 extras/craft/config/path-config.json delete mode 100644 extras/craft/config/task-config.js delete mode 100755 extras/craft/craft/plugins/gulprev/GulpRevPlugin.php delete mode 100644 extras/craft/craft/plugins/gulprev/templates/settings.html delete mode 100755 extras/craft/craft/plugins/gulprev/twigextensions/GulpRevTwigExtension.php delete mode 100644 extras/docker/.dockerignore delete mode 100644 extras/docker/Dockerfile delete mode 100644 extras/docker/README.md delete mode 100644 extras/drupal/README.md delete mode 100644 extras/drupal/THEMENAME.info.yml delete mode 100644 extras/drupal/THEMENAME.libraries.yml delete mode 100644 extras/drupal/THEMENAME.theme delete mode 100644 extras/drupal/config/install/THEMENAME.settings.yml delete mode 100644 extras/drupal/config/path-config.json delete mode 100644 extras/drupal/config/schema/THEMENAME.schema.yml delete mode 100644 extras/drupal/config/task-config.js delete mode 100644 extras/drupal/src/fonts/.gitkeep delete mode 100644 extras/drupal/src/icons/.gitkeep delete mode 100644 extras/drupal/src/images/.gitkeep delete mode 100644 extras/drupal/src/javascripts/app.js delete mode 100644 extras/drupal/src/javascripts/modules/example.js delete mode 100644 extras/drupal/src/javascripts/modules/index.js delete mode 100644 extras/drupal/src/static/favicon.ico delete mode 100644 extras/drupal/src/static/logo.svg delete mode 100644 extras/drupal/src/stylesheets/app.scss delete mode 100644 extras/drupal/src/stylesheets/base/_typography.scss delete mode 100644 extras/drupal/templates/.gitkeep delete mode 100644 extras/http2/config/task-config.js delete mode 100644 extras/http2/src/html/components/example-component/index.html delete mode 100644 extras/http2/src/html/data/global.json delete mode 100644 extras/http2/src/html/index.html delete mode 100644 extras/http2/src/html/layouts/application.html delete mode 100644 extras/http2/src/html/macros/helpers.html delete mode 100644 extras/http2/src/javascripts/app.js delete mode 100644 extras/http2/src/javascripts/modules/example.js delete mode 100644 extras/http2/src/javascripts/modules/index.js delete mode 100644 extras/http2/src/stylesheets/components/README.md delete mode 100644 extras/http2/src/stylesheets/components/example-component/_example-component.scss delete mode 100644 extras/http2/src/stylesheets/components/example-component/index.scss delete mode 100644 extras/http2/src/stylesheets/config/functions/_color.scss delete mode 100644 extras/http2/src/stylesheets/config/index.scss delete mode 100644 extras/http2/src/stylesheets/config/mixins/_hover.scss delete mode 100644 extras/http2/src/stylesheets/config/variables/_colors.scss delete mode 100644 extras/http2/src/stylesheets/global/_headings.scss delete mode 100644 extras/http2/src/stylesheets/global/index.scss delete mode 100644 extras/rails/ASSETS-README.md delete mode 100644 extras/rails/app/helpers/blendid_asset_helper.rb delete mode 100644 extras/rails/assets/fonts/.gitkeep delete mode 100644 extras/rails/assets/icons/.gitkeep delete mode 100644 extras/rails/assets/images/.gitkeep delete mode 100644 extras/rails/assets/javascripts/app.js delete mode 100644 extras/rails/assets/javascripts/modules/example.js delete mode 100644 extras/rails/assets/javascripts/modules/index.js delete mode 100644 extras/rails/assets/stylesheets/app.scss delete mode 100644 extras/rails/assets/stylesheets/base/_reset.scss delete mode 100644 extras/rails/config/deploy.rb.example delete mode 100644 extras/rails/config/initializers/blendid.rb delete mode 100644 extras/rails/config/path-config.json delete mode 100644 extras/rails/config/task-config.js delete mode 100644 extras/react/README.md delete mode 100644 extras/shopify/.gitignore delete mode 100644 extras/shopify/README.md delete mode 100644 extras/shopify/shopify_api.json.example delete mode 100644 extras/shopify/tasks/shopify.js diff --git a/extras/craft/ASSETS-README.md b/extras/craft/ASSETS-README.md deleted file mode 100644 index d0bdabb15..000000000 --- a/extras/craft/ASSETS-README.md +++ /dev/null @@ -1,27 +0,0 @@ -# Blendid on Craft - -## Gulp Rev Craft Plugin -Include the proper gulp-revisioned version of an asset in your Twig templates with this plugin. - -### Usage: - -```twig - -``` - -The output of the Twig filter defaults to the given string/path unless `rev-manifest.json` exists. When `rev-manifest.json` exists, then the string is replaced with the revisioned asset path. - - -### Important Notes: -* By default, the plugin looks for your `rev-manifest.json` file in `/public/assets/rev-manifest.json`. -* To customize the path to your `rev-manifest.json`, go to `/admin/settings/plugins/gulprev` in the Craft Admin and change the setting for the file path. -* Make sure `rev-manifest.json` does not exist when running development environment task (when files are not versioned). This will cause an error since the versioned file will not exist. - - -### To install: -* Drop the `gulprev` directory into `craft/plugins` within your Craft build -* Enable the plugin at `/settings/plugins` in the Craft Admin -* Change the path to your `rev-manifest.json` in plugin settings if necessary -* Start using the Twig filter in your templates - -## For additional configuration tips view the [wiki page](https://github.com/vigetlabs/blendid/wiki/Craft-Setup) diff --git a/extras/craft/config/path-config.json b/extras/craft/config/path-config.json deleted file mode 100644 index ef6af6b41..000000000 --- a/extras/craft/config/path-config.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "src": "./src", - "dest": "./public/assets", - - "javascripts": { - "src": "javascripts", - "dest": "javascripts" - }, - - "stylesheets": { - "src": "stylesheets", - "dest": "stylesheets" - }, - - "images": { - "src": "images", - "dest": "images" - }, - - "fonts": { - "src": "fonts", - "dest": "fonts" - }, - - "icons": { - "src": "icons", - "dest": "images" - } -} diff --git a/extras/craft/config/task-config.js b/extras/craft/config/task-config.js deleted file mode 100644 index 392186d91..000000000 --- a/extras/craft/config/task-config.js +++ /dev/null @@ -1,32 +0,0 @@ -module.exports = { - images : true, - fonts : true, - svgSprite : true, - stylesheets : true, - - javascripts: { - entry: { - // files paths are relative to - // javascripts.dest in path-config.json - app: ["./app.js"] - }, - // This tells webpack middleware where to - // serve js files from in development: - publicPath: "/assets/javascripts" - }, - - browserSync: { - // Update this to match your development URL - proxy: 'craft.dev', - files: ['craft/templates/**/*'] - }, - - production: { - rev: true - }, - - ghPages : false, - html : false, - static : false -} - diff --git a/extras/craft/craft/plugins/gulprev/GulpRevPlugin.php b/extras/craft/craft/plugins/gulprev/GulpRevPlugin.php deleted file mode 100755 index 29a8f906b..000000000 --- a/extras/craft/craft/plugins/gulprev/GulpRevPlugin.php +++ /dev/null @@ -1,51 +0,0 @@ - array(AttributeType::String, 'default' => '/assets') - ); - } - - public function getSettingsHtml() - { - if(craft()->request->getPath() == 'settings/plugins') - { - return true; - } - - return craft()->templates->render('gulprev/settings', array( - 'settings' => $this->getSettings() - )); - } -} \ No newline at end of file diff --git a/extras/craft/craft/plugins/gulprev/templates/settings.html b/extras/craft/craft/plugins/gulprev/templates/settings.html deleted file mode 100644 index b8b67e167..000000000 --- a/extras/craft/craft/plugins/gulprev/templates/settings.html +++ /dev/null @@ -1,20 +0,0 @@ -{% import "_includes/forms" as forms %} -{% set title = "Gulprev Settings"|t %} - -{% set crumbs = [ - { label: "Settings"|t, url: url('settings') }, - { label: "Plugins"|t, url: url('settings/plugins') } -] %} - - -

Settings

- -{{ forms.textField({ - label: "Blendid rev-manifest.json File Location"|t, - id: 'gulprev-path', - name: 'gulprev_path', - placeholder: '/', - instructions: 'The directory path (within the public folder) where the rev-manifest file can be found. For example, a path of "/assets" means the file exists at `/public/assets/rev-manifest.json`.'|t, - value: settings.gulprev_path, - errors: settings.getErrors('gulprev_path') -}) }} \ No newline at end of file diff --git a/extras/craft/craft/plugins/gulprev/twigextensions/GulpRevTwigExtension.php b/extras/craft/craft/plugins/gulprev/twigextensions/GulpRevTwigExtension.php deleted file mode 100755 index 1ca7621f8..000000000 --- a/extras/craft/craft/plugins/gulprev/twigextensions/GulpRevTwigExtension.php +++ /dev/null @@ -1,113 +0,0 @@ -plugins->getPlugin('gulprev')->getSettings(); - $this->base_path = $this->getBasePath($settings); - } - - public function getName() - { - return 'gulpRev'; - } - - public function getFilters() - { - return array( - 'gulp_rev' => new Twig_Filter_Method($this, 'gulpRev') - ); - } - - public function getBasePath($settings) - { - if (!$settings || $settings->gulprev_path === '') { - return '/'; - } - - $path = $settings->gulprev_path; - - // if the path doesn't start with a /, add one - if (substr($path, 0, 1) !== '/') { - $path = '/' . $path; - } - - // if the path doesn't end with a /, add one - if (substr($path, -1) !== '/') { - $path .= '/'; - } - - return $path; - } - - public function stripBasePath($path) - { - if ($this->base_path !== '/') { - // take off the starting slash - $base_path = substr($this->base_path, 1); - - // remove base path and any possible double-slashes - $path = str_replace($base_path, '', $path); - $path = str_replace('//', '/', $path); - - return $path; - } else { - // strip off starting slash if it exists - if (substr($path, 0, 1) === '/') { - $path = substr($path, 1); - } - - return $path; - } - } - - public function addBasePath($path) - { - return $this->base_path . $path; - } - - /** - * The "gulp_rev" filter checks a manifest file to properly rev assets. - * - * Usage: {{ "assets/stylesheets/app.css" | gulp_rev }} - */ - public function gulpRev($file) - { - static $manifest = null; - - $path = $this->stripBasePath($file); - $manifest_path = $_SERVER['DOCUMENT_ROOT']; - $manifest_path .= $this->base_path; - $manifest_path .= 'rev-manifest.json'; - - // looking for rev-manifest file in public folder - // and storing the contents of the file - if (is_null($manifest) && file_exists($manifest_path)) { - $manifest = json_decode(file_get_contents($manifest_path), true); - } - - // Find the revved version path of the file in the manifest - if (isset($manifest[$path])) { - $path = $manifest[$path]; - } - - // We remove, then re-add the base path since it's not in - // the keys for each file in the manifest file - $path = $this->addBasePath($path); - return $path; - } -} \ No newline at end of file diff --git a/extras/docker/.dockerignore b/extras/docker/.dockerignore deleted file mode 100644 index b512c09d4..000000000 --- a/extras/docker/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -node_modules \ No newline at end of file diff --git a/extras/docker/Dockerfile b/extras/docker/Dockerfile deleted file mode 100644 index 703bf7a9d..000000000 --- a/extras/docker/Dockerfile +++ /dev/null @@ -1,18 +0,0 @@ -FROM node:4.6.1 -MAINTAINER You - -RUN mkdir /app - -WORKDIR /app - -COPY package.json ./ - -RUN ["npm", "install"] - -COPY karma.conf.js ./ -COPY gulpfile.js/ ./gulpfile.js - -# If you don't plan to deploy this container to production, you can comment this line out, and instead just mount src and public as volumes. -COPY src/ ./src - -CMD ["npm", "run", "gulp", "production"] diff --git a/extras/docker/README.md b/extras/docker/README.md deleted file mode 100644 index 71ed848ce..000000000 --- a/extras/docker/README.md +++ /dev/null @@ -1,46 +0,0 @@ -# Gulp Starter on Docker - -This extra allows you to run gulp-starter in a Docker container. You can use the included development server, or use Docker to manage assets for another server environment, which may or may not also use Docker. - -## Requirements - -Requires [Docker](https://www.docker.com/products/overview), naturally. - -## Usage - -### In development -```bash -git clone https://github.com/vigetlabs/gulp-starter.git MyApp -cd MyApp -cp ./extras/docker/Dockerfile . -cp ./extras/docker/.dockerignore . -docker build -t myapp . -docker run -it --rm \ - -v "$PWD"/src:/app/src \ - -v "$PWD"/public:/app/public \ - -p 3000:3000 \ - myapp \ - npm start -``` -Browse to [http://localhost:3000](http://localhost:3000). - -### As part of an automated build -```bash -docker run --rm myrepo/myimage:mytag npm run gulp production -``` - -If you want to use this to process front-end assets for a different server environment, you can do that too. In the Browsersync section of [config.json](https://github.com/davidham/gulp-starter/blob/master/gulpfile.js/config.json), set Browsersync to proxy your app server. Here's an example pointing at a Rails app: - -```json -"browserSync": { - "proxy": "http://app:3000", - "ghostMode": false, - "port": "8080", - "ui": { - "port": "8081" - }, - "files": "./app/views/**/*" -} -``` - -In this example `app` is the name of the Rails service from a `docker-compose.yml` file (sold separately). diff --git a/extras/drupal/README.md b/extras/drupal/README.md deleted file mode 100644 index d49cb89b6..000000000 --- a/extras/drupal/README.md +++ /dev/null @@ -1,4 +0,0 @@ -# Blendid on Drupal - -### Important Notes: -* The theme foldername is used as the basename to rename folders and config files. diff --git a/extras/drupal/THEMENAME.info.yml b/extras/drupal/THEMENAME.info.yml deleted file mode 100644 index e03413ee7..000000000 --- a/extras/drupal/THEMENAME.info.yml +++ /dev/null @@ -1,8 +0,0 @@ -name: Drupal 8 Starter -type: theme -description: 'A default Drupal 8.x core basetheme configured with Blendid' -core: 8.x -base theme: stable - -libraries: - - THEMENAME/global-styling diff --git a/extras/drupal/THEMENAME.libraries.yml b/extras/drupal/THEMENAME.libraries.yml deleted file mode 100644 index 8d85a6a63..000000000 --- a/extras/drupal/THEMENAME.libraries.yml +++ /dev/null @@ -1,15 +0,0 @@ -global-styling: - css: - theme: - public/stylesheets/app.css: {} - js: - public/javascripts/app.js: {} - dependencies: - - core/jquery - - core/drupal - -# Examples of Library syntax -# typekit: -# header: true -# js: -# //use.typekit.net/TYPEKIT_ID.js: { every_page: true } diff --git a/extras/drupal/THEMENAME.theme b/extras/drupal/THEMENAME.theme deleted file mode 100644 index bf1aca66f..000000000 --- a/extras/drupal/THEMENAME.theme +++ /dev/null @@ -1,6 +0,0 @@ -disappear! - - js - -- - // modules/disappear.js - export default class Disappear { - constructor(el) { - el.style.display = 'none' - } - } -*/ diff --git a/extras/drupal/src/static/favicon.ico b/extras/drupal/src/static/favicon.ico deleted file mode 100644 index 42625665d1fc6e3394e8a884589b47eea0bed150..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 34494 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 XWlB%KUp?eNDtHAm*%mF5ZMFUfz=m4b diff --git a/extras/drupal/src/static/logo.svg b/extras/drupal/src/static/logo.svg deleted file mode 100644 index 7af098302..000000000 --- a/extras/drupal/src/static/logo.svg +++ /dev/null @@ -1,22 +0,0 @@ - - - - - logo - - - - - - - - - - - - - diff --git a/extras/drupal/src/stylesheets/app.scss b/extras/drupal/src/stylesheets/app.scss deleted file mode 100644 index ac643b9f4..000000000 --- a/extras/drupal/src/stylesheets/app.scss +++ /dev/null @@ -1 +0,0 @@ -@import "base/typography"; diff --git a/extras/drupal/src/stylesheets/base/_typography.scss b/extras/drupal/src/stylesheets/base/_typography.scss deleted file mode 100644 index 9d23ceb08..000000000 --- a/extras/drupal/src/stylesheets/base/_typography.scss +++ /dev/null @@ -1,3 +0,0 @@ -body { - font-family: sans-serif; -} diff --git a/extras/drupal/templates/.gitkeep b/extras/drupal/templates/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/extras/http2/config/task-config.js b/extras/http2/config/task-config.js deleted file mode 100644 index 31a285f3d..000000000 --- a/extras/http2/config/task-config.js +++ /dev/null @@ -1,37 +0,0 @@ -var globImporter = require('node-sass-glob-importer'); - -module.exports = { - html : true, - images : true, - fonts : true, - static : true, - svgSprite : true, - ghPages : true, - stylesheets : true, - - javascripts: { - entry: { - // files paths are relative to - // javascripts.dest in path-config.json - app: ["./app.js"] - } - }, - - stylesheets: { - sass: { - importer: globImporter() - } - }, - - browserSync: { - server: { - // should match `dest` in - // path-config.json - baseDir: 'public' - } - }, - - production: { - rev: true - } -} diff --git a/extras/http2/src/html/components/example-component/index.html b/extras/http2/src/html/components/example-component/index.html deleted file mode 100644 index 7cb1c0c6a..000000000 --- a/extras/http2/src/html/components/example-component/index.html +++ /dev/null @@ -1,8 +0,0 @@ -{%- import 'macros/helpers.html' as macros -%} -{{ macros.css('example-component') }} - -
-

{{ text }}

-

{{ caveat }}

-

{{ link }}

-
diff --git a/extras/http2/src/html/data/global.json b/extras/http2/src/html/data/global.json deleted file mode 100644 index 39bbe9e35..000000000 --- a/extras/http2/src/html/data/global.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "message": "HTTP/2 Blendid!", - "text": "This module is styled using HTTP/2 multiplexing. Check out the inspector to see the link tag inserted right above my parent div.", - "caveat": "Note: this should only be used if your server is configured for HTTP/2, otherwise you are sending needless requests.", - "link": "Read more about Blendid & HTTP/2 here", - "linkUrl": "https://www.viget.com/articles/blendid-http-2-upgrade" -} diff --git a/extras/http2/src/html/index.html b/extras/http2/src/html/index.html deleted file mode 100644 index b49b5728b..000000000 --- a/extras/http2/src/html/index.html +++ /dev/null @@ -1,13 +0,0 @@ -{# - Nunjucks Templating! - Homepage: https://mozilla.github.io/nunjucks/ - Docs: https://mozilla.github.io/nunjucks/api.html -#} - -{% extends 'layouts/application.html' %} - -{% block content %} -

{{ message }}

- - {% include 'components/example-component/index.html' %} -{% endblock %} diff --git a/extras/http2/src/html/layouts/application.html b/extras/http2/src/html/layouts/application.html deleted file mode 100644 index ab4907692..000000000 --- a/extras/http2/src/html/layouts/application.html +++ /dev/null @@ -1,19 +0,0 @@ -{%- import 'macros/helpers.html' as macros -%} - - - - - - {% block title %}{{ title }}{% endblock %} - - - {% include "shared/app-icons.html" %} - {% block head %}{% endblock %} - - - {% block content %}{% endblock %} - {% block javascript %} - - {% endblock %} - - diff --git a/extras/http2/src/html/macros/helpers.html b/extras/http2/src/html/macros/helpers.html deleted file mode 100644 index 7dfbb5275..000000000 --- a/extras/http2/src/html/macros/helpers.html +++ /dev/null @@ -1,10 +0,0 @@ -{% macro sprite(id, viewBox, classes) %} - {% set viewBox = viewBox or "0 0 1 1"%} - - - -{% endmacro %} - -{% macro css(stylesheet) -%} - -{%- endmacro %} diff --git a/extras/http2/src/javascripts/app.js b/extras/http2/src/javascripts/app.js deleted file mode 100644 index 75b9ac661..000000000 --- a/extras/http2/src/javascripts/app.js +++ /dev/null @@ -1,5 +0,0 @@ -// es6-promise/auto needed to fulfil promises for the `import()` statement in modules/index.js -import 'es6-promise/auto' -import './modules' - -console.log(`app.js has loaded!`) diff --git a/extras/http2/src/javascripts/modules/example.js b/extras/http2/src/javascripts/modules/example.js deleted file mode 100644 index 5140ed366..000000000 --- a/extras/http2/src/javascripts/modules/example.js +++ /dev/null @@ -1,6 +0,0 @@ -export default class Example { - constructor(el) { - this.el = el - console.log(el.textContent, '- From the example module') - } -} diff --git a/extras/http2/src/javascripts/modules/index.js b/extras/http2/src/javascripts/modules/index.js deleted file mode 100644 index 626a2e7d3..000000000 --- a/extras/http2/src/javascripts/modules/index.js +++ /dev/null @@ -1,33 +0,0 @@ -/* - Automatically instantiates modules based on data-attributes - specifying module file-names. -*/ - -const moduleElements = document.querySelectorAll('[data-module]') - -for (var i = 0; i < moduleElements.length; i++) { - const el = moduleElements[i] - const name = el.getAttribute('data-module') - - import(`./${name}`).then(Module => { - new Module.default(el) - }); -} - -/* - Usage: - ====== - - html - ---- - - - js - -- - // modules/disappear.js - export default class Disappear { - constructor(el) { - el.style.display = 'none' - } - } -*/ diff --git a/extras/http2/src/stylesheets/components/README.md b/extras/http2/src/stylesheets/components/README.md deleted file mode 100644 index c0d8fde66..000000000 --- a/extras/http2/src/stylesheets/components/README.md +++ /dev/null @@ -1,29 +0,0 @@ -# HTTP2 component styles - -HTTP/2 allows for multiplexing, which allows you to sprinkle your CSS files in where they are needed, rather than loading them all in one big CSS file on the initial session to your application. - -A recommended way to approach this is for each HTML component (within `src/html/components`) you create a corresponding CSS component within this directory (`src/stylesheets/components`). The CSS component only loads when the HTML template is built on page (see *Using component styles in your HTML templates* below on how to do this). - -Every CSS component should import the config files (variables, mixins and functions) so that anything defined there can be used to calculate values within the component. - -## Organizing your stylesheets directory -Standard component directory structure should include an index file that imports the config files as well as any files in the directory, usually just one that is either named `_base.scss` or `_[component-name].scss` for easier fuzzy finder location. - -For example: - -``` -/components - | - /example-component - | | - | index.scss // imports config and any underscored files in this directory - | _example-component.scss // has all the styles for this component - | - /another-component - | - index.scss - // etc -``` - -## Using component styles in your HTML templates -Using the `css()` macro defined in `src/html/macros/helpers.html` will allow you to easily pull in the styles defined for that component inline. To use simply call `{{ macros.css('example-component') }}` before writing any HTML in the template and it will find pull in the *index file* of that directory. diff --git a/extras/http2/src/stylesheets/components/example-component/_example-component.scss b/extras/http2/src/stylesheets/components/example-component/_example-component.scss deleted file mode 100644 index 023b825a1..000000000 --- a/extras/http2/src/stylesheets/components/example-component/_example-component.scss +++ /dev/null @@ -1,24 +0,0 @@ -// example base level component file - -.example-component { - padding: 15px; - border: 1px dashed color(neon-magenta); - - p { - color: color(text-black); - font-size: 18px; - font-family: Helvetica, Arial, sans-serif; - } - - strong { - color: color(bright-pink); - } - - a { - color: color(text-black); - - @include hover { - color: color(electric-green); - } - } -} diff --git a/extras/http2/src/stylesheets/components/example-component/index.scss b/extras/http2/src/stylesheets/components/example-component/index.scss deleted file mode 100644 index 9339935ea..000000000 --- a/extras/http2/src/stylesheets/components/example-component/index.scss +++ /dev/null @@ -1,6 +0,0 @@ -// Pull in all global variables, mixins and functions -// for use in this component -@import "../../config/index"; - -// Pull in all partials in this module's folder -@import "_*.scss" diff --git a/extras/http2/src/stylesheets/config/functions/_color.scss b/extras/http2/src/stylesheets/config/functions/_color.scss deleted file mode 100644 index 98c380729..000000000 --- a/extras/http2/src/stylesheets/config/functions/_color.scss +++ /dev/null @@ -1,3 +0,0 @@ -@function color($key) { - @return map-get($colors, $key); -} diff --git a/extras/http2/src/stylesheets/config/index.scss b/extras/http2/src/stylesheets/config/index.scss deleted file mode 100644 index 8aaeb0512..000000000 --- a/extras/http2/src/stylesheets/config/index.scss +++ /dev/null @@ -1,3 +0,0 @@ -@import "variables/*"; -@import "mixins/*"; -@import "functions/*"; diff --git a/extras/http2/src/stylesheets/config/mixins/_hover.scss b/extras/http2/src/stylesheets/config/mixins/_hover.scss deleted file mode 100644 index 10e9d0ccf..000000000 --- a/extras/http2/src/stylesheets/config/mixins/_hover.scss +++ /dev/null @@ -1,11 +0,0 @@ -@mixin hover { - a:hover &, - a:focus &, - button:hover &, - button:focus &, - &:hover, - &:focus { - @content; - outline: none; - } -} diff --git a/extras/http2/src/stylesheets/config/variables/_colors.scss b/extras/http2/src/stylesheets/config/variables/_colors.scss deleted file mode 100644 index f0bbfc783..000000000 --- a/extras/http2/src/stylesheets/config/variables/_colors.scss +++ /dev/null @@ -1,7 +0,0 @@ -$colors: ( - bright-pink: #F71256, - vivid-blue: #0066cc, - electric-green: #12EE33, - neon-magenta: #AE11FE, - text-black: #1F1D1D -); diff --git a/extras/http2/src/stylesheets/global/_headings.scss b/extras/http2/src/stylesheets/global/_headings.scss deleted file mode 100644 index 495ff3eed..000000000 --- a/extras/http2/src/stylesheets/global/_headings.scss +++ /dev/null @@ -1,4 +0,0 @@ -h1 { - color: color(text-black); - font-family: "Arial Black", Gadget, sans-serif; -} diff --git a/extras/http2/src/stylesheets/global/index.scss b/extras/http2/src/stylesheets/global/index.scss deleted file mode 100644 index 997d68cf4..000000000 --- a/extras/http2/src/stylesheets/global/index.scss +++ /dev/null @@ -1,6 +0,0 @@ -// Pull in all global variables, mixins and functions -// for use globally -@import "../config/index"; - -// Pull in all partials in the global directory -@import "_*.scss"; diff --git a/extras/rails/ASSETS-README.md b/extras/rails/ASSETS-README.md deleted file mode 100644 index 02899ccc0..000000000 --- a/extras/rails/ASSETS-README.md +++ /dev/null @@ -1,117 +0,0 @@ -# Gulp Starter on Rails -```bash -yarn run blendid -- init-rails -``` - -Using gulp-starter with Rails (instead of the built in asset pipeline) is actually pretty easy. This directory contains the extra pieces that get put in place by the `init-rails` task. - -## Overview -Firstly, note that we're going to leave the existing asset pipeline in place. Many gems rely on it (e.g, Active Admin), and it's a good idea to keep it around. That said, it's important to keep it separated. We won't be mixing gulp-generated assets with rails generated ones. - -Source files should be in a `src` directory in the root of the project, **not** in `app/assets`. You'll also no longer be using the built in Rails asset helpers like `javascript_include_tag` and the like. Instead, you'll use a set of **blendid_asset_helpers** with regular markup. - -#### app/helpers/blendid_asset_helper.rb -In production (`yarn run blendid -- build`), filenames get hashed so you can cache them forever. When the file or any of it's referenced assets changes, the hash changes. This works just like the Rails asset pipeline, and we have similar helpers to ensure that the correct filenames are referenced in production: - -```ruby -blendid_asset_path('image/asset.jpg') # -> /image/logo-n39o4orb81.png -blendid_js_path('app.js') # -> /javascripts/app-f43e9abc11.js -blendid_css_path('app.css') # -> /stylesheets/app-d29e4cdb76.css -blendid_image_path('logo.png') # -> /images/logo-n39o4orb81.png -``` - -So instead of this: - -```erb -<%= image_tag 'logo.png', alt: 'logo' %> -``` - -You would do this: -```erb -logo -``` - -##### Sprite helper -There's also a `<%= icon 'id' %>` helper included for rendering svg icons generated from the `svgSpriteTask` task. Modify as needed. - -#### config/initializers/gulp.rb -The asset path helpers check for the existence a rev-manifest.json file, generated by the `build` tasks. It may look something like this: - -```json -{ - "javascripts/app.js": "app-f43e9abc11.js", - "stylesheets/app.css": "app-d29e4cdb76.css" -} -``` -And so on. This initializer file reads and caches the object in production. In development, the file is constantly checked for and read. The asset helpers read this and find strings matching the key, and replace them with their hashed value. - -#### What about my gem assets and Sprockets manifest files? -For things like Active Admin that rely on the asset pipeline (Sprockets), continue usin g Sprockets manifest files (`application.js`, `application.css`, etc.) and `//=include` your gem asset dependencies there. You'll also use the existing Rails helpers to include these files on the page. - -``` -<%= javascript_include_tag 'application' %> -``` - -In some cases, this means you may have two JS files on your page. One containing *only* your gem-installed assets, and one for your bundles compiled with webpack. I try to avoid using gem assets where possible though, and usually just have my webpack bundle on the page. - -You may be thinking, "couldn't you still bundle them together, either by including Gulp complied files in the sprockets manifest, or vice versa?" The answer is, yes, technically, but we've been down that road, and it's not a good one to travel. Trust me on this—it's better to keep them separate. - - -## Deploying -### Heroku -Heroku makes deploying SUPER easy, but there are a couple of things you'll need to do to get this running. - -Since we're using Ruby (to run Rails) AND Node (to compile our assets with Gulp) in our setup, we need both running on our server. Heroku will automatically detect ONE of these at a time based on the presence of a `Gemfile` or `package.json`, but to get both running simultaneously, we need to [specifiy heroku-buildback-multi as your buildpack](https://github.com/ddollar/heroku-buildpack-multi). This enables us to specify multiple custom buildpacks in a `.buildpacks` file. -``` -https://github.com/heroku/heroku-buildpack-nodejs.git -https://github.com/orlando/heroku-buildpack-ruby.git -``` -(see: https://github.com/vigetlabs/gulp-rails-pipeline/issues/6#issuecomment-128444639) - -Add the following `postinstall` script to your scripts property in `package.json`: -``` - "postinstall": "yarn run production" -``` -OR set up a different way to tell Heroku to run this task when deploying (this is not the only way). - -Now, when we deploy to Heroku, first `yarn install` will run, then our `postinstall` script specified in `package.json`, and then `bundle install` will run. - -Take note of the following: -```rb - #production.rb line 25 - config.serve_static_files = ENV['RAILS_SERVE_STATIC_FILES'].present? -``` -Heroku requires `config.serve_static_files` to be enabled, so be sure to either add `RAILS_SERVE_STATIC_FILES` as a config var in your Heroku settings, or manually set this to true in your `production.rb` file. - -#### A note on devDependencies -You'll either need to make sure all dependencies accessed during the production gulp task are included in `dependencies` rather than `devDependencies` or do the following: - -> Npm reads configuration from any environment variables beginning with NPM_CONFIG. We set production=true by default to install dependencies only. If you would like to install additional devDependencies, you can disable this behavior: -``` -$ heroku config:set NPM_CONFIG_PRODUCTION=false -``` - -[https://devcenter.heroku.com/articles/nodejs-support#customizing-the-build-process]() - -### Capistrano - -All we need to do is add a task to run `yarn install` before we compile the assets. - -The example below shows an example of using [nvm](https://github.com/creationix/nvm) (node version manager) to use the specified node version for your application. - -```rb -# ./config/deploy.rb - -before "deploy:assets:precompile", "deploy:yarn_install" - -namespace :deploy do - desc "Run yarn install" - task :yarn_install do - invoke_command "bash -c '. /home/deploy/.nvm/nvm.sh && cd #{release_path} && yarn install'" - end -end -``` - -## Further reading - -This blog post gives some additional reasoning (note though that some methods detailed in the post are outdated): [viget.com/extend/gulp-rails-asset-pipeline](http://viget.com/extend/gulp-rails-asset-pipeline) diff --git a/extras/rails/app/helpers/blendid_asset_helper.rb b/extras/rails/app/helpers/blendid_asset_helper.rb deleted file mode 100644 index d2cac8e82..000000000 --- a/extras/rails/app/helpers/blendid_asset_helper.rb +++ /dev/null @@ -1,43 +0,0 @@ -module BlendidAssetHelper - def blendid_asset_path(path, type = nil) - root = ASSET_PATH_CONFIG['dest'].gsub(/(.*)public\//, '/') - asset_path = type ? File.join(ASSET_PATH_CONFIG[type]['dest'], path) : path - if rev_manifest - raise "#{asset_path} not found in rev_manifest.json. Fix path or try rebuilding with `yarn run blendid -- build` from `/client_side`." if rev_manifest[asset_path].nil? - asset_path = rev_manifest[asset_path] - end - File.absolute_path(File.join(root, asset_path), '/') - end - - def blendid_js_path(path) - blendid_asset_path(path, 'javascripts') - end - - def blendid_css_path(path) - blendid_asset_path(path, 'stylesheets') - end - - def blendid_image_path(path) - blendid_asset_path(path, 'images') - end - - def icon(id, label = false, classes = "", viewBox = "0 0 24 24") - svg = <<-ICON - - - - ICON - svg.html_safe - end - - private - - def rev_manifest - if Rails.env.development? - JSON.parse(File.read(REV_MANIFEST_PATH)) if File.exist?(REV_MANIFEST_PATH) - else - # In production, use the manifest cached in initializers/blendid.rb - REV_MANIFEST if defined?(REV_MANIFEST) - end - end -end diff --git a/extras/rails/assets/fonts/.gitkeep b/extras/rails/assets/fonts/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/extras/rails/assets/icons/.gitkeep b/extras/rails/assets/icons/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/extras/rails/assets/images/.gitkeep b/extras/rails/assets/images/.gitkeep deleted file mode 100644 index f7e58856a..000000000 --- a/extras/rails/assets/images/.gitkeep +++ /dev/null @@ -1,13 +0,0 @@ -# Image Assets - -If you are using images (jpgs, pngs, gifs, svgs, etc.), this is the place to put them. - -If you don't plan using images, feel free to delete this folder and the `tasks.images` config in `gulpfile.js/config.json`. - -### Tasks and Files -``` -gulpfile.js/tasks/images -``` -The image task will copy them over to the destination specified in `config.json`. - -This task formerly ran everything through image-min. This is a pretty heavy package, and not a task that really needs to be run every time. I recommend installing [imagemin-cli](https://github.com/imagemin/imagemin-cli) globally and manually running it on your source files from time to time, or use a tool like [ImageOptim](https://imageoptim.com) and [ImageAlpha](https://pngmini.com/). diff --git a/extras/rails/assets/javascripts/app.js b/extras/rails/assets/javascripts/app.js deleted file mode 100644 index 17e1660c2..000000000 --- a/extras/rails/assets/javascripts/app.js +++ /dev/null @@ -1,3 +0,0 @@ -import './modules' - -console.log(`app.js has loaded!`) diff --git a/extras/rails/assets/javascripts/modules/example.js b/extras/rails/assets/javascripts/modules/example.js deleted file mode 100644 index 5140ed366..000000000 --- a/extras/rails/assets/javascripts/modules/example.js +++ /dev/null @@ -1,6 +0,0 @@ -export default class Example { - constructor(el) { - this.el = el - console.log(el.textContent, '- From the example module') - } -} diff --git a/extras/rails/assets/javascripts/modules/index.js b/extras/rails/assets/javascripts/modules/index.js deleted file mode 100644 index 4333cce86..000000000 --- a/extras/rails/assets/javascripts/modules/index.js +++ /dev/null @@ -1,31 +0,0 @@ -/* - Automatically instantiates modules based on data-attrubiutes - specifying module file-names. -*/ - -const moduleElements = document.querySelectorAll('[data-module]') - -for (var i = 0; i < moduleElements.length; i++) { - const el = moduleElements[i] - const name = el.getAttribute('data-module') - const Module = require(`./${name}`).default - new Module(el) -} - -/* - Usage: - ====== - - html - ---- - - - js - -- - // modules/disappear.js - export default class Disappear { - constructor(el) { - el.style.display = none - } - } -*/ diff --git a/extras/rails/assets/stylesheets/app.scss b/extras/rails/assets/stylesheets/app.scss deleted file mode 100644 index 14ac6a1ff..000000000 --- a/extras/rails/assets/stylesheets/app.scss +++ /dev/null @@ -1 +0,0 @@ -@import "base/reset"; diff --git a/extras/rails/assets/stylesheets/base/_reset.scss b/extras/rails/assets/stylesheets/base/_reset.scss deleted file mode 100644 index 47c3939d3..000000000 --- a/extras/rails/assets/stylesheets/base/_reset.scss +++ /dev/null @@ -1,60 +0,0 @@ -// https://css-tricks.com/inheriting-box-sizing-probably-slightly-better-best-practice/ -html { - box-sizing: border-box; -} - -*, *:before, *:after { - box-sizing: inherit; -} - -/* http://meyerweb.com/eric/tools/css/reset/ - v2.0 | 20110126 - License: none (public domain) -*/ - -html, body, div, span, applet, object, iframe, -h1, h2, h3, h4, h5, h6, p, blockquote, pre, -a, abbr, acronym, address, big, cite, code, -del, dfn, em, img, ins, kbd, q, s, samp, -small, strike, strong, sub, sup, tt, var, -b, u, i, center, -dl, dt, dd, ol, ul, li, -fieldset, form, label, legend, -table, caption, tbody, tfoot, thead, tr, th, td, -article, aside, canvas, details, embed, -figure, figcaption, footer, header, hgroup, -menu, nav, output, ruby, section, summary, -time, mark, audio, video { - margin: 0; - padding: 0; - border: 0; - font-size: 100%; - font: inherit; - vertical-align: baseline; -} -/* HTML5 display-role reset for older browsers */ -article, aside, details, figcaption, figure, -footer, header, hgroup, menu, nav, section { - display: block; -} -body { - line-height: 1; -} -ol, ul { - list-style: none; -} -blockquote, q { - quotes: none; -} -blockquote:before, blockquote:after, -q:before, q:after { - content: ''; - content: none; -} -table { - border-collapse: collapse; - border-spacing: 0; -} -button { - cursor: pointer -} diff --git a/extras/rails/config/deploy.rb.example b/extras/rails/config/deploy.rb.example deleted file mode 100644 index 2f901d303..000000000 --- a/extras/rails/config/deploy.rb.example +++ /dev/null @@ -1,9 +0,0 @@ -# Using Capistrano? Use this file -before "deploy:assets:precompile", "deploy:blendid_build" - -namespace :deploy do - desc "Install front end dependencies and compile for production with Blendid" - task :blendid_build do - invoke_command "bash -c '. /home/deploy/.nvm/nvm.sh && cd #{release_path} && yarn install && yarn run blendid -- build'" - end -end diff --git a/extras/rails/config/initializers/blendid.rb b/extras/rails/config/initializers/blendid.rb deleted file mode 100644 index 3fff1b1ef..000000000 --- a/extras/rails/config/initializers/blendid.rb +++ /dev/null @@ -1,8 +0,0 @@ -ASSET_PATH_CONFIG = JSON.parse(File.read('config/path-config.json')) -REV_MANIFEST_PATH = File.join(ASSET_PATH_CONFIG['dest'].gsub("..", "."), 'rev-manifest.json') - -if File.exist?(REV_MANIFEST_PATH) - REV_MANIFEST = JSON.parse(File.read(REV_MANIFEST_PATH)) -elsif !Rails.env.development? && !Rails.env.test? - raise "rev-manifest.json can not be found at path: #{REV_MANIFEST_PATH} and is required in non-development environments" -end diff --git a/extras/rails/config/path-config.json b/extras/rails/config/path-config.json deleted file mode 100644 index dca190bfc..000000000 --- a/extras/rails/config/path-config.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "src": "./assets", - "dest": "./public/assets", - - "javascripts": { - "src": "javascripts", - "dest": "javascripts" - }, - - "stylesheets": { - "src": "stylesheets", - "dest": "stylesheets" - }, - - "images": { - "src": "images", - "dest": "images" - }, - - "fonts": { - "src": "fonts", - "dest": "fonts" - }, - - "icons": { - "src": "icons", - "dest": "images" - } -} diff --git a/extras/rails/config/task-config.js b/extras/rails/config/task-config.js deleted file mode 100644 index 2d659f502..000000000 --- a/extras/rails/config/task-config.js +++ /dev/null @@ -1,19 +0,0 @@ -module.exports = { - html : false, - images : true, - fonts : true, - svgSprite : true, - stylesheets : true, - - browserSync: { - proxy: 'localhost:3000', - files: ['app/**/*'], - }, - - javascripts: { - publicPath: '/assets/javascripts', - entry: { - app: ['./app.js'] - } - } -} diff --git a/extras/react/README.md b/extras/react/README.md deleted file mode 100644 index fdf702fb0..000000000 --- a/extras/react/README.md +++ /dev/null @@ -1 +0,0 @@ -Coming soon... \ No newline at end of file diff --git a/extras/shopify/.gitignore b/extras/shopify/.gitignore deleted file mode 100644 index 165cd19a2..000000000 --- a/extras/shopify/.gitignore +++ /dev/null @@ -1 +0,0 @@ -shopify_api.json diff --git a/extras/shopify/README.md b/extras/shopify/README.md deleted file mode 100644 index a95f23cb8..000000000 --- a/extras/shopify/README.md +++ /dev/null @@ -1,39 +0,0 @@ -# Gulp Shopify Upload Task - -Using gulp-starter with Shopify creates a simple workflow that makes iteration loops fairly tight. This directory contains the extra pieces you'll need to get going. - -## Overview - -It is expected that you're working with a Shopify Theme which should have a folder structure that resembles the following: - -``` -myproject - ├── assets - ├── config - ├── gulpfile.js - ├── layout - ├── locales - ├── snippets - ├── src (your uncompiled source files) - └── templates -``` - -#### Dependencies - - npm install gulp-shopify-upload --save-dev - -#### Gulp Tasks - -This example contains two gulp tasks: `shopifywatch` and `shopifydeploy` defined in `gulpfile.js/tasks/shopify.js`. The watch task starts a watching process that monitors at all Shopify directories and uploads saved files (whether they have changed or not). The deploy task simply deploys all files at once. - -Not depicted in this example is the integration of these gulp tasks with your configured task pipelines. It is up to you to add `shopifywatch` to a list of tasks executed during development, and `shopifydeploy` to a deploy task. - -**One Caveat**: It is true that, during development, you will actually be deploying (uploading) files to the Shopify server that holds your theme files, overwriting what's there. Keep this in mind! Always develop against a test theme on a dev Shopify project and if you're working with a team, take care not to overwrite eachother's work. - -#### API Credentials - -In order to upload files, the gulp plugin requires your store's API key and API password, along with the store URL. As you can see in `.gitignore`, it is recommended that you ignore the file with the credentials filled in, and only store the example file in source control. Here's the procedure for setting this up (you probably want to include these instructions in _your_ project's README). - -1. Copy `shopify_api.json.example` and rename it to `shopify_api.json` in the root directory of your project -2. Fill in the fields with your store's information -3. Make sure to add `shopify_api.json` to your `.gitignore` so that your secret key isn't stored in source control diff --git a/extras/shopify/shopify_api.json.example b/extras/shopify/shopify_api.json.example deleted file mode 100644 index 9123e5174..000000000 --- a/extras/shopify/shopify_api.json.example +++ /dev/null @@ -1,5 +0,0 @@ -{ - "api_key": "FILL ME IN", - "api_password": "FILL ME IN", - "store_url": "yourdomain.myshopify.com" -} diff --git a/extras/shopify/tasks/shopify.js b/extras/shopify/tasks/shopify.js deleted file mode 100644 index 2cf538ab2..000000000 --- a/extras/shopify/tasks/shopify.js +++ /dev/null @@ -1,39 +0,0 @@ -var gulp = require('gulp') -var notify = require('gulp-notify') -var watch = require('gulp-watch') -var gulpShopify = require('gulp-shopify-upload') -var pkg = require('../../shopify_api.json') -var handleErrors = require('../lib/handleErrors') - -gulp.task('shopifywatch', function() { - return watch('./+(assets|config|layout|snippets|templates|locales)/**') - .on('error', handleErrors) - .pipe( - gulpShopify( - pkg.api_key, - pkg.api_password, - pkg.store_url, - null - ) - ) - .pipe(notify({ - message: '<%= file.relative %> uploaded.' - })); -}); - -gulp.task('shopifydeploy', function() { - return gulp.src('./+(assets|config|layout|snippets|templates|locales)/**') - .on('error', handleErrors) - .pipe( - gulpShopify( - pkg.api_key, - pkg.api_password, - pkg.store_url, - null - ) - ) - .pipe(notify({ - message: 'Shopify deploy complete.', - onLast: true - })); -}); diff --git a/gulpfile.js/tasks/init.js b/gulpfile.js/tasks/init.js index 6fc66ffa1..5b4da26b2 100644 --- a/gulpfile.js/tasks/init.js +++ b/gulpfile.js/tasks/init.js @@ -5,8 +5,8 @@ var projectPath = require('../lib/projectPath') var merge = require('merge-stream') gulp.task('init', function() { - var defaultStream = gulp.src(['extras/default/**/*', 'extras/default/**/.*']) - .pipe(gulp.dest(projectPath())) + var defaultStream = gulp.src(['extras/default/*']) + .pipe(gulp.dest(process.env.PWD)) var configStream = gulp.src(['gulpfile.js/path-config.json', 'gulpfile.js/task-config.js']) .pipe(gulp.dest(projectPath('config'))) From 3052a0df415698ad7a4e3e857b2838c2b90ac2f2 Mon Sep 17 00:00:00 2001 From: benjtinsley Date: Thu, 18 Jan 2018 15:04:09 -0700 Subject: [PATCH 02/33] updates babel-preset-es2015 to babel-preset-env [updates #524] --- gulpfile.js/lib/task-defaults.js | 3 +- package.json | 2 +- yarn.lock | 297 ++++++++++++++++++++----------- 3 files changed, 192 insertions(+), 110 deletions(-) diff --git a/gulpfile.js/lib/task-defaults.js b/gulpfile.js/lib/task-defaults.js index a78ccdc1b..d5d75b80e 100644 --- a/gulpfile.js/lib/task-defaults.js +++ b/gulpfile.js/lib/task-defaults.js @@ -20,7 +20,7 @@ module.exports = { exclude: /node_modules/ }, babel: { - presets: [["es2015", { "modules": false }], 'stage-1'] + presets: [["env", { "modules": false }], 'stage-1'] }, development: {}, production: { @@ -92,4 +92,3 @@ module.exports = { } } } - diff --git a/package.json b/package.json index f1fd2a52e..3c4c6d067 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,6 @@ "ansi-colors": "^1.0.1", "babel-core": "^6.25.0", "babel-loader": "^7.1.1", - "babel-preset-es2015": "^6.24.1", "babel-preset-stage-1": "^6.24.1", "browser-sync": "^2.18.8", "del": "2.2.2", @@ -68,6 +67,7 @@ "webpack-hot-middleware": "^2.18.2" }, "devDependencies": { + "babel-preset-env": "^1.6.1", "chai": "^3.5.0", "mocha": "3.2.0" } diff --git a/yarn.lock b/yarn.lock index 5a6797236..dc8fbde20 100644 --- a/yarn.lock +++ b/yarn.lock @@ -328,6 +328,14 @@ babel-code-frame@^6.22.0: esutils "^2.0.2" js-tokens "^3.0.0" +babel-code-frame@^6.26.0: + version "6.26.0" + resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b" + dependencies: + chalk "^1.1.3" + esutils "^2.0.2" + js-tokens "^3.0.2" + babel-core@^6.24.1, babel-core@^6.25.0: version "6.25.0" resolved "https://registry.npmjs.org/babel-core/-/babel-core-6.25.0.tgz#7dd42b0463c742e9d5296deb3ec67a9322dad729" @@ -383,7 +391,7 @@ babel-helper-builder-binary-assignment-operator-visitor@^6.24.1: babel-helper-call-delegate@^6.24.1: version "6.24.1" - resolved "https://registry.npmjs.org/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz#ece6aacddc76e41c3461f88bfc575bd0daa2df8d" + resolved "https://registry.yarnpkg.com/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz#ece6aacddc76e41c3461f88bfc575bd0daa2df8d" dependencies: babel-helper-hoist-variables "^6.24.1" babel-runtime "^6.22.0" @@ -391,13 +399,13 @@ babel-helper-call-delegate@^6.24.1: babel-types "^6.24.1" babel-helper-define-map@^6.24.1: - version "6.24.1" - resolved "https://registry.npmjs.org/babel-helper-define-map/-/babel-helper-define-map-6.24.1.tgz#7a9747f258d8947d32d515f6aa1c7bd02204a080" + version "6.26.0" + resolved "https://registry.yarnpkg.com/babel-helper-define-map/-/babel-helper-define-map-6.26.0.tgz#a5f56dab41a25f97ecb498c7ebaca9819f95be5f" dependencies: babel-helper-function-name "^6.24.1" - babel-runtime "^6.22.0" - babel-types "^6.24.1" - lodash "^4.2.0" + babel-runtime "^6.26.0" + babel-types "^6.26.0" + lodash "^4.17.4" babel-helper-explode-assignable-expression@^6.24.1: version "6.24.1" @@ -435,25 +443,25 @@ babel-helper-get-function-arity@^6.24.1: babel-helper-hoist-variables@^6.24.1: version "6.24.1" - resolved "https://registry.npmjs.org/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz#1ecb27689c9d25513eadbc9914a73f5408be7a76" + resolved "https://registry.yarnpkg.com/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz#1ecb27689c9d25513eadbc9914a73f5408be7a76" dependencies: babel-runtime "^6.22.0" babel-types "^6.24.1" babel-helper-optimise-call-expression@^6.24.1: version "6.24.1" - resolved "https://registry.npmjs.org/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz#f7a13427ba9f73f8f4fa993c54a97882d1244257" + resolved "https://registry.yarnpkg.com/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz#f7a13427ba9f73f8f4fa993c54a97882d1244257" dependencies: babel-runtime "^6.22.0" babel-types "^6.24.1" babel-helper-regex@^6.24.1: - version "6.24.1" - resolved "https://registry.npmjs.org/babel-helper-regex/-/babel-helper-regex-6.24.1.tgz#d36e22fab1008d79d88648e32116868128456ce8" + version "6.26.0" + resolved "https://registry.yarnpkg.com/babel-helper-regex/-/babel-helper-regex-6.26.0.tgz#325c59f902f82f24b74faceed0363954f6495e72" dependencies: - babel-runtime "^6.22.0" - babel-types "^6.24.1" - lodash "^4.2.0" + babel-runtime "^6.26.0" + babel-types "^6.26.0" + lodash "^4.17.4" babel-helper-remap-async-to-generator@^6.24.1: version "6.24.1" @@ -467,7 +475,7 @@ babel-helper-remap-async-to-generator@^6.24.1: babel-helper-replace-supers@^6.24.1: version "6.24.1" - resolved "https://registry.npmjs.org/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz#bf6dbfe43938d17369a213ca8a8bf74b6a90ab1a" + resolved "https://registry.yarnpkg.com/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz#bf6dbfe43938d17369a213ca8a8bf74b6a90ab1a" dependencies: babel-helper-optimise-call-expression "^6.24.1" babel-messages "^6.23.0" @@ -499,7 +507,7 @@ babel-messages@^6.23.0: babel-plugin-check-es2015-constants@^6.22.0: version "6.22.0" - resolved "https://registry.npmjs.org/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz#35157b101426fd2ffd3da3f75c7d1e91835bbf8a" + resolved "https://registry.yarnpkg.com/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz#35157b101426fd2ffd3da3f75c7d1e91835bbf8a" dependencies: babel-runtime "^6.22.0" @@ -551,7 +559,7 @@ babel-plugin-transform-async-generator-functions@^6.24.1: babel-plugin-syntax-async-generators "^6.5.0" babel-runtime "^6.22.0" -babel-plugin-transform-async-to-generator@^6.24.1: +babel-plugin-transform-async-to-generator@^6.22.0, babel-plugin-transform-async-to-generator@^6.24.1: version "6.24.1" resolved "https://registry.npmjs.org/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz#6536e378aff6cb1d5517ac0e40eb3e9fc8d08761" dependencies: @@ -588,29 +596,29 @@ babel-plugin-transform-decorators@^6.24.1: babel-plugin-transform-es2015-arrow-functions@^6.22.0: version "6.22.0" - resolved "https://registry.npmjs.org/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz#452692cb711d5f79dc7f85e440ce41b9f244d221" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz#452692cb711d5f79dc7f85e440ce41b9f244d221" dependencies: babel-runtime "^6.22.0" babel-plugin-transform-es2015-block-scoped-functions@^6.22.0: version "6.22.0" - resolved "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz#bbc51b49f964d70cb8d8e0b94e820246ce3a6141" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz#bbc51b49f964d70cb8d8e0b94e820246ce3a6141" dependencies: babel-runtime "^6.22.0" -babel-plugin-transform-es2015-block-scoping@^6.24.1: - version "6.24.1" - resolved "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.24.1.tgz#76c295dc3a4741b1665adfd3167215dcff32a576" +babel-plugin-transform-es2015-block-scoping@^6.23.0: + version "6.26.0" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.26.0.tgz#d70f5299c1308d05c12f463813b0a09e73b1895f" dependencies: - babel-runtime "^6.22.0" - babel-template "^6.24.1" - babel-traverse "^6.24.1" - babel-types "^6.24.1" - lodash "^4.2.0" + babel-runtime "^6.26.0" + babel-template "^6.26.0" + babel-traverse "^6.26.0" + babel-types "^6.26.0" + lodash "^4.17.4" -babel-plugin-transform-es2015-classes@^6.24.1: +babel-plugin-transform-es2015-classes@^6.23.0: version "6.24.1" - resolved "https://registry.npmjs.org/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz#5a4c58a50c9c9461e564b4b2a3bfabc97a2584db" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz#5a4c58a50c9c9461e564b4b2a3bfabc97a2584db" dependencies: babel-helper-define-map "^6.24.1" babel-helper-function-name "^6.24.1" @@ -622,35 +630,35 @@ babel-plugin-transform-es2015-classes@^6.24.1: babel-traverse "^6.24.1" babel-types "^6.24.1" -babel-plugin-transform-es2015-computed-properties@^6.24.1: +babel-plugin-transform-es2015-computed-properties@^6.22.0: version "6.24.1" - resolved "https://registry.npmjs.org/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz#6fe2a8d16895d5634f4cd999b6d3480a308159b3" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz#6fe2a8d16895d5634f4cd999b6d3480a308159b3" dependencies: babel-runtime "^6.22.0" babel-template "^6.24.1" -babel-plugin-transform-es2015-destructuring@^6.22.0: +babel-plugin-transform-es2015-destructuring@^6.23.0: version "6.23.0" - resolved "https://registry.npmjs.org/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz#997bb1f1ab967f682d2b0876fe358d60e765c56d" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz#997bb1f1ab967f682d2b0876fe358d60e765c56d" dependencies: babel-runtime "^6.22.0" -babel-plugin-transform-es2015-duplicate-keys@^6.24.1: +babel-plugin-transform-es2015-duplicate-keys@^6.22.0: version "6.24.1" - resolved "https://registry.npmjs.org/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz#73eb3d310ca969e3ef9ec91c53741a6f1576423e" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz#73eb3d310ca969e3ef9ec91c53741a6f1576423e" dependencies: babel-runtime "^6.22.0" babel-types "^6.24.1" -babel-plugin-transform-es2015-for-of@^6.22.0: +babel-plugin-transform-es2015-for-of@^6.23.0: version "6.23.0" - resolved "https://registry.npmjs.org/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz#f47c95b2b613df1d3ecc2fdb7573623c75248691" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz#f47c95b2b613df1d3ecc2fdb7573623c75248691" dependencies: babel-runtime "^6.22.0" -babel-plugin-transform-es2015-function-name@^6.24.1: +babel-plugin-transform-es2015-function-name@^6.22.0: version "6.24.1" - resolved "https://registry.npmjs.org/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz#834c89853bc36b1af0f3a4c5dbaa94fd8eacaa8b" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz#834c89853bc36b1af0f3a4c5dbaa94fd8eacaa8b" dependencies: babel-helper-function-name "^6.24.1" babel-runtime "^6.22.0" @@ -658,53 +666,53 @@ babel-plugin-transform-es2015-function-name@^6.24.1: babel-plugin-transform-es2015-literals@^6.22.0: version "6.22.0" - resolved "https://registry.npmjs.org/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz#4f54a02d6cd66cf915280019a31d31925377ca2e" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz#4f54a02d6cd66cf915280019a31d31925377ca2e" dependencies: babel-runtime "^6.22.0" -babel-plugin-transform-es2015-modules-amd@^6.24.1: +babel-plugin-transform-es2015-modules-amd@^6.22.0, babel-plugin-transform-es2015-modules-amd@^6.24.1: version "6.24.1" - resolved "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz#3b3e54017239842d6d19c3011c4bd2f00a00d154" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz#3b3e54017239842d6d19c3011c4bd2f00a00d154" dependencies: babel-plugin-transform-es2015-modules-commonjs "^6.24.1" babel-runtime "^6.22.0" babel-template "^6.24.1" -babel-plugin-transform-es2015-modules-commonjs@^6.24.1: - version "6.24.1" - resolved "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.24.1.tgz#d3e310b40ef664a36622200097c6d440298f2bfe" +babel-plugin-transform-es2015-modules-commonjs@^6.23.0, babel-plugin-transform-es2015-modules-commonjs@^6.24.1: + version "6.26.0" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.0.tgz#0d8394029b7dc6abe1a97ef181e00758dd2e5d8a" dependencies: babel-plugin-transform-strict-mode "^6.24.1" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - babel-types "^6.24.1" + babel-runtime "^6.26.0" + babel-template "^6.26.0" + babel-types "^6.26.0" -babel-plugin-transform-es2015-modules-systemjs@^6.24.1: +babel-plugin-transform-es2015-modules-systemjs@^6.23.0: version "6.24.1" - resolved "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz#ff89a142b9119a906195f5f106ecf305d9407d23" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz#ff89a142b9119a906195f5f106ecf305d9407d23" dependencies: babel-helper-hoist-variables "^6.24.1" babel-runtime "^6.22.0" babel-template "^6.24.1" -babel-plugin-transform-es2015-modules-umd@^6.24.1: +babel-plugin-transform-es2015-modules-umd@^6.23.0: version "6.24.1" - resolved "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.1.tgz#ac997e6285cd18ed6176adb607d602344ad38468" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.1.tgz#ac997e6285cd18ed6176adb607d602344ad38468" dependencies: babel-plugin-transform-es2015-modules-amd "^6.24.1" babel-runtime "^6.22.0" babel-template "^6.24.1" -babel-plugin-transform-es2015-object-super@^6.24.1: +babel-plugin-transform-es2015-object-super@^6.22.0: version "6.24.1" - resolved "https://registry.npmjs.org/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz#24cef69ae21cb83a7f8603dad021f572eb278f8d" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz#24cef69ae21cb83a7f8603dad021f572eb278f8d" dependencies: babel-helper-replace-supers "^6.24.1" babel-runtime "^6.22.0" -babel-plugin-transform-es2015-parameters@^6.24.1: +babel-plugin-transform-es2015-parameters@^6.23.0: version "6.24.1" - resolved "https://registry.npmjs.org/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz#57ac351ab49caf14a97cd13b09f66fdf0a625f2b" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz#57ac351ab49caf14a97cd13b09f66fdf0a625f2b" dependencies: babel-helper-call-delegate "^6.24.1" babel-helper-get-function-arity "^6.24.1" @@ -713,22 +721,22 @@ babel-plugin-transform-es2015-parameters@^6.24.1: babel-traverse "^6.24.1" babel-types "^6.24.1" -babel-plugin-transform-es2015-shorthand-properties@^6.24.1: +babel-plugin-transform-es2015-shorthand-properties@^6.22.0: version "6.24.1" - resolved "https://registry.npmjs.org/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz#24f875d6721c87661bbd99a4622e51f14de38aa0" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz#24f875d6721c87661bbd99a4622e51f14de38aa0" dependencies: babel-runtime "^6.22.0" babel-types "^6.24.1" babel-plugin-transform-es2015-spread@^6.22.0: version "6.22.0" - resolved "https://registry.npmjs.org/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz#d6d68a99f89aedc4536c81a542e8dd9f1746f8d1" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz#d6d68a99f89aedc4536c81a542e8dd9f1746f8d1" dependencies: babel-runtime "^6.22.0" -babel-plugin-transform-es2015-sticky-regex@^6.24.1: +babel-plugin-transform-es2015-sticky-regex@^6.22.0: version "6.24.1" - resolved "https://registry.npmjs.org/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz#00c1cdb1aca71112cdf0cf6126c2ed6b457ccdbc" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz#00c1cdb1aca71112cdf0cf6126c2ed6b457ccdbc" dependencies: babel-helper-regex "^6.24.1" babel-runtime "^6.22.0" @@ -736,25 +744,25 @@ babel-plugin-transform-es2015-sticky-regex@^6.24.1: babel-plugin-transform-es2015-template-literals@^6.22.0: version "6.22.0" - resolved "https://registry.npmjs.org/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz#a84b3450f7e9f8f1f6839d6d687da84bb1236d8d" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz#a84b3450f7e9f8f1f6839d6d687da84bb1236d8d" dependencies: babel-runtime "^6.22.0" -babel-plugin-transform-es2015-typeof-symbol@^6.22.0: +babel-plugin-transform-es2015-typeof-symbol@^6.23.0: version "6.23.0" - resolved "https://registry.npmjs.org/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz#dec09f1cddff94b52ac73d505c84df59dcceb372" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz#dec09f1cddff94b52ac73d505c84df59dcceb372" dependencies: babel-runtime "^6.22.0" -babel-plugin-transform-es2015-unicode-regex@^6.24.1: +babel-plugin-transform-es2015-unicode-regex@^6.22.0: version "6.24.1" - resolved "https://registry.npmjs.org/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz#d38b12f42ea7323f729387f18a7c5ae1faeb35e9" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz#d38b12f42ea7323f729387f18a7c5ae1faeb35e9" dependencies: babel-helper-regex "^6.24.1" babel-runtime "^6.22.0" regexpu-core "^2.0.0" -babel-plugin-transform-exponentiation-operator@^6.24.1: +babel-plugin-transform-exponentiation-operator@^6.22.0, babel-plugin-transform-exponentiation-operator@^6.24.1: version "6.24.1" resolved "https://registry.npmjs.org/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz#2ab0c9c7f3098fa48907772bb813fe41e8de3a0e" dependencies: @@ -776,47 +784,53 @@ babel-plugin-transform-object-rest-spread@^6.22.0: babel-plugin-syntax-object-rest-spread "^6.8.0" babel-runtime "^6.22.0" -babel-plugin-transform-regenerator@^6.24.1: - version "6.24.1" - resolved "https://registry.npmjs.org/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.24.1.tgz#b8da305ad43c3c99b4848e4fe4037b770d23c418" +babel-plugin-transform-regenerator@^6.22.0: + version "6.26.0" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz#e0703696fbde27f0a3efcacf8b4dca2f7b3a8f2f" dependencies: - regenerator-transform "0.9.11" + regenerator-transform "^0.10.0" babel-plugin-transform-strict-mode@^6.24.1: version "6.24.1" - resolved "https://registry.npmjs.org/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz#d5faf7aa578a65bbe591cf5edae04a0c67020758" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz#d5faf7aa578a65bbe591cf5edae04a0c67020758" dependencies: babel-runtime "^6.22.0" babel-types "^6.24.1" -babel-preset-es2015@^6.24.1: - version "6.24.1" - resolved "https://registry.npmjs.org/babel-preset-es2015/-/babel-preset-es2015-6.24.1.tgz#d44050d6bc2c9feea702aaf38d727a0210538939" +babel-preset-env@^1.6.1: + version "1.6.1" + resolved "https://registry.yarnpkg.com/babel-preset-env/-/babel-preset-env-1.6.1.tgz#a18b564cc9b9afdf4aae57ae3c1b0d99188e6f48" dependencies: babel-plugin-check-es2015-constants "^6.22.0" + babel-plugin-syntax-trailing-function-commas "^6.22.0" + babel-plugin-transform-async-to-generator "^6.22.0" babel-plugin-transform-es2015-arrow-functions "^6.22.0" babel-plugin-transform-es2015-block-scoped-functions "^6.22.0" - babel-plugin-transform-es2015-block-scoping "^6.24.1" - babel-plugin-transform-es2015-classes "^6.24.1" - babel-plugin-transform-es2015-computed-properties "^6.24.1" - babel-plugin-transform-es2015-destructuring "^6.22.0" - babel-plugin-transform-es2015-duplicate-keys "^6.24.1" - babel-plugin-transform-es2015-for-of "^6.22.0" - babel-plugin-transform-es2015-function-name "^6.24.1" + babel-plugin-transform-es2015-block-scoping "^6.23.0" + babel-plugin-transform-es2015-classes "^6.23.0" + babel-plugin-transform-es2015-computed-properties "^6.22.0" + babel-plugin-transform-es2015-destructuring "^6.23.0" + babel-plugin-transform-es2015-duplicate-keys "^6.22.0" + babel-plugin-transform-es2015-for-of "^6.23.0" + babel-plugin-transform-es2015-function-name "^6.22.0" babel-plugin-transform-es2015-literals "^6.22.0" - babel-plugin-transform-es2015-modules-amd "^6.24.1" - babel-plugin-transform-es2015-modules-commonjs "^6.24.1" - babel-plugin-transform-es2015-modules-systemjs "^6.24.1" - babel-plugin-transform-es2015-modules-umd "^6.24.1" - babel-plugin-transform-es2015-object-super "^6.24.1" - babel-plugin-transform-es2015-parameters "^6.24.1" - babel-plugin-transform-es2015-shorthand-properties "^6.24.1" + babel-plugin-transform-es2015-modules-amd "^6.22.0" + babel-plugin-transform-es2015-modules-commonjs "^6.23.0" + babel-plugin-transform-es2015-modules-systemjs "^6.23.0" + babel-plugin-transform-es2015-modules-umd "^6.23.0" + babel-plugin-transform-es2015-object-super "^6.22.0" + babel-plugin-transform-es2015-parameters "^6.23.0" + babel-plugin-transform-es2015-shorthand-properties "^6.22.0" babel-plugin-transform-es2015-spread "^6.22.0" - babel-plugin-transform-es2015-sticky-regex "^6.24.1" + babel-plugin-transform-es2015-sticky-regex "^6.22.0" babel-plugin-transform-es2015-template-literals "^6.22.0" - babel-plugin-transform-es2015-typeof-symbol "^6.22.0" - babel-plugin-transform-es2015-unicode-regex "^6.24.1" - babel-plugin-transform-regenerator "^6.24.1" + babel-plugin-transform-es2015-typeof-symbol "^6.23.0" + babel-plugin-transform-es2015-unicode-regex "^6.22.0" + babel-plugin-transform-exponentiation-operator "^6.22.0" + babel-plugin-transform-regenerator "^6.22.0" + browserslist "^2.1.2" + invariant "^2.2.2" + semver "^5.3.0" babel-preset-stage-1@^6.24.1: version "6.24.1" @@ -857,7 +871,14 @@ babel-register@^6.24.1: mkdirp "^0.5.1" source-map-support "^0.4.2" -babel-runtime@^6.18.0, babel-runtime@^6.22.0: +babel-runtime@^6.18.0, babel-runtime@^6.26.0: + version "6.26.0" + resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe" + dependencies: + core-js "^2.4.0" + regenerator-runtime "^0.11.0" + +babel-runtime@^6.22.0: version "6.25.0" resolved "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.25.0.tgz#33b98eaa5d482bb01a8d1aa6b437ad2b01aec41c" dependencies: @@ -874,6 +895,16 @@ babel-template@^6.24.1, babel-template@^6.25.0: babylon "^6.17.2" lodash "^4.2.0" +babel-template@^6.26.0: + version "6.26.0" + resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.26.0.tgz#de03e2d16396b069f46dd9fff8521fb1a0e35e02" + dependencies: + 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@^6.24.1, babel-traverse@^6.25.0: version "6.25.0" resolved "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.25.0.tgz#2257497e2fcd19b89edc13c4c91381f9512496f1" @@ -888,7 +919,30 @@ babel-traverse@^6.24.1, babel-traverse@^6.25.0: invariant "^2.2.0" lodash "^4.2.0" -babel-types@^6.19.0, babel-types@^6.24.1, babel-types@^6.25.0: +babel-traverse@^6.26.0: + version "6.26.0" + resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.26.0.tgz#46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee" + dependencies: + 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@^6.19.0, babel-types@^6.26.0: + version "6.26.0" + resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.26.0.tgz#a3b073f94ab49eb6fa55cd65227a334380632497" + dependencies: + babel-runtime "^6.26.0" + esutils "^2.0.2" + lodash "^4.17.4" + to-fast-properties "^1.0.3" + +babel-types@^6.24.1, babel-types@^6.25.0: version "6.25.0" resolved "https://registry.npmjs.org/babel-types/-/babel-types-6.25.0.tgz#70afb248d5660e5d18f811d91c8303b54134a18e" dependencies: @@ -901,6 +955,10 @@ babylon@^6.17.2: version "6.17.4" resolved "https://registry.npmjs.org/babylon/-/babylon-6.17.4.tgz#3e8b7402b88d22c3423e137a1577883b15ff869a" +babylon@^6.18.0: + version "6.18.0" + resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3" + backo2@1.0.2: version "1.0.2" resolved "https://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947" @@ -1111,6 +1169,13 @@ browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.6: caniuse-db "^1.0.30000639" electron-to-chromium "^1.2.7" +browserslist@^2.1.2: + version "2.11.3" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.11.3.tgz#fe36167aed1bbcde4827ebfe71347a2cc70b99b2" + dependencies: + caniuse-lite "^1.0.30000792" + electron-to-chromium "^1.3.30" + bs-recipes@1.3.4: version "1.3.4" resolved "https://registry.npmjs.org/bs-recipes/-/bs-recipes-1.3.4.tgz#0d2d4d48a718c8c044769fdc4f89592dc8b69585" @@ -1188,6 +1253,10 @@ caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639: version "1.0.30000709" resolved "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000709.tgz#0b600072b7cdbbf6336a8758b71b9ad03268ede2" +caniuse-lite@^1.0.30000792: + version "1.0.30000792" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000792.tgz#d0cea981f8118f3961471afbb43c9a1e5bbf0332" + caseless@~0.12.0: version "0.12.0" resolved "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" @@ -1720,6 +1789,12 @@ debug@2.6.8, debug@^2.1.1, debug@^2.2.0: dependencies: ms "2.0.0" +debug@^2.6.8: + version "2.6.9" + resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" + dependencies: + ms "2.0.0" + decamelize@^1.0.0, decamelize@^1.1.1, decamelize@^1.1.2: version "1.2.0" resolved "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" @@ -1906,6 +1981,10 @@ electron-to-chromium@^1.2.7: version "1.3.16" resolved "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.16.tgz#d0e026735754770901ae301a21664cba45d92f7d" +electron-to-chromium@^1.3.30: + version "1.3.31" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.31.tgz#00d832cba9fe2358652b0c48a8816c8e3a037e9f" + elliptic@^6.0.0: version "6.4.0" resolved "https://registry.npmjs.org/elliptic/-/elliptic-6.4.0.tgz#cac9af8762c85836187003c8dfe193e5e2eae5df" @@ -2592,7 +2671,7 @@ global@^4.3.2: min-document "^2.19.0" process "~0.5.1" -globals@^9.0.0: +globals@^9.0.0, globals@^9.18.0: version "9.18.0" resolved "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a" @@ -3172,7 +3251,7 @@ interpret@^1.0.0: version "1.0.3" resolved "https://registry.npmjs.org/interpret/-/interpret-1.0.3.tgz#cbc35c62eeee73f19ab7b10a801511401afc0f90" -invariant@^2.2.0: +invariant@^2.2.0, invariant@^2.2.2: version "2.2.2" resolved "https://registry.npmjs.org/invariant/-/invariant-2.2.2.tgz#9e1f56ac0acdb6bf303306f338be3b204ae60360" dependencies: @@ -3414,7 +3493,7 @@ js-base64@^2.1.8, js-base64@^2.1.9: version "2.1.9" resolved "https://registry.npmjs.org/js-base64/-/js-base64-2.1.9.tgz#f0e80ae039a4bd654b5f281fc93f04a914a7fcce" -js-tokens@^3.0.0: +js-tokens@^3.0.0, js-tokens@^3.0.2: version "3.0.2" resolved "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b" @@ -3435,7 +3514,7 @@ jsesc@^1.3.0: jsesc@~0.5.0: version "0.5.0" - resolved "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d" + resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d" json-loader@^0.5.4: version "0.5.7" @@ -5187,16 +5266,20 @@ reduce-function-call@^1.0.1: balanced-match "^0.4.2" regenerate@^1.2.1: - version "1.3.2" - resolved "https://registry.npmjs.org/regenerate/-/regenerate-1.3.2.tgz#d1941c67bad437e1be76433add5b385f95b19260" + version "1.3.3" + resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.3.3.tgz#0c336d3980553d755c39b586ae3b20aa49c82b7f" regenerator-runtime@^0.10.0: version "0.10.5" resolved "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz#336c3efc1220adcedda2c9fab67b5a7955a33658" -regenerator-transform@0.9.11: - version "0.9.11" - resolved "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.9.11.tgz#3a7d067520cb7b7176769eb5ff868691befe1283" +regenerator-runtime@^0.11.0: + version "0.11.1" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9" + +regenerator-transform@^0.10.0: + version "0.10.1" + resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.10.1.tgz#1e4996837231da8b7f3cf4114d71b5691a0680dd" dependencies: babel-runtime "^6.18.0" babel-types "^6.19.0" @@ -5211,7 +5294,7 @@ regex-cache@^0.4.2: regexpu-core@^2.0.0: version "2.0.0" - resolved "https://registry.npmjs.org/regexpu-core/-/regexpu-core-2.0.0.tgz#49d038837b8dcf8bfa5b9a42139938e6ea2ae240" + resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-2.0.0.tgz#49d038837b8dcf8bfa5b9a42139938e6ea2ae240" dependencies: regenerate "^1.2.1" regjsgen "^0.2.0" @@ -5219,11 +5302,11 @@ regexpu-core@^2.0.0: regjsgen@^0.2.0: version "0.2.0" - resolved "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz#6c016adeac554f75823fe37ac05b92d5a4edb1f7" + resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.2.0.tgz#6c016adeac554f75823fe37ac05b92d5a4edb1f7" regjsparser@^0.1.4: version "0.1.5" - resolved "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz#7ee8f84dc6fa792d3fd0ae228d24bd949ead205c" + resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.1.5.tgz#7ee8f84dc6fa792d3fd0ae228d24bd949ead205c" dependencies: jsesc "~0.5.0" @@ -5981,7 +6064,7 @@ to-arraybuffer@^1.0.0: version "1.0.1" resolved "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43" -to-fast-properties@^1.0.1: +to-fast-properties@^1.0.1, to-fast-properties@^1.0.3: version "1.0.3" resolved "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47" From 90ba19f9093ffe0149b5e3f5b1b5c76ca286d8f1 Mon Sep 17 00:00:00 2001 From: benjtinsley Date: Fri, 19 Jan 2018 12:44:08 -0700 Subject: [PATCH 03/33] removes the extras directory --- extras/README.md | 4 -- extras/blendid-logo.png | Bin 5654 -> 0 bytes extras/tasks/README.md | 57 ---------------------- extras/tasks/iconFont/generateIconSass.js | 36 -------------- extras/tasks/iconFont/template.sass | 38 --------------- gulpfile.js/lib/task-defaults.js | 4 +- gulpfile.js/tasks/init.js | 4 +- {extras/default => root}/.gitignore | 0 {extras/default => root}/.nvmrc | 0 9 files changed, 5 insertions(+), 138 deletions(-) delete mode 100644 extras/README.md delete mode 100644 extras/blendid-logo.png delete mode 100644 extras/tasks/README.md delete mode 100644 extras/tasks/iconFont/generateIconSass.js delete mode 100644 extras/tasks/iconFont/template.sass rename {extras/default => root}/.gitignore (100%) rename {extras/default => root}/.nvmrc (100%) diff --git a/extras/README.md b/extras/README.md deleted file mode 100644 index 273a6a557..000000000 --- a/extras/README.md +++ /dev/null @@ -1,4 +0,0 @@ -# Extras -This folder a place for platform-specific helpers, configuration, and READMEs, as well as addtional tasks you may find helpful. The contents of a platform folder should reflect the placement of files and folders in the project directory. For example, [`extras/rails`](/gulpfile.js/extras/rails) contains `app/helpers/blendid_asset_helper.rb`, which is where the file should go in a Rails app. - -Pull requests are very welcome! diff --git a/extras/blendid-logo.png b/extras/blendid-logo.png deleted file mode 100644 index 1ceb868812ef0a89838138e1f9e5f84039397f5b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5654 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 -``` - -With mixins: -```sass -.lil-birdy-guy - +icon--twitter -``` - -```scss -.lil-birdy-guy { - @include icon--twitter; -} -``` - -```html - -``` - -*Don't forget about accessibility!* - -```html - - -
Twitter
-``` diff --git a/extras/tasks/iconFont/generateIconSass.js b/extras/tasks/iconFont/generateIconSass.js deleted file mode 100644 index 0acabaf30..000000000 --- a/extras/tasks/iconFont/generateIconSass.js +++ /dev/null @@ -1,36 +0,0 @@ -var gulp = require('gulp') -var render = require('gulp-nunjucks-render') -var rename = require('gulp-rename') -var handleErrors = require('../../lib/handleErrors') -var log = require('fancy-log') -var colors = require('ansi-colors') -var data = require('gulp-data') - -module.exports = function(config) { - return function(glyphs, options) { - log(colors.blue('Generating ' + config.sassDest + '/' + config.sassOutputName)) - render.nunjucks.configure(config.nunjucks, { watch: false }) - - return gulp.src(config.template) - .pipe(data({ - icons: glyphs.map(function(glyph) { - log(colors.green('+ adding ' + glyph.name + ' glyph')) - return { - name: glyph.name, - code: glyph.unicode[0].charCodeAt(0).toString(16).toUpperCase() - } - }), - - fontName: config.options.fontName, - fontPath: config.fontPath, - className: config.className, - comment: '// DO NOT EDIT DIRECTLY!\n //Generated by gulpfile.js/tasks/iconFont.js\n //from ' + config.template - })) - .pipe(render({ - path: config.template - })) - .on('error', handleErrors) - .pipe(rename(config.sassOutputName)) - .pipe(gulp.dest(config.sassDest)) - } -} diff --git a/extras/tasks/iconFont/template.sass b/extras/tasks/iconFont/template.sass deleted file mode 100644 index 94a111859..000000000 --- a/extras/tasks/iconFont/template.sass +++ /dev/null @@ -1,38 +0,0 @@ -// {{comment}} - -@font-face - font-family: {{fontName}} - src: url("{{fontPath}}/{{fontName}}.eot") - src: url("{{fontPath}}/{{fontName}}.eot?#iefix") format('embedded-opentype'), url("{{fontPath}}/{{fontName}}.woff") format('woff'), url("{{fontPath}}/{{fontName}}.ttf") format('truetype'), url("{{fontPath}}/{{fontName}}.svg#{{fontName}}") format('svg') - font-weight: normal - font-style: normal - -=icon($content: '') - &:before - -moz-osx-font-smoothing: grayscale - -webkit-font-smoothing: antialiased - content: $content - font-family: '{{fontName}}' - font-style: normal - font-variant: normal - font-weight: normal - line-height: 1 - speak: none - text-transform: none - @content - -.icon - +icon - -{% for icon in icons -%} -// Save variable -$icon-{{icon.name}}: "\{{icon.code}}" -// Save mixin -=icon--{{icon.name}} - +icon($icon-{{icon.name}}) - @content -// Expose as class -.icon.-{{icon.name}}:before - content: $icon-{{icon.name}} - -{% endfor %} diff --git a/gulpfile.js/lib/task-defaults.js b/gulpfile.js/lib/task-defaults.js index d5d75b80e..11d0f9ec0 100644 --- a/gulpfile.js/lib/task-defaults.js +++ b/gulpfile.js/lib/task-defaults.js @@ -20,7 +20,9 @@ module.exports = { exclude: /node_modules/ }, babel: { - presets: [["env", { "modules": false }], 'stage-1'] + presets: [["env", { + "modules": false + }], 'stage-1'] }, development: {}, production: { diff --git a/gulpfile.js/tasks/init.js b/gulpfile.js/tasks/init.js index 5b4da26b2..1b93c53c8 100644 --- a/gulpfile.js/tasks/init.js +++ b/gulpfile.js/tasks/init.js @@ -5,7 +5,7 @@ var projectPath = require('../lib/projectPath') var merge = require('merge-stream') gulp.task('init', function() { - var defaultStream = gulp.src(['extras/default/*']) + var rootStream = gulp.src(['root/*']) .pipe(gulp.dest(process.env.PWD)) var configStream = gulp.src(['gulpfile.js/path-config.json', 'gulpfile.js/task-config.js']) @@ -21,5 +21,5 @@ To start the dev server: yarn run blendid `)) - return merge(defaultStream, configStream, srcStream) + return merge(rootStream, configStream, srcStream) }) diff --git a/extras/default/.gitignore b/root/.gitignore similarity index 100% rename from extras/default/.gitignore rename to root/.gitignore diff --git a/extras/default/.nvmrc b/root/.nvmrc similarity index 100% rename from extras/default/.nvmrc rename to root/.nvmrc From 4be18d6380d8cb24aea0e162d728545d7b50f0c9 Mon Sep 17 00:00:00 2001 From: benjtinsley Date: Fri, 19 Jan 2018 15:21:16 -0700 Subject: [PATCH 04/33] removes outdated gulp-rev-napkin for one that has been maintained more recently [updates #524] --- gulpfile.js/tasks/rev/rev-assets.js | 5 +++-- gulpfile.js/tasks/rev/rev-css.js | 4 ++-- package.json | 2 +- yarn.lock | 21 +++++++++++++-------- 4 files changed, 19 insertions(+), 13 deletions(-) diff --git a/gulpfile.js/tasks/rev/rev-assets.js b/gulpfile.js/tasks/rev/rev-assets.js index 55e99152e..1c4cbead6 100644 --- a/gulpfile.js/tasks/rev/rev-assets.js +++ b/gulpfile.js/tasks/rev/rev-assets.js @@ -1,6 +1,7 @@ var gulp = require('gulp') +var path = require('path') var rev = require('gulp-rev') -var revNapkin = require('gulp-rev-napkin'); +var revDel = require('gulp-rev-delete-original') var projectPath = require('../../lib/projectPath') // 1) Add md5 hashes to assets referenced by CSS and JS files @@ -11,7 +12,7 @@ gulp.task('rev-assets', function() { return gulp.src([projectPath(PATH_CONFIG.dest,'**/*'), ignoreThese]) .pipe(rev()) .pipe(gulp.dest(PATH_CONFIG.dest)) - .pipe(revNapkin({ verbose: false, force: true })) + .pipe(revDel()) .pipe(rev.manifest(projectPath(PATH_CONFIG.dest, 'rev-manifest.json'), {merge: true})) .pipe(gulp.dest('')) }) diff --git a/gulpfile.js/tasks/rev/rev-css.js b/gulpfile.js/tasks/rev/rev-css.js index 491c310dc..d34d979ba 100644 --- a/gulpfile.js/tasks/rev/rev-css.js +++ b/gulpfile.js/tasks/rev/rev-css.js @@ -1,6 +1,6 @@ var gulp = require('gulp') var rev = require('gulp-rev') -var revNapkin = require('gulp-rev-napkin') +var revDel = require('gulp-rev-delete-original') var projectPath = require('../../lib/projectPath') // 3) Rev and compress CSS and JS files (this is done after assets, so that if a @@ -9,7 +9,7 @@ gulp.task('rev-css', function(){ return gulp.src(projectPath(PATH_CONFIG.dest,'**/*.css')) .pipe(rev()) .pipe(gulp.dest(PATH_CONFIG.dest)) - .pipe(revNapkin({verbose: false, force: true})) + .pipe(revDel()) .pipe(rev.manifest(projectPath(PATH_CONFIG.dest, 'rev-manifest.json'), {merge: true})) .pipe(gulp.dest('')) }) diff --git a/package.json b/package.json index 3c4c6d067..748d744cb 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,6 @@ "gulp-rename": "1.2.2", "gulp-replace": "^0.5.4", "gulp-rev": "7.1.2", - "gulp-rev-napkin": "0.1.0", "gulp-rev-replace": "0.4.3", "gulp-sass": "^3.1.0", "gulp-sequence": "0.4.6", @@ -69,6 +68,7 @@ "devDependencies": { "babel-preset-env": "^1.6.1", "chai": "^3.5.0", + "gulp-rev-delete-original": "^0.2.3", "mocha": "3.2.0" } } diff --git a/yarn.lock b/yarn.lock index dc8fbde20..958c29c50 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2835,13 +2835,12 @@ gulp-replace@^0.5.4: readable-stream "^2.0.1" replacestream "^4.0.0" -gulp-rev-napkin@0.1.0: - version "0.1.0" - resolved "https://registry.npmjs.org/gulp-rev-napkin/-/gulp-rev-napkin-0.1.0.tgz#e2f885e75fe72b7f04df218da9249202a62bb81b" +gulp-rev-delete-original@^0.2.3: + version "0.2.3" + resolved "https://registry.yarnpkg.com/gulp-rev-delete-original/-/gulp-rev-delete-original-0.2.3.tgz#81f3f95db3bd3a324923df6d235ae953c2ac038d" dependencies: - gulp-util "^3.0.1" - rimraf "^2.2.8" - through2 "^0.6.3" + rimraf "^2.3.4" + through2 "^0.6.5" gulp-rev-replace@0.4.3: version "0.4.3" @@ -2924,7 +2923,7 @@ gulp-svgstore@6.1.0: cheerio "0.*" gulp-util "^3.0.0" -gulp-util@>=3.0.0, gulp-util@^3.0, gulp-util@^3.0.0, gulp-util@^3.0.1, gulp-util@^3.0.6, gulp-util@^3.0.7, gulp-util@^3.0.8: +gulp-util@>=3.0.0, gulp-util@^3.0, gulp-util@^3.0.0, gulp-util@^3.0.6, gulp-util@^3.0.7, gulp-util@^3.0.8: version "3.0.8" resolved "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz#0054e1e744502e27c04c187c3ecc505dd54bbb4f" dependencies: @@ -5440,6 +5439,12 @@ rimraf@2, rimraf@^2.2.8, rimraf@^2.4.3, rimraf@^2.5.1, rimraf@^2.6.1: dependencies: glob "^7.0.5" +rimraf@^2.3.4: + version "2.6.2" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36" + dependencies: + glob "^7.0.5" + rimraf@~2.2.0: version "2.2.8" resolved "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz#e439be2aaee327321952730f99a8929e4fc50582" @@ -5997,7 +6002,7 @@ through2@^0.5.0: readable-stream "~1.0.17" xtend "~3.0.0" -through2@^0.6.0, through2@^0.6.1, through2@^0.6.3: +through2@^0.6.0, through2@^0.6.1, through2@^0.6.5: version "0.6.5" resolved "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz#41ab9c67b29d57209071410e1d7a7a968cd3ad48" dependencies: From f23c8f02ed24c99292ddee299affbf8ad1f292d8 Mon Sep 17 00:00:00 2001 From: benjtinsley Date: Fri, 19 Jan 2018 16:28:14 -0700 Subject: [PATCH 05/33] several package updates to resolve dependency warnings [updates #524] --- package.json | 10 +- yarn.lock | 806 +++++++++++++++++++++------------------------------ 2 files changed, 341 insertions(+), 475 deletions(-) diff --git a/package.json b/package.json index 748d744cb..d5abd4fc8 100644 --- a/package.json +++ b/package.json @@ -33,21 +33,19 @@ "es6-promise": "^4.1.1", "fancy-log": "^1.3.2", "gulp": "3.9.1", - "gulp-autoprefixer": "3.1.1", + "gulp-autoprefixer": "4.1.0", "gulp-changed": "^2.0.0", "gulp-cssnano": "2.1.2", - "gulp-data": "1.2.1", + "gulp-data": "1.3.1", "gulp-gh-pages": "0.5.4", "gulp-htmlmin": "3.0.0", "gulp-if": "2.0.2", "gulp-notify": "^3.0.0", - "gulp-nunjucks-render": "^2.2.1", - "gulp-rename": "1.2.2", - "gulp-replace": "^0.5.4", + "gulp-nunjucks-render": "2.2.2", "gulp-rev": "7.1.2", "gulp-rev-replace": "0.4.3", "gulp-sass": "^3.1.0", - "gulp-sequence": "0.4.6", + "gulp-sequence": "1.0.0", "gulp-sizereport": "1.2.0", "gulp-sourcemaps": "^2.6.0", "gulp-svgstore": "6.1.0", diff --git a/yarn.lock b/yarn.lock index 958c29c50..2bc1b942b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -21,11 +21,11 @@ a-sync-waterfall@^1.0.0: version "1.0.0" - resolved "https://registry.npmjs.org/a-sync-waterfall/-/a-sync-waterfall-1.0.0.tgz#38e8319d79379e24628845b53b96722b29e0e47c" + resolved "https://registry.yarnpkg.com/a-sync-waterfall/-/a-sync-waterfall-1.0.0.tgz#38e8319d79379e24628845b53b96722b29e0e47c" abbrev@1: - version "1.1.0" - resolved "https://registry.npmjs.org/abbrev/-/abbrev-1.1.0.tgz#d0554c2256636e2f56e7c2e5ad183f859428d81f" + version "1.1.1" + resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" accepts@1.3.3, accepts@~1.3.3: version "1.3.3" @@ -58,7 +58,7 @@ ajv-keywords@^2.0.0: ajv@^4.9.1: version "4.11.8" - resolved "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz#82ffb02b29e662ae53bdc20af15947706739c536" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.8.tgz#82ffb02b29e662ae53bdc20af15947706739c536" dependencies: co "^4.6.0" json-stable-stringify "^1.0.1" @@ -116,22 +116,14 @@ ansi-red@^0.1.1: dependencies: ansi-wrap "0.1.0" -ansi-regex@^0.2.0, ansi-regex@^0.2.1: - version "0.2.1" - resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz#0d8e946967a3d8143f93e24e298525fc1b2235f9" - ansi-regex@^2.0.0: version "2.1.1" - resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" ansi-regex@^3.0.0: version "3.0.0" resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998" -ansi-styles@^1.1.0: - version "1.1.0" - resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz#eaecbf66cd706882760b2f4691582b8f55d7a7de" - ansi-styles@^2.2.1: version "2.2.1" resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" @@ -148,14 +140,14 @@ ansi-wrap@0.1.0, ansi-wrap@^0.1.0: anymatch@^1.3.0: version "1.3.2" - resolved "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz#553dcb8f91e3c889845dfdba34c77721b90b9d7a" + resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.2.tgz#553dcb8f91e3c889845dfdba34c77721b90b9d7a" dependencies: micromatch "^2.1.5" normalize-path "^2.0.0" aproba@^1.0.3: - version "1.1.2" - resolved "https://registry.npmjs.org/aproba/-/aproba-1.1.2.tgz#45c6629094de4e96f693ef7eab74ae079c240fc1" + version "1.2.0" + resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" archy@^1.0.0: version "1.0.0" @@ -163,7 +155,7 @@ archy@^1.0.0: are-we-there-yet@~1.1.2: version "1.1.4" - resolved "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz#bb5dca382bb94f05e15194373d16fd3ba1ca110d" + resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz#bb5dca382bb94f05e15194373d16fd3ba1ca110d" dependencies: delegates "^1.0.0" readable-stream "^2.0.6" @@ -183,13 +175,13 @@ arr-diff@^1.0.1: arr-diff@^2.0.0: version "2.0.0" - resolved "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf" + resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf" dependencies: arr-flatten "^1.0.1" arr-flatten@^1.0.1: version "1.1.0" - resolved "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1" + resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1" arr-union@^2.0.1: version "2.1.0" @@ -205,7 +197,7 @@ array-each@^1.0.1: array-find-index@^1.0.1: version "1.0.2" - resolved "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1" + resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1" array-slice@^0.2.3: version "0.2.3" @@ -227,7 +219,7 @@ array-uniq@^1.0.1, array-uniq@^1.0.2: array-unique@^0.2.1: version "0.2.1" - resolved "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53" + resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53" arraybuffer.slice@0.0.6: version "0.0.6" @@ -239,7 +231,7 @@ arrify@^1.0.0: asap@^2.0.3: version "2.0.6" - resolved "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46" + resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46" asn1.js@^4.0.0: version "4.9.1" @@ -251,15 +243,15 @@ asn1.js@^4.0.0: asn1@~0.2.3: version "0.2.3" - resolved "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz#dac8787713c9966849fc8180777ebe9c1ddf3b86" + resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.3.tgz#dac8787713c9966849fc8180777ebe9c1ddf3b86" assert-plus@1.0.0, assert-plus@^1.0.0: version "1.0.0" - resolved "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" + resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" assert-plus@^0.2.0: version "0.2.0" - resolved "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234" + resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234" assert@^1.1.1: version "1.4.1" @@ -277,7 +269,7 @@ async-each-series@0.1.1: async-each@^1.0.0: version "1.0.1" - resolved "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d" + resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d" async-foreach@^0.1.3: version "0.1.3" @@ -295,13 +287,13 @@ async@^2.1.2: asynckit@^0.4.0: version "0.4.0" - resolved "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" + resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" atob@~1.1.0: version "1.1.3" resolved "https://registry.npmjs.org/atob/-/atob-1.1.3.tgz#95f13629b12c3a51a5d215abdce2aa9f32f80773" -autoprefixer@^6.0.0, autoprefixer@^6.3.1: +autoprefixer@^6.3.1: version "6.7.7" resolved "https://registry.npmjs.org/autoprefixer/-/autoprefixer-6.7.7.tgz#1dbd1c835658e35ce3f9984099db00585c782014" dependencies: @@ -312,13 +304,24 @@ autoprefixer@^6.0.0, autoprefixer@^6.3.1: postcss "^5.2.16" postcss-value-parser "^3.2.3" +autoprefixer@^7.0.0: + version "7.2.5" + resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-7.2.5.tgz#04ccbd0c6a61131b6d13f53d371926092952d192" + dependencies: + browserslist "^2.11.1" + caniuse-lite "^1.0.30000791" + normalize-range "^0.1.2" + num2fraction "^1.2.2" + postcss "^6.0.16" + postcss-value-parser "^3.2.3" + aws-sign2@~0.6.0: version "0.6.0" - resolved "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz#14342dd38dbcc94d0e5b87d763cd63612c0e794f" + resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.6.0.tgz#14342dd38dbcc94d0e5b87d763cd63612c0e794f" aws4@^1.2.1: version "1.6.0" - resolved "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e" + resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e" babel-code-frame@^6.22.0: version "6.22.0" @@ -969,7 +972,7 @@ balanced-match@^0.4.2: balanced-match@^1.0.0: version "1.0.0" - resolved "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" + resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" base64-arraybuffer@0.1.5: version "0.1.5" @@ -989,7 +992,7 @@ batch@0.5.3: bcrypt-pbkdf@^1.0.0: version "1.0.1" - resolved "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz#63bc5dcb61331b92bc05fd528953c33462a06f8d" + resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz#63bc5dcb61331b92bc05fd528953c33462a06f8d" dependencies: tweetnacl "^0.14.3" @@ -1008,12 +1011,8 @@ big.js@^3.1.3: resolved "https://registry.npmjs.org/big.js/-/big.js-3.1.3.tgz#4cada2193652eb3ca9ec8e55c9015669c9806978" binary-extensions@^1.0.0: - version "1.9.0" - resolved "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.9.0.tgz#66506c16ce6f4d6928a5b3cd6a33ca41e941e37b" - -binaryextensions@~1.0.0: - version "1.0.1" - resolved "https://registry.npmjs.org/binaryextensions/-/binaryextensions-1.0.1.tgz#1e637488b35b58bda5f4774bf96a5212a8c90755" + version "1.11.0" + resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.11.0.tgz#46aa1751fb6a2f93ee5e689bb1087d4b14c6c205" blob@0.0.4: version "0.0.4" @@ -1021,7 +1020,7 @@ blob@0.0.4: block-stream@*: version "0.0.9" - resolved "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a" + resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a" dependencies: inherits "~2.0.0" @@ -1035,20 +1034,20 @@ boolbase@~1.0.0: boom@2.x.x: version "2.10.1" - resolved "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz#39c8918ceff5799f83f9492a848f625add0c766f" + resolved "https://registry.yarnpkg.com/boom/-/boom-2.10.1.tgz#39c8918ceff5799f83f9492a848f625add0c766f" dependencies: hoek "2.x.x" brace-expansion@^1.0.0, brace-expansion@^1.1.7: version "1.1.8" - resolved "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz#c07b211c7c952ec1f8efd51a77ef0d1d3990a292" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.8.tgz#c07b211c7c952ec1f8efd51a77ef0d1d3990a292" dependencies: balanced-match "^1.0.0" concat-map "0.0.1" braces@^1.8.2: version "1.8.5" - resolved "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7" + resolved "https://registry.yarnpkg.com/braces/-/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7" dependencies: expand-range "^1.8.1" preserve "^0.2.0" @@ -1169,7 +1168,7 @@ browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.6: caniuse-db "^1.0.30000639" electron-to-chromium "^1.2.7" -browserslist@^2.1.2: +browserslist@^2.1.2, browserslist@^2.11.1: version "2.11.3" resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.11.3.tgz#fe36167aed1bbcde4827ebfe71347a2cc70b99b2" dependencies: @@ -1200,7 +1199,7 @@ bufferstreams@^1.1.0: builtin-modules@^1.0.0: version "1.1.1" - resolved "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f" + resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f" builtin-status-codes@^3.0.0: version "3.0.0" @@ -1219,7 +1218,7 @@ camel-case@3.0.x, camel-case@^3.0.0: camelcase-keys@^2.0.0: version "2.1.0" - resolved "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz#308beeaffdf28119051efa1d932213c91b8f92e7" + resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-2.1.0.tgz#308beeaffdf28119051efa1d932213c91b8f92e7" dependencies: camelcase "^2.0.0" map-obj "^1.0.0" @@ -1230,7 +1229,7 @@ camelcase@^1.0.2, camelcase@^1.2.1: camelcase@^2.0.0, camelcase@^2.0.1: version "2.1.1" - resolved "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f" + resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f" camelcase@^3.0.0: version "3.0.0" @@ -1253,13 +1252,13 @@ caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639: version "1.0.30000709" resolved "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000709.tgz#0b600072b7cdbbf6336a8758b71b9ad03268ede2" -caniuse-lite@^1.0.30000792: +caniuse-lite@^1.0.30000791, caniuse-lite@^1.0.30000792: version "1.0.30000792" resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000792.tgz#d0cea981f8118f3961471afbb43c9a1e5bbf0332" caseless@~0.12.0: version "0.12.0" - resolved "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" + resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" center-align@^0.1.1: version "0.1.3" @@ -1276,16 +1275,6 @@ chai@^3.5.0: deep-eql "^0.1.3" type-detect "^1.0.0" -chalk@^0.5.0: - version "0.5.1" - resolved "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz#663b3a648b68b55d04690d49167aa837858f2174" - dependencies: - ansi-styles "^1.1.0" - escape-string-regexp "^1.0.0" - has-ansi "^0.1.0" - strip-ansi "^0.3.0" - supports-color "^0.2.0" - chalk@^1.0.0, chalk@^1.1.0, chalk@^1.1.1, chalk@^1.1.3: version "1.1.3" resolved "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" @@ -1304,6 +1293,14 @@ chalk@^2.1.0: escape-string-regexp "^1.0.5" supports-color "^4.0.0" +chalk@^2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.0.tgz#b5ea48efc9c1793dccc9b4767c93914d3f2d52ba" + dependencies: + ansi-styles "^3.1.0" + escape-string-regexp "^1.0.5" + supports-color "^4.0.0" + change-case@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/change-case/-/change-case-3.0.1.tgz#ee5f5ad0415ad1ad9e8072cf49cd4cfa7660a554" @@ -1404,7 +1401,7 @@ cliui@^3.0.3, cliui@^3.2.0: strip-ansi "^3.0.1" wrap-ansi "^2.0.0" -clone-stats@^0.0.1, clone-stats@~0.0.1: +clone-stats@^0.0.1: version "0.0.1" resolved "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz#b88f94a82cf38b8791d58046ea4029ad88ca99d1" @@ -1418,7 +1415,7 @@ clone@^1.0.0, clone@^1.0.2: co@^4.6.0: version "4.6.0" - resolved "https://registry.npmjs.org/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184" + resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184" coa@~1.0.1: version "1.0.4" @@ -1428,7 +1425,7 @@ coa@~1.0.1: code-point-at@^1.0.0: version "1.1.0" - resolved "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" + resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" color-convert@^1.3.0, color-convert@^1.9.0: version "1.9.0" @@ -1476,7 +1473,7 @@ colors@~1.1.2: combined-stream@^1.0.5, combined-stream@~1.0.5: version "1.0.5" - resolved "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz#938370a57b4a51dea2c77c15d5c5fdf895164009" + resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.5.tgz#938370a57b4a51dea2c77c15d5c5fdf895164009" dependencies: delayed-stream "~1.0.0" @@ -1512,7 +1509,7 @@ component-inherit@0.0.3: concat-map@0.0.1: version "0.0.1" - resolved "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" + resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" connect-history-api-fallback@^1.1.0: version "1.3.0" @@ -1543,7 +1540,7 @@ console-browserify@^1.1.0: console-control-strings@^1.0.0, console-control-strings@~1.1.0: version "1.1.0" - resolved "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" + resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" constant-case@^2.0.0: version "2.0.0" @@ -1568,9 +1565,9 @@ core-js@^2.4.0: version "2.4.1" resolved "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz#4de911e667b0eae9124e34254b53aea6fc618d3e" -core-util-is@~1.0.0: +core-util-is@1.0.2, core-util-is@~1.0.0: version "1.0.2" - resolved "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" + resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" create-ecdh@^4.0.0: version "4.0.0" @@ -1616,7 +1613,7 @@ cross-spawn@^5.0.1: cryptiles@2.x.x: version "2.0.5" - resolved "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz#3bdfecdc608147c1c67202fa291e7dca59eaa3b8" + resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-2.0.5.tgz#3bdfecdc608147c1c67202fa291e7dca59eaa3b8" dependencies: boom "2.x.x" @@ -1720,7 +1717,7 @@ csso@~2.3.1: currently-unhandled@^0.4.1: version "0.4.1" - resolved "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea" + resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea" dependencies: array-find-index "^1.0.1" @@ -1732,7 +1729,7 @@ d@1: dashdash@^1.12.0: version "1.14.1" - resolved "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0" + resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0" dependencies: assert-plus "^1.0.0" @@ -1740,13 +1737,6 @@ date-now@^0.1.4: version "0.1.4" resolved "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b" -dateformat@^1.0.7-1.2.3: - version "1.0.12" - resolved "https://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz#9f124b67594c937ff706932e4a642cca8dbbfee9" - dependencies: - get-stdin "^4.0.1" - meow "^3.3.0" - dateformat@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/dateformat/-/dateformat-2.0.0.tgz#2743e3abb5c3fc2462e527dca445e04e9f4dee17" @@ -1783,13 +1773,13 @@ debug@2.6.4: dependencies: ms "0.7.3" -debug@2.6.8, debug@^2.1.1, debug@^2.2.0: +debug@2.6.8, debug@^2.1.1: version "2.6.8" resolved "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz#e731531ca2ede27d188222427da17821d68ff4fc" dependencies: ms "2.0.0" -debug@^2.6.8: +debug@^2.2.0, debug@^2.6.8: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" dependencies: @@ -1807,7 +1797,7 @@ deep-eql@^0.1.3: deep-extend@~0.4.0: version "0.4.2" - resolved "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz#48b699c27e334bf89f10892be432f6e4c7d34a7f" + resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.4.2.tgz#48b699c27e334bf89f10892be432f6e4c7d34a7f" defaults@^1.0.0: version "1.0.3" @@ -1833,11 +1823,11 @@ del@2.2.2: delayed-stream@~1.0.0: version "1.0.0" - resolved "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" + resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" delegates@^1.0.0: version "1.0.0" - resolved "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" + resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" depd@1.1.0: version "1.1.0" @@ -1874,6 +1864,10 @@ detect-indent@^4.0.0: dependencies: repeating "^2.0.0" +detect-libc@^1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" + detect-newline@2.X: version "2.1.0" resolved "https://registry.npmjs.org/detect-newline/-/detect-newline-2.1.0.tgz#f41f1c10be4b00e87b5f13da680759f2c5bfd3e2" @@ -1938,7 +1932,7 @@ dot-case@^2.1.0: duplexer2@0.0.2: version "0.0.2" - resolved "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz#c614dcf67e2fb14995a91711e5a617e8a60a31db" + resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.0.2.tgz#c614dcf67e2fb14995a91711e5a617e8a60a31db" dependencies: readable-stream "~1.1.9" @@ -1969,7 +1963,7 @@ eazy-logger@3.0.2: ecc-jsbn@~0.1.1: version "0.1.1" - resolved "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz#0fc73a9ed5f0d53c38193398523ef7e543777505" + resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz#0fc73a9ed5f0d53c38193398523ef7e543777505" dependencies: jsbn "~0.1.0" @@ -2081,7 +2075,7 @@ errno@^0.1.3: error-ex@^1.2.0: version "1.3.1" - resolved "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz#f855a86ce61adc4e8621c3cda21e7a7612c3a8dc" + resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.1.tgz#f855a86ce61adc4e8621c3cda21e7a7612c3a8dc" dependencies: is-arrayish "^0.2.1" @@ -2149,7 +2143,7 @@ escape-html@~1.0.3: version "1.0.3" resolved "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" -escape-string-regexp@1.0.5, escape-string-regexp@^1.0.0, escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.3, escape-string-regexp@^1.0.5: +escape-string-regexp@1.0.5, escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: version "1.0.5" resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" @@ -2220,13 +2214,13 @@ execa@^0.7.0: expand-brackets@^0.1.4: version "0.1.5" - resolved "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b" + resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b" dependencies: is-posix-bracket "^0.1.0" expand-range@^1.8.1: version "1.8.2" - resolved "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337" + resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337" dependencies: fill-range "^2.1.0" @@ -2265,17 +2259,21 @@ extend-shallow@^2.0.1: extend@^3.0.0, extend@~3.0.0: version "3.0.1" - resolved "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444" + resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444" extglob@^0.3.1: version "0.3.2" - resolved "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1" + resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1" dependencies: is-extglob "^1.0.0" -extsprintf@1.0.2: - version "1.0.2" - resolved "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz#e1080e0658e300b06294990cc70e1502235fd550" +extsprintf@1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05" + +extsprintf@^1.2.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f" fancy-log@^1.1.0: version "1.3.0" @@ -2298,11 +2296,11 @@ fast-deep-equal@^1.0.0: filename-regex@^2.0.0: version "2.0.1" - resolved "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26" + resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26" fill-range@^2.1.0: version "2.2.3" - resolved "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz#50b77dfd7e469bc7492470963699fe7a8485a723" + resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.3.tgz#50b77dfd7e469bc7492470963699fe7a8485a723" dependencies: is-number "^2.1.0" isobject "^2.0.0" @@ -2334,7 +2332,7 @@ find-index@^0.1.1: find-up@^1.0.0: version "1.1.2" - resolved "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f" dependencies: path-exists "^2.0.0" pinkie-promise "^2.0.0" @@ -2384,11 +2382,11 @@ flatten@^1.0.2: for-in@^1.0.1: version "1.0.2" - resolved "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" + resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" for-own@^0.1.4: version "0.1.5" - resolved "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce" + resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce" dependencies: for-in "^1.0.1" @@ -2400,7 +2398,7 @@ for-own@^1.0.0: forever-agent@~0.6.1: version "0.6.1" - resolved "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" + resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" fork-stream@^0.0.4: version "0.0.4" @@ -2408,7 +2406,7 @@ fork-stream@^0.0.4: form-data@~2.1.1: version "2.1.4" - resolved "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz#33c183acf193276ecaa98143a69e94bfee1750d1" + resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.1.4.tgz#33c183acf193276ecaa98143a69e94bfee1750d1" dependencies: asynckit "^0.4.0" combined-stream "^1.0.5" @@ -2440,18 +2438,18 @@ fs-extra@3.0.1: fs.realpath@^1.0.0: version "1.0.0" - resolved "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" + resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" fsevents@^1.0.0: - version "1.1.2" - resolved "https://registry.npmjs.org/fsevents/-/fsevents-1.1.2.tgz#3282b713fb3ad80ede0e9fcf4611b5aa6fc033f4" + version "1.1.3" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.1.3.tgz#11f82318f5fe7bb2cd22965a108e9306208216d8" dependencies: nan "^2.3.0" - node-pre-gyp "^0.6.36" + node-pre-gyp "^0.6.39" fstream-ignore@^1.0.5: version "1.0.5" - resolved "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.5.tgz#9c31dae34767018fe1d249b24dada67d092da105" + resolved "https://registry.yarnpkg.com/fstream-ignore/-/fstream-ignore-1.0.5.tgz#9c31dae34767018fe1d249b24dada67d092da105" dependencies: fstream "^1.0.0" inherits "2" @@ -2459,7 +2457,7 @@ fstream-ignore@^1.0.5: fstream@^1.0.0, fstream@^1.0.10, fstream@^1.0.2: version "1.0.11" - resolved "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171" + resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171" dependencies: graceful-fs "^4.1.2" inherits "~2.0.0" @@ -2472,7 +2470,7 @@ function-bind@^1.0.2: gauge@~2.7.3: version "2.7.4" - resolved "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7" + resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7" dependencies: aproba "^1.0.3" console-control-strings "^1.0.0" @@ -2507,7 +2505,7 @@ get-installed-path@^3.0.1: get-stdin@^4.0.1: version "4.0.1" - resolved "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe" + resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe" get-stream@^3.0.0: version "3.0.0" @@ -2515,7 +2513,7 @@ get-stream@^3.0.0: getpass@^0.1.1: version "0.1.7" - resolved "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa" + resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa" dependencies: assert-plus "^1.0.0" @@ -2527,14 +2525,14 @@ gift@^0.6.1: glob-base@^0.3.0: version "0.3.0" - resolved "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4" + resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4" dependencies: glob-parent "^2.0.0" is-glob "^2.0.0" glob-parent@^2.0.0: version "2.0.0" - resolved "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz#81383d72db054fcccf5336daa902f182f6edbb28" + resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-2.0.0.tgz#81383d72db054fcccf5336daa902f182f6edbb28" dependencies: is-glob "^2.0.0" @@ -2581,7 +2579,7 @@ glob2base@^0.0.12: dependencies: find-index "^0.1.1" -glob@7.0.5, glob@^7.0.0, glob@^7.0.3, glob@^7.0.5: +glob@7.0.5, glob@^7.0.0, glob@^7.0.3: version "7.0.5" resolved "https://registry.npmjs.org/glob/-/glob-7.0.5.tgz#b4202a69099bbb4d292a7c1b95b6682b67ebdc95" dependencies: @@ -2611,17 +2609,9 @@ glob@^5.0.3: once "^1.3.0" path-is-absolute "^1.0.0" -glob@~3.1.21: - version "3.1.21" - resolved "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz#d29e0a055dea5138f4d07ed40e8982e83c2066cd" - dependencies: - graceful-fs "~1.2.0" - inherits "1" - minimatch "~0.2.11" - -glob@~7.1.1: +glob@^7.0.5, glob@~7.1.1: version "7.1.2" - resolved "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15" dependencies: fs.realpath "^1.0.0" inflight "^1.0.4" @@ -2630,6 +2620,14 @@ glob@~7.1.1: once "^1.3.0" path-is-absolute "^1.0.0" +glob@~3.1.21: + version "3.1.21" + resolved "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz#d29e0a055dea5138f4d07ed40e8982e83c2066cd" + dependencies: + graceful-fs "~1.2.0" + inherits "1" + minimatch "~0.2.11" + global-modules@1.0.0, global-modules@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz#6d770f0eb523ac78164d72b5e71a8877265cc3ea" @@ -2734,13 +2732,14 @@ growly@^1.3.0: version "1.3.0" resolved "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081" -gulp-autoprefixer@3.1.1: - version "3.1.1" - resolved "https://registry.npmjs.org/gulp-autoprefixer/-/gulp-autoprefixer-3.1.1.tgz#75230051cd0d171343d783b7e9b5d1120eeef9b0" +gulp-autoprefixer@4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/gulp-autoprefixer/-/gulp-autoprefixer-4.1.0.tgz#064af73cc02cadac8ff34d0bf93ffdfb94ea12aa" dependencies: - autoprefixer "^6.0.0" - gulp-util "^3.0.0" - postcss "^5.0.4" + autoprefixer "^7.0.0" + fancy-log "^1.3.2" + plugin-error "^0.1.2" + postcss "^6.0.1" through2 "^2.0.0" vinyl-sourcemaps-apply "^0.2.0" @@ -2760,11 +2759,11 @@ gulp-cssnano@2.1.2: object-assign "^4.0.1" vinyl-sourcemaps-apply "^0.2.1" -gulp-data@1.2.1: - version "1.2.1" - resolved "https://registry.npmjs.org/gulp-data/-/gulp-data-1.2.1.tgz#a94b54de7d4f3b8ea1f40ef859749c24578cf12b" +gulp-data@1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/gulp-data/-/gulp-data-1.3.1.tgz#3304d5d1203d554d3385e42de78ee9204f61c8a2" dependencies: - gulp-util "^3.0.7" + plugin-error "^0.1.2" through2 "^2.0.0" util-extend "^1.0.1" @@ -2814,27 +2813,16 @@ gulp-notify@^3.0.0: node.extend "^1.1.6" through2 "^2.0.3" -gulp-nunjucks-render@^2.2.1: - version "2.2.1" - resolved "https://registry.npmjs.org/gulp-nunjucks-render/-/gulp-nunjucks-render-2.2.1.tgz#371c6acafe94ba9d69ce5a5fc43c1523863b10f0" +gulp-nunjucks-render@2.2.2: + version "2.2.2" + resolved "https://registry.yarnpkg.com/gulp-nunjucks-render/-/gulp-nunjucks-render-2.2.2.tgz#5958b2cf0f0501e93779d2d5646ebd6587c924ff" dependencies: - gulp-util "~2.2.0" lodash "^3.10.0" nunjucks "^3.0.0" + plugin-error "^0.1.2" + replace-ext "^1.0.0" through2 "~0.4.0" -gulp-rename@1.2.2: - version "1.2.2" - resolved "https://registry.npmjs.org/gulp-rename/-/gulp-rename-1.2.2.tgz#3ad4428763f05e2764dec1c67d868db275687817" - -gulp-replace@^0.5.4: - version "0.5.4" - resolved "https://registry.npmjs.org/gulp-replace/-/gulp-replace-0.5.4.tgz#69a67914bbd13c562bff14f504a403796aa0daa9" - dependencies: - istextorbinary "1.0.2" - readable-stream "^2.0.1" - replacestream "^4.0.0" - gulp-rev-delete-original@^0.2.3: version "0.2.3" resolved "https://registry.yarnpkg.com/gulp-rev-delete-original/-/gulp-rev-delete-original-0.2.3.tgz#81f3f95db3bd3a324923df6d235ae953c2ac038d" @@ -2872,12 +2860,11 @@ gulp-sass@^3.1.0: through2 "^2.0.0" vinyl-sourcemaps-apply "^0.2.0" -gulp-sequence@0.4.6: - version "0.4.6" - resolved "https://registry.npmjs.org/gulp-sequence/-/gulp-sequence-0.4.6.tgz#e388d64311046e05547af43035352d9495501c50" +gulp-sequence@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/gulp-sequence/-/gulp-sequence-1.0.0.tgz#862f93e6503e67c350a42948fa666953cf88ba67" dependencies: - gulp-util ">=3.0.0" - thunks "^4.5.1" + thunks "^4.9.0" gulp-sizereport@1.2.0: version "1.2.0" @@ -2923,7 +2910,7 @@ gulp-svgstore@6.1.0: cheerio "0.*" gulp-util "^3.0.0" -gulp-util@>=3.0.0, gulp-util@^3.0, gulp-util@^3.0.0, gulp-util@^3.0.6, gulp-util@^3.0.7, gulp-util@^3.0.8: +gulp-util@^3.0, gulp-util@^3.0.0, gulp-util@^3.0.6, gulp-util@^3.0.7, gulp-util@^3.0.8: version "3.0.8" resolved "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz#0054e1e744502e27c04c187c3ecc505dd54bbb4f" dependencies: @@ -2946,19 +2933,6 @@ gulp-util@>=3.0.0, gulp-util@^3.0, gulp-util@^3.0.0, gulp-util@^3.0.6, gulp-util through2 "^2.0.0" vinyl "^0.5.0" -gulp-util@~2.2.0: - version "2.2.20" - resolved "https://registry.npmjs.org/gulp-util/-/gulp-util-2.2.20.tgz#d7146e5728910bd8f047a6b0b1e549bc22dbd64c" - dependencies: - chalk "^0.5.0" - dateformat "^1.0.7-1.2.3" - lodash._reinterpolate "^2.4.1" - lodash.template "^2.4.1" - minimist "^0.2.0" - multipipe "^0.1.0" - through2 "^0.5.0" - vinyl "^0.2.1" - gulp-watch@4.3.11: version "4.3.11" resolved "https://registry.npmjs.org/gulp-watch/-/gulp-watch-4.3.11.tgz#162fc563de9fc770e91f9a7ce3955513a9a118c0" @@ -3006,21 +2980,15 @@ gzip-size@^3.0.0: har-schema@^1.0.5: version "1.0.5" - resolved "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz#d263135f43307c02c602afc8fe95970c0151369e" + resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-1.0.5.tgz#d263135f43307c02c602afc8fe95970c0151369e" har-validator@~4.2.1: version "4.2.1" - resolved "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz#33481d0f1bbff600dd203d75812a6a5fba002e2a" + resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-4.2.1.tgz#33481d0f1bbff600dd203d75812a6a5fba002e2a" dependencies: ajv "^4.9.1" har-schema "^1.0.5" -has-ansi@^0.1.0: - version "0.1.0" - resolved "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz#84f265aae8c0e6a88a12d7022894b7568894c62e" - dependencies: - ansi-regex "^0.2.0" - has-ansi@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91" @@ -3059,7 +3027,7 @@ has-gulplog@^0.1.0: has-unicode@^2.0.0: version "2.0.1" - resolved "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" + resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" has@^1.0.1: version "1.0.1" @@ -3080,9 +3048,9 @@ hash.js@^1.0.0, hash.js@^1.0.3: inherits "^2.0.3" minimalistic-assert "^1.0.0" -hawk@~3.1.3: +hawk@3.1.3, hawk@~3.1.3: version "3.1.3" - resolved "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz#078444bd7c1640b0fe540d2c9b73d59678e8e1c4" + resolved "https://registry.yarnpkg.com/hawk/-/hawk-3.1.3.tgz#078444bd7c1640b0fe540d2c9b73d59678e8e1c4" dependencies: boom "2.x.x" cryptiles "2.x.x" @@ -3110,7 +3078,7 @@ hmac-drbg@^1.0.0: hoek@2.x.x: version "2.16.3" - resolved "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed" + resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed" home-or-tmp@^2.0.0: version "2.0.0" @@ -3127,7 +3095,7 @@ homedir-polyfill@^1.0.0, homedir-polyfill@^1.0.1: hosted-git-info@^2.1.4: version "2.5.0" - resolved "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz#6d60e34b3abbc8313062c3b798ef8d901a07af3c" + resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.5.0.tgz#6d60e34b3abbc8313062c3b798ef8d901a07af3c" html-comment-regex@^1.1.0: version "1.1.1" @@ -3187,7 +3155,7 @@ http-proxy@1.15.2: http-signature@~1.1.0: version "1.1.1" - resolved "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz#df72e267066cd0ac67fb76adf8e134a8fbcf91bf" + resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.1.1.tgz#df72e267066cd0ac67fb76adf8e134a8fbcf91bf" dependencies: assert-plus "^0.2.0" jsprim "^1.2.2" @@ -3211,7 +3179,7 @@ in-publish@^2.0.0: indent-string@^2.1.0: version "2.1.0" - resolved "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80" + resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80" dependencies: repeating "^2.0.0" @@ -3225,7 +3193,7 @@ indexof@0.0.1: inflight@^1.0.4: version "1.0.6" - resolved "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" + resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" dependencies: once "^1.3.0" wrappy "1" @@ -3242,10 +3210,14 @@ inherits@2.0.1: version "2.0.1" resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1" -ini@^1.3.4, ini@~1.3.0: +ini@^1.3.4: version "1.3.4" resolved "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz#0537cb79daf59b59a1a517dff706c86ec039162e" +ini@~1.3.0: + version "1.3.5" + resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927" + interpret@^1.0.0: version "1.0.3" resolved "https://registry.npmjs.org/interpret/-/interpret-1.0.3.tgz#cbc35c62eeee73f19ab7b10a801511401afc0f90" @@ -3258,7 +3230,7 @@ invariant@^2.2.0, invariant@^2.2.2: invert-kv@^1.0.0: version "1.0.0" - resolved "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6" + resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6" is-absolute-url@^2.0.0: version "2.1.0" @@ -3273,41 +3245,41 @@ is-absolute@^0.2.3: is-arrayish@^0.2.1: version "0.2.1" - resolved "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" + resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" is-binary-path@^1.0.0: version "1.0.1" - resolved "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898" + resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898" dependencies: binary-extensions "^1.0.0" is-buffer@^1.1.5: - version "1.1.5" - resolved "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.5.tgz#1f3b26ef613b214b88cbca23cc6c01d87961eecc" + version "1.1.6" + resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" is-builtin-module@^1.0.0: version "1.0.0" - resolved "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe" + resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe" dependencies: builtin-modules "^1.0.0" is-dotfile@^1.0.0: version "1.0.3" - resolved "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1" + resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1" is-equal-shallow@^0.1.3: version "0.1.3" - resolved "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz#2238098fc221de0bcfa5d9eac4c45d638aa1c534" + resolved "https://registry.yarnpkg.com/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz#2238098fc221de0bcfa5d9eac4c45d638aa1c534" dependencies: is-primitive "^2.0.0" is-extendable@^0.1.0, is-extendable@^0.1.1: version "0.1.1" - resolved "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89" + resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89" is-extglob@^1.0.0: version "1.0.0" - resolved "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0" + resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0" is-extglob@^2.1.0: version "2.1.1" @@ -3315,13 +3287,13 @@ is-extglob@^2.1.0: is-finite@^1.0.0: version "1.0.2" - resolved "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz#cc6677695602be550ef11e8b4aa6305342b6d0aa" + resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.0.2.tgz#cc6677695602be550ef11e8b4aa6305342b6d0aa" dependencies: number-is-nan "^1.0.0" is-fullwidth-code-point@^1.0.0: version "1.0.0" - resolved "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb" dependencies: number-is-nan "^1.0.0" @@ -3331,7 +3303,7 @@ is-fullwidth-code-point@^2.0.0: is-glob@^2.0.0, is-glob@^2.0.1: version "2.0.1" - resolved "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863" + resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863" dependencies: is-extglob "^1.0.0" @@ -3355,13 +3327,13 @@ is-number-like@^1.0.3: is-number@^2.1.0: version "2.1.0" - resolved "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f" + resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f" dependencies: kind-of "^3.0.2" is-number@^3.0.0: version "3.0.0" - resolved "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195" + resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195" dependencies: kind-of "^3.0.2" @@ -3393,11 +3365,11 @@ is-plain-object@^2.0.3: is-posix-bracket@^0.1.0: version "0.1.1" - resolved "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4" + resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4" is-primitive@^2.0.0: version "2.0.0" - resolved "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575" + resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575" is-promise@^2.1: version "2.1.0" @@ -3421,7 +3393,7 @@ is-svg@^2.0.0: is-typedarray@~1.0.0: version "1.0.0" - resolved "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" + resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" is-unc-path@^0.1.1: version "0.1.2" @@ -3437,7 +3409,7 @@ is-upper-case@^1.1.0: is-utf8@^0.2.0: version "0.2.1" - resolved "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72" + resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72" is-valid-glob@^0.3.0: version "0.3.0" @@ -3457,11 +3429,11 @@ is@^3.1.0: isarray@0.0.1: version "0.0.1" - resolved "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf" + resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf" isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0: version "1.0.0" - resolved "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" + resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" isexe@^2.0.0: version "2.0.0" @@ -3469,7 +3441,7 @@ isexe@^2.0.0: isobject@^2.0.0, isobject@^2.1.0: version "2.1.0" - resolved "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89" + resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89" dependencies: isarray "1.0.0" @@ -3479,14 +3451,7 @@ isobject@^3.0.0, isobject@^3.0.1: isstream@~0.1.2: version "0.1.2" - resolved "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" - -istextorbinary@1.0.2: - version "1.0.2" - resolved "https://registry.npmjs.org/istextorbinary/-/istextorbinary-1.0.2.tgz#ace19354d1a9a0173efeb1084ce0f87b0ad7decf" - dependencies: - binaryextensions "~1.0.0" - textextensions "~1.0.0" + resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" js-base64@^2.1.8, js-base64@^2.1.9: version "2.1.9" @@ -3505,7 +3470,7 @@ js-yaml@~3.7.0: jsbn@~0.1.0: version "0.1.1" - resolved "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" + resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" jsesc@^1.3.0: version "1.3.0" @@ -3525,17 +3490,17 @@ json-schema-traverse@^0.3.0: json-schema@0.2.3: version "0.2.3" - resolved "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13" + resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13" json-stable-stringify@^1.0.0, json-stable-stringify@^1.0.1: version "1.0.1" - resolved "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz#9a759d39c5f2ff503fd5300646ed445f88c4f9af" + resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz#9a759d39c5f2ff503fd5300646ed445f88c4f9af" dependencies: jsonify "~0.0.0" json-stringify-safe@~5.0.1: version "5.0.1" - resolved "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" + resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" json3@3.3.2: version "3.3.2" @@ -3557,16 +3522,16 @@ jsonfile@~1.1.0: jsonify@~0.0.0: version "0.0.0" - resolved "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73" + resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73" jsprim@^1.2.2: - version "1.4.0" - resolved "https://registry.npmjs.org/jsprim/-/jsprim-1.4.0.tgz#a3b87e40298d8c380552d8cc7628a0bb95a22918" + version "1.4.1" + resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2" dependencies: 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" kind-of@^1.1.0: version "1.1.0" @@ -3574,13 +3539,13 @@ kind-of@^1.1.0: kind-of@^3.0.2: version "3.2.2" - resolved "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" dependencies: is-buffer "^1.1.5" kind-of@^4.0.0: version "4.0.0" - resolved "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57" dependencies: is-buffer "^1.1.5" @@ -3596,7 +3561,7 @@ lazystream@^1.0.0: lcid@^1.0.0: version "1.0.0" - resolved "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835" + resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835" dependencies: invert-kv "^1.0.0" @@ -3620,7 +3585,7 @@ limiter@^1.0.5: load-json-file@^1.0.0: version "1.1.0" - resolved "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0" + resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0" dependencies: graceful-fs "^4.1.2" parse-json "^2.2.0" @@ -3688,36 +3653,14 @@ lodash._basevalues@^3.0.0: version "3.0.0" resolved "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz#5b775762802bde3d3297503e26300820fdf661b7" -lodash._escapehtmlchar@~2.4.1: - version "2.4.1" - resolved "https://registry.npmjs.org/lodash._escapehtmlchar/-/lodash._escapehtmlchar-2.4.1.tgz#df67c3bb6b7e8e1e831ab48bfa0795b92afe899d" - dependencies: - lodash._htmlescapes "~2.4.1" - -lodash._escapestringchar@~2.4.1: - version "2.4.1" - resolved "https://registry.npmjs.org/lodash._escapestringchar/-/lodash._escapestringchar-2.4.1.tgz#ecfe22618a2ade50bfeea43937e51df66f0edb72" - lodash._getnative@^3.0.0: version "3.9.1" resolved "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5" -lodash._htmlescapes@~2.4.1: - version "2.4.1" - resolved "https://registry.npmjs.org/lodash._htmlescapes/-/lodash._htmlescapes-2.4.1.tgz#32d14bf0844b6de6f8b62a051b4f67c228b624cb" - lodash._isiterateecall@^3.0.0: version "3.0.9" resolved "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz#5203ad7ba425fae842460e696db9cf3e6aac057c" -lodash._isnative@~2.4.1: - version "2.4.1" - resolved "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz#3ea6404b784a7be836c7b57580e1cdf79b14832c" - -lodash._objecttypes@~2.4.1: - version "2.4.1" - resolved "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz#7c0b7f69d98a1f76529f890b0cdb1b4dfec11c11" - lodash._reescape@^3.0.0: version "3.0.0" resolved "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz#2b1d6f5dfe07c8a355753e5f27fac7f1cde1616a" @@ -3726,31 +3669,14 @@ lodash._reevaluate@^3.0.0: version "3.0.0" resolved "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz#58bc74c40664953ae0b124d806996daca431e2ed" -lodash._reinterpolate@^2.4.1, lodash._reinterpolate@~2.4.1: - version "2.4.1" - resolved "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-2.4.1.tgz#4f1227aa5a8711fc632f5b07a1f4607aab8b3222" - lodash._reinterpolate@^3.0.0, lodash._reinterpolate@~3.0.0: version "3.0.0" resolved "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d" -lodash._reunescapedhtml@~2.4.1: - version "2.4.1" - resolved "https://registry.npmjs.org/lodash._reunescapedhtml/-/lodash._reunescapedhtml-2.4.1.tgz#747c4fc40103eb3bb8a0976e571f7a2659e93ba7" - dependencies: - lodash._htmlescapes "~2.4.1" - lodash.keys "~2.4.1" - lodash._root@^3.0.0: version "3.0.1" resolved "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz#fba1c4524c19ee9a5f8136b4609f017cf4ded692" -lodash._shimkeys@~2.4.1: - version "2.4.1" - resolved "https://registry.npmjs.org/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz#6e9cc9666ff081f0b5a6c978b83e242e6949d203" - dependencies: - lodash._objecttypes "~2.4.1" - lodash.assign@^4.2.0: version "4.2.0" resolved "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7" @@ -3779,27 +3705,12 @@ lodash.defaults@^4.0.1: version "4.2.0" resolved "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c" -lodash.defaults@~2.4.1: - version "2.4.1" - resolved "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-2.4.1.tgz#a7e8885f05e68851144b6e12a8f3678026bc4c54" - dependencies: - lodash._objecttypes "~2.4.1" - lodash.keys "~2.4.1" - lodash.escape@^3.0.0: version "3.2.0" resolved "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz#995ee0dc18c1b48cc92effae71a10aab5b487698" dependencies: lodash._root "^3.0.0" -lodash.escape@~2.4.1: - version "2.4.1" - resolved "https://registry.npmjs.org/lodash.escape/-/lodash.escape-2.4.1.tgz#2ce12c5e084db0a57dda5e5d1eeeb9f5d175a3b4" - dependencies: - lodash._escapehtmlchar "~2.4.1" - lodash._reunescapedhtml "~2.4.1" - lodash.keys "~2.4.1" - lodash.filter@^4.4.0: version "4.6.0" resolved "https://registry.npmjs.org/lodash.filter/-/lodash.filter-4.6.0.tgz#668b1d4981603ae1cc5a6fa760143e480b4c4ace" @@ -3828,12 +3739,6 @@ lodash.isfinite@^3.3.2: version "3.3.2" resolved "https://registry.npmjs.org/lodash.isfinite/-/lodash.isfinite-3.3.2.tgz#fb89b65a9a80281833f0b7478b3a5104f898ebb3" -lodash.isobject@~2.4.1: - version "2.4.1" - resolved "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz#5a2e47fe69953f1ee631a7eba1fe64d2d06558f5" - dependencies: - lodash._objecttypes "~2.4.1" - lodash.isplainobject@^4.0.4: version "4.0.6" resolved "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb" @@ -3850,14 +3755,6 @@ lodash.keys@^3.0.0: lodash.isarguments "^3.0.0" lodash.isarray "^3.0.0" -lodash.keys@~2.4.1: - version "2.4.1" - resolved "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz#48dea46df8ff7632b10d706b8acb26591e2b3727" - dependencies: - lodash._isnative "~2.4.1" - lodash._shimkeys "~2.4.1" - lodash.isobject "~2.4.1" - lodash.map@^4.4.0: version "4.6.0" resolved "https://registry.npmjs.org/lodash.map/-/lodash.map-4.6.0.tgz#771ec7839e3473d9c4cde28b19394c3562f4f6d3" @@ -3898,18 +3795,6 @@ lodash.some@^4.4.0: version "4.6.0" resolved "https://registry.npmjs.org/lodash.some/-/lodash.some-4.6.0.tgz#1bb9f314ef6b8baded13b549169b2a945eb68e4d" -lodash.template@^2.4.1: - version "2.4.1" - resolved "https://registry.npmjs.org/lodash.template/-/lodash.template-2.4.1.tgz#9e611007edf629129a974ab3c48b817b3e1cf20d" - dependencies: - lodash._escapestringchar "~2.4.1" - lodash._reinterpolate "~2.4.1" - lodash.defaults "~2.4.1" - lodash.escape "~2.4.1" - lodash.keys "~2.4.1" - lodash.templatesettings "~2.4.1" - lodash.values "~2.4.1" - lodash.template@^3.0.0: version "3.6.2" resolved "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz#f8cdecc6169a255be9098ae8b0c53d378931d14f" @@ -3944,23 +3829,10 @@ lodash.templatesettings@^4.0.0: dependencies: lodash._reinterpolate "~3.0.0" -lodash.templatesettings@~2.4.1: - version "2.4.1" - resolved "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-2.4.1.tgz#ea76c75d11eb86d4dbe89a83893bb861929ac699" - dependencies: - lodash._reinterpolate "~2.4.1" - lodash.escape "~2.4.1" - lodash.uniq@^4.5.0: version "4.5.0" resolved "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" -lodash.values@~2.4.1: - version "2.4.1" - resolved "https://registry.npmjs.org/lodash.values/-/lodash.values-2.4.1.tgz#abf514436b3cb705001627978cbcf30b1280eea4" - dependencies: - lodash.keys "~2.4.1" - lodash@^3.10.0, lodash@^3.10.1: version "3.10.1" resolved "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6" @@ -3985,7 +3857,7 @@ loose-envify@^1.0.0: loud-rejection@^1.0.0: version "1.6.0" - resolved "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f" + resolved "https://registry.yarnpkg.com/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f" dependencies: currently-unhandled "^0.4.1" signal-exit "^3.0.0" @@ -4033,7 +3905,7 @@ map-cache@^0.2.0: map-obj@^1.0.0, map-obj@^1.0.1: version "1.0.1" - resolved "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d" + resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d" math-expression-evaluator@^1.2.14: version "1.2.17" @@ -4065,7 +3937,7 @@ memory-fs@^0.4.0, memory-fs@~0.4.1: errno "^0.1.3" readable-stream "^2.0.1" -meow@^3.3.0, meow@^3.7.0: +meow@^3.7.0: version "3.7.0" resolved "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb" dependencies: @@ -4113,9 +3985,19 @@ miller-rabin@^4.0.0: mime-db@~1.29.0: version "1.29.0" - resolved "https://registry.npmjs.org/mime-db/-/mime-db-1.29.0.tgz#48d26d235589651704ac5916ca06001914266878" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.29.0.tgz#48d26d235589651704ac5916ca06001914266878" + +mime-db@~1.30.0: + version "1.30.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.30.0.tgz#74c643da2dd9d6a45399963465b26d5ca7d71f01" + +mime-types@^2.1.12, mime-types@~2.1.7: + version "2.1.17" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.17.tgz#09d7a393f03e995a79f8af857b70a9e0ab16557a" + dependencies: + mime-db "~1.30.0" -mime-types@^2.1.12, mime-types@~2.1.11, mime-types@~2.1.7: +mime-types@~2.1.11: version "2.1.16" resolved "https://registry.npmjs.org/mime-types/-/mime-types-2.1.16.tgz#2b858a52e5ecd516db897ac2be87487830698e23" dependencies: @@ -4153,7 +4035,7 @@ minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1: "minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4, minimatch@~3.0.2: version "3.0.4" - resolved "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" dependencies: brace-expansion "^1.1.7" @@ -4172,11 +4054,7 @@ minimatch@~0.2.11: minimist@0.0.8: version "0.0.8" - resolved "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d" - -minimist@^0.2.0: - version "0.2.0" - resolved "https://registry.npmjs.org/minimist/-/minimist-0.2.0.tgz#4dffe525dae2b864c66c2e23c6271d7afdecefce" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d" minimist@^1.1.0, minimist@^1.1.3, minimist@^1.2.0: version "1.2.0" @@ -4192,7 +4070,7 @@ mkdirp@0.3.x: mkdirp@0.5.1, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1: version "0.5.1" - resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" dependencies: minimist "0.0.8" @@ -4234,15 +4112,19 @@ ms@1.0.0: ms@2.0.0: version "2.0.0" - resolved "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" -multipipe@^0.1.0, multipipe@^0.1.2: +multipipe@^0.1.2: version "0.1.2" resolved "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz#2a8f2ddf70eed564dff2d57f1e1a137d9f05078b" dependencies: duplexer2 "0.0.2" -nan@^2.3.0, nan@^2.3.2: +nan@^2.3.0: + version "2.8.0" + resolved "https://registry.yarnpkg.com/nan/-/nan-2.8.0.tgz#ed715f3fe9de02b57a5e6252d90a96675e1f085a" + +nan@^2.3.2: version "2.6.2" resolved "https://registry.npmjs.org/nan/-/nan-2.6.2.tgz#e4ff34e6c95fdfb5aecc08de6596f43605a7db45" @@ -4338,15 +4220,17 @@ node-notifier@^5.0.1: shellwords "^0.1.0" which "^1.2.12" -node-pre-gyp@^0.6.36: - version "0.6.36" - resolved "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.36.tgz#db604112cb74e0d477554e9b505b17abddfab786" +node-pre-gyp@^0.6.39: + version "0.6.39" + resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.39.tgz#c00e96860b23c0e1420ac7befc5044e1d78d8649" dependencies: + detect-libc "^1.0.2" + hawk "3.1.3" mkdirp "^0.5.1" nopt "^4.0.1" npmlog "^4.0.2" rc "^1.1.7" - request "^2.81.0" + request "2.81.0" rimraf "^2.6.1" semver "^5.3.0" tar "^2.2.1" @@ -4406,14 +4290,14 @@ node.extend@^1.1.6: nopt@^4.0.1: version "4.0.1" - resolved "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d" + resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d" dependencies: abbrev "1" osenv "^0.1.4" normalize-package-data@^2.3.2, normalize-package-data@^2.3.4: version "2.4.0" - resolved "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f" + resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f" dependencies: hosted-git-info "^2.1.4" is-builtin-module "^1.0.0" @@ -4422,7 +4306,7 @@ normalize-package-data@^2.3.2, normalize-package-data@^2.3.4: normalize-path@^2.0.0, normalize-path@^2.0.1, normalize-path@^2.1.1: version "2.1.1" - resolved "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9" + resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9" dependencies: remove-trailing-separator "^1.0.1" @@ -4447,7 +4331,7 @@ npm-run-path@^2.0.0: "npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0, npmlog@^4.0.2: version "4.1.2" - resolved "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" + resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" dependencies: are-we-there-yet "~1.1.2" console-control-strings "~1.1.0" @@ -4466,11 +4350,11 @@ num2fraction@^1.2.2: number-is-nan@^1.0.0: version "1.0.1" - resolved "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" + resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" nunjucks@^3.0.0: version "3.0.1" - resolved "https://registry.npmjs.org/nunjucks/-/nunjucks-3.0.1.tgz#4de74a3e550baf6fa3370323f3d1c7c2a86bdc4d" + resolved "https://registry.yarnpkg.com/nunjucks/-/nunjucks-3.0.1.tgz#4de74a3e550baf6fa3370323f3d1c7c2a86bdc4d" dependencies: a-sync-waterfall "^1.0.0" asap "^2.0.3" @@ -4480,7 +4364,7 @@ nunjucks@^3.0.0: oauth-sign@~0.8.1: version "0.8.2" - resolved "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43" + resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43" object-assign@4.1.0: version "4.1.0" @@ -4492,7 +4376,7 @@ object-assign@^3.0.0: object-assign@^4.0.0, object-assign@^4.0.1, object-assign@^4.1.0: version "4.1.1" - resolved "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" + resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" object-component@0.0.3: version "0.0.3" @@ -4504,7 +4388,7 @@ object-hash@^1.1.8: object-keys@~0.4.0: version "0.4.0" - resolved "https://registry.npmjs.org/object-keys/-/object-keys-0.4.0.tgz#28a6aae7428dd2c3a92f3d95f21335dd204e0336" + resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-0.4.0.tgz#28a6aae7428dd2c3a92f3d95f21335dd204e0336" object-path@^0.9.0: version "0.9.2" @@ -4521,7 +4405,7 @@ object.defaults@^1.1.0: object.omit@^2.0.0: version "2.0.1" - resolved "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa" + resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa" dependencies: for-own "^0.1.4" is-extendable "^0.1.1" @@ -4540,7 +4424,7 @@ on-finished@~2.3.0: once@^1.3.0, once@^1.3.3: version "1.4.0" - resolved "https://registry.npmjs.org/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" + resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" dependencies: wrappy "1" @@ -4594,11 +4478,11 @@ os-browserify@^0.2.0: os-homedir@^1.0.0, os-homedir@^1.0.1: version "1.0.2" - resolved "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3" + resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3" os-locale@^1.4.0: version "1.4.0" - resolved "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9" + resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9" dependencies: lcid "^1.0.0" @@ -4616,7 +4500,7 @@ os-tmpdir@^1.0.0, os-tmpdir@^1.0.1: osenv@0, osenv@^0.1.4: version "0.1.4" - resolved "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz#42fe6d5953df06c8064be6f176c3d05aaaa34644" + resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.4.tgz#42fe6d5953df06c8064be6f176c3d05aaaa34644" dependencies: os-homedir "^1.0.0" os-tmpdir "^1.0.0" @@ -4665,7 +4549,7 @@ parse-filepath@^1.0.1: parse-glob@^3.0.4: version "3.0.4" - resolved "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c" + resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c" dependencies: glob-base "^0.3.0" is-dotfile "^1.0.0" @@ -4674,7 +4558,7 @@ parse-glob@^3.0.4: parse-json@^2.2.0: version "2.2.0" - resolved "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9" + resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9" dependencies: error-ex "^1.2.0" @@ -4727,7 +4611,7 @@ path-dirname@^1.0.0: path-exists@^2.0.0: version "2.1.0" - resolved "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b" + resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b" dependencies: pinkie-promise "^2.0.0" @@ -4737,7 +4621,7 @@ path-exists@^3.0.0: path-is-absolute@^1.0.0, path-is-absolute@^1.0.1: version "1.0.1" - resolved "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" + resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" path-is-inside@^1.0.1: version "1.0.2" @@ -4763,7 +4647,7 @@ path-root@^0.1.1: path-type@^1.0.0: version "1.1.0" - resolved "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441" + resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441" dependencies: graceful-fs "^4.1.2" pify "^2.0.0" @@ -4787,7 +4671,7 @@ pbkdf2@^3.0.3: performance-now@^0.2.0: version "0.2.0" - resolved "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz#33ef30c5c77d4ea21c5a53869d91b56d8f2555e5" + resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-0.2.0.tgz#33ef30c5c77d4ea21c5a53869d91b56d8f2555e5" pify@^2.0.0, pify@^2.3.0: version "2.3.0" @@ -4795,13 +4679,13 @@ pify@^2.0.0, pify@^2.3.0: pinkie-promise@^2.0.0: version "2.0.1" - resolved "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa" + resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa" dependencies: pinkie "^2.0.0" pinkie@^2.0.0: version "2.0.4" - resolved "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870" + resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870" pkg-dir@^2.0.0: version "2.0.0" @@ -5043,6 +4927,14 @@ postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0 source-map "^0.5.6" supports-color "^3.2.3" +postcss@^6.0.1, postcss@^6.0.16: + version "6.0.16" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.16.tgz#112e2fe2a6d2109be0957687243170ea5589e146" + dependencies: + chalk "^2.3.0" + source-map "^0.6.1" + supports-color "^5.1.0" + postcss@^6.0.11, postcss@^6.0.3: version "6.0.12" resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.12.tgz#6b0155089d2d212f7bd6a0cecd4c58c007403535" @@ -5057,7 +4949,7 @@ prepend-http@^1.0.0: preserve@^0.2.0: version "0.2.0" - resolved "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b" + resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b" pretty-bytes@^3.0.1: version "3.0.1" @@ -5075,7 +4967,7 @@ private@^0.1.6: process-nextick-args@~1.0.6: version "1.0.7" - resolved "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3" + resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3" process@^0.11.0: version "0.11.10" @@ -5109,7 +5001,7 @@ punycode@1.3.2: punycode@^1.2.4, punycode@^1.4.1: version "1.4.1" - resolved "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e" q@^1.1.2: version "1.5.0" @@ -5144,7 +5036,7 @@ querystring@0.2.0, querystring@^0.2.0: randomatic@^1.1.3: version "1.1.7" - resolved "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz#c7abe9cc8b87c0baa876b19fde83fd464797e38c" + resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-1.1.7.tgz#c7abe9cc8b87c0baa876b19fde83fd464797e38c" dependencies: is-number "^3.0.0" kind-of "^4.0.0" @@ -5160,8 +5052,8 @@ range-parser@^1.0.3, range-parser@~1.2.0: resolved "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e" rc@^1.1.7: - version "1.2.1" - resolved "https://registry.npmjs.org/rc/-/rc-1.2.1.tgz#2e03e8e42ee450b8cb3dce65be1bf8974e1dfd95" + version "1.2.4" + resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.4.tgz#a0f606caae2a3b862bbd0ef85482c0125b315fa3" dependencies: deep-extend "~0.4.0" ini "~1.3.0" @@ -5170,7 +5062,7 @@ rc@^1.1.7: read-pkg-up@^1.0.1: version "1.0.1" - resolved "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02" + resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02" dependencies: find-up "^1.0.0" read-pkg "^1.0.0" @@ -5184,7 +5076,7 @@ read-pkg-up@^2.0.0: read-pkg@^1.0.0: version "1.1.0" - resolved "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28" + resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28" dependencies: load-json-file "^1.0.0" normalize-package-data "^2.3.2" @@ -5209,7 +5101,7 @@ read-pkg@^2.0.0: readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.2.6: version "2.3.3" - resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz#368f2512d79f9d46fdfc71349ae7878bbc1eb95c" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.3.tgz#368f2512d79f9d46fdfc71349ae7878bbc1eb95c" dependencies: core-util-is "~1.0.0" inherits "~2.0.3" @@ -5221,7 +5113,7 @@ readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable readable-stream@~1.1.9: version "1.1.14" - resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9" dependencies: core-util-is "~1.0.0" inherits "~2.0.1" @@ -5230,7 +5122,7 @@ readable-stream@~1.1.9: readdirp@^2.0.0: version "2.1.0" - resolved "https://registry.npmjs.org/readdirp/-/readdirp-2.1.0.tgz#4ed0ad060df3073300c48440373f72d1cc642d78" + resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.1.0.tgz#4ed0ad060df3073300c48440373f72d1cc642d78" dependencies: graceful-fs "^4.1.2" minimatch "^3.0.2" @@ -5245,7 +5137,7 @@ rechoir@^0.6.2: redent@^1.0.0: version "1.0.0" - resolved "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde" + resolved "https://registry.yarnpkg.com/redent/-/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde" dependencies: indent-string "^2.1.0" strip-indent "^1.0.1" @@ -5285,11 +5177,10 @@ regenerator-transform@^0.10.0: private "^0.1.6" regex-cache@^0.4.2: - version "0.4.3" - resolved "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.3.tgz#9b1a6c35d4d0dfcef5711ae651e8e9d3d7114145" + version "0.4.4" + resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.4.tgz#75bdc58a2a1496cec48a12835bc54c8d562336dd" dependencies: is-equal-shallow "^0.1.3" - is-primitive "^2.0.0" regexpu-core@^2.0.0: version "2.0.0" @@ -5314,20 +5205,20 @@ relateurl@0.2.x: resolved "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9" remove-trailing-separator@^1.0.1: - version "1.0.2" - resolved "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.0.2.tgz#69b062d978727ad14dc6b56ba4ab772fd8d70511" + version "1.1.0" + resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef" repeat-element@^1.1.2: version "1.1.2" - resolved "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz#ef089a178d1483baae4d93eb98b4f9e4e11d990a" + resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.2.tgz#ef089a178d1483baae4d93eb98b4f9e4e11d990a" repeat-string@^1.5.2: version "1.6.1" - resolved "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" + resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" repeating@^2.0.0: version "2.0.1" - resolved "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda" + resolved "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda" dependencies: is-finite "^1.0.0" @@ -5335,15 +5226,11 @@ replace-ext@0.0.1: version "0.0.1" resolved "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz#29bbd92078a739f0bcce2b4ee41e837953522924" -replacestream@^4.0.0: - version "4.0.2" - resolved "https://registry.npmjs.org/replacestream/-/replacestream-4.0.2.tgz#0c4140707e4f0323f50de044851708cf58bc37bd" - dependencies: - escape-string-regexp "^1.0.3" - object-assign "^4.0.1" - readable-stream "^2.0.2" +replace-ext@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.0.tgz#de63128373fcbf7c3ccfa4de5a480c45a67958eb" -request@2, request@2.81.0, request@^2.79.0, request@^2.81.0: +request@2, request@2.81.0, request@^2.79.0: version "2.81.0" resolved "https://registry.npmjs.org/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0" dependencies: @@ -5433,15 +5320,15 @@ right-align@^0.1.1: dependencies: align-text "^0.1.1" -rimraf@2, rimraf@^2.2.8, rimraf@^2.4.3, rimraf@^2.5.1, rimraf@^2.6.1: - version "2.6.1" - resolved "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz#c2338ec643df7a1b7fe5c54fa86f57428a55f33d" +rimraf@2, rimraf@^2.3.4, rimraf@^2.5.1, rimraf@^2.6.1: + version "2.6.2" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36" dependencies: glob "^7.0.5" -rimraf@^2.3.4: - version "2.6.2" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36" +rimraf@^2.2.8, rimraf@^2.4.3: + version "2.6.1" + resolved "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz#c2338ec643df7a1b7fe5c54fa86f57428a55f33d" dependencies: glob "^7.0.5" @@ -5462,7 +5349,7 @@ rx@4.1.0: safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@~5.1.0, safe-buffer@~5.1.1: version "5.1.1" - resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853" sass-graph@^2.1.1: version "2.2.4" @@ -5485,8 +5372,8 @@ scss-tokenizer@^0.2.3: source-map "^0.4.2" "semver@2 || 3 || 4 || 5", semver@^5.3.0: - version "5.4.1" - resolved "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e" + version "5.5.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab" semver@^4.1.0: version "4.3.6" @@ -5556,7 +5443,7 @@ set-blocking@^2.0.0, set-blocking@~2.0.0: set-immediate-shim@^1.0.1: version "1.0.1" - resolved "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61" + resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61" setimmediate@^1.0.4: version "1.0.5" @@ -5596,7 +5483,7 @@ sigmund@~1.0.0: signal-exit@^3.0.0: version "3.0.2" - resolved "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d" + resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d" slash@^1.0.0: version "1.0.0" @@ -5610,7 +5497,7 @@ snake-case@^2.1.0: sntp@1.x.x: version "1.0.9" - resolved "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz#6541184cc90aeea6c6e7b35e2659082443c66198" + resolved "https://registry.yarnpkg.com/sntp/-/sntp-1.0.9.tgz#6541184cc90aeea6c6e7b35e2659082443c66198" dependencies: hoek "2.x.x" @@ -5707,23 +5594,27 @@ source-map@^0.5.7: version "0.5.7" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" +source-map@^0.6.1: + version "0.6.1" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" + sparkles@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/sparkles/-/sparkles-1.0.0.tgz#1acbbfb592436d10bbe8f785b7cc6f82815012c3" spdx-correct@~1.0.0: version "1.0.2" - resolved "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz#4b3073d933ff51f3912f03ac5519498a4150db40" + resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-1.0.2.tgz#4b3073d933ff51f3912f03ac5519498a4150db40" dependencies: spdx-license-ids "^1.0.2" spdx-expression-parse@~1.0.0: version "1.0.4" - resolved "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz#9bdf2f20e1f40ed447fbe273266191fced51626c" + resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz#9bdf2f20e1f40ed447fbe273266191fced51626c" spdx-license-ids@^1.0.2: version "1.2.2" - resolved "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz#c9df7a3424594ade6bd11900d596696dc06bac57" + resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz#c9df7a3424594ade6bd11900d596696dc06bac57" sprintf-js@~1.0.2: version "1.0.3" @@ -5731,7 +5622,7 @@ sprintf-js@~1.0.2: sshpk@^1.7.0: version "1.13.1" - resolved "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz#512df6da6287144316dc4c18fe1cf1d940739be3" + resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.13.1.tgz#512df6da6287144316dc4c18fe1cf1d940739be3" dependencies: asn1 "~0.2.3" assert-plus "^1.0.0" @@ -5791,7 +5682,7 @@ strict-uri-encode@^1.0.0: string-width@^1.0.1, string-width@^1.0.2: version "1.0.2" - resolved "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" dependencies: code-point-at "^1.0.0" is-fullwidth-code-point "^1.0.0" @@ -5806,27 +5697,21 @@ string-width@^2.0.0: string_decoder@^0.10.25, string_decoder@~0.10.x: version "0.10.31" - resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94" string_decoder@~1.0.3: version "1.0.3" - resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz#0fc67d7c141825de94282dd536bec6b9bce860ab" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.3.tgz#0fc67d7c141825de94282dd536bec6b9bce860ab" dependencies: safe-buffer "~5.1.0" stringstream@~0.0.4: version "0.0.5" - resolved "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878" - -strip-ansi@^0.3.0: - version "0.3.0" - resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz#25f48ea22ca79187f3174a4db8759347bb126220" - dependencies: - ansi-regex "^0.2.1" + resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878" strip-ansi@^3.0.0, strip-ansi@^3.0.1: version "3.0.1" - resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" dependencies: ansi-regex "^2.0.0" @@ -5863,7 +5748,7 @@ strip-bom@^1.0.0: strip-bom@^2.0.0: version "2.0.0" - resolved "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e" + resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e" dependencies: is-utf8 "^0.2.0" @@ -5877,13 +5762,13 @@ strip-eof@^1.0.0: strip-indent@^1.0.1: version "1.0.1" - resolved "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz#0c7962a6adefa7bbd4ac366460a638552ae1a0a2" + resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-1.0.1.tgz#0c7962a6adefa7bbd4ac366460a638552ae1a0a2" dependencies: get-stdin "^4.0.1" strip-json-comments@~2.0.1: version "2.0.1" - resolved "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" + resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" supports-color@3.1.2: version "3.1.2" @@ -5891,10 +5776,6 @@ supports-color@3.1.2: dependencies: has-flag "^1.0.0" -supports-color@^0.2.0: - version "0.2.0" - resolved "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz#d92de2694eb3f67323973d7ae3d8b55b4c22190a" - supports-color@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" @@ -5917,6 +5798,12 @@ supports-color@^4.2.1: dependencies: has-flag "^2.0.0" +supports-color@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.1.0.tgz#058a021d1b619f7ddf3980d712ea3590ce7de3d5" + dependencies: + has-flag "^2.0.0" + svgo@^0.7.0: version "0.7.2" resolved "https://registry.npmjs.org/svgo/-/svgo-0.7.2.tgz#9f5772413952135c6fefbf40afe6a4faa88b4bb5" @@ -5941,8 +5828,8 @@ tapable@^0.2.7: resolved "https://registry.npmjs.org/tapable/-/tapable-0.2.7.tgz#e46c0daacbb2b8a98b9b0cea0f4052105817ed5c" tar-pack@^3.4.0: - version "3.4.0" - resolved "https://registry.npmjs.org/tar-pack/-/tar-pack-3.4.0.tgz#23be2d7f671a8339376cbdb0b8fe3fdebf317984" + version "3.4.1" + resolved "https://registry.yarnpkg.com/tar-pack/-/tar-pack-3.4.1.tgz#e1dbc03a9b9d3ba07e896ad027317eb679a10a1f" dependencies: debug "^2.2.0" fstream "^1.0.10" @@ -5955,7 +5842,7 @@ tar-pack@^3.4.0: tar@^2.0.0, tar@^2.2.1: version "2.2.1" - resolved "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1" + resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1" dependencies: block-stream "*" fstream "^1.0.2" @@ -5970,10 +5857,6 @@ ternary-stream@^2.0.1: merge-stream "^1.0.0" through2 "^2.0.1" -textextensions@~1.0.0: - version "1.0.2" - resolved "https://registry.npmjs.org/textextensions/-/textextensions-1.0.2.tgz#65486393ee1f2bb039a60cbba05b0b68bd9501d2" - tfunk@^3.0.1: version "3.1.0" resolved "https://registry.npmjs.org/tfunk/-/tfunk-3.1.0.tgz#38e4414fc64977d87afdaa72facb6d29f82f7b5b" @@ -5995,13 +5878,6 @@ through2@2.X, through2@^2.0.0, through2@^2.0.1, through2@^2.0.3, through2@~2.0.0 readable-stream "^2.1.5" xtend "~4.0.1" -through2@^0.5.0: - version "0.5.1" - resolved "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz#dfdd012eb9c700e2323fd334f38ac622ab372da7" - dependencies: - readable-stream "~1.0.17" - xtend "~3.0.0" - through2@^0.6.0, through2@^0.6.1, through2@^0.6.5: version "0.6.5" resolved "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz#41ab9c67b29d57209071410e1d7a7a968cd3ad48" @@ -6011,14 +5887,14 @@ through2@^0.6.0, through2@^0.6.1, through2@^0.6.5: through2@~0.4.0: version "0.4.2" - resolved "https://registry.npmjs.org/through2/-/through2-0.4.2.tgz#dbf5866031151ec8352bb6c4db64a2292a840b9b" + resolved "https://registry.yarnpkg.com/through2/-/through2-0.4.2.tgz#dbf5866031151ec8352bb6c4db64a2292a840b9b" dependencies: readable-stream "~1.0.17" xtend "~2.1.1" -thunks@^4.5.1: - version "4.8.0" - resolved "https://registry.npmjs.org/thunks/-/thunks-4.8.0.tgz#63d5fff7f6a957d6953c46dc72829dd5462a8ab4" +thunks@^4.9.0: + version "4.9.0" + resolved "https://registry.yarnpkg.com/thunks/-/thunks-4.9.0.tgz#46c00db9968583b3a421e0c9285eac8b9fddb31a" tildify@^1.0.0: version "1.2.0" @@ -6074,14 +5950,14 @@ to-fast-properties@^1.0.1, to-fast-properties@^1.0.3: resolved "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47" tough-cookie@~2.3.0: - version "2.3.2" - resolved "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz#f081f76e4c85720e6c37a5faced737150d84072a" + version "2.3.3" + resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.3.tgz#0b618a5565b6dea90bf3425d04d55edc475a7561" dependencies: punycode "^1.4.1" trim-newlines@^1.0.0: version "1.0.0" - resolved "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613" + resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613" trim-right@^1.0.1: version "1.0.1" @@ -6097,13 +5973,13 @@ tty-browserify@0.0.0: tunnel-agent@^0.6.0: version "0.6.0" - resolved "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd" + resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd" dependencies: safe-buffer "^5.0.1" tweetnacl@^0.14.3, tweetnacl@~0.14.0: version "0.14.5" - resolved "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64" + resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64" type-detect@0.1.1: version "0.1.1" @@ -6147,7 +6023,7 @@ uglifyjs-webpack-plugin@^0.4.6: uid-number@^0.0.6: version "0.0.6" - resolved "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81" + resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81" ultron@1.0.x: version "1.0.2" @@ -6225,7 +6101,7 @@ user-home@^1.1.1: util-deprecate@~1.0.1: version "1.0.2" - resolved "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" + resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" util-extend@^1.0.1: version "1.0.3" @@ -6242,8 +6118,8 @@ utils-merge@1.0.0: resolved "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz#0294fb922bb9375153541c4f7096231f287c8af8" uuid@^3.0.0: - version "3.1.0" - resolved "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz#3dd3d3e790abc24d7b0d3a034ffababe28ebbc04" + version "3.2.1" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.2.1.tgz#12c528bb9d58d0b9265d9a2f6f0fe8be17ff1f14" v8flags@^2.0.2: version "2.1.1" @@ -6257,7 +6133,7 @@ vali-date@^1.0.0: validate-npm-package-license@^3.0.1: version "3.0.1" - resolved "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz#2804babe712ad3379459acfbe24746ab2c303fbc" + resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz#2804babe712ad3379459acfbe24746ab2c303fbc" dependencies: spdx-correct "~1.0.0" spdx-expression-parse "~1.0.0" @@ -6266,11 +6142,13 @@ vendors@^1.0.0: version "1.0.1" resolved "https://registry.npmjs.org/vendors/-/vendors-1.0.1.tgz#37ad73c8ee417fb3d580e785312307d274847f22" -verror@1.3.6: - version "1.3.6" - resolved "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz#cff5df12946d297d2baaefaa2689e25be01c005c" +verror@1.10.0: + version "1.10.0" + resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400" dependencies: - extsprintf "1.0.2" + assert-plus "^1.0.0" + core-util-is "1.0.2" + extsprintf "^1.2.0" vinyl-file@^1.1.0: version "1.3.0" @@ -6341,12 +6219,6 @@ vinyl@1.X, vinyl@^1.0.0, vinyl@^1.1.0, vinyl@^1.2.0: clone-stats "^0.0.1" replace-ext "0.0.1" -vinyl@^0.2.1: - version "0.2.3" - resolved "https://registry.npmjs.org/vinyl/-/vinyl-0.2.3.tgz#bca938209582ec5a49ad538a00fa1f125e513252" - dependencies: - clone-stats "~0.0.1" - vinyl@^0.4.0: version "0.4.6" resolved "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz#2f356c87a550a255461f36bbeb2a5ba8bf784847" @@ -6457,7 +6329,7 @@ which@1, which@^1.2.12, which@^1.2.14, which@^1.2.9: wide-align@^1.1.0: version "1.1.2" - resolved "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz#571e0f1b0604636ebc0dfc21b0339bbe31341710" + resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.2.tgz#571e0f1b0604636ebc0dfc21b0339bbe31341710" dependencies: string-width "^1.0.2" @@ -6479,7 +6351,7 @@ wordwrap@0.0.2: wrap-ansi@^2.0.0: version "2.1.0" - resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85" dependencies: string-width "^1.0.1" strip-ansi "^3.0.1" @@ -6492,7 +6364,7 @@ wrap-promise@^1.0.1: wrappy@1: version "1.0.2" - resolved "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" + resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" ws@1.1.1: version "1.1.1" @@ -6519,14 +6391,10 @@ xmlhttprequest-ssl@1.5.3: xtend@~2.1.1: version "2.1.2" - resolved "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz#6efecc2a4dad8e6962c4901b337ce7ba87b5d28b" + resolved "https://registry.yarnpkg.com/xtend/-/xtend-2.1.2.tgz#6efecc2a4dad8e6962c4901b337ce7ba87b5d28b" dependencies: object-keys "~0.4.0" -xtend@~3.0.0: - version "3.0.0" - resolved "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz#5cce7407baf642cba7becda568111c493f59665a" - y18n@^3.2.0, y18n@^3.2.1: version "3.2.1" resolved "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41" @@ -6585,7 +6453,7 @@ yargs@6.4.0: yargs@^3.32.0: version "3.32.0" - resolved "https://registry.npmjs.org/yargs/-/yargs-3.32.0.tgz#03088e9ebf9e756b69751611d2a5ef591482c995" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.32.0.tgz#03088e9ebf9e756b69751611d2a5ef591482c995" dependencies: camelcase "^2.0.1" cliui "^3.0.3" From 0725cce5d41810ba515559c164bb6bbbeec7da0f Mon Sep 17 00:00:00 2001 From: benjtinsley Date: Wed, 24 Jan 2018 15:54:13 -0700 Subject: [PATCH 06/33] reremoves obviated tasks --- gulpfile.js/tasks/http2-upgrade.js | 24 ---------------- gulpfile.js/tasks/init-config.js | 14 ---------- gulpfile.js/tasks/init-craft.js | 41 --------------------------- gulpfile.js/tasks/init-drupal.js | 45 ------------------------------ gulpfile.js/tasks/init-rails.js | 43 ---------------------------- gulpfile.js/tasks/init.js | 10 +++---- 6 files changed, 5 insertions(+), 172 deletions(-) delete mode 100644 gulpfile.js/tasks/http2-upgrade.js delete mode 100644 gulpfile.js/tasks/init-config.js delete mode 100644 gulpfile.js/tasks/init-craft.js delete mode 100644 gulpfile.js/tasks/init-drupal.js delete mode 100644 gulpfile.js/tasks/init-rails.js diff --git a/gulpfile.js/tasks/http2-upgrade.js b/gulpfile.js/tasks/http2-upgrade.js deleted file mode 100644 index 4c7b9320b..000000000 --- a/gulpfile.js/tasks/http2-upgrade.js +++ /dev/null @@ -1,24 +0,0 @@ -const gulp = require('gulp') -const log = require('fancy-log') -const colors = require('ansi-colors') -const mergeStream = require('merge-stream') -const del = require('del') -const projectPath = require('../lib/projectPath') - - -gulp.task('http2-upgrade', function() { - del([projectPath(PATH_CONFIG.src, PATH_CONFIG.stylesheets.src)], { force: true }) - log(colors.green('Cleaned stylesheets directory')) - - const configStream = gulp.src('extras/http2/**/*') - .pipe(gulp.dest(projectPath())) - - const srcStream = gulp.src(['src/stylesheets', 'src/javascripts', 'src/html']) - .pipe(gulp.dest(projectPath(PATH_CONFIG.src))) - - log(colors.green('Created HTTP/2 ready stylesheets directory')) - log(colors.green('Added some HTTP/2 helpers to the html directory')) - log(colors.green('Created config/path-config.json')) - - return mergeStream(configStream, srcStream) -}) diff --git a/gulpfile.js/tasks/init-config.js b/gulpfile.js/tasks/init-config.js deleted file mode 100644 index 27a44d783..000000000 --- a/gulpfile.js/tasks/init-config.js +++ /dev/null @@ -1,14 +0,0 @@ -var gulp = require('gulp') -var log = require('fancy-log') -var colors = require('ansi-colors') -var projectPath = require('../lib/projectPath') -var merge = require('merge-stream') - -gulp.task('init-config', function () { - var configStream = gulp.src(['gulpfile.js/path-config.json', 'gulpfile.js/task-config.js']) - .pipe(gulp.dest(projectPath('config'))) - - log(colors.green('Adding default path-config.json and task-config.js files to ./config/')) - - return configStream -}) diff --git a/gulpfile.js/tasks/init-craft.js b/gulpfile.js/tasks/init-craft.js deleted file mode 100644 index c855febf0..000000000 --- a/gulpfile.js/tasks/init-craft.js +++ /dev/null @@ -1,41 +0,0 @@ -const gulp = require('gulp') -const log = require('fancy-log') -const colors = require('ansi-colors') -const mergeStream = require('merge-stream') -const projectPath = require('../lib/projectPath') - -gulp.task('init-craft', function() { - const configStream = gulp.src(['extras/craft/**/*', '!**/ASSETS-README.md']) - .pipe(gulp.dest(projectPath())) - - const srcStream = gulp.src(['src/**/*', 'src/**/.gitkeep', '!src/html{,/**}', '!src/static{,/**}']) - .pipe(gulp.dest(projectPath(PATH_CONFIG.src))) - - - log(colors.green('Added gulpRev plugin to craft/plugins/gulprev!')) - log(colors.green('Created config/path-config.json')) - log(colors.green('Created config/task-config.js')) - log( -colors.green(`Blendid is configured for Craft! - -Next Steps -========== - -1) Make sure to update browserSync.proxy in 'config/task-config.js' - to match your development url. - -2) Enable the Gulp Rev plugin in /admin/settings/plugins - -3) Update the script and stylesheet tags in your layout with the - blendid asset helpers: - - - - -4) Start Compiling! - - yarn run blendid -`)) - - return mergeStream(configStream, srcStream) -}) diff --git a/gulpfile.js/tasks/init-drupal.js b/gulpfile.js/tasks/init-drupal.js deleted file mode 100644 index e0ee472da..000000000 --- a/gulpfile.js/tasks/init-drupal.js +++ /dev/null @@ -1,45 +0,0 @@ -const gulp = require('gulp') -const log = require('fancy-log') -const colors = require('ansi-colors') -const rename = require('gulp-rename') -const replace = require('gulp-replace') -const mergeStream = require('merge-stream') -const path = require('path') -const projectPath = require('../lib/projectPath') - -gulp.task('init-drupal', function() { - const envBasename = path.basename(process.env.INIT_CWD) - - const configStream = gulp.src(['extras/drupal/**/*', '!extras/drupal/src/', '!extras/drupal/src/**/*', '!**/README.md']) - .pipe(rename(function (filepath) { - filepath.basename = filepath.basename.replace('THEMENAME', envBasename); - })) - .pipe(replace('THEMENAME', envBasename)) - .pipe(gulp.dest(projectPath())) - - const srcStream = gulp.src(['extras/drupal/src/**/*', 'extras/drupal/src/**/.gitkeep']) - .pipe(gulp.dest(projectPath(PATH_CONFIG.src))) - - log(colors.green('Created config/path-config.json')) - log(colors.green('Created config/task-config.js')) - log(colors.green('Created config/install/'+ envBasename +'.settings.yml')) - log(colors.green('Created config/schema/'+ envBasename +'.schema.yml')) - log(colors.green('Created '+ envBasename +'.info.yml')) - log(colors.green('Created '+ envBasename +'.libraries.yml')) - log(colors.green('Created '+ envBasename +'.theme')) - log( -colors.green(`Blendid is configured for Drupal! - -Next Steps -========== - -1) Make sure to update browserSync.proxy in 'config/task-config.js' - to match your development url. - -2) Start Compiling! - - yarn run blendid -`)) - - return mergeStream(configStream, srcStream) -}) diff --git a/gulpfile.js/tasks/init-rails.js b/gulpfile.js/tasks/init-rails.js deleted file mode 100644 index e9f3f9585..000000000 --- a/gulpfile.js/tasks/init-rails.js +++ /dev/null @@ -1,43 +0,0 @@ -var gulp = require('gulp') -var log = require('fancy-log') -var colors = require('ansi-colors') -var projectPath = require('../lib/projectPath') - -gulp.task('init-rails', function() { - var stream = gulp.src(['extras/rails/**/*', 'extras/rails/**/.gitkeep', '!**/ASSETS-README.md']) - .pipe(gulp.dest(projectPath())) - - log(colors.green('Created app/helpers/blendid_asset_helper.rb')) - log(colors.green('Created config/initializers/blendid.rb')) - log(colors.green('Created config/deploy.rb.example')) - log( -colors.yellow(` - -Using Capistrano? Add the following to deploy.rb so assets will compile on deploy: -`), colors.magenta(` -namespace :deploy do - namespace :npm do - task :install, :roles => :app do - # Install NPM dependencies in development mode because the build command - # gets invoked on the server - run "cd #{release_path} && yarn && yarn run build" - end - end -end - -# Run NPM install after assets:precompile -before "deploy:assets:precompile", "deploy:npm:install" - -`), colors.magenta(` - -Make sure to add 'public/assets' to your .gitignore file. - -`), colors.magenta(` -Update the script and stylesheet tags in your layout with the blendid asset helpers: - - - -`)) - - return stream -}) diff --git a/gulpfile.js/tasks/init.js b/gulpfile.js/tasks/init.js index 1b93c53c8..2ed87159d 100644 --- a/gulpfile.js/tasks/init.js +++ b/gulpfile.js/tasks/init.js @@ -1,12 +1,12 @@ -var gulp = require('gulp') -var log = require('fancy-log') -var colors = require('ansi-colors') +var gulp = require('gulp') +var log = require('fancy-log') +var colors = require('ansi-colors') var projectPath = require('../lib/projectPath') -var merge = require('merge-stream') +var merge = require('merge-stream') gulp.task('init', function() { var rootStream = gulp.src(['root/*']) - .pipe(gulp.dest(process.env.PWD)) + .pipe(gulp.dest(projectPath())) var configStream = gulp.src(['gulpfile.js/path-config.json', 'gulpfile.js/task-config.js']) .pipe(gulp.dest(projectPath('config'))) From 0760e559d71bb01bee92d8b5b17bf0eb56659df7 Mon Sep 17 00:00:00 2001 From: benjtinsley Date: Thu, 25 Jan 2018 09:37:33 -0700 Subject: [PATCH 07/33] PR changes including, removing devDependencies for dependencies and using gulp naming standards --- gulpfile.js/tasks/init.js | 2 +- gulpfile.js/tasks/rev/rev-assets.js | 4 ++-- gulpfile.js/tasks/rev/rev-css.js | 4 ++-- package.json | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gulpfile.js/tasks/init.js b/gulpfile.js/tasks/init.js index 2ed87159d..7d8a2a24f 100644 --- a/gulpfile.js/tasks/init.js +++ b/gulpfile.js/tasks/init.js @@ -5,7 +5,7 @@ var projectPath = require('../lib/projectPath') var merge = require('merge-stream') gulp.task('init', function() { - var rootStream = gulp.src(['root/*']) + var rootStream = gulp.src('root/*') .pipe(gulp.dest(projectPath())) var configStream = gulp.src(['gulpfile.js/path-config.json', 'gulpfile.js/task-config.js']) diff --git a/gulpfile.js/tasks/rev/rev-assets.js b/gulpfile.js/tasks/rev/rev-assets.js index 1c4cbead6..af2735172 100644 --- a/gulpfile.js/tasks/rev/rev-assets.js +++ b/gulpfile.js/tasks/rev/rev-assets.js @@ -1,7 +1,7 @@ var gulp = require('gulp') var path = require('path') var rev = require('gulp-rev') -var revDel = require('gulp-rev-delete-original') +var revdel = require('gulp-rev-delete-original') var projectPath = require('../../lib/projectPath') // 1) Add md5 hashes to assets referenced by CSS and JS files @@ -12,7 +12,7 @@ gulp.task('rev-assets', function() { return gulp.src([projectPath(PATH_CONFIG.dest,'**/*'), ignoreThese]) .pipe(rev()) .pipe(gulp.dest(PATH_CONFIG.dest)) - .pipe(revDel()) + .pipe(revdel()) .pipe(rev.manifest(projectPath(PATH_CONFIG.dest, 'rev-manifest.json'), {merge: true})) .pipe(gulp.dest('')) }) diff --git a/gulpfile.js/tasks/rev/rev-css.js b/gulpfile.js/tasks/rev/rev-css.js index d34d979ba..08d2f028f 100644 --- a/gulpfile.js/tasks/rev/rev-css.js +++ b/gulpfile.js/tasks/rev/rev-css.js @@ -1,6 +1,6 @@ var gulp = require('gulp') var rev = require('gulp-rev') -var revDel = require('gulp-rev-delete-original') +var revdel = require('gulp-rev-delete-original') var projectPath = require('../../lib/projectPath') // 3) Rev and compress CSS and JS files (this is done after assets, so that if a @@ -9,7 +9,7 @@ gulp.task('rev-css', function(){ return gulp.src(projectPath(PATH_CONFIG.dest,'**/*.css')) .pipe(rev()) .pipe(gulp.dest(PATH_CONFIG.dest)) - .pipe(revDel()) + .pipe(revdel()) .pipe(rev.manifest(projectPath(PATH_CONFIG.dest, 'rev-manifest.json'), {merge: true})) .pipe(gulp.dest('')) }) diff --git a/package.json b/package.json index d5abd4fc8..83944c8a3 100644 --- a/package.json +++ b/package.json @@ -27,6 +27,7 @@ "ansi-colors": "^1.0.1", "babel-core": "^6.25.0", "babel-loader": "^7.1.1", + "babel-preset-env": "^1.6.1", "babel-preset-stage-1": "^6.24.1", "browser-sync": "^2.18.8", "del": "2.2.2", @@ -43,6 +44,7 @@ "gulp-notify": "^3.0.0", "gulp-nunjucks-render": "2.2.2", "gulp-rev": "7.1.2", + "gulp-rev-delete-original": "^0.2.3", "gulp-rev-replace": "0.4.3", "gulp-sass": "^3.1.0", "gulp-sequence": "1.0.0", @@ -64,9 +66,7 @@ "webpack-hot-middleware": "^2.18.2" }, "devDependencies": { - "babel-preset-env": "^1.6.1", "chai": "^3.5.0", - "gulp-rev-delete-original": "^0.2.3", "mocha": "3.2.0" } } From ebf8a0889dab8a804f6b2145068a1c6b32a77518 Mon Sep 17 00:00:00 2001 From: benjtinsley Date: Fri, 19 Jan 2018 15:21:16 -0700 Subject: [PATCH 08/33] removes outdated gulp-rev-napkin for one that has been maintained more recently [updates #524] --- package.json | 1 + yarn.lock | 27 ++++++++++++++++++++++++++- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 83944c8a3..695e2c77e 100644 --- a/package.json +++ b/package.json @@ -67,6 +67,7 @@ }, "devDependencies": { "chai": "^3.5.0", + "gulp-rev-delete-original": "^0.2.3", "mocha": "3.2.0" } } diff --git a/yarn.lock b/yarn.lock index 2bc1b942b..443727021 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2823,6 +2823,18 @@ gulp-nunjucks-render@2.2.2: replace-ext "^1.0.0" through2 "~0.4.0" +gulp-rename@1.2.2: + version "1.2.2" + resolved "https://registry.npmjs.org/gulp-rename/-/gulp-rename-1.2.2.tgz#3ad4428763f05e2764dec1c67d868db275687817" + +gulp-replace@^0.5.4: + version "0.5.4" + resolved "https://registry.npmjs.org/gulp-replace/-/gulp-replace-0.5.4.tgz#69a67914bbd13c562bff14f504a403796aa0daa9" + dependencies: + istextorbinary "1.0.2" + readable-stream "^2.0.1" + replacestream "^4.0.0" + gulp-rev-delete-original@^0.2.3: version "0.2.3" resolved "https://registry.yarnpkg.com/gulp-rev-delete-original/-/gulp-rev-delete-original-0.2.3.tgz#81f3f95db3bd3a324923df6d235ae953c2ac038d" @@ -2910,7 +2922,7 @@ gulp-svgstore@6.1.0: cheerio "0.*" gulp-util "^3.0.0" -gulp-util@^3.0, gulp-util@^3.0.0, gulp-util@^3.0.6, gulp-util@^3.0.7, gulp-util@^3.0.8: +gulp-util@>=3.0.0, gulp-util@^3.0, gulp-util@^3.0.0, gulp-util@^3.0.6, gulp-util@^3.0.7, gulp-util@^3.0.8: version "3.0.8" resolved "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz#0054e1e744502e27c04c187c3ecc505dd54bbb4f" dependencies: @@ -5332,6 +5344,12 @@ rimraf@^2.2.8, rimraf@^2.4.3: dependencies: glob "^7.0.5" +rimraf@^2.3.4: + version "2.6.2" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36" + dependencies: + glob "^7.0.5" + rimraf@~2.2.0: version "2.2.8" resolved "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz#e439be2aaee327321952730f99a8929e4fc50582" @@ -5878,6 +5896,13 @@ through2@2.X, through2@^2.0.0, through2@^2.0.1, through2@^2.0.3, through2@~2.0.0 readable-stream "^2.1.5" xtend "~4.0.1" +through2@^0.5.0: + version "0.5.1" + resolved "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz#dfdd012eb9c700e2323fd334f38ac622ab372da7" + dependencies: + readable-stream "~1.0.17" + xtend "~3.0.0" + through2@^0.6.0, through2@^0.6.1, through2@^0.6.5: version "0.6.5" resolved "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz#41ab9c67b29d57209071410e1d7a7a968cd3ad48" From 6a307ba17124c84fe572e60b0a60b294fb4ba70c Mon Sep 17 00:00:00 2001 From: benjtinsley Date: Mon, 22 Jan 2018 16:12:39 -0700 Subject: [PATCH 09/33] first crack at js/css linting [updates #517] --- gulpfile.js/.eslintrc.js | 33 + gulpfile.js/.stylelintrc | 35 + gulpfile.js/task-config.js | 7 + gulpfile.js/tasks/stylesheets.js | 21 +- package.json | 8 +- yarn.lock | 1102 +++++++++++++++++++++++++++++- 6 files changed, 1167 insertions(+), 39 deletions(-) create mode 100644 gulpfile.js/.eslintrc.js create mode 100644 gulpfile.js/.stylelintrc diff --git a/gulpfile.js/.eslintrc.js b/gulpfile.js/.eslintrc.js new file mode 100644 index 000000000..7c45ba9f0 --- /dev/null +++ b/gulpfile.js/.eslintrc.js @@ -0,0 +1,33 @@ +var isIntegration = !!process.env.CI + +module.exports = { + env: { + browser: true, + commonjs: true, + es6: true, + node: true, + jest: true, + jasmine: true + }, + parser: 'babel-eslint', + parserOptions: { + ecmaVersion: 7, + ecmaFeatures: { + experimentalObjectRestSpread: true, + jsx: true + } + }, + extends: ['eslint:recommended'], + plugins: ['prettier'], + rules: { + semi: 'off', + 'no-console': 'off', + 'no-debugger': isIntegration ? 'error' : 'off', + 'no-unused-vars': [ + 1, + { args: 'none', ignoreRestSiblings: true, varsIgnorePattern: '^_' } + ], + 'no-return-assign': 'error', + 'prettier/prettier': isIntegration ? 'error' : 'warn' + } +} diff --git a/gulpfile.js/.stylelintrc b/gulpfile.js/.stylelintrc new file mode 100644 index 000000000..1eed01e4f --- /dev/null +++ b/gulpfile.js/.stylelintrc @@ -0,0 +1,35 @@ +{ + "plugins": { + "stylelint-order" + }, + "rules": { + "block-no-empty": null, + "color-no-invalid-hex": true, + "comment-empty-line-before": [ "always", { + "ignore": ["stylelint-commands", "after-comment"] + } ], + "comment-no-empty": true, + "declaration-block-single-line-max-declarations": 1, + "declaration-colon-space-after": "always", + "indentation": 4, + "max-empty-lines": 1, + "no-descending-specificity": true, + "no-duplicate-at-import-rules": true, + "no-duplicate-selectors": true, + "no-empty-source": true, + "no-extra-semicolons": true, + "no-unknown-animations": true, + "property-no-unknown": [true, { + "checkPrefixed": true + }] + "rule-empty-line-before": [ "always", { + "except": ["first-nested"], + "ignore": ["after-comment"] + }], + "selector-pseudo-class-no-unknown": true, + "selector-pseudo-element-no-unknown": true, + // plugin based rules + // stylint-order + "order/properties-alphabetical-order": true + } +} diff --git a/gulpfile.js/task-config.js b/gulpfile.js/task-config.js index 36b24f1a7..4736bf1b5 100644 --- a/gulpfile.js/task-config.js +++ b/gulpfile.js/task-config.js @@ -15,6 +15,13 @@ module.exports = { } }, + stylesheets: { + stylelint: { + console: true, + fix: true + } + }, + browserSync: { server: { // should match `dest` in diff --git a/gulpfile.js/tasks/stylesheets.js b/gulpfile.js/tasks/stylesheets.js index cd6c3fcea..30df360ec 100644 --- a/gulpfile.js/tasks/stylesheets.js +++ b/gulpfile.js/tasks/stylesheets.js @@ -1,14 +1,16 @@ if(!TASK_CONFIG.stylesheets) return -var gulp = require('gulp') -var gulpif = require('gulp-if') -var browserSync = require('browser-sync') -var sass = require('gulp-sass') -var sourcemaps = require('gulp-sourcemaps') -var handleErrors = require('../lib/handleErrors') -var autoprefixer = require('gulp-autoprefixer') -var projectPath = require('../lib/projectPath') -var cssnano = require('gulp-cssnano') +var gulp = require('gulp') +var gulpif = require('gulp-if') +var browserSync = require('browser-sync') +var sass = require('gulp-sass') +var sourcemaps = require('gulp-sourcemaps') +var handleErrors = require('../lib/handleErrors') +var autoprefixer = require('gulp-autoprefixer') +var path = require('path') +var cssnano = require('gulp-cssnano') +var gulpStylelint = require('gulp-stylelint') +var projectPath = require('../lib/projectPath') var sassTask = function () { @@ -30,6 +32,7 @@ var sassTask = function () { .pipe(gulpif(!global.production, sourcemaps.init())) .pipe(sass(TASK_CONFIG.stylesheets.sass)) .on('error', handleErrors) + .pipe(gulpStylelint(TASK_CONFIG.stylesheets.stylelint)) .pipe(autoprefixer(TASK_CONFIG.stylesheets.autoprefixer)) .pipe(gulpif(global.production, cssnano(cssnanoConfig))) .pipe(gulpif(!global.production, sourcemaps.write())) diff --git a/package.json b/package.json index 695e2c77e..86758b06e 100644 --- a/package.json +++ b/package.json @@ -32,6 +32,8 @@ "browser-sync": "^2.18.8", "del": "2.2.2", "es6-promise": "^4.1.1", + "eslint-loader": "^1.9.0", + "eslint-plugin-prettier": "^2.5.0", "fancy-log": "^1.3.2", "gulp": "3.9.1", "gulp-autoprefixer": "4.1.0", @@ -67,7 +69,11 @@ }, "devDependencies": { "chai": "^3.5.0", + "eslint": "^4.16.0", "gulp-rev-delete-original": "^0.2.3", - "mocha": "3.2.0" + "gulp-stylelint": "^6.0.0", + "mocha": "3.2.0", + "stylelint": "^8.4.0", + "stylelint-order": "^0.8.0" } } diff --git a/yarn.lock b/yarn.lock index 443727021..95de36c1d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -40,14 +40,28 @@ acorn-dynamic-import@^2.0.0: dependencies: acorn "^4.0.3" +acorn-jsx@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-3.0.1.tgz#afdf9488fb1ecefc8348f6fb22f464e32a58b36b" + dependencies: + acorn "^3.0.4" + acorn@4.X, acorn@^4.0.3: version "4.0.13" resolved "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787" +acorn@^3.0.4: + version "3.3.0" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a" + acorn@^5.0.0, acorn@^5.0.3: version "5.1.1" resolved "https://registry.npmjs.org/acorn/-/acorn-5.1.1.tgz#53fe161111f912ab999ee887a90a0bc52822fd75" +acorn@^5.2.1: + version "5.3.0" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.3.0.tgz#7446d39459c54fb49a80e6ee6478149b940ec822" + after@0.8.1: version "0.8.1" resolved "https://registry.npmjs.org/after/-/after-0.8.1.tgz#ab5d4fb883f596816d3515f8f791c0af486dd627" @@ -56,6 +70,10 @@ ajv-keywords@^2.0.0: version "2.1.0" resolved "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.0.tgz#a296e17f7bfae7c1ce4f7e0de53d29cb32162df0" +ajv-keywords@^2.1.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-2.1.1.tgz#617997fc5f60576894c435f940d819e135b80762" + ajv@^4.9.1: version "4.11.8" resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.8.tgz#82ffb02b29e662ae53bdc20af15947706739c536" @@ -72,6 +90,15 @@ ajv@^5.1.5: json-schema-traverse "^0.3.0" json-stable-stringify "^1.0.1" +ajv@^5.2.3, ajv@^5.3.0: + version "5.5.2" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965" + dependencies: + co "^4.6.0" + fast-deep-equal "^1.0.0" + fast-json-stable-stringify "^2.0.0" + json-schema-traverse "^0.3.0" + align-text@^0.1.1, align-text@^0.1.3: version "0.1.4" resolved "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117" @@ -100,6 +127,10 @@ ansi-cyan@^0.1.1: dependencies: ansi-wrap "0.1.0" +ansi-escapes@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.0.0.tgz#ec3e8b4e9f8064fc02c3ac9b65f1c275bda8ef92" + ansi-gray@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/ansi-gray/-/ansi-gray-0.1.1.tgz#2962cf54ec9792c48510a3deb524436861ef7251" @@ -199,6 +230,10 @@ array-find-index@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1" +array-iterate@^1.0.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/array-iterate/-/array-iterate-1.1.1.tgz#865bf7f8af39d6b0982c60902914ac76bc0108f6" + array-slice@^0.2.3: version "0.2.3" resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-0.2.3.tgz#dd3cfb80ed7973a75117cdac69b0b99ec86186f5" @@ -225,11 +260,11 @@ arraybuffer.slice@0.0.6: version "0.0.6" resolved "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.6.tgz#f33b2159f0532a3f3107a272c0ccfbd1ad2979ca" -arrify@^1.0.0: +arrify@^1.0.0, arrify@^1.0.1: version "1.0.1" resolved "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d" -asap@^2.0.3: +asap@^2.0.3, asap@~2.0.3: version "2.0.6" resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46" @@ -304,7 +339,7 @@ autoprefixer@^6.3.1: postcss "^5.2.16" postcss-value-parser "^3.2.3" -autoprefixer@^7.0.0: +autoprefixer@^7.0.0, autoprefixer@^7.1.2: version "7.2.5" resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-7.2.5.tgz#04ccbd0c6a61131b6d13f53d371926092952d192" dependencies: @@ -966,6 +1001,10 @@ backo2@1.0.2: version "1.0.2" resolved "https://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947" +bail@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/bail/-/bail-1.0.2.tgz#f7d6c1731630a9f9f0d4d35ed1f962e2074a1764" + balanced-match@^0.4.2: version "0.4.2" resolved "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz#cb3f3e3c732dc0f01ee70b403f302e61d7709838" @@ -1205,10 +1244,20 @@ builtin-status-codes@^3.0.0: version "3.0.0" resolved "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8" +caller-path@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-0.1.0.tgz#94085ef63581ecd3daa92444a8fe94e82577751f" + dependencies: + callsites "^0.2.0" + callsite@1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz#280398e5d664bd74038b6f0905153e6e8af1bc20" +callsites@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/callsites/-/callsites-0.2.0.tgz#afab96262910a7f33c19a5775825c69f34e350ca" + camel-case@3.0.x, camel-case@^3.0.0: version "3.0.0" resolved "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz#ca3c3688a4e9cf3a4cda777dc4dcbc713249cf73" @@ -1223,6 +1272,14 @@ camelcase-keys@^2.0.0: camelcase "^2.0.0" map-obj "^1.0.0" +camelcase-keys@^4.0.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-4.2.0.tgz#a2aa5fb1af688758259c32c141426d78923b9b77" + dependencies: + camelcase "^4.1.0" + map-obj "^2.0.0" + quick-lru "^1.0.0" + camelcase@^1.0.2, camelcase@^1.2.1: version "1.2.1" resolved "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39" @@ -1260,6 +1317,10 @@ caseless@~0.12.0: version "0.12.0" resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" +ccount@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/ccount/-/ccount-1.0.2.tgz#53b6a2f815bb77b9c2871f7b9a72c3a25f1d8e89" + center-align@^0.1.1: version "0.1.3" resolved "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz#aa0d32629b6ee972200411cbd4461c907bc2b7ad" @@ -1285,17 +1346,17 @@ chalk@^1.0.0, chalk@^1.1.0, chalk@^1.1.1, chalk@^1.1.3: strip-ansi "^3.0.0" supports-color "^2.0.0" -chalk@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.1.0.tgz#ac5becf14fa21b99c6c92ca7a7d7cfd5b17e743e" +chalk@^2.0.0, chalk@^2.0.1, chalk@^2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.0.tgz#b5ea48efc9c1793dccc9b4767c93914d3f2d52ba" dependencies: ansi-styles "^3.1.0" escape-string-regexp "^1.0.5" supports-color "^4.0.0" -chalk@^2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.0.tgz#b5ea48efc9c1793dccc9b4767c93914d3f2d52ba" +chalk@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.1.0.tgz#ac5becf14fa21b99c6c92ca7a7d7cfd5b17e743e" dependencies: ansi-styles "^3.1.0" escape-string-regexp "^1.0.5" @@ -1324,6 +1385,26 @@ change-case@^3.0.1: upper-case "^1.1.1" upper-case-first "^1.1.0" +character-entities-html4@^1.0.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/character-entities-html4/-/character-entities-html4-1.1.1.tgz#359a2a4a0f7e29d3dc2ac99bdbe21ee39438ea50" + +character-entities-legacy@^1.0.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/character-entities-legacy/-/character-entities-legacy-1.1.1.tgz#f40779df1a101872bb510a3d295e1fccf147202f" + +character-entities@^1.0.0: + version "1.2.1" + resolved "https://registry.yarnpkg.com/character-entities/-/character-entities-1.2.1.tgz#f76871be5ef66ddb7f8f8e3478ecc374c27d6dca" + +character-reference-invalid@^1.0.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/character-reference-invalid/-/character-reference-invalid-1.1.1.tgz#942835f750e4ec61a308e60c2ef8cc1011202efc" + +chardet@^0.4.0: + version "0.4.2" + resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.4.2.tgz#b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2" + cheerio@0.*: version "0.22.0" resolved "https://registry.npmjs.org/cheerio/-/cheerio-0.22.0.tgz#a9baa860a3f9b595a6b81b1a86873121ed3a269e" @@ -1367,6 +1448,10 @@ cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3: inherits "^2.0.1" safe-buffer "^5.0.1" +circular-json@^0.3.1: + version "0.3.3" + resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.3.3.tgz#815c99ea84f6809529d2f45791bdf82711352d66" + clap@^1.0.9: version "1.2.0" resolved "https://registry.npmjs.org/clap/-/clap-1.2.0.tgz#59c90fe3e137104746ff19469a27a634ff68c857" @@ -1379,12 +1464,22 @@ clean-css@4.1.x: dependencies: source-map "0.5.x" +cli-cursor@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5" + dependencies: + restore-cursor "^2.0.0" + cli-table@^0.3.1: version "0.3.1" resolved "https://registry.npmjs.org/cli-table/-/cli-table-0.3.1.tgz#f53b05266a8b1a0b934b3d0821e6e2dc5914ae23" dependencies: colors "1.0.3" +cli-width@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639" + cliui@^2.1.0: version "2.1.0" resolved "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz#4b475760ff80264c762c3a1719032e91c7fea0d1" @@ -1401,6 +1496,13 @@ cliui@^3.0.3, cliui@^3.2.0: strip-ansi "^3.0.1" wrap-ansi "^2.0.0" +clone-regexp@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/clone-regexp/-/clone-regexp-1.0.0.tgz#eae0a2413f55c0942f818c229fefce845d7f3b1c" + dependencies: + is-regexp "^1.0.0" + is-supported-regexp-flag "^1.0.0" + clone-stats@^0.0.1: version "0.0.1" resolved "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz#b88f94a82cf38b8791d58046ea4029ad88ca99d1" @@ -1427,6 +1529,10 @@ code-point-at@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" +collapse-white-space@^1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/collapse-white-space/-/collapse-white-space-1.0.3.tgz#4b906f670e5a963a87b76b0e1689643341b6023c" + color-convert@^1.3.0, color-convert@^1.9.0: version "1.9.0" resolved "https://registry.npmjs.org/color-convert/-/color-convert-1.9.0.tgz#1accf97dd739b983bf994d56fec8f95853641b7a" @@ -1511,6 +1617,14 @@ concat-map@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" +concat-stream@^1.6.0: + version "1.6.0" + resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.0.tgz#0aac662fd52be78964d5532f694784e70110acf7" + dependencies: + inherits "^2.0.3" + readable-stream "^2.2.2" + typedarray "^0.0.6" + connect-history-api-fallback@^1.1.0: version "1.3.0" resolved "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.3.0.tgz#e51d17f8f0ef0db90a64fdb47de3051556e9f169" @@ -1569,6 +1683,15 @@ core-util-is@1.0.2, core-util-is@~1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" +cosmiconfig@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-3.1.0.tgz#640a94bf9847f321800403cd273af60665c73397" + dependencies: + is-directory "^0.3.1" + js-yaml "^3.9.0" + parse-json "^3.0.0" + require-from-string "^2.0.1" + create-ecdh@^4.0.0: version "4.0.0" resolved "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.0.tgz#888c723596cdf7612f6498233eebd7a35301737d" @@ -1603,7 +1726,7 @@ cross-spawn@^3.0.0: lru-cache "^4.0.1" which "^1.2.9" -cross-spawn@^5.0.1: +cross-spawn@^5.0.1, cross-spawn@^5.1.0: version "5.1.0" resolved "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449" dependencies: @@ -1785,7 +1908,20 @@ debug@^2.2.0, debug@^2.6.8: dependencies: ms "2.0.0" -decamelize@^1.0.0, decamelize@^1.1.1, decamelize@^1.1.2: +debug@^3.0.0, debug@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261" + dependencies: + ms "2.0.0" + +decamelize-keys@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.0.tgz#d171a87933252807eb3cb61dc1c1445d078df2d9" + dependencies: + decamelize "^1.1.0" + map-obj "^1.0.0" + +decamelize@^1.0.0, decamelize@^1.1.0, decamelize@^1.1.1, decamelize@^1.1.2: version "1.2.0" resolved "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" @@ -1795,10 +1931,18 @@ deep-eql@^0.1.3: dependencies: type-detect "0.1.1" +deep-extend@^0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.5.0.tgz#6ef4a09b05f98b0e358d6d93d4ca3caec6672803" + deep-extend@~0.4.0: version "0.4.2" resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.4.2.tgz#48b699c27e334bf89f10892be432f6e4c7d34a7f" +deep-is@~0.1.3: + version "0.1.3" + resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34" + defaults@^1.0.0: version "1.0.3" resolved "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz#c656051e9817d9ff08ed881477f3fe4019f3ef7d" @@ -1809,7 +1953,7 @@ defined@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693" -del@2.2.2: +del@2.2.2, del@^2.0.2: version "2.2.2" resolved "https://registry.npmjs.org/del/-/del-2.2.2.tgz#c12c981d067846c84bcaf862cff930d907ffd1a8" dependencies: @@ -1888,6 +2032,19 @@ diffie-hellman@^5.0.0: miller-rabin "^4.0.0" randombytes "^2.0.0" +dir-glob@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-2.0.0.tgz#0b205d2b6aef98238ca286598a8204d29d0a0034" + dependencies: + arrify "^1.0.1" + path-type "^3.0.0" + +doctrine@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d" + dependencies: + esutils "^2.0.2" + dom-serializer@0, dom-serializer@~0.1.0: version "0.1.0" resolved "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz#073c697546ce0780ce23be4a28e293e40bc30c82" @@ -1930,6 +2087,12 @@ dot-case@^2.1.0: dependencies: no-case "^2.2.0" +dot-prop@^4.1.1: + version "4.2.0" + resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.0.tgz#1f19e0c2e1aa0e32797c49799f2837ac6af69c57" + dependencies: + is-obj "^1.0.0" + duplexer2@0.0.2: version "0.0.2" resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.0.2.tgz#c614dcf67e2fb14995a91711e5a617e8a60a31db" @@ -2073,7 +2236,7 @@ errno@^0.1.3: dependencies: prr "~0.0.0" -error-ex@^1.2.0: +error-ex@^1.2.0, error-ex@^1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.1.tgz#f855a86ce61adc4e8621c3cda21e7a7612c3a8dc" dependencies: @@ -2156,10 +2319,97 @@ escope@^3.6.0: esrecurse "^4.1.0" estraverse "^4.1.1" +eslint-loader@^1.9.0: + version "1.9.0" + resolved "https://registry.yarnpkg.com/eslint-loader/-/eslint-loader-1.9.0.tgz#7e1be9feddca328d3dcfaef1ad49d5beffe83a13" + dependencies: + loader-fs-cache "^1.0.0" + loader-utils "^1.0.2" + object-assign "^4.0.1" + object-hash "^1.1.4" + rimraf "^2.6.1" + +eslint-plugin-prettier@^2.5.0: + version "2.5.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-2.5.0.tgz#39a91dd7528eaf19cd42c0ee3f2c1f684606a05f" + dependencies: + fast-diff "^1.1.1" + jest-docblock "^21.0.0" + +eslint-scope@^3.7.1: + version "3.7.1" + resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-3.7.1.tgz#3d63c3edfda02e06e01a452ad88caacc7cdcb6e8" + dependencies: + esrecurse "^4.1.0" + estraverse "^4.1.1" + +eslint-visitor-keys@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#3f3180fb2e291017716acb4c9d6d5b5c34a6a81d" + +eslint@^4.16.0: + version "4.16.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-4.16.0.tgz#934ada9e98715e1d7bbfd6f6f0519ed2fab35cc1" + dependencies: + ajv "^5.3.0" + babel-code-frame "^6.22.0" + chalk "^2.1.0" + concat-stream "^1.6.0" + cross-spawn "^5.1.0" + debug "^3.1.0" + doctrine "^2.1.0" + eslint-scope "^3.7.1" + eslint-visitor-keys "^1.0.0" + espree "^3.5.2" + esquery "^1.0.0" + esutils "^2.0.2" + file-entry-cache "^2.0.0" + functional-red-black-tree "^1.0.1" + glob "^7.1.2" + globals "^11.0.1" + ignore "^3.3.3" + imurmurhash "^0.1.4" + inquirer "^3.0.6" + is-resolvable "^1.0.0" + js-yaml "^3.9.1" + json-stable-stringify-without-jsonify "^1.0.1" + levn "^0.3.0" + lodash "^4.17.4" + minimatch "^3.0.2" + mkdirp "^0.5.1" + natural-compare "^1.4.0" + optionator "^0.8.2" + path-is-inside "^1.0.2" + pluralize "^7.0.0" + progress "^2.0.0" + require-uncached "^1.0.3" + semver "^5.3.0" + strip-ansi "^4.0.0" + strip-json-comments "~2.0.1" + table "^4.0.1" + text-table "~0.2.0" + +espree@^3.5.2: + version "3.5.2" + resolved "https://registry.yarnpkg.com/espree/-/espree-3.5.2.tgz#756ada8b979e9dcfcdb30aad8d1a9304a905e1ca" + dependencies: + acorn "^5.2.1" + acorn-jsx "^3.0.0" + esprima@^2.6.0: version "2.7.3" resolved "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581" +esprima@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.0.tgz#4499eddcd1110e0b218bacf2fa7f7f59f55ca804" + +esquery@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.0.0.tgz#cfba8b57d7fba93f17298a8a006a04cda13d80fa" + dependencies: + estraverse "^4.0.0" + esrecurse@^4.1.0: version "4.2.0" resolved "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.0.tgz#fa9568d98d3823f9a41d91e902dcab9ea6e5b163" @@ -2167,7 +2417,7 @@ esrecurse@^4.1.0: estraverse "^4.1.0" object-assign "^4.0.1" -estraverse@^4.1.0, estraverse@^4.1.1: +estraverse@^4.0.0, estraverse@^4.1.0, estraverse@^4.1.1: version "4.2.0" resolved "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13" @@ -2212,6 +2462,12 @@ execa@^0.7.0: signal-exit "^3.0.0" strip-eof "^1.0.0" +execall@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/execall/-/execall-1.0.0.tgz#73d0904e395b3cab0658b08d09ec25307f29bb73" + dependencies: + clone-regexp "^1.0.0" + expand-brackets@^0.1.4: version "0.1.5" resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b" @@ -2261,6 +2517,14 @@ extend@^3.0.0, extend@~3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444" +external-editor@^2.0.4: + version "2.1.0" + resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-2.1.0.tgz#3d026a21b7f95b5726387d4200ac160d372c3b48" + dependencies: + chardet "^0.4.0" + iconv-lite "^0.4.17" + tmp "^0.0.33" + extglob@^0.3.1: version "0.3.2" resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1" @@ -2294,6 +2558,31 @@ fast-deep-equal@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz#96256a3bc975595eb36d82e9929d060d893439ff" +fast-diff@^1.1.1: + version "1.1.2" + resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.1.2.tgz#4b62c42b8e03de3f848460b639079920695d0154" + +fast-json-stable-stringify@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2" + +fast-levenshtein@~2.0.4: + version "2.0.6" + resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" + +figures@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962" + dependencies: + escape-string-regexp "^1.0.5" + +file-entry-cache@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-2.0.0.tgz#c392990c3e684783d838b8c84a45d8a048458361" + dependencies: + flat-cache "^1.2.1" + object-assign "^4.0.1" + filename-regex@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26" @@ -2318,6 +2607,14 @@ finalhandler@0.5.0: statuses "~1.3.0" unpipe "~1.0.0" +find-cache-dir@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-0.1.1.tgz#c8defae57c8a52a8a784f9e31c57c742e993a0b9" + dependencies: + commondir "^1.0.1" + mkdirp "^0.5.1" + pkg-dir "^1.0.0" + find-cache-dir@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-1.0.0.tgz#9288e3e9e3cc3748717d39eade17cf71fc30ee6f" @@ -2376,6 +2673,15 @@ flagged-respawn@^0.3.2: version "0.3.2" resolved "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-0.3.2.tgz#ff191eddcd7088a675b2610fffc976be9b8074b5" +flat-cache@^1.2.1: + version "1.3.0" + resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-1.3.0.tgz#d3030b32b38154f4e3b7e9c709f490f7ef97c481" + dependencies: + circular-json "^0.3.1" + del "^2.0.2" + graceful-fs "^4.1.2" + write "^0.2.1" + flatten@^1.0.2: version "1.0.2" resolved "https://registry.npmjs.org/flatten/-/flatten-1.0.2.tgz#dae46a9d78fbe25292258cc1e780a41d95c03782" @@ -2468,6 +2774,10 @@ function-bind@^1.0.2: version "1.1.0" resolved "https://registry.npmjs.org/function-bind/-/function-bind-1.1.0.tgz#16176714c801798e4e8f2cf7f7529467bb4a5771" +functional-red-black-tree@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327" + gauge@~2.7.3: version "2.7.4" resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7" @@ -2507,6 +2817,10 @@ get-stdin@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe" +get-stdin@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-5.0.1.tgz#122e161591e21ff4c52530305693f20e6393a398" + get-stream@^3.0.0: version "3.0.0" resolved "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14" @@ -2609,7 +2923,7 @@ glob@^5.0.3: once "^1.3.0" path-is-absolute "^1.0.0" -glob@^7.0.5, glob@~7.1.1: +glob@^7.0.5, glob@^7.1.2, glob@~7.1.1: version "7.1.2" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15" dependencies: @@ -2669,6 +2983,10 @@ global@^4.3.2: min-document "^2.19.0" process "~0.5.1" +globals@^11.0.1: + version "11.1.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-11.1.0.tgz#632644457f5f0e3ae711807183700ebf2e4633e4" + globals@^9.0.0, globals@^9.18.0: version "9.18.0" resolved "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a" @@ -2684,6 +3002,21 @@ globby@^5.0.0: pify "^2.0.0" pinkie-promise "^2.0.0" +globby@^7.0.0: + version "7.1.1" + resolved "https://registry.yarnpkg.com/globby/-/globby-7.1.1.tgz#fb2ccff9401f8600945dfada97440cca972b8680" + dependencies: + array-union "^1.0.1" + dir-glob "^2.0.0" + glob "^7.1.2" + ignore "^3.3.5" + pify "^3.0.0" + slash "^1.0.0" + +globjoin@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/globjoin/-/globjoin-0.1.4.tgz#2f4494ac8919e3767c5cbb691e9f463324285d43" + globule@^1.0.0: version "1.2.0" resolved "https://registry.npmjs.org/globule/-/globule-1.2.0.tgz#1dc49c6822dd9e8a2fa00ba2a295006e8664bd09" @@ -2706,6 +3039,12 @@ glogg@^1.0.0: dependencies: sparkles "^1.0.0" +gonzales-pe@^4.0.3: + version "4.2.3" + resolved "https://registry.yarnpkg.com/gonzales-pe/-/gonzales-pe-4.2.3.tgz#41091703625433285e0aee3aa47829fc1fbeb6f2" + dependencies: + minimist "1.1.x" + graceful-fs@4.X, graceful-fs@^4.0.0, graceful-fs@^4.1.2, graceful-fs@^4.1.6: version "4.1.11" resolved "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658" @@ -2915,6 +3254,20 @@ gulp-sourcemaps@^2.6.0: through2 "2.X" vinyl "1.X" +gulp-stylelint@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/gulp-stylelint/-/gulp-stylelint-6.0.0.tgz#b65b1fcd4ddfeff9564457eaa7fee264a5d71e5e" + dependencies: + chalk "^2.3.0" + deep-extend "^0.5.0" + fancy-log "^1.3.2" + mkdirp "^0.5.1" + plugin-error "^0.1.2" + promise "^8.0.1" + source-map "^0.6.1" + strip-ansi "^4.0.0" + through2 "^2.0.3" + gulp-svgstore@6.1.0: version "6.1.0" resolved "https://registry.npmjs.org/gulp-svgstore/-/gulp-svgstore-6.1.0.tgz#04b203ac0e13f8ed6dbfc940d25965c4e2456676" @@ -3130,7 +3483,11 @@ html-minifier@^3.0.3: relateurl "0.2.x" uglify-js "3.0.x" -htmlparser2@^3.9.1: +html-tags@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/html-tags/-/html-tags-2.0.0.tgz#10b30a386085f43cede353cc8fa7cb0deeea668b" + +htmlparser2@^3.9.1, htmlparser2@^3.9.2: version "3.9.2" resolved "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.9.2.tgz#1bdf87acca0f3f9e53fa4fcceb0f4b4cbb00b338" dependencies: @@ -3177,14 +3534,26 @@ https-browserify@0.0.1: version "0.0.1" resolved "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.1.tgz#3f91365cabe60b77ed0ebba24b454e3e09d95a82" +iconv-lite@^0.4.17: + version "0.4.19" + resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b" + ieee754@^1.1.4: version "1.1.8" resolved "https://registry.npmjs.org/ieee754/-/ieee754-1.1.8.tgz#be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4" +ignore@^3.3.3, ignore@^3.3.5: + version "3.3.7" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.7.tgz#612289bfb3c220e186a58118618d5be8c1bab021" + immutable@3.8.1, immutable@^3.7.6: version "3.8.1" resolved "https://registry.npmjs.org/immutable/-/immutable-3.8.1.tgz#200807f11ab0f72710ea485542de088075f68cd2" +imurmurhash@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" + in-publish@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/in-publish/-/in-publish-2.0.0.tgz#e20ff5e3a2afc2690320b6dc552682a9c7fadf51" @@ -3195,6 +3564,10 @@ indent-string@^2.1.0: dependencies: repeating "^2.0.0" +indent-string@^3.0.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-3.2.0.tgz#4a5fd6d27cc332f37e5419a504dbb837105c9289" + indexes-of@^1.0.1: version "1.0.1" resolved "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607" @@ -3230,6 +3603,25 @@ ini@~1.3.0: version "1.3.5" resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927" +inquirer@^3.0.6: + version "3.3.0" + resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-3.3.0.tgz#9dd2f2ad765dcab1ff0443b491442a20ba227dc9" + dependencies: + ansi-escapes "^3.0.0" + chalk "^2.0.0" + cli-cursor "^2.1.0" + cli-width "^2.0.0" + external-editor "^2.0.4" + figures "^2.0.0" + lodash "^4.3.0" + mute-stream "0.0.7" + run-async "^2.2.0" + rx-lite "^4.0.8" + rx-lite-aggregates "^4.0.8" + string-width "^2.1.0" + strip-ansi "^4.0.0" + through "^2.3.6" + interpret@^1.0.0: version "1.0.3" resolved "https://registry.npmjs.org/interpret/-/interpret-1.0.3.tgz#cbc35c62eeee73f19ab7b10a801511401afc0f90" @@ -3255,6 +3647,21 @@ is-absolute@^0.2.3: is-relative "^0.2.1" is-windows "^0.2.0" +is-alphabetical@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-alphabetical/-/is-alphabetical-1.0.1.tgz#c77079cc91d4efac775be1034bf2d243f95e6f08" + +is-alphanumeric@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-alphanumeric/-/is-alphanumeric-1.0.0.tgz#4a9cef71daf4c001c1d81d63d140cf53fd6889f4" + +is-alphanumerical@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-alphanumerical/-/is-alphanumerical-1.0.1.tgz#dfb4aa4d1085e33bdb61c2dee9c80e9c6c19f53b" + dependencies: + is-alphabetical "^1.0.0" + is-decimal "^1.0.0" + is-arrayish@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" @@ -3265,7 +3672,7 @@ is-binary-path@^1.0.0: dependencies: binary-extensions "^1.0.0" -is-buffer@^1.1.5: +is-buffer@^1.1.4, is-buffer@^1.1.5: version "1.1.6" resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" @@ -3275,6 +3682,14 @@ is-builtin-module@^1.0.0: dependencies: builtin-modules "^1.0.0" +is-decimal@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-decimal/-/is-decimal-1.0.1.tgz#f5fb6a94996ad9e8e3761fbfbd091f1fca8c4e82" + +is-directory@^0.3.1: + version "0.3.1" + resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1" + is-dotfile@^1.0.0: version "1.0.3" resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1" @@ -3325,6 +3740,10 @@ is-glob@^3.1.0: dependencies: is-extglob "^2.1.0" +is-hexadecimal@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-hexadecimal/-/is-hexadecimal-1.0.1.tgz#6e084bbc92061fbb0971ec58b6ce6d404e24da69" + is-lower-case@^1.1.0: version "1.1.3" resolved "https://registry.yarnpkg.com/is-lower-case/-/is-lower-case-1.1.3.tgz#7e147be4768dc466db3bfb21cc60b31e6ad69393" @@ -3349,6 +3768,10 @@ is-number@^3.0.0: dependencies: kind-of "^3.0.2" +is-obj@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f" + is-path-cwd@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d" @@ -3365,7 +3788,7 @@ is-path-inside@^1.0.0: dependencies: path-is-inside "^1.0.1" -is-plain-obj@^1.0.0: +is-plain-obj@^1.0.0, is-plain-obj@^1.1.0: version "1.1.0" resolved "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e" @@ -3383,20 +3806,32 @@ is-primitive@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575" -is-promise@^2.1: +is-promise@^2.1, is-promise@^2.1.0: version "2.1.0" resolved "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa" +is-regexp@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069" + is-relative@^0.2.1: version "0.2.1" resolved "https://registry.npmjs.org/is-relative/-/is-relative-0.2.1.tgz#d27f4c7d516d175fb610db84bbeef23c3bc97aa5" dependencies: is-unc-path "^0.1.1" +is-resolvable@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88" + is-stream@^1.0.1, is-stream@^1.1.0: version "1.1.0" resolved "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" +is-supported-regexp-flag@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-supported-regexp-flag/-/is-supported-regexp-flag-1.0.0.tgz#8b520c85fae7a253382d4b02652e045576e13bb8" + is-svg@^2.0.0: version "2.1.0" resolved "https://registry.npmjs.org/is-svg/-/is-svg-2.1.0.tgz#cf61090da0d9efbcab8722deba6f032208dbb0e9" @@ -3427,6 +3862,10 @@ is-valid-glob@^0.3.0: version "0.3.0" resolved "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-0.3.0.tgz#d4b55c69f51886f9b65c70d6c2622d37e29f48fe" +is-whitespace-character@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-whitespace-character/-/is-whitespace-character-1.0.1.tgz#9ae0176f3282b65457a1992cdb084f8a5f833e3b" + is-windows@^0.2.0: version "0.2.0" resolved "https://registry.npmjs.org/is-windows/-/is-windows-0.2.0.tgz#de1aa6d63ea29dd248737b69f1ff8b8002d2108c" @@ -3435,6 +3874,10 @@ is-windows@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.1.tgz#310db70f742d259a16a369202b51af84233310d9" +is-word-character@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-word-character/-/is-word-character-1.0.1.tgz#5a03fa1ea91ace8a6eb0c7cd770eb86d65c8befb" + is@^3.1.0: version "3.2.1" resolved "https://registry.npmjs.org/is/-/is-3.2.1.tgz#d0ac2ad55eb7b0bec926a5266f6c662aaa83dca5" @@ -3465,6 +3908,10 @@ isstream@~0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" +jest-docblock@^21.0.0: + version "21.2.0" + resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-21.2.0.tgz#51529c3b30d5fd159da60c27ceedc195faf8d414" + js-base64@^2.1.8, js-base64@^2.1.9: version "2.1.9" resolved "https://registry.npmjs.org/js-base64/-/js-base64-2.1.9.tgz#f0e80ae039a4bd654b5f281fc93f04a914a7fcce" @@ -3473,6 +3920,13 @@ js-tokens@^3.0.0, js-tokens@^3.0.2: version "3.0.2" resolved "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b" +js-yaml@^3.9.0, js-yaml@^3.9.1: + version "3.10.0" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.10.0.tgz#2e78441646bd4682e963f22b6e92823c309c62dc" + dependencies: + argparse "^1.0.7" + esprima "^4.0.0" + js-yaml@~3.7.0: version "3.7.0" resolved "https://registry.npmjs.org/js-yaml/-/js-yaml-3.7.0.tgz#5c967ddd837a9bfdca5f2de84253abe8a1c03b80" @@ -3496,6 +3950,10 @@ json-loader@^0.5.4: version "0.5.7" resolved "https://registry.npmjs.org/json-loader/-/json-loader-0.5.7.tgz#dca14a70235ff82f0ac9a3abeb60d337a365185d" +json-parse-better-errors@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.1.tgz#50183cd1b2d25275de069e9e71b467ac9eab973a" + json-schema-traverse@^0.3.0: version "0.3.1" resolved "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340" @@ -3504,6 +3962,10 @@ json-schema@0.2.3: version "0.2.3" resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13" +json-stable-stringify-without-jsonify@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651" + json-stable-stringify@^1.0.0, json-stable-stringify@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz#9a759d39c5f2ff503fd5300646ed445f88c4f9af" @@ -3561,6 +4023,10 @@ kind-of@^4.0.0: dependencies: is-buffer "^1.1.5" +known-css-properties@^0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.5.0.tgz#6ff66943ed4a5b55657ee095779a91f4536f8084" + lazy-cache@^1.0.3: version "1.0.4" resolved "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e" @@ -3577,6 +4043,13 @@ lcid@^1.0.0: dependencies: invert-kv "^1.0.0" +levn@^0.3.0, levn@~0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee" + dependencies: + prelude-ls "~1.1.2" + type-check "~0.3.2" + liftoff@^2.1.0: version "2.3.0" resolved "https://registry.npmjs.org/liftoff/-/liftoff-2.3.0.tgz#a98f2ff67183d8ba7cfaca10548bd7ff0550b385" @@ -3614,6 +4087,22 @@ load-json-file@^2.0.0: pify "^2.0.0" strip-bom "^3.0.0" +load-json-file@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b" + dependencies: + graceful-fs "^4.1.2" + parse-json "^4.0.0" + pify "^3.0.0" + strip-bom "^3.0.0" + +loader-fs-cache@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/loader-fs-cache/-/loader-fs-cache-1.0.1.tgz#56e0bf08bd9708b26a765b68509840c8dec9fdbc" + dependencies: + find-cache-dir "^0.1.1" + mkdirp "0.5.1" + loader-runner@^2.3.0: version "2.3.0" resolved "https://registry.npmjs.org/loader-runner/-/loader-runner-2.3.0.tgz#f482aea82d543e07921700d5a46ef26fdac6b8a2" @@ -3849,7 +4338,7 @@ lodash@^3.10.0, lodash@^3.10.1: version "3.10.1" resolved "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6" -lodash@^4.0.0, lodash@^4.14.0, lodash@^4.17.4, lodash@^4.2.0, lodash@~4.17.4: +lodash@^4.0.0, lodash@^4.14.0, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.3.0, lodash@~4.17.4: version "4.17.4" resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae" @@ -3857,6 +4346,16 @@ lodash@~1.0.1: version "1.0.2" resolved "https://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz#8f57560c83b59fc270bd3d561b690043430e2551" +log-symbols@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a" + dependencies: + chalk "^2.0.1" + +longest-streak@^2.0.1: + version "2.0.2" + resolved "https://registry.yarnpkg.com/longest-streak/-/longest-streak-2.0.2.tgz#2421b6ba939a443bb9ffebf596585a50b4c38e2e" + longest@^1.0.1: version "1.0.1" resolved "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097" @@ -3919,10 +4418,33 @@ map-obj@^1.0.0, map-obj@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d" +map-obj@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-2.0.0.tgz#a65cd29087a92598b8791257a523e021222ac1f9" + +markdown-escapes@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/markdown-escapes/-/markdown-escapes-1.0.1.tgz#1994df2d3af4811de59a6714934c2b2292734518" + +markdown-table@^1.1.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/markdown-table/-/markdown-table-1.1.1.tgz#4b3dd3a133d1518b8ef0dbc709bf2a1b4824bc8c" + math-expression-evaluator@^1.2.14: version "1.2.17" resolved "https://registry.npmjs.org/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz#de819fdbcd84dccd8fae59c6aeb79615b9d266ac" +mathml-tag-names@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.0.1.tgz#8d41268168bf86d1102b98109e28e531e7a34578" + +mdast-util-compact@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/mdast-util-compact/-/mdast-util-compact-1.0.1.tgz#cdb5f84e2b6a2d3114df33bd05d9cb32e3c4083a" + dependencies: + unist-util-modify-children "^1.0.0" + unist-util-visit "^1.1.0" + mem@^1.1.0: version "1.1.0" resolved "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz#5edd52b485ca1d900fe64895505399a0dfa45f76" @@ -3964,13 +4486,27 @@ meow@^3.7.0: redent "^1.0.0" trim-newlines "^1.0.0" +meow@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/meow/-/meow-4.0.0.tgz#fd5855dd008db5b92c552082db1c307cba20b29d" + dependencies: + camelcase-keys "^4.0.0" + decamelize-keys "^1.0.0" + loud-rejection "^1.0.0" + minimist "^1.1.3" + minimist-options "^3.0.1" + normalize-package-data "^2.3.4" + read-pkg-up "^3.0.0" + redent "^2.0.0" + trim-newlines "^2.0.0" + merge-stream@^1.0.0, merge-stream@^1.0.1: version "1.0.1" resolved "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz#4041202d508a342ba00174008df0c251b8c135e1" dependencies: readable-stream "^2.0.1" -micromatch@2.3.11, micromatch@^2.1.5, micromatch@^2.3.7: +micromatch@2.3.11, micromatch@^2.1.5, micromatch@^2.3.11, micromatch@^2.3.7: version "2.3.11" resolved "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565" dependencies: @@ -4064,10 +4600,21 @@ minimatch@~0.2.11: lru-cache "2" sigmund "~1.0.0" +minimist-options@^3.0.1: + version "3.0.2" + resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-3.0.2.tgz#fba4c8191339e13ecf4d61beb03f070103f3d954" + dependencies: + arrify "^1.0.1" + is-plain-obj "^1.1.0" + minimist@0.0.8: version "0.0.8" resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d" +minimist@1.1.x: + version "1.1.3" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.1.3.tgz#3bedfd91a92d39016fcfaa1c681e8faa1a1efda8" + minimist@^1.1.0, minimist@^1.1.3, minimist@^1.2.0: version "1.2.0" resolved "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" @@ -4132,6 +4679,10 @@ multipipe@^0.1.2: dependencies: duplexer2 "0.0.2" +mute-stream@0.0.7: + version "0.0.7" + resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab" + nan@^2.3.0: version "2.8.0" resolved "https://registry.yarnpkg.com/nan/-/nan-2.8.0.tgz#ed715f3fe9de02b57a5e6252d90a96675e1f085a" @@ -4144,6 +4695,10 @@ natives@^1.1.0: version "1.1.0" resolved "https://registry.npmjs.org/natives/-/natives-1.1.0.tgz#e9ff841418a6b2ec7a495e939984f78f163e6e31" +natural-compare@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" + ncname@1.0.x: version "1.0.0" resolved "https://registry.npmjs.org/ncname/-/ncname-1.0.0.tgz#5b57ad18b1ca092864ef62b0b1ed8194f383b71c" @@ -4326,6 +4881,10 @@ normalize-range@^0.1.2: version "0.1.2" resolved "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942" +normalize-selector@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/normalize-selector/-/normalize-selector-0.2.0.tgz#d0b145eb691189c63a78d201dc4fdb1293ef0c03" + normalize-url@^1.4.0: version "1.9.1" resolved "https://registry.npmjs.org/normalize-url/-/normalize-url-1.9.1.tgz#2cc0d66b31ea23036458436e3620d85954c66c3c" @@ -4394,6 +4953,10 @@ object-component@0.0.3: version "0.0.3" resolved "https://registry.npmjs.org/object-component/-/object-component-0.0.3.tgz#f0c69aa50efc95b866c186f400a33769cb2f1291" +object-hash@^1.1.4: + version "1.2.0" + resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-1.2.0.tgz#e96af0e96981996a1d47f88ead8f74f1ebc4422b" + object-hash@^1.1.8: version "1.1.8" resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-1.1.8.tgz#28a659cf987d96a4dabe7860289f3b5326c4a03c" @@ -4446,6 +5009,12 @@ once@~1.3.0: dependencies: wrappy "1" +onetime@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4" + dependencies: + mimic-fn "^1.0.0" + open@0.0.5: version "0.0.5" resolved "https://registry.npmjs.org/open/-/open-0.0.5.tgz#42c3e18ec95466b6bf0dc42f3a2945c3f0cad8fc" @@ -4461,6 +5030,17 @@ opn@4.0.2: object-assign "^4.0.1" pinkie-promise "^2.0.0" +optionator@^0.8.2: + version "0.8.2" + resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64" + dependencies: + deep-is "~0.1.3" + fast-levenshtein "~2.0.4" + levn "~0.3.0" + prelude-ls "~1.1.2" + type-check "~0.3.2" + wordwrap "~1.0.0" + options@>=0.0.5: version "0.0.6" resolved "https://registry.npmjs.org/options/-/options-0.0.6.tgz#ec22d312806bb53e731773e7cdaefcf1c643128f" @@ -4506,7 +5086,7 @@ os-locale@^2.0.0: lcid "^1.0.0" mem "^1.1.0" -os-tmpdir@^1.0.0, os-tmpdir@^1.0.1: +os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.2: version "1.0.2" resolved "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" @@ -4551,6 +5131,17 @@ parse-asn1@^5.0.0: evp_bytestokey "^1.0.0" pbkdf2 "^3.0.3" +parse-entities@^1.0.2: + version "1.1.1" + resolved "https://registry.yarnpkg.com/parse-entities/-/parse-entities-1.1.1.tgz#8112d88471319f27abae4d64964b122fe4e1b890" + dependencies: + character-entities "^1.0.0" + character-entities-legacy "^1.0.0" + character-reference-invalid "^1.0.0" + is-alphanumerical "^1.0.0" + is-decimal "^1.0.0" + is-hexadecimal "^1.0.0" + parse-filepath@^1.0.1: version "1.0.1" resolved "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.1.tgz#159d6155d43904d16c10ef698911da1e91969b73" @@ -4574,6 +5165,19 @@ parse-json@^2.2.0: dependencies: error-ex "^1.2.0" +parse-json@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-3.0.0.tgz#fa6f47b18e23826ead32f263e744d0e1e847fb13" + dependencies: + error-ex "^1.3.1" + +parse-json@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0" + dependencies: + error-ex "^1.3.1" + json-parse-better-errors "^1.0.1" + parse-passwd@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6" @@ -4635,7 +5239,7 @@ path-is-absolute@^1.0.0, path-is-absolute@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" -path-is-inside@^1.0.1: +path-is-inside@^1.0.1, path-is-inside@^1.0.2: version "1.0.2" resolved "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53" @@ -4671,6 +5275,12 @@ path-type@^2.0.0: dependencies: pify "^2.0.0" +path-type@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f" + dependencies: + pify "^3.0.0" + pbkdf2@^3.0.3: version "3.0.12" resolved "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.12.tgz#be36785c5067ea48d806ff923288c5f750b6b8a2" @@ -4689,6 +5299,10 @@ pify@^2.0.0, pify@^2.3.0: version "2.3.0" resolved "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c" +pify@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176" + pinkie-promise@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa" @@ -4699,6 +5313,12 @@ pinkie@^2.0.0: version "2.0.4" resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870" +pkg-dir@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-1.0.0.tgz#7a4b508a8d5bb2d629d447056ff4e9c9314cf3d4" + dependencies: + find-up "^1.0.0" + pkg-dir@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b" @@ -4715,6 +5335,10 @@ plugin-error@^0.1.2: arr-union "^2.0.1" extend-shallow "^1.1.2" +pluralize@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-7.0.0.tgz#298b89df8b93b0221dbf421ad2b1b1ea23fc6777" + portscanner@2.1.1: version "2.1.1" resolved "https://registry.npmjs.org/portscanner/-/portscanner-2.1.1.tgz#eabb409e4de24950f5a2a516d35ae769343fbb96" @@ -4783,6 +5407,24 @@ postcss-filter-plugins@^2.0.0: postcss "^5.0.4" uniqid "^4.0.0" +postcss-html@^0.12.0: + version "0.12.0" + resolved "https://registry.yarnpkg.com/postcss-html/-/postcss-html-0.12.0.tgz#39b6adb4005dfc5464df7999c0f81c95bced7e50" + dependencies: + htmlparser2 "^3.9.2" + remark "^8.0.0" + unist-util-find-all-after "^1.0.1" + +postcss-less@^1.1.0: + version "1.1.3" + resolved "https://registry.yarnpkg.com/postcss-less/-/postcss-less-1.1.3.tgz#6930525271bfe38d5793d33ac09c1a546b87bb51" + dependencies: + postcss "^5.2.16" + +postcss-media-query-parser@^0.2.3: + version "0.2.3" + resolved "https://registry.yarnpkg.com/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz#27b39c6f4d94f81b1a73b8f76351c609e5cef244" + postcss-merge-idents@^2.1.5: version "2.1.7" resolved "https://registry.npmjs.org/postcss-merge-idents/-/postcss-merge-idents-2.1.7.tgz#4c5530313c08e1d5b3bbf3d2bbc747e278eea270" @@ -4887,6 +5529,32 @@ postcss-reduce-transforms@^1.0.3: postcss "^5.0.8" postcss-value-parser "^3.0.1" +postcss-reporter@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/postcss-reporter/-/postcss-reporter-5.0.0.tgz#a14177fd1342829d291653f2786efd67110332c3" + dependencies: + chalk "^2.0.1" + lodash "^4.17.4" + log-symbols "^2.0.0" + postcss "^6.0.8" + +postcss-resolve-nested-selector@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz#29ccbc7c37dedfac304e9fff0bf1596b3f6a0e4e" + +postcss-safe-parser@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/postcss-safe-parser/-/postcss-safe-parser-3.0.1.tgz#b753eff6c7c0aea5e8375fbe4cde8bf9063ff142" + dependencies: + postcss "^6.0.6" + +postcss-sass@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/postcss-sass/-/postcss-sass-0.2.0.tgz#e55516441e9526ba4b380a730d3a02e9eaa78c7a" + dependencies: + gonzales-pe "^4.0.3" + postcss "^6.0.6" + postcss-scss@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/postcss-scss/-/postcss-scss-1.0.2.tgz#ff45cf3354b879ee89a4eb68680f46ac9bb14f94" @@ -4901,6 +5569,21 @@ postcss-selector-parser@^2.0.0, postcss-selector-parser@^2.2.2: indexes-of "^1.0.1" uniq "^1.0.1" +postcss-selector-parser@^3.1.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-3.1.1.tgz#4f875f4afb0c96573d5cf4d74011aee250a7e865" + dependencies: + dot-prop "^4.1.1" + indexes-of "^1.0.1" + uniq "^1.0.1" + +postcss-sorting@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/postcss-sorting/-/postcss-sorting-3.1.0.tgz#af7c90ee73ad12569a57664eaf06735c2e25bec0" + dependencies: + lodash "^4.17.4" + postcss "^6.0.13" + postcss-svgo@^2.1.1: version "2.1.6" resolved "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-2.1.6.tgz#b6df18aa613b666e133f08adb5219c2684ac108d" @@ -4939,7 +5622,7 @@ postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0 source-map "^0.5.6" supports-color "^3.2.3" -postcss@^6.0.1, postcss@^6.0.16: +postcss@^6.0.1, postcss@^6.0.13, postcss@^6.0.14, postcss@^6.0.16, postcss@^6.0.6, postcss@^6.0.8: version "6.0.16" resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.16.tgz#112e2fe2a6d2109be0957687243170ea5589e146" dependencies: @@ -4955,6 +5638,10 @@ postcss@^6.0.11, postcss@^6.0.3: source-map "^0.5.7" supports-color "^4.4.0" +prelude-ls@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" + prepend-http@^1.0.0: version "1.0.4" resolved "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc" @@ -4989,6 +5676,16 @@ process@~0.5.1: version "0.5.2" resolved "https://registry.npmjs.org/process/-/process-0.5.2.tgz#1638d8a8e34c2f440a91db95ab9aeb677fc185cf" +progress@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.0.tgz#8a1be366bf8fc23db2bd23f10c6fe920b4389d1f" + +promise@^8.0.1: + version "8.0.1" + resolved "https://registry.yarnpkg.com/promise/-/promise-8.0.1.tgz#e45d68b00a17647b6da711bf85ed6ed47208f450" + dependencies: + asap "~2.0.3" + prr@~0.0.0: version "0.0.0" resolved "https://registry.npmjs.org/prr/-/prr-0.0.0.tgz#1a84b85908325501411853d0081ee3fa86e2926a" @@ -5046,6 +5743,10 @@ querystring@0.2.0, querystring@^0.2.0: version "0.2.0" resolved "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620" +quick-lru@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-1.1.0.tgz#4360b17c61136ad38078397ff11416e186dcfbb8" + randomatic@^1.1.3: version "1.1.7" resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-1.1.7.tgz#c7abe9cc8b87c0baa876b19fde83fd464797e38c" @@ -5086,6 +5787,13 @@ read-pkg-up@^2.0.0: find-up "^2.0.0" read-pkg "^2.0.0" +read-pkg-up@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-3.0.0.tgz#3ed496685dba0f8fe118d0691dc51f4a1ff96f07" + dependencies: + find-up "^2.0.0" + read-pkg "^3.0.0" + read-pkg@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28" @@ -5102,6 +5810,14 @@ read-pkg@^2.0.0: normalize-package-data "^2.3.2" path-type "^2.0.0" +read-pkg@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389" + dependencies: + load-json-file "^4.0.0" + normalize-package-data "^2.3.2" + path-type "^3.0.0" + "readable-stream@>=1.0.33-1 <1.1.0-0", readable-stream@~1.0.17: version "1.0.34" resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c" @@ -5154,6 +5870,13 @@ redent@^1.0.0: indent-string "^2.1.0" strip-indent "^1.0.1" +redent@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/redent/-/redent-2.0.0.tgz#c1b2007b42d57eb1389079b3c8333639d5e1ccaa" + dependencies: + indent-string "^3.0.0" + strip-indent "^2.0.0" + reduce-css-calc@^1.2.6: version "1.3.0" resolved "https://registry.npmjs.org/reduce-css-calc/-/reduce-css-calc-1.3.0.tgz#747c914e049614a4c9cfbba629871ad1d2927716" @@ -5216,6 +5939,53 @@ relateurl@0.2.x: version "0.2.7" resolved "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9" +remark-parse@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/remark-parse/-/remark-parse-4.0.0.tgz#99f1f049afac80382366e2e0d0bd55429dd45d8b" + dependencies: + collapse-white-space "^1.0.2" + is-alphabetical "^1.0.0" + is-decimal "^1.0.0" + is-whitespace-character "^1.0.0" + is-word-character "^1.0.0" + markdown-escapes "^1.0.0" + parse-entities "^1.0.2" + repeat-string "^1.5.4" + state-toggle "^1.0.0" + trim "0.0.1" + trim-trailing-lines "^1.0.0" + unherit "^1.0.4" + unist-util-remove-position "^1.0.0" + vfile-location "^2.0.0" + xtend "^4.0.1" + +remark-stringify@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/remark-stringify/-/remark-stringify-4.0.0.tgz#4431884c0418f112da44991b4e356cfe37facd87" + dependencies: + ccount "^1.0.0" + is-alphanumeric "^1.0.0" + is-decimal "^1.0.0" + is-whitespace-character "^1.0.0" + longest-streak "^2.0.1" + markdown-escapes "^1.0.0" + markdown-table "^1.1.0" + mdast-util-compact "^1.0.0" + parse-entities "^1.0.2" + repeat-string "^1.5.4" + state-toggle "^1.0.0" + stringify-entities "^1.0.1" + unherit "^1.0.4" + xtend "^4.0.1" + +remark@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/remark/-/remark-8.0.0.tgz#287b6df2fe1190e263c1d15e486d3fa835594d6d" + dependencies: + remark-parse "^4.0.0" + remark-stringify "^4.0.0" + unified "^6.0.0" + remove-trailing-separator@^1.0.1: version "1.1.0" resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef" @@ -5224,7 +5994,7 @@ repeat-element@^1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.2.tgz#ef089a178d1483baae4d93eb98b4f9e4e11d990a" -repeat-string@^1.5.2: +repeat-string@^1.5.2, repeat-string@^1.5.4: version "1.6.1" resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" @@ -5238,7 +6008,7 @@ replace-ext@0.0.1: version "0.0.1" resolved "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz#29bbd92078a739f0bcce2b4ee41e837953522924" -replace-ext@^1.0.0: +replace-ext@1.0.0, replace-ext@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.0.tgz#de63128373fcbf7c3ccfa4de5a480c45a67958eb" @@ -5277,10 +6047,21 @@ require-directory@^2.1.1: version "2.1.1" resolved "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" +require-from-string@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.1.tgz#c545233e9d7da6616e9d59adfb39fc9f588676ff" + require-main-filename@^1.0.1: version "1.0.1" resolved "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1" +require-uncached@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/require-uncached/-/require-uncached-1.0.3.tgz#4e0d56d6c9662fd31e43011c4b95aa49955421d3" + dependencies: + caller-path "^0.1.0" + resolve-from "^1.0.0" + requires-port@1.x.x: version "1.0.0" resolved "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" @@ -5299,6 +6080,14 @@ resolve-dir@^1.0.0: expand-tilde "^2.0.0" global-modules "^1.0.0" +resolve-from@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-1.0.1.tgz#26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226" + +resolve-from@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" + resolve-url@~0.2.1: version "0.2.1" resolved "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" @@ -5316,6 +6105,13 @@ resp-modifier@6.0.2: debug "^2.2.0" minimatch "^3.0.2" +restore-cursor@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf" + dependencies: + onetime "^2.0.0" + signal-exit "^3.0.2" + rev-hash@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/rev-hash/-/rev-hash-1.0.0.tgz#96993959ea9bfb1c59b13adf02ac2e34bb373603" @@ -5361,6 +6157,22 @@ ripemd160@^2.0.0, ripemd160@^2.0.1: hash-base "^2.0.0" inherits "^2.0.1" +run-async@^2.2.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz#0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0" + dependencies: + is-promise "^2.1.0" + +rx-lite-aggregates@^4.0.8: + version "4.0.8" + resolved "https://registry.yarnpkg.com/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz#753b87a89a11c95467c4ac1626c4efc4e05c67be" + dependencies: + rx-lite "*" + +rx-lite@*, rx-lite@^4.0.8: + version "4.0.8" + resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-4.0.8.tgz#0b1e11af8bc44836f04a6407e92da42467b79444" + rx@4.1.0: version "4.1.0" resolved "https://registry.npmjs.org/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782" @@ -5499,7 +6311,7 @@ sigmund@~1.0.0: version "1.0.1" resolved "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590" -signal-exit@^3.0.0: +signal-exit@^3.0.0, signal-exit@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d" @@ -5507,6 +6319,12 @@ slash@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55" +slice-ansi@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-1.0.0.tgz#044f1a49d8842ff307aad6b505ed178bd950134d" + dependencies: + is-fullwidth-code-point "^2.0.0" + snake-case@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/snake-case/-/snake-case-2.1.0.tgz#41bdb1b73f30ec66a04d4e2cad1b76387d4d6d9f" @@ -5634,6 +6452,10 @@ spdx-license-ids@^1.0.2: version "1.2.2" resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz#c9df7a3424594ade6bd11900d596696dc06bac57" +specificity@^0.3.1: + version "0.3.2" + resolved "https://registry.yarnpkg.com/specificity/-/specificity-0.3.2.tgz#99e6511eceef0f8d9b57924937aac2cb13d13c42" + sprintf-js@~1.0.2: version "1.0.3" resolved "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" @@ -5652,6 +6474,10 @@ sshpk@^1.7.0: jsbn "~0.1.0" tweetnacl "~0.14.0" +state-toggle@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/state-toggle/-/state-toggle-1.0.0.tgz#d20f9a616bb4f0c3b98b91922d25b640aa2bc425" + "statuses@>= 1.3.1 < 2", statuses@~1.3.0, statuses@~1.3.1: version "1.3.1" resolved "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e" @@ -5706,7 +6532,7 @@ string-width@^1.0.1, string-width@^1.0.2: is-fullwidth-code-point "^1.0.0" strip-ansi "^3.0.0" -string-width@^2.0.0: +string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1: version "2.1.1" resolved "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e" dependencies: @@ -5723,6 +6549,15 @@ string_decoder@~1.0.3: dependencies: safe-buffer "~5.1.0" +stringify-entities@^1.0.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/stringify-entities/-/stringify-entities-1.3.1.tgz#b150ec2d72ac4c1b5f324b51fb6b28c9cdff058c" + dependencies: + character-entities-html4 "^1.0.0" + character-entities-legacy "^1.0.0" + is-alphanumerical "^1.0.0" + is-hexadecimal "^1.0.0" + stringstream@~0.0.4: version "0.0.5" resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878" @@ -5784,10 +6619,76 @@ strip-indent@^1.0.1: dependencies: get-stdin "^4.0.1" +strip-indent@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-2.0.0.tgz#5ef8db295d01e6ed6cbf7aab96998d7822527b68" + strip-json-comments@~2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" +style-search@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/style-search/-/style-search-0.1.0.tgz#7958c793e47e32e07d2b5cafe5c0bf8e12e77902" + +stylelint-order@^0.8.0: + version "0.8.0" + resolved "https://registry.yarnpkg.com/stylelint-order/-/stylelint-order-0.8.0.tgz#49da5615cb91ed077ebd274687f4df3d6feeb4e4" + dependencies: + lodash "^4.17.4" + postcss "^6.0.14" + postcss-sorting "^3.1.0" + +stylelint@^8.4.0: + version "8.4.0" + resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-8.4.0.tgz#c2dbaeb17236917819f9206e1c0df5fddf6f83c3" + dependencies: + autoprefixer "^7.1.2" + balanced-match "^1.0.0" + chalk "^2.0.1" + cosmiconfig "^3.1.0" + debug "^3.0.0" + execall "^1.0.0" + file-entry-cache "^2.0.0" + get-stdin "^5.0.1" + globby "^7.0.0" + globjoin "^0.1.4" + html-tags "^2.0.0" + ignore "^3.3.3" + imurmurhash "^0.1.4" + known-css-properties "^0.5.0" + lodash "^4.17.4" + log-symbols "^2.0.0" + mathml-tag-names "^2.0.1" + meow "^4.0.0" + micromatch "^2.3.11" + normalize-selector "^0.2.0" + pify "^3.0.0" + postcss "^6.0.6" + postcss-html "^0.12.0" + postcss-less "^1.1.0" + postcss-media-query-parser "^0.2.3" + postcss-reporter "^5.0.0" + postcss-resolve-nested-selector "^0.1.1" + postcss-safe-parser "^3.0.1" + postcss-sass "^0.2.0" + postcss-scss "^1.0.2" + postcss-selector-parser "^3.1.0" + postcss-value-parser "^3.3.0" + resolve-from "^4.0.0" + specificity "^0.3.1" + string-width "^2.1.0" + style-search "^0.1.0" + sugarss "^1.0.0" + svg-tags "^1.0.0" + table "^4.0.1" + +sugarss@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/sugarss/-/sugarss-1.0.1.tgz#be826d9003e0f247735f92365dc3fd7f1bae9e44" + dependencies: + postcss "^6.0.14" + supports-color@3.1.2: version "3.1.2" resolved "https://registry.npmjs.org/supports-color/-/supports-color-3.1.2.tgz#72a262894d9d408b956ca05ff37b2ed8a6e2a2d5" @@ -5822,6 +6723,10 @@ supports-color@^5.1.0: dependencies: has-flag "^2.0.0" +svg-tags@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/svg-tags/-/svg-tags-1.0.0.tgz#58f71cee3bd519b59d4b2a843b6c7de64ac04764" + svgo@^0.7.0: version "0.7.2" resolved "https://registry.npmjs.org/svgo/-/svgo-0.7.2.tgz#9f5772413952135c6fefbf40afe6a4faa88b4bb5" @@ -5841,6 +6746,17 @@ swap-case@^1.1.0: lower-case "^1.1.1" upper-case "^1.1.1" +table@^4.0.1: + version "4.0.2" + resolved "https://registry.yarnpkg.com/table/-/table-4.0.2.tgz#a33447375391e766ad34d3486e6e2aedc84d2e36" + dependencies: + ajv "^5.2.3" + ajv-keywords "^2.1.0" + chalk "^2.1.0" + lodash "^4.17.4" + slice-ansi "1.0.0" + string-width "^2.1.1" + tapable@^0.2.7: version "0.2.7" resolved "https://registry.npmjs.org/tapable/-/tapable-0.2.7.tgz#e46c0daacbb2b8a98b9b0cea0f4052105817ed5c" @@ -5875,6 +6791,10 @@ ternary-stream@^2.0.1: merge-stream "^1.0.0" through2 "^2.0.1" +text-table@~0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" + tfunk@^3.0.1: version "3.1.0" resolved "https://registry.npmjs.org/tfunk/-/tfunk-3.1.0.tgz#38e4414fc64977d87afdaa72facb6d29f82f7b5b" @@ -5917,6 +6837,10 @@ through2@~0.4.0: readable-stream "~1.0.17" xtend "~2.1.1" +through@^2.3.6: + version "2.3.8" + resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" + thunks@^4.9.0: version "4.9.0" resolved "https://registry.yarnpkg.com/thunks/-/thunks-4.9.0.tgz#46c00db9968583b3a421e0c9285eac8b9fddb31a" @@ -5956,6 +6880,12 @@ title-case@^2.1.0: no-case "^2.2.0" upper-case "^1.0.3" +tmp@^0.0.33: + version "0.0.33" + resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9" + dependencies: + os-tmpdir "~1.0.2" + to-absolute-glob@^0.1.1: version "0.1.1" resolved "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-0.1.1.tgz#1cdfa472a9ef50c239ee66999b662ca0eb39937f" @@ -5984,10 +6914,26 @@ trim-newlines@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613" +trim-newlines@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-2.0.0.tgz#b403d0b91be50c331dfc4b82eeceb22c3de16d20" + trim-right@^1.0.1: version "1.0.1" resolved "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003" +trim-trailing-lines@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/trim-trailing-lines/-/trim-trailing-lines-1.1.0.tgz#7aefbb7808df9d669f6da2e438cac8c46ada7684" + +trim@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/trim/-/trim-0.0.1.tgz#5858547f6b290757ee95cccc666fb50084c460dd" + +trough@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/trough/-/trough-1.0.1.tgz#a9fd8b0394b0ae8fff82e0633a0a36ccad5b5f86" + tryit@^1.0.1: version "1.0.3" resolved "https://registry.npmjs.org/tryit/-/tryit-1.0.3.tgz#393be730a9446fd1ead6da59a014308f36c289cb" @@ -6006,6 +6952,12 @@ tweetnacl@^0.14.3, tweetnacl@~0.14.0: version "0.14.5" resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64" +type-check@~0.3.2: + version "0.3.2" + resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72" + dependencies: + prelude-ls "~1.1.2" + type-detect@0.1.1: version "0.1.1" resolved "https://registry.npmjs.org/type-detect/-/type-detect-0.1.1.tgz#0ba5ec2a885640e470ea4e8505971900dac58822" @@ -6014,6 +6966,10 @@ type-detect@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/type-detect/-/type-detect-1.0.0.tgz#762217cc06db258ec48908a1298e8b95121e8ea2" +typedarray@^0.0.6: + version "0.0.6" + resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" + ua-parser-js@0.7.12: version "0.7.12" resolved "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.12.tgz#04c81a99bdd5dc52263ea29d24c6bf8d4818a4bb" @@ -6066,6 +7022,25 @@ underscore@1.x.x: version "1.8.3" resolved "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz#4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022" +unherit@^1.0.4: + version "1.1.0" + resolved "https://registry.yarnpkg.com/unherit/-/unherit-1.1.0.tgz#6b9aaedfbf73df1756ad9e316dd981885840cd7d" + dependencies: + inherits "^2.0.1" + xtend "^4.0.1" + +unified@^6.0.0: + version "6.1.6" + resolved "https://registry.yarnpkg.com/unified/-/unified-6.1.6.tgz#5ea7f807a0898f1f8acdeefe5f25faa010cc42b1" + dependencies: + bail "^1.0.0" + extend "^3.0.0" + is-plain-obj "^1.1.0" + trough "^1.0.0" + vfile "^2.0.0" + x-is-function "^1.0.4" + x-is-string "^0.1.0" + uniq@^1.0.1: version "1.0.1" resolved "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff" @@ -6091,6 +7066,38 @@ unique-stream@^2.0.2: json-stable-stringify "^1.0.0" through2-filter "^2.0.0" +unist-util-find-all-after@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/unist-util-find-all-after/-/unist-util-find-all-after-1.0.1.tgz#4e5512abfef7e0616781aecf7b1ed751c00af908" + dependencies: + unist-util-is "^2.0.0" + +unist-util-is@^2.0.0, unist-util-is@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-2.1.1.tgz#0c312629e3f960c66e931e812d3d80e77010947b" + +unist-util-modify-children@^1.0.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/unist-util-modify-children/-/unist-util-modify-children-1.1.1.tgz#66d7e6a449e6f67220b976ab3cb8b5ebac39e51d" + dependencies: + array-iterate "^1.0.0" + +unist-util-remove-position@^1.0.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/unist-util-remove-position/-/unist-util-remove-position-1.1.1.tgz#5a85c1555fc1ba0c101b86707d15e50fa4c871bb" + dependencies: + unist-util-visit "^1.1.0" + +unist-util-stringify-position@^1.0.0, unist-util-stringify-position@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/unist-util-stringify-position/-/unist-util-stringify-position-1.1.1.tgz#3ccbdc53679eed6ecf3777dd7f5e3229c1b6aa3c" + +unist-util-visit@^1.1.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/unist-util-visit/-/unist-util-visit-1.3.0.tgz#41ca7c82981fd1ce6c762aac397fc24e35711444" + dependencies: + unist-util-is "^2.1.1" + universalify@^0.1.0: version "0.1.1" resolved "https://registry.npmjs.org/universalify/-/universalify-0.1.1.tgz#fa71badd4437af4c148841e3b3b165f9e9e590b7" @@ -6175,6 +7182,25 @@ verror@1.10.0: core-util-is "1.0.2" extsprintf "^1.2.0" +vfile-location@^2.0.0: + version "2.0.2" + resolved "https://registry.yarnpkg.com/vfile-location/-/vfile-location-2.0.2.tgz#d3675c59c877498e492b4756ff65e4af1a752255" + +vfile-message@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/vfile-message/-/vfile-message-1.0.0.tgz#a6adb0474ea400fa25d929f1d673abea6a17e359" + dependencies: + unist-util-stringify-position "^1.1.1" + +vfile@^2.0.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/vfile/-/vfile-2.3.0.tgz#e62d8e72b20e83c324bc6c67278ee272488bf84a" + dependencies: + is-buffer "^1.1.4" + replace-ext "1.0.0" + unist-util-stringify-position "^1.0.0" + vfile-message "^1.0.0" + vinyl-file@^1.1.0: version "1.3.0" resolved "https://registry.npmjs.org/vinyl-file/-/vinyl-file-1.3.0.tgz#aa05634d3a867ba91447bedbb34afcb26f44f6e7" @@ -6374,6 +7400,10 @@ wordwrap@0.0.2: version "0.0.2" resolved "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f" +wordwrap@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb" + wrap-ansi@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85" @@ -6391,6 +7421,12 @@ wrappy@1: version "1.0.2" resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" +write@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/write/-/write-0.2.1.tgz#5fc03828e264cea3fe91455476f7a3c566cb0757" + dependencies: + mkdirp "^0.5.1" + ws@1.1.1: version "1.1.1" resolved "https://registry.npmjs.org/ws/-/ws-1.1.1.tgz#082ddb6c641e85d4bb451f03d52f06eabdb1f018" @@ -6402,6 +7438,14 @@ wtf-8@1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/wtf-8/-/wtf-8-1.0.0.tgz#392d8ba2d0f1c34d1ee2d630f15d0efb68e1048a" +x-is-function@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/x-is-function/-/x-is-function-1.0.4.tgz#5d294dc3d268cbdd062580e0c5df77a391d1fa1e" + +x-is-string@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/x-is-string/-/x-is-string-0.1.0.tgz#474b50865af3a49a9c4657f05acd145458f77d82" + xml-char-classes@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/xml-char-classes/-/xml-char-classes-1.0.0.tgz#64657848a20ffc5df583a42ad8a277b4512bbc4d" @@ -6410,7 +7454,7 @@ xmlhttprequest-ssl@1.5.3: version "1.5.3" resolved "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.3.tgz#185a888c04eca46c3e4070d99f7b49de3528992d" -"xtend@>=4.0.0 <4.1.0-0", xtend@^4.0.0, xtend@~4.0.0, xtend@~4.0.1: +"xtend@>=4.0.0 <4.1.0-0", xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.0, xtend@~4.0.1: version "4.0.1" resolved "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af" From 7d6526c3ec8d5bca7e1bd4232f909d23d8f411f1 Mon Sep 17 00:00:00 2001 From: benjtinsley Date: Tue, 23 Jan 2018 09:20:38 -0700 Subject: [PATCH 10/33] resolves dependency error with eslint --- package.json | 2 ++ yarn.lock | 81 ++++++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 80 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 86758b06e..2b0b95242 100644 --- a/package.json +++ b/package.json @@ -26,6 +26,7 @@ "dependencies": { "ansi-colors": "^1.0.1", "babel-core": "^6.25.0", + "babel-eslint": "^8.2.1", "babel-loader": "^7.1.1", "babel-preset-env": "^1.6.1", "babel-preset-stage-1": "^6.24.1", @@ -73,6 +74,7 @@ "gulp-rev-delete-original": "^0.2.3", "gulp-stylelint": "^6.0.0", "mocha": "3.2.0", + "prettier": "^1.10.2", "stylelint": "^8.4.0", "stylelint-order": "^0.8.0" } diff --git a/yarn.lock b/yarn.lock index 95de36c1d..e87f05220 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,6 +2,58 @@ # yarn lockfile v1 +"@babel/code-frame@7.0.0-beta.36": + version "7.0.0-beta.36" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0-beta.36.tgz#2349d7ec04b3a06945ae173280ef8579b63728e4" + dependencies: + chalk "^2.0.0" + esutils "^2.0.2" + js-tokens "^3.0.0" + +"@babel/helper-function-name@7.0.0-beta.36": + version "7.0.0-beta.36" + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.0.0-beta.36.tgz#366e3bc35147721b69009f803907c4d53212e88d" + dependencies: + "@babel/helper-get-function-arity" "7.0.0-beta.36" + "@babel/template" "7.0.0-beta.36" + "@babel/types" "7.0.0-beta.36" + +"@babel/helper-get-function-arity@7.0.0-beta.36": + version "7.0.0-beta.36" + resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0-beta.36.tgz#f5383bac9a96b274828b10d98900e84ee43e32b8" + dependencies: + "@babel/types" "7.0.0-beta.36" + +"@babel/template@7.0.0-beta.36": + version "7.0.0-beta.36" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.0.0-beta.36.tgz#02e903de5d68bd7899bce3c5b5447e59529abb00" + dependencies: + "@babel/code-frame" "7.0.0-beta.36" + "@babel/types" "7.0.0-beta.36" + babylon "7.0.0-beta.36" + lodash "^4.2.0" + +"@babel/traverse@7.0.0-beta.36": + version "7.0.0-beta.36" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.0.0-beta.36.tgz#1dc6f8750e89b6b979de5fe44aa993b1a2192261" + dependencies: + "@babel/code-frame" "7.0.0-beta.36" + "@babel/helper-function-name" "7.0.0-beta.36" + "@babel/types" "7.0.0-beta.36" + babylon "7.0.0-beta.36" + debug "^3.0.1" + globals "^11.1.0" + invariant "^2.2.0" + lodash "^4.2.0" + +"@babel/types@7.0.0-beta.36": + version "7.0.0-beta.36" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.0.0-beta.36.tgz#64f2004353de42adb72f9ebb4665fc35b5499d23" + dependencies: + esutils "^2.0.2" + lodash "^4.2.0" + to-fast-properties "^2.0.0" + "@gulp-sourcemaps/identity-map@1.X": version "1.0.1" resolved "https://registry.npmjs.org/@gulp-sourcemaps/identity-map/-/identity-map-1.0.1.tgz#cfa23bc5840f9104ce32a65e74db7e7a974bbee1" @@ -398,6 +450,17 @@ babel-core@^6.24.1, babel-core@^6.25.0: slash "^1.0.0" source-map "^0.5.0" +babel-eslint@^8.2.1: + version "8.2.1" + resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-8.2.1.tgz#136888f3c109edc65376c23ebf494f36a3e03951" + dependencies: + "@babel/code-frame" "7.0.0-beta.36" + "@babel/traverse" "7.0.0-beta.36" + "@babel/types" "7.0.0-beta.36" + babylon "7.0.0-beta.36" + eslint-scope "~3.7.1" + eslint-visitor-keys "^1.0.0" + babel-generator@^6.25.0: version "6.25.0" resolved "https://registry.npmjs.org/babel-generator/-/babel-generator-6.25.0.tgz#33a1af70d5f2890aeb465a4a7793c1df6a9ea9fc" @@ -989,6 +1052,10 @@ babel-types@^6.24.1, babel-types@^6.25.0: lodash "^4.2.0" to-fast-properties "^1.0.1" +babylon@7.0.0-beta.36: + version "7.0.0-beta.36" + resolved "https://registry.yarnpkg.com/babylon/-/babylon-7.0.0-beta.36.tgz#3a3683ba6a9a1e02b0aa507c8e63435e39305b9e" + babylon@^6.17.2: version "6.17.4" resolved "https://registry.npmjs.org/babylon/-/babylon-6.17.4.tgz#3e8b7402b88d22c3423e137a1577883b15ff869a" @@ -1908,7 +1975,7 @@ debug@^2.2.0, debug@^2.6.8: dependencies: ms "2.0.0" -debug@^3.0.0, debug@^3.1.0: +debug@^3.0.0, debug@^3.0.1, debug@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261" dependencies: @@ -2336,7 +2403,7 @@ eslint-plugin-prettier@^2.5.0: fast-diff "^1.1.1" jest-docblock "^21.0.0" -eslint-scope@^3.7.1: +eslint-scope@^3.7.1, eslint-scope@~3.7.1: version "3.7.1" resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-3.7.1.tgz#3d63c3edfda02e06e01a452ad88caacc7cdcb6e8" dependencies: @@ -2983,7 +3050,7 @@ global@^4.3.2: min-document "^2.19.0" process "~0.5.1" -globals@^11.0.1: +globals@^11.0.1, globals@^11.1.0: version "11.1.0" resolved "https://registry.yarnpkg.com/globals/-/globals-11.1.0.tgz#632644457f5f0e3ae711807183700ebf2e4633e4" @@ -5650,6 +5717,10 @@ preserve@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b" +prettier@^1.10.2: + version "1.10.2" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.10.2.tgz#1af8356d1842276a99a5b5529c82dd9e9ad3cc93" + pretty-bytes@^3.0.1: version "3.0.1" resolved "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-3.0.1.tgz#27d0008d778063a0b4811bb35c79f1bd5d5fbccf" @@ -6904,6 +6975,10 @@ to-fast-properties@^1.0.1, to-fast-properties@^1.0.3: version "1.0.3" resolved "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47" +to-fast-properties@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" + tough-cookie@~2.3.0: version "2.3.3" resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.3.tgz#0b618a5565b6dea90bf3425d04d55edc475a7561" From 77ce4f7a85c6ea3ba77ef74484b5807bac909e73 Mon Sep 17 00:00:00 2001 From: benjtinsley Date: Wed, 24 Jan 2018 15:16:33 -0700 Subject: [PATCH 11/33] removes gulp-watch package in favor of built in gulp.watch --- gulpfile.js/tasks/watch.js | 7 +----- package.json | 3 +-- yarn.lock | 47 ++++---------------------------------- 3 files changed, 6 insertions(+), 51 deletions(-) diff --git a/gulpfile.js/tasks/watch.js b/gulpfile.js/tasks/watch.js index 60e05bc6d..b5e68a318 100644 --- a/gulpfile.js/tasks/watch.js +++ b/gulpfile.js/tasks/watch.js @@ -1,5 +1,4 @@ var gulp = require('gulp') -var watch = require('gulp-watch') var path = require('path') var projectPath = require('../lib/projectPath') @@ -12,10 +11,6 @@ var watchTask = function() { return PATH_CONFIG.icons case 'svgSprite': return PATH_CONFIG.icons - case 'html': - return PATH_CONFIG.html - case 'static': - return PATH_CONFIG.static default: return PATH_CONFIG[taskName] } @@ -32,7 +27,7 @@ var watchTask = function() { if(taskConfig) { var srcPath = projectPath(PATH_CONFIG.src, taskPath.src) var globPattern = '**/*' + (taskConfig.extensions ? '.{' + taskConfig.extensions.join(',') + '}' : '') - watch(path.join(srcPath, globPattern), watchConfig, function() { + gulp.watch(path.join(srcPath, globPattern), watchConfig, function() { require('./' + taskName)() }) } diff --git a/package.json b/package.json index 2b0b95242..65da21c7b 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,6 @@ "gulp-sizereport": "1.2.0", "gulp-sourcemaps": "^2.6.0", "gulp-svgstore": "6.1.0", - "gulp-watch": "4.3.11", "lodash": "^4.17.4", "merge-stream": "^1.0.1", "minimist": "^1.2.0", @@ -64,6 +63,7 @@ "plugin-error": "^0.1.2", "pretty-hrtime": "1.0.3", "require-dir": "0.3.2", + "stylelint": "^8.4.0", "webpack": "^3.4.1", "webpack-dev-middleware": "^1.12.0", "webpack-hot-middleware": "^2.18.2" @@ -75,7 +75,6 @@ "gulp-stylelint": "^6.0.0", "mocha": "3.2.0", "prettier": "^1.10.2", - "stylelint": "^8.4.0", "stylelint-order": "^0.8.0" } } diff --git a/yarn.lock b/yarn.lock index e87f05220..0121a5d17 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1493,7 +1493,7 @@ cheerio@0.*: lodash.reject "^4.4.0" lodash.some "^4.4.0" -chokidar@1.7.0, chokidar@^1.6.0, chokidar@^1.6.1, chokidar@^1.7.0: +chokidar@1.7.0, chokidar@^1.6.0, chokidar@^1.7.0: version "1.7.0" resolved "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468" dependencies: @@ -2730,12 +2730,6 @@ first-chunk-stream@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz#59bfb50cd905f60d7c394cd3d9acaab4e6ad934e" -first-chunk-stream@^2.0.0: - version "2.0.0" - resolved "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-2.0.0.tgz#1bdecdb8e083c0664b91945581577a43a9f31d70" - dependencies: - readable-stream "^2.0.2" - flagged-respawn@^0.3.2: version "0.3.2" resolved "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-0.3.2.tgz#ff191eddcd7088a675b2610fffc976be9b8074b5" @@ -2917,7 +2911,7 @@ glob-parent@^2.0.0: dependencies: is-glob "^2.0.0" -glob-parent@^3.0.0, glob-parent@^3.0.1: +glob-parent@^3.0.0: version "3.1.0" resolved "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae" dependencies: @@ -3365,21 +3359,6 @@ gulp-util@>=3.0.0, gulp-util@^3.0, gulp-util@^3.0.0, gulp-util@^3.0.6, gulp-util through2 "^2.0.0" vinyl "^0.5.0" -gulp-watch@4.3.11: - version "4.3.11" - resolved "https://registry.npmjs.org/gulp-watch/-/gulp-watch-4.3.11.tgz#162fc563de9fc770e91f9a7ce3955513a9a118c0" - dependencies: - anymatch "^1.3.0" - chokidar "^1.6.1" - glob-parent "^3.0.1" - gulp-util "^3.0.7" - object-assign "^4.1.0" - path-is-absolute "^1.0.1" - readable-stream "^2.2.2" - slash "^1.0.0" - vinyl "^1.2.0" - vinyl-file "^2.0.0" - gulp@3.9.1: version "3.9.1" resolved "https://registry.npmjs.org/gulp/-/gulp-3.9.1.tgz#571ce45928dd40af6514fc4011866016c13845b4" @@ -5302,7 +5281,7 @@ path-exists@^3.0.0: version "3.0.0" resolved "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515" -path-is-absolute@^1.0.0, path-is-absolute@^1.0.1: +path-is-absolute@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" @@ -6652,13 +6631,6 @@ strip-bom-stream@^1.0.0: first-chunk-stream "^1.0.0" strip-bom "^2.0.0" -strip-bom-stream@^2.0.0: - version "2.0.0" - resolved "https://registry.npmjs.org/strip-bom-stream/-/strip-bom-stream-2.0.0.tgz#f87db5ef2613f6968aa545abfe1ec728b6a829ca" - dependencies: - first-chunk-stream "^2.0.0" - strip-bom "^2.0.0" - strip-bom-string@1.X: version "1.0.0" resolved "https://registry.npmjs.org/strip-bom-string/-/strip-bom-string-1.0.0.tgz#e5211e9224369fbb81d633a2f00044dc8cedad92" @@ -7285,17 +7257,6 @@ vinyl-file@^1.1.0: strip-bom-stream "^1.0.0" vinyl "^1.1.0" -vinyl-file@^2.0.0: - version "2.0.0" - resolved "https://registry.npmjs.org/vinyl-file/-/vinyl-file-2.0.0.tgz#a7ebf5ffbefda1b7d18d140fcb07b223efb6751a" - dependencies: - graceful-fs "^4.1.2" - pify "^2.3.0" - pinkie-promise "^2.0.0" - strip-bom "^2.0.0" - strip-bom-stream "^2.0.0" - vinyl "^1.1.0" - vinyl-fs@^0.3.0: version "0.3.14" resolved "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.14.tgz#9a6851ce1cac1c1cea5fe86c0931d620c2cfa9e6" @@ -7337,7 +7298,7 @@ vinyl-sourcemaps-apply@^0.2.0, vinyl-sourcemaps-apply@^0.2.1: dependencies: source-map "^0.5.1" -vinyl@1.X, vinyl@^1.0.0, vinyl@^1.1.0, vinyl@^1.2.0: +vinyl@1.X, vinyl@^1.0.0, vinyl@^1.1.0: version "1.2.0" resolved "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz#5c88036cf565e5df05558bfc911f8656df218884" dependencies: From fde9934c2acb5c7d2ea1a7c36bcc977a66e0c54f Mon Sep 17 00:00:00 2001 From: benjtinsley Date: Wed, 24 Jan 2018 15:18:35 -0700 Subject: [PATCH 12/33] configures stylelint to work properly [updates #517] --- .stylelintrc | 1 + gulpfile.js/.stylelintrc | 16 ++++------------ gulpfile.js/lib/task-defaults.js | 12 +++++++++++- gulpfile.js/tasks/default.js | 1 + gulpfile.js/tasks/stylesheets.js | 31 ++++++++++++++++++------------- 5 files changed, 35 insertions(+), 26 deletions(-) create mode 100644 .stylelintrc diff --git a/.stylelintrc b/.stylelintrc new file mode 100644 index 000000000..67e4f1883 --- /dev/null +++ b/.stylelintrc @@ -0,0 +1 @@ +// this file to stay empty to ensure CI builds pass. editable .stylelintrc found at gulpfile.js/.stylelintrc diff --git a/gulpfile.js/.stylelintrc b/gulpfile.js/.stylelintrc index 1eed01e4f..9880ee250 100644 --- a/gulpfile.js/.stylelintrc +++ b/gulpfile.js/.stylelintrc @@ -1,35 +1,27 @@ { - "plugins": { + "plugins": [ "stylelint-order" - }, + ], "rules": { "block-no-empty": null, "color-no-invalid-hex": true, - "comment-empty-line-before": [ "always", { - "ignore": ["stylelint-commands", "after-comment"] - } ], "comment-no-empty": true, "declaration-block-single-line-max-declarations": 1, "declaration-colon-space-after": "always", - "indentation": 4, + "declaration-colon-space-before": "never", + "indentation": 2, "max-empty-lines": 1, "no-descending-specificity": true, "no-duplicate-at-import-rules": true, "no-duplicate-selectors": true, "no-empty-source": true, "no-extra-semicolons": true, - "no-unknown-animations": true, - "property-no-unknown": [true, { - "checkPrefixed": true - }] "rule-empty-line-before": [ "always", { "except": ["first-nested"], "ignore": ["after-comment"] }], "selector-pseudo-class-no-unknown": true, "selector-pseudo-element-no-unknown": true, - // plugin based rules - // stylint-order "order/properties-alphabetical-order": true } } diff --git a/gulpfile.js/lib/task-defaults.js b/gulpfile.js/lib/task-defaults.js index 11d0f9ec0..8cc923bfd 100644 --- a/gulpfile.js/lib/task-defaults.js +++ b/gulpfile.js/lib/task-defaults.js @@ -42,7 +42,17 @@ module.exports = { "./node_modules" ] }, - extensions: ["sass", "scss", "css"] + extensions: ["sass", "scss", "css"], + stylelint: { + reporters: [{ + formatter: 'string', + console: true + }], + debug: true, + console: true, + failAfterError: false, + fix: true + } }, html: { diff --git a/gulpfile.js/tasks/default.js b/gulpfile.js/tasks/default.js index cfa57651a..fff85baf3 100644 --- a/gulpfile.js/tasks/default.js +++ b/gulpfile.js/tasks/default.js @@ -6,6 +6,7 @@ var defaultTask = function(cb) { var tasks = getEnabledTasks('watch') var static = TASK_CONFIG.static ? 'static' : false const { prebuild, postbuild } = TASK_CONFIG.additionalTasks.development + gulpSequence('clean', prebuild, tasks.assetTasks, tasks.codeTasks, static, postbuild, 'watch', cb) } diff --git a/gulpfile.js/tasks/stylesheets.js b/gulpfile.js/tasks/stylesheets.js index 30df360ec..d77ce50ef 100644 --- a/gulpfile.js/tasks/stylesheets.js +++ b/gulpfile.js/tasks/stylesheets.js @@ -1,20 +1,21 @@ if(!TASK_CONFIG.stylesheets) return -var gulp = require('gulp') -var gulpif = require('gulp-if') -var browserSync = require('browser-sync') -var sass = require('gulp-sass') -var sourcemaps = require('gulp-sourcemaps') -var handleErrors = require('../lib/handleErrors') -var autoprefixer = require('gulp-autoprefixer') -var path = require('path') -var cssnano = require('gulp-cssnano') -var gulpStylelint = require('gulp-stylelint') -var projectPath = require('../lib/projectPath') +var gulp = require('gulp') +var path = require('path') +var stylelint = require('gulp-stylelint') +var handleErrors = require('../lib/handleErrors') +var gulpif = require('gulp-if') +var browserSync = require('browser-sync') +var sass = require('gulp-sass') +var sourcemaps = require('gulp-sourcemaps') +var autoprefixer = require('gulp-autoprefixer') +var cssnano = require('gulp-cssnano') +var projectPath = require('../lib/projectPath') var sassTask = function () { var paths = { + srcDir: projectPath(PATH_CONFIG.src, PATH_CONFIG.stylesheets.src), src: projectPath(PATH_CONFIG.src, PATH_CONFIG.stylesheets.src, '**/*.{' + TASK_CONFIG.stylesheets.extensions + '}'), dest: projectPath(PATH_CONFIG.dest, PATH_CONFIG.stylesheets.dest) } @@ -29,10 +30,14 @@ var sassTask = function () { cssnanoConfig.autoprefixer = false // this should always be false, since we're autoprefixing separately return gulp.src(paths.src) + // allow stylelint to check if there are any syntax errors in the code + .pipe(stylelint(TASK_CONFIG.stylesheets.stylelint)) + .on('error', handleErrors) + // if fixable, it will push the changes back to the original file and save + .pipe(gulp.dest(paths.srcDir)) + // then proceed with the rest of the stylesheets tasks .pipe(gulpif(!global.production, sourcemaps.init())) .pipe(sass(TASK_CONFIG.stylesheets.sass)) - .on('error', handleErrors) - .pipe(gulpStylelint(TASK_CONFIG.stylesheets.stylelint)) .pipe(autoprefixer(TASK_CONFIG.stylesheets.autoprefixer)) .pipe(gulpif(global.production, cssnano(cssnanoConfig))) .pipe(gulpif(!global.production, sourcemaps.write())) From f943fcb2737c01f1b1cd8c72367f0133aa874928 Mon Sep 17 00:00:00 2001 From: benjtinsley Date: Wed, 24 Jan 2018 15:24:52 -0700 Subject: [PATCH 13/33] a bit of cleanup --- gulpfile.js/task-config.js | 7 ------- gulpfile.js/tasks/stylesheets.js | 1 + 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/gulpfile.js/task-config.js b/gulpfile.js/task-config.js index 4736bf1b5..36b24f1a7 100644 --- a/gulpfile.js/task-config.js +++ b/gulpfile.js/task-config.js @@ -15,13 +15,6 @@ module.exports = { } }, - stylesheets: { - stylelint: { - console: true, - fix: true - } - }, - browserSync: { server: { // should match `dest` in diff --git a/gulpfile.js/tasks/stylesheets.js b/gulpfile.js/tasks/stylesheets.js index d77ce50ef..4c8286a91 100644 --- a/gulpfile.js/tasks/stylesheets.js +++ b/gulpfile.js/tasks/stylesheets.js @@ -38,6 +38,7 @@ var sassTask = function () { // then proceed with the rest of the stylesheets tasks .pipe(gulpif(!global.production, sourcemaps.init())) .pipe(sass(TASK_CONFIG.stylesheets.sass)) + .on('error', handleErrors) .pipe(autoprefixer(TASK_CONFIG.stylesheets.autoprefixer)) .pipe(gulpif(global.production, cssnano(cssnanoConfig))) .pipe(gulpif(!global.production, sourcemaps.write())) From 34e3cb7abfc59aa4e11734c256fc08e431b3eaaf Mon Sep 17 00:00:00 2001 From: benjtinsley Date: Thu, 25 Jan 2018 10:28:10 -0700 Subject: [PATCH 14/33] rearranges dependencies, ensures linting files are in correct directory --- .stylelintrc | 5 ++++- package.json | 11 +++++------ {gulpfile.js => root}/.eslintrc.js | 0 {gulpfile.js => root}/.stylelintrc | 0 yarn.lock | 27 +-------------------------- 5 files changed, 10 insertions(+), 33 deletions(-) rename {gulpfile.js => root}/.eslintrc.js (100%) rename {gulpfile.js => root}/.stylelintrc (100%) diff --git a/.stylelintrc b/.stylelintrc index 67e4f1883..88084d167 100644 --- a/.stylelintrc +++ b/.stylelintrc @@ -1 +1,4 @@ -// this file to stay empty to ensure CI builds pass. editable .stylelintrc found at gulpfile.js/.stylelintrc +{ + "_developer-comment": "this file to stay empty to ensure CI builds pass. editable .stylelintrc found at root/.stylelintrc", + "rules": {} +} diff --git a/package.json b/package.json index 65da21c7b..a0bb680d0 100644 --- a/package.json +++ b/package.json @@ -33,6 +33,7 @@ "browser-sync": "^2.18.8", "del": "2.2.2", "es6-promise": "^4.1.1", + "eslint": "^4.16.0", "eslint-loader": "^1.9.0", "eslint-plugin-prettier": "^2.5.0", "fancy-log": "^1.3.2", @@ -52,6 +53,7 @@ "gulp-sass": "^3.1.0", "gulp-sequence": "1.0.0", "gulp-sizereport": "1.2.0", + "gulp-stylelint": "^6.0.0", "gulp-sourcemaps": "^2.6.0", "gulp-svgstore": "6.1.0", "lodash": "^4.17.4", @@ -61,20 +63,17 @@ "node-sass-glob-importer": "^5.0.0-alpha.5", "open": "0.0.5", "plugin-error": "^0.1.2", + "prettier": "^1.10.2", "pretty-hrtime": "1.0.3", "require-dir": "0.3.2", "stylelint": "^8.4.0", + "stylelint-order": "^0.8.0", "webpack": "^3.4.1", "webpack-dev-middleware": "^1.12.0", "webpack-hot-middleware": "^2.18.2" }, "devDependencies": { "chai": "^3.5.0", - "eslint": "^4.16.0", - "gulp-rev-delete-original": "^0.2.3", - "gulp-stylelint": "^6.0.0", - "mocha": "3.2.0", - "prettier": "^1.10.2", - "stylelint-order": "^0.8.0" + "mocha": "3.2.0" } } diff --git a/gulpfile.js/.eslintrc.js b/root/.eslintrc.js similarity index 100% rename from gulpfile.js/.eslintrc.js rename to root/.eslintrc.js diff --git a/gulpfile.js/.stylelintrc b/root/.stylelintrc similarity index 100% rename from gulpfile.js/.stylelintrc rename to root/.stylelintrc diff --git a/yarn.lock b/yarn.lock index 0121a5d17..bb9f37fce 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3223,18 +3223,6 @@ gulp-nunjucks-render@2.2.2: replace-ext "^1.0.0" through2 "~0.4.0" -gulp-rename@1.2.2: - version "1.2.2" - resolved "https://registry.npmjs.org/gulp-rename/-/gulp-rename-1.2.2.tgz#3ad4428763f05e2764dec1c67d868db275687817" - -gulp-replace@^0.5.4: - version "0.5.4" - resolved "https://registry.npmjs.org/gulp-replace/-/gulp-replace-0.5.4.tgz#69a67914bbd13c562bff14f504a403796aa0daa9" - dependencies: - istextorbinary "1.0.2" - readable-stream "^2.0.1" - replacestream "^4.0.0" - gulp-rev-delete-original@^0.2.3: version "0.2.3" resolved "https://registry.yarnpkg.com/gulp-rev-delete-original/-/gulp-rev-delete-original-0.2.3.tgz#81f3f95db3bd3a324923df6d235ae953c2ac038d" @@ -3336,7 +3324,7 @@ gulp-svgstore@6.1.0: cheerio "0.*" gulp-util "^3.0.0" -gulp-util@>=3.0.0, gulp-util@^3.0, gulp-util@^3.0.0, gulp-util@^3.0.6, gulp-util@^3.0.7, gulp-util@^3.0.8: +gulp-util@^3.0, gulp-util@^3.0.0, gulp-util@^3.0.6, gulp-util@^3.0.7, gulp-util@^3.0.8: version "3.0.8" resolved "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz#0054e1e744502e27c04c187c3ecc505dd54bbb4f" dependencies: @@ -6190,12 +6178,6 @@ rimraf@^2.2.8, rimraf@^2.4.3: dependencies: glob "^7.0.5" -rimraf@^2.3.4: - version "2.6.2" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36" - dependencies: - glob "^7.0.5" - rimraf@~2.2.0: version "2.2.8" resolved "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz#e439be2aaee327321952730f99a8929e4fc50582" @@ -6859,13 +6841,6 @@ through2@2.X, through2@^2.0.0, through2@^2.0.1, through2@^2.0.3, through2@~2.0.0 readable-stream "^2.1.5" xtend "~4.0.1" -through2@^0.5.0: - version "0.5.1" - resolved "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz#dfdd012eb9c700e2323fd334f38ac622ab372da7" - dependencies: - readable-stream "~1.0.17" - xtend "~3.0.0" - through2@^0.6.0, through2@^0.6.1, through2@^0.6.5: version "0.6.5" resolved "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz#41ab9c67b29d57209071410e1d7a7a968cd3ad48" From 1efa34e347619f4f1190858e190320c053e48685 Mon Sep 17 00:00:00 2001 From: benjtinsley Date: Thu, 25 Jan 2018 11:37:51 -0700 Subject: [PATCH 15/33] gets eslint logging errors [updates #517] --- gulpfile.js/lib/task-defaults.js | 12 ++++++++++ gulpfile.js/lib/webpack-multi-config.js | 12 ++++++++-- package.json | 9 ++++++-- yarn.lock | 30 ++++++++++++++++++++++--- 4 files changed, 56 insertions(+), 7 deletions(-) diff --git a/gulpfile.js/lib/task-defaults.js b/gulpfile.js/lib/task-defaults.js index 8cc923bfd..1ff7bde74 100644 --- a/gulpfile.js/lib/task-defaults.js +++ b/gulpfile.js/lib/task-defaults.js @@ -19,6 +19,18 @@ module.exports = { loader: 'babel-loader', exclude: /node_modules/ }, + eslintLoader: { + enforce: 'pre', + exclude: /node_modules/, + use: [ + { + loader: 'eslint-loader', + options: { + cache: true + } + } + ] + }, babel: { presets: [["env", { "modules": false diff --git a/gulpfile.js/lib/webpack-multi-config.js b/gulpfile.js/lib/webpack-multi-config.js index 3ef13903c..559ef0c09 100644 --- a/gulpfile.js/lib/webpack-multi-config.js +++ b/gulpfile.js/lib/webpack-multi-config.js @@ -10,6 +10,7 @@ const projectPath = require('./projectPath') const webpack = require('webpack') const webpackManifest = require('./webpackManifest') const querystring = require('querystring') +const FriendlyErrorsWebpackPlugin = require('friendly-errors-webpack-plugin') module.exports = function (env) { @@ -36,14 +37,21 @@ module.exports = function (env) { filename: rev ? '[name]-[hash].js' : '[name].js', publicPath: publicPath }, - plugins: [], + plugins: [ + new FriendlyErrorsWebpackPlugin({ + clearConsole: false + }) + ], resolve: { extensions: extensions, alias: TASK_CONFIG.javascripts.alias, modules: [jsSrc, projectPath('node_modules')], }, module: { - rules: [ TASK_CONFIG.javascripts.babelLoader ] + rules: [ + TASK_CONFIG.javascripts.eslintLoader, + TASK_CONFIG.javascripts.babelLoader + ] } } diff --git a/package.json b/package.json index a0bb680d0..41c6410d3 100644 --- a/package.json +++ b/package.json @@ -37,6 +37,7 @@ "eslint-loader": "^1.9.0", "eslint-plugin-prettier": "^2.5.0", "fancy-log": "^1.3.2", + "friendly-errors-webpack-plugin": "^1.6.1", "gulp": "3.9.1", "gulp-autoprefixer": "4.1.0", "gulp-changed": "^2.0.0", @@ -53,8 +54,8 @@ "gulp-sass": "^3.1.0", "gulp-sequence": "1.0.0", "gulp-sizereport": "1.2.0", - "gulp-stylelint": "^6.0.0", "gulp-sourcemaps": "^2.6.0", + "gulp-stylelint": "^6.0.0", "gulp-svgstore": "6.1.0", "lodash": "^4.17.4", "merge-stream": "^1.0.1", @@ -68,12 +69,16 @@ "require-dir": "0.3.2", "stylelint": "^8.4.0", "stylelint-order": "^0.8.0", - "webpack": "^3.4.1", + "webpack": "3.10.0", "webpack-dev-middleware": "^1.12.0", "webpack-hot-middleware": "^2.18.2" }, "devDependencies": { "chai": "^3.5.0", "mocha": "3.2.0" + }, + "prettier": { + "semi": false, + "singleQuote": true } } diff --git a/yarn.lock b/yarn.lock index bb9f37fce..e6f0f59f7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2309,6 +2309,12 @@ error-ex@^1.2.0, error-ex@^1.3.1: dependencies: is-arrayish "^0.2.1" +error-stack-parser@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/error-stack-parser/-/error-stack-parser-2.0.1.tgz#a3202b8fb03114aa9b40a0e3669e48b2b65a010a" + dependencies: + stackframe "^1.0.3" + es5-ext@^0.10.13, es5-ext@^0.10.14, es5-ext@^0.10.9, es5-ext@~0.10.14, es5-ext@~0.10.2: version "0.10.24" resolved "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.24.tgz#a55877c9924bc0c8d9bd3c2cbe17495ac1709b14" @@ -2791,6 +2797,14 @@ fresh@^0.3.0: version "0.3.0" resolved "https://registry.npmjs.org/fresh/-/fresh-0.3.0.tgz#651f838e22424e7566de161d8358caa199f83d4f" +friendly-errors-webpack-plugin@^1.6.1: + version "1.6.1" + resolved "https://registry.yarnpkg.com/friendly-errors-webpack-plugin/-/friendly-errors-webpack-plugin-1.6.1.tgz#e32781c4722f546a06a9b5d7a7cfa28520375d70" + dependencies: + chalk "^1.1.3" + error-stack-parser "^2.0.0" + string-length "^1.0.1" + fs-exists-sync@^0.1.0: version "0.1.0" resolved "https://registry.npmjs.org/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz#982d6893af918e72d08dec9e8673ff2b5a8d6add" @@ -6506,6 +6520,10 @@ sshpk@^1.7.0: jsbn "~0.1.0" tweetnacl "~0.14.0" +stackframe@^1.0.3: + version "1.0.4" + resolved "https://registry.yarnpkg.com/stackframe/-/stackframe-1.0.4.tgz#357b24a992f9427cba6b545d96a14ed2cbca187b" + state-toggle@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/state-toggle/-/state-toggle-1.0.0.tgz#d20f9a616bb4f0c3b98b91922d25b640aa2bc425" @@ -6556,6 +6574,12 @@ strict-uri-encode@^1.0.0: version "1.1.0" resolved "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713" +string-length@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/string-length/-/string-length-1.0.1.tgz#56970fb1c38558e9e70b728bf3de269ac45adfac" + dependencies: + strip-ansi "^3.0.0" + string-width@^1.0.1, string-width@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" @@ -7336,9 +7360,9 @@ webpack-sources@^1.0.1: source-list-map "^2.0.0" source-map "~0.5.3" -webpack@^3.4.1: - version "3.4.1" - resolved "https://registry.npmjs.org/webpack/-/webpack-3.4.1.tgz#4c3f4f3fb318155a4db0cb6a36ff05c5697418f4" +webpack@3.10.0: + version "3.10.0" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-3.10.0.tgz#5291b875078cf2abf42bdd23afe3f8f96c17d725" dependencies: acorn "^5.0.0" acorn-dynamic-import "^2.0.0" From 3f74340cb5579c6dd79ead71e99909b5dbf1fc23 Mon Sep 17 00:00:00 2001 From: benjtinsley Date: Thu, 25 Jan 2018 13:35:46 -0700 Subject: [PATCH 16/33] adds prettierignore to leave config files alone --- .prettierignore | 1 + gulpfile.js/lib/webpack-multi-config.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 .prettierignore diff --git a/.prettierignore b/.prettierignore new file mode 100644 index 000000000..298d5f7ed --- /dev/null +++ b/.prettierignore @@ -0,0 +1 @@ +gulpfile.js/ diff --git a/gulpfile.js/lib/webpack-multi-config.js b/gulpfile.js/lib/webpack-multi-config.js index 559ef0c09..b3164f673 100644 --- a/gulpfile.js/lib/webpack-multi-config.js +++ b/gulpfile.js/lib/webpack-multi-config.js @@ -39,7 +39,7 @@ module.exports = function (env) { }, plugins: [ new FriendlyErrorsWebpackPlugin({ - clearConsole: false + clearConsole: false }) ], resolve: { From 36be351f3301b2a49e7609eeb0aac915e11bb5c9 Mon Sep 17 00:00:00 2001 From: benjtinsley Date: Mon, 29 Jan 2018 10:27:11 -0700 Subject: [PATCH 17/33] fixes some PR issues --- .prettierignore | 1 - package.json | 4 ---- root/.prettierignore | 1 + root/.stylelintrc | 2 ++ 4 files changed, 3 insertions(+), 5 deletions(-) delete mode 100644 .prettierignore create mode 100644 root/.prettierignore diff --git a/.prettierignore b/.prettierignore deleted file mode 100644 index 298d5f7ed..000000000 --- a/.prettierignore +++ /dev/null @@ -1 +0,0 @@ -gulpfile.js/ diff --git a/package.json b/package.json index 41c6410d3..6e3214d60 100644 --- a/package.json +++ b/package.json @@ -76,9 +76,5 @@ "devDependencies": { "chai": "^3.5.0", "mocha": "3.2.0" - }, - "prettier": { - "semi": false, - "singleQuote": true } } diff --git a/root/.prettierignore b/root/.prettierignore new file mode 100644 index 000000000..c2658d7d1 --- /dev/null +++ b/root/.prettierignore @@ -0,0 +1 @@ +node_modules/ diff --git a/root/.stylelintrc b/root/.stylelintrc index 9880ee250..40ce8dc80 100644 --- a/root/.stylelintrc +++ b/root/.stylelintrc @@ -16,6 +16,8 @@ "no-duplicate-selectors": true, "no-empty-source": true, "no-extra-semicolons": true, + "number-leading-zero": "always", + "number-no-trailing-zeros": true, "rule-empty-line-before": [ "always", { "except": ["first-nested"], "ignore": ["after-comment"] From 900c0604cf727cd487870667009f716e486f3c3d Mon Sep 17 00:00:00 2001 From: benjtinsley Date: Mon, 29 Jan 2018 11:13:51 -0700 Subject: [PATCH 18/33] updates yarn tasks to match yarn commands --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index c8172bb89..bb670abee 100644 --- a/README.md +++ b/README.md @@ -3,13 +3,13 @@ [![Build Status](https://travis-ci.org/vigetlabs/blendid.svg?branch=static-server)](https://travis-ci.org/vigetlabs/blendid) [![Stories in Ready](https://badge.waffle.io/vigetlabs/blendid.png?label=ready&title=Ready)](https://waffle.io/vigetlabs/blendid) -**Blendid** *(formerly known as Gulp Starter)* is a delicious stand-alone blend of tasks and build tools poured into [Gulp](http://gulpjs.com/) to form a full-featured modern asset pipeline. It can be used as-is as a static site builder, or can be configured and integrated into your own development environment and site or app structure. +**Blendid** is a delicious stand-alone blend of tasks and build tools that form a full-featured modern asset pipeline. It can be used as-is as a static site builder, or can be configured and integrated into your own development environment and site or app structure. ## Quick start on a fresh project (empty directory) ```bash yarn init yarn add blendid -yarn run blendid -- init +yarn run blendid init yarn run blendid ``` From b789b30d798b57e8c2550a5a25eb3ac59728f519 Mon Sep 17 00:00:00 2001 From: benjtinsley Date: Mon, 29 Jan 2018 13:54:26 -0700 Subject: [PATCH 19/33] adds in explicit paths to files with '.' prefixes --- gulpfile.js/tasks/init.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gulpfile.js/tasks/init.js b/gulpfile.js/tasks/init.js index 7d8a2a24f..360651746 100644 --- a/gulpfile.js/tasks/init.js +++ b/gulpfile.js/tasks/init.js @@ -5,8 +5,8 @@ var projectPath = require('../lib/projectPath') var merge = require('merge-stream') gulp.task('init', function() { - var rootStream = gulp.src('root/*') - .pipe(gulp.dest(projectPath())) + var rootStream = gulp.src(['root/.eslintrc.js', 'root/.gitignore', 'root/.nvmrc', 'root/.prettierignore', 'root/.stylelintrc']) + .pipe(gulp.dest(projectPath(''))) var configStream = gulp.src(['gulpfile.js/path-config.json', 'gulpfile.js/task-config.js']) .pipe(gulp.dest(projectPath('config'))) From 8df7b208c6d9d107651bd34db345dbc755171ab5 Mon Sep 17 00:00:00 2001 From: benjtinsley Date: Mon, 29 Jan 2018 14:49:20 -0700 Subject: [PATCH 20/33] brings back init-config task for user configurability --- gulpfile.js/tasks/init-config.js | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 gulpfile.js/tasks/init-config.js diff --git a/gulpfile.js/tasks/init-config.js b/gulpfile.js/tasks/init-config.js new file mode 100644 index 000000000..27a44d783 --- /dev/null +++ b/gulpfile.js/tasks/init-config.js @@ -0,0 +1,14 @@ +var gulp = require('gulp') +var log = require('fancy-log') +var colors = require('ansi-colors') +var projectPath = require('../lib/projectPath') +var merge = require('merge-stream') + +gulp.task('init-config', function () { + var configStream = gulp.src(['gulpfile.js/path-config.json', 'gulpfile.js/task-config.js']) + .pipe(gulp.dest(projectPath('config'))) + + log(colors.green('Adding default path-config.json and task-config.js files to ./config/')) + + return configStream +}) From 32966e35ea69f371ae6ffad271a423ce5e5a4448 Mon Sep 17 00:00:00 2001 From: benjtinsley Date: Mon, 29 Jan 2018 16:46:02 -0700 Subject: [PATCH 21/33] resolves any outdated packages --- package.json | 6 +-- yarn.lock | 111 ++++++++++++++++++++++++++++++++++++++++++--------- 2 files changed, 96 insertions(+), 21 deletions(-) diff --git a/package.json b/package.json index 6e3214d60..456d907a9 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "friendly-errors-webpack-plugin": "^1.6.1", "gulp": "3.9.1", "gulp-autoprefixer": "4.1.0", - "gulp-changed": "^2.0.0", + "gulp-changed": "3.2.0", "gulp-cssnano": "2.1.2", "gulp-data": "1.3.1", "gulp-gh-pages": "0.5.4", @@ -63,14 +63,14 @@ "node-fs-extra": "^0.8.2", "node-sass-glob-importer": "^5.0.0-alpha.5", "open": "0.0.5", - "plugin-error": "^0.1.2", + "plugin-error": "1.0.1", "prettier": "^1.10.2", "pretty-hrtime": "1.0.3", "require-dir": "0.3.2", "stylelint": "^8.4.0", "stylelint-order": "^0.8.0", "webpack": "3.10.0", - "webpack-dev-middleware": "^1.12.0", + "webpack-dev-middleware": "2.0.4", "webpack-hot-middleware": "^2.18.2" }, "devDependencies": { diff --git a/yarn.lock b/yarn.lock index e6f0f59f7..cdcfb7b77 100644 --- a/yarn.lock +++ b/yarn.lock @@ -262,6 +262,10 @@ arr-diff@^2.0.0: dependencies: arr-flatten "^1.0.1" +arr-diff@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520" + arr-flatten@^1.0.1: version "1.1.0" resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1" @@ -270,6 +274,10 @@ arr-union@^2.0.1: version "2.1.0" resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-2.1.0.tgz#20f9eab5ec70f5c7d215b1077b1c39161d292c7d" +arr-union@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4" + array-differ@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz#eff52e3758249d33be402b8bb8e564bb2b5d4031" @@ -350,6 +358,10 @@ assertion-error@^1.0.1: version "1.0.2" resolved "https://registry.npmjs.org/assertion-error/-/assertion-error-1.0.2.tgz#13ca515d86206da0bac66e834dd397d87581094c" +assign-symbols@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367" + async-each-series@0.1.1: version "0.1.1" resolved "https://registry.npmjs.org/async-each-series/-/async-each-series-0.1.1.tgz#7617c1917401fd8ca4a28aadce3dbae98afeb432" @@ -2586,6 +2598,13 @@ extend-shallow@^2.0.1: dependencies: is-extendable "^0.1.0" +extend-shallow@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8" + dependencies: + assign-symbols "^1.0.0" + is-extendable "^1.0.1" + extend@^3.0.0, extend@~3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444" @@ -3157,12 +3176,16 @@ gulp-autoprefixer@4.1.0: through2 "^2.0.0" vinyl-sourcemaps-apply "^0.2.0" -gulp-changed@^2.0.0: - version "2.0.0" - resolved "https://registry.npmjs.org/gulp-changed/-/gulp-changed-2.0.0.tgz#7396d95aeab35c6bcbcb75169fd7f24a271a013b" +gulp-changed@3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/gulp-changed/-/gulp-changed-3.2.0.tgz#cee9866d949e09187522523d6c65565f6e32bd7c" dependencies: - gulp-util "^3.0.0" + make-dir "^1.1.0" + pify "^3.0.0" + plugin-error "^0.1.2" + replace-ext "^1.0.0" through2 "^2.0.0" + touch "^3.1.0" gulp-cssnano@2.1.2: version "2.1.2" @@ -3752,6 +3775,12 @@ is-extendable@^0.1.0, is-extendable@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89" +is-extendable@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4" + dependencies: + is-plain-object "^2.0.4" + is-extglob@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0" @@ -3840,7 +3869,7 @@ is-plain-obj@^1.0.0, is-plain-obj@^1.1.0: version "1.1.0" resolved "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e" -is-plain-object@^2.0.3: +is-plain-object@^2.0.3, is-plain-object@^2.0.4: version "2.0.4" resolved "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677" dependencies: @@ -4394,12 +4423,16 @@ lodash@~1.0.1: version "1.0.2" resolved "https://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz#8f57560c83b59fc270bd3d561b690043430e2551" -log-symbols@^2.0.0: +log-symbols@^2.0.0, log-symbols@^2.1.0: version "2.2.0" resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a" dependencies: chalk "^2.0.1" +loglevelnext@^1.0.1: + version "1.0.3" + resolved "https://registry.yarnpkg.com/loglevelnext/-/loglevelnext-1.0.3.tgz#0f69277e73bbbf2cd61b94d82313216bf87ac66e" + longest-streak@^2.0.1: version "2.0.2" resolved "https://registry.yarnpkg.com/longest-streak/-/longest-streak-2.0.2.tgz#2421b6ba939a443bb9ffebf596585a50b4c38e2e" @@ -4414,7 +4447,7 @@ loose-envify@^1.0.0: dependencies: js-tokens "^3.0.0" -loud-rejection@^1.0.0: +loud-rejection@^1.0.0, loud-rejection@^1.6.0: version "1.6.0" resolved "https://registry.yarnpkg.com/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f" dependencies: @@ -4458,6 +4491,12 @@ make-dir@^1.0.0: dependencies: pify "^2.3.0" +make-dir@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.1.0.tgz#19b4369fe48c116f53c2af95ad102c0e39e85d51" + dependencies: + pify "^3.0.0" + map-cache@^0.2.0: version "0.2.2" resolved "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf" @@ -4607,10 +4646,14 @@ mime@1.3.4: version "1.3.4" resolved "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz#115f9e3b6b3daf2959983cb38f149a2d40eb5d53" -"mime@>= 0.0.1", mime@^1.3.4: +"mime@>= 0.0.1": version "1.3.6" resolved "https://registry.npmjs.org/mime/-/mime-1.3.6.tgz#591d84d3653a6b0b4a3b9df8de5aa8108e72e5e0" +mime@^2.1.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/mime/-/mime-2.2.0.tgz#161e541965551d3b549fa1114391e3a3d55b923b" + mimic-fn@^1.0.0: version "1.1.0" resolved "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.1.0.tgz#e667783d92e89dbd342818b5230b9d62a672ad18" @@ -4910,6 +4953,12 @@ nopt@^4.0.1: abbrev "1" osenv "^0.1.4" +nopt@~1.0.10: + version "1.0.10" + resolved "https://registry.yarnpkg.com/nopt/-/nopt-1.0.10.tgz#6ddd21bd2a31417b92727dd585f8a6f37608ebee" + dependencies: + abbrev "1" + normalize-package-data@^2.3.2, normalize-package-data@^2.3.4: version "2.4.0" resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f" @@ -5373,6 +5422,15 @@ pkg-dir@^2.0.0: dependencies: find-up "^2.1.0" +plugin-error@1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/plugin-error/-/plugin-error-1.0.1.tgz#77016bd8919d0ac377fdcdd0322328953ca5781c" + dependencies: + ansi-colors "^1.0.1" + arr-diff "^4.0.0" + arr-union "^3.1.0" + extend-shallow "^3.0.2" + plugin-error@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/plugin-error/-/plugin-error-0.1.2.tgz#3b9bb3335ccf00f425e07437e19276967da47ace" @@ -6897,10 +6955,6 @@ time-stamp@^1.0.0: version "1.1.0" resolved "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz#764a5a11af50561921b133f3b44e618687e0f5c3" -time-stamp@^2.0.0: - version "2.0.0" - resolved "https://registry.npmjs.org/time-stamp/-/time-stamp-2.0.0.tgz#95c6a44530e15ba8d6f4a3ecb8c3a3fac46da357" - timers-browserify@^2.0.2: version "2.0.3" resolved "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.3.tgz#41fd0bdc926a5feedc33a17a8e1f7d491925f7fc" @@ -6950,6 +7004,12 @@ to-fast-properties@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" +touch@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/touch/-/touch-3.1.0.tgz#fe365f5f75ec9ed4e56825e0bb76d24ab74af83b" + dependencies: + nopt "~1.0.10" + tough-cookie@~2.3.0: version "2.3.3" resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.3.tgz#0b618a5565b6dea90bf3425d04d55edc475a7561" @@ -7166,6 +7226,10 @@ urix@^0.1.0, urix@~0.1.0: version "0.1.0" resolved "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72" +url-join@^2.0.2: + version "2.0.5" + resolved "https://registry.yarnpkg.com/url-join/-/url-join-2.0.5.tgz#5af22f18c052a000a48d7b82c5e9c2e2feeda728" + url@^0.11.0: version "0.11.0" resolved "https://registry.npmjs.org/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1" @@ -7195,7 +7259,7 @@ utils-merge@1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz#0294fb922bb9375153541c4f7096231f287c8af8" -uuid@^3.0.0: +uuid@^3.0.0, uuid@^3.1.0: version "3.2.1" resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.2.1.tgz#12c528bb9d58d0b9265d9a2f6f0fe8be17ff1f14" @@ -7334,15 +7398,17 @@ watchpack@^1.4.0: chokidar "^1.7.0" graceful-fs "^4.1.2" -webpack-dev-middleware@^1.12.0: - version "1.12.0" - resolved "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-1.12.0.tgz#d34efefb2edda7e1d3b5dbe07289513219651709" +webpack-dev-middleware@2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-2.0.4.tgz#7d8943a609121021bb72772a41636e229346cb41" dependencies: + loud-rejection "^1.6.0" memory-fs "~0.4.1" - mime "^1.3.4" + mime "^2.1.0" path-is-absolute "^1.0.0" range-parser "^1.0.3" - time-stamp "^2.0.0" + url-join "^2.0.2" + webpack-log "^1.0.1" webpack-hot-middleware@^2.18.2: version "2.18.2" @@ -7353,6 +7419,15 @@ webpack-hot-middleware@^2.18.2: querystring "^0.2.0" strip-ansi "^3.0.0" +webpack-log@^1.0.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/webpack-log/-/webpack-log-1.1.1.tgz#a0c7beb385245da7b2172afe46c02cf3a471ef31" + dependencies: + chalk "^2.1.0" + log-symbols "^2.1.0" + loglevelnext "^1.0.1" + uuid "^3.1.0" + webpack-sources@^1.0.1: version "1.0.1" resolved "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.0.1.tgz#c7356436a4d13123be2e2426a05d1dad9cbe65cf" From 90600b7ea1a19abcc3bf1ee4cfc7ce090aec36ad Mon Sep 17 00:00:00 2001 From: benjtinsley Date: Tue, 30 Jan 2018 09:35:58 -0700 Subject: [PATCH 22/33] upgrades several more semi-deprecated packages --- package.json | 4 +- yarn.lock | 151 +++++++++++++++++++++++++++++++++++++++------------ 2 files changed, 119 insertions(+), 36 deletions(-) diff --git a/package.json b/package.json index 456d907a9..1ebfba954 100644 --- a/package.json +++ b/package.json @@ -63,14 +63,14 @@ "node-fs-extra": "^0.8.2", "node-sass-glob-importer": "^5.0.0-alpha.5", "open": "0.0.5", - "plugin-error": "1.0.1", + "plugin-error": "^0.1.2", "prettier": "^1.10.2", "pretty-hrtime": "1.0.3", "require-dir": "0.3.2", "stylelint": "^8.4.0", "stylelint-order": "^0.8.0", "webpack": "3.10.0", - "webpack-dev-middleware": "2.0.4", + "webpack-dev-middleware": "^1.12.0", "webpack-hot-middleware": "^2.18.2" }, "devDependencies": { diff --git a/yarn.lock b/yarn.lock index cdcfb7b77..a6bbe1ee7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1575,6 +1575,10 @@ cliui@^3.0.3, cliui@^3.2.0: strip-ansi "^3.0.1" wrap-ansi "^2.0.0" +clone-buffer@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/clone-buffer/-/clone-buffer-1.0.0.tgz#e3e25b207ac4e701af721e2cb5a16792cac3dc58" + clone-regexp@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/clone-regexp/-/clone-regexp-1.0.0.tgz#eae0a2413f55c0942f818c229fefce845d7f3b1c" @@ -1586,6 +1590,10 @@ clone-stats@^0.0.1: version "0.0.1" resolved "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz#b88f94a82cf38b8791d58046ea4029ad88ca99d1" +clone-stats@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-1.0.0.tgz#b3782dff8bb5474e18b9b6bf0fdfe782f8777680" + clone@^0.2.0: version "0.2.0" resolved "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz#c6126a90ad4f72dbf5acdb243cc37724fe93fc1f" @@ -1594,6 +1602,18 @@ clone@^1.0.0, clone@^1.0.2: version "1.0.2" resolved "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz#260b7a99ebb1edfe247538175f783243cb19d149" +clone@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.1.tgz#d217d1e961118e3ac9a4b8bba3285553bf647cdb" + +cloneable-readable@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/cloneable-readable/-/cloneable-readable-1.0.0.tgz#a6290d413f217a61232f95e458ff38418cfb0117" + dependencies: + inherits "^2.0.1" + process-nextick-args "^1.0.6" + through2 "^2.0.1" + co@^4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184" @@ -2032,7 +2052,18 @@ defined@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693" -del@2.2.2, del@^2.0.2: +del@3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/del/-/del-3.0.0.tgz#53ecf699ffcbcb39637691ab13baf160819766e5" + dependencies: + globby "^6.1.0" + is-path-cwd "^1.0.0" + is-path-in-cwd "^1.0.0" + p-map "^1.1.1" + pify "^3.0.0" + rimraf "^2.2.8" + +del@^2.0.2: version "2.2.2" resolved "https://registry.npmjs.org/del/-/del-2.2.2.tgz#c12c981d067846c84bcaf862cff930d907ffd1a8" dependencies: @@ -2755,6 +2786,12 @@ first-chunk-stream@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz#59bfb50cd905f60d7c394cd3d9acaab4e6ad934e" +first-chunk-stream@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/first-chunk-stream/-/first-chunk-stream-2.0.0.tgz#1bdecdb8e083c0664b91945581577a43a9f31d70" + dependencies: + readable-stream "^2.0.2" + flagged-respawn@^0.3.2: version "0.3.2" resolved "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-0.3.2.tgz#ff191eddcd7088a675b2610fffc976be9b8074b5" @@ -3096,6 +3133,16 @@ globby@^5.0.0: pify "^2.0.0" pinkie-promise "^2.0.0" +globby@^6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c" + dependencies: + array-union "^1.0.1" + glob "^7.0.3" + object-assign "^4.0.1" + pify "^2.0.0" + pinkie-promise "^2.0.0" + globby@^7.0.0: version "7.1.1" resolved "https://registry.yarnpkg.com/globby/-/globby-7.1.1.tgz#fb2ccff9401f8600945dfada97440cca972b8680" @@ -3215,14 +3262,13 @@ gulp-gh-pages@0.5.4: vinyl-fs "^2.2.1" wrap-promise "^1.0.1" -gulp-htmlmin@3.0.0: - version "3.0.0" - resolved "https://registry.npmjs.org/gulp-htmlmin/-/gulp-htmlmin-3.0.0.tgz#19ea8002d1231d6b1f18a12d20f2a66a77770fb3" +gulp-htmlmin@4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/gulp-htmlmin/-/gulp-htmlmin-4.0.0.tgz#266feaed83588838aedda3666f67d057ec120313" dependencies: bufferstreams "^1.1.0" - gulp-util "^3.0.7" html-minifier "^3.0.3" - object-assign "^4.0.1" + plugin-error "^0.1.2" readable-stream "^2.0.2" tryit "^1.0.1" @@ -3274,18 +3320,18 @@ gulp-rev-replace@0.4.3: gulp-util "^3.0.7" through2 "^2.0.0" -gulp-rev@7.1.2: - version "7.1.2" - resolved "https://registry.npmjs.org/gulp-rev/-/gulp-rev-7.1.2.tgz#5e17cc229f6b45c74256f88ad3f2d3e9a3305829" +gulp-rev@8.1.1: + version "8.1.1" + resolved "https://registry.yarnpkg.com/gulp-rev/-/gulp-rev-8.1.1.tgz#b1106bfaa5653106a11d1612eb0cffde540cb196" dependencies: - gulp-util "^3.0.0" modify-filename "^1.1.0" - object-assign "^4.0.1" - rev-hash "^1.0.0" - rev-path "^1.0.0" - sort-keys "^1.0.0" + plugin-error "^0.1.2" + rev-hash "^2.0.0" + rev-path "^2.0.0" + sort-keys "^2.0.0" through2 "^2.0.0" - vinyl-file "^1.1.0" + vinyl "^2.1.0" + vinyl-file "^3.0.0" gulp-sass@^3.1.0: version "3.1.0" @@ -3354,12 +3400,14 @@ gulp-stylelint@^6.0.0: strip-ansi "^4.0.0" through2 "^2.0.3" -gulp-svgstore@6.1.0: - version "6.1.0" - resolved "https://registry.npmjs.org/gulp-svgstore/-/gulp-svgstore-6.1.0.tgz#04b203ac0e13f8ed6dbfc940d25965c4e2456676" +gulp-svgstore@6.1.1: + version "6.1.1" + resolved "https://registry.yarnpkg.com/gulp-svgstore/-/gulp-svgstore-6.1.1.tgz#7fa8af005c23bb0338f9f365a6010c86651f13d0" dependencies: cheerio "0.*" - gulp-util "^3.0.0" + fancy-log "^1.3.2" + plugin-error "^0.1.2" + vinyl "^2.1.0" gulp-util@^3.0, gulp-util@^3.0.0, gulp-util@^3.0.6, gulp-util@^3.0.7, gulp-util@^3.0.8: version "3.0.8" @@ -3931,7 +3979,7 @@ is-upper-case@^1.1.0: dependencies: upper-case "^1.1.0" -is-utf8@^0.2.0: +is-utf8@^0.2.0, is-utf8@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72" @@ -5208,6 +5256,10 @@ p-locate@^2.0.0: dependencies: p-limit "^1.1.0" +p-map@^1.1.1: + version "1.2.0" + resolved "https://registry.yarnpkg.com/p-map/-/p-map-1.2.0.tgz#e4e94f311eabbc8633a1e79908165fca26241b6b" + pako@~0.2.0: version "0.2.9" resolved "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz#f3f7522f4ef782348da8161bad9ecfd51bf83a75" @@ -5774,7 +5826,7 @@ private@^0.1.6: version "0.1.7" resolved "https://registry.npmjs.org/private/-/private-0.1.7.tgz#68ce5e8a1ef0a23bb570cc28537b5332aba63ef1" -process-nextick-args@~1.0.6: +process-nextick-args@^1.0.6, process-nextick-args@~1.0.6: version "1.0.7" resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3" @@ -6222,13 +6274,13 @@ restore-cursor@^2.0.0: onetime "^2.0.0" signal-exit "^3.0.2" -rev-hash@^1.0.0: - version "1.0.0" - resolved "https://registry.npmjs.org/rev-hash/-/rev-hash-1.0.0.tgz#96993959ea9bfb1c59b13adf02ac2e34bb373603" +rev-hash@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/rev-hash/-/rev-hash-2.0.0.tgz#7720a236ed0c258df3e64bec03ec048b05b924c4" -rev-path@^1.0.0: - version "1.0.0" - resolved "https://registry.npmjs.org/rev-path/-/rev-path-1.0.0.tgz#d4ccb436ac3370c4607175ce88eafc5c65c5d653" +rev-path@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/rev-path/-/rev-path-2.0.0.tgz#10c978e824d76ce7dd1f7e66e88f50f5e71a0a6a" dependencies: modify-filename "^1.0.0" @@ -6491,6 +6543,12 @@ sort-keys@^1.0.0: dependencies: is-plain-obj "^1.0.0" +sort-keys@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-2.0.0.tgz#658535584861ec97d730d6cf41822e1f56684128" + dependencies: + is-plain-obj "^1.0.0" + source-list-map@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.0.tgz#aaa47403f7b245a92fbc97ea08f250d6087ed085" @@ -6688,6 +6746,12 @@ strip-ansi@^4.0.0: dependencies: ansi-regex "^3.0.0" +strip-bom-buf@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/strip-bom-buf/-/strip-bom-buf-1.0.0.tgz#1cb45aaf57530f4caf86c7f75179d2c9a51dd572" + dependencies: + is-utf8 "^0.2.1" + strip-bom-stream@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/strip-bom-stream/-/strip-bom-stream-1.0.0.tgz#e7144398577d51a6bed0fa1994fa05f43fd988ee" @@ -6695,6 +6759,13 @@ strip-bom-stream@^1.0.0: first-chunk-stream "^1.0.0" strip-bom "^2.0.0" +strip-bom-stream@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/strip-bom-stream/-/strip-bom-stream-2.0.0.tgz#f87db5ef2613f6968aa545abfe1ec728b6a829ca" + dependencies: + first-chunk-stream "^2.0.0" + strip-bom "^2.0.0" + strip-bom-string@1.X: version "1.0.0" resolved "https://registry.npmjs.org/strip-bom-string/-/strip-bom-string-1.0.0.tgz#e5211e9224369fbb81d633a2f00044dc8cedad92" @@ -7311,14 +7382,15 @@ vfile@^2.0.0: unist-util-stringify-position "^1.0.0" vfile-message "^1.0.0" -vinyl-file@^1.1.0: - version "1.3.0" - resolved "https://registry.npmjs.org/vinyl-file/-/vinyl-file-1.3.0.tgz#aa05634d3a867ba91447bedbb34afcb26f44f6e7" +vinyl-file@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/vinyl-file/-/vinyl-file-3.0.0.tgz#b104d9e4409ffa325faadd520642d0a3b488b365" dependencies: graceful-fs "^4.1.2" - strip-bom "^2.0.0" - strip-bom-stream "^1.0.0" - vinyl "^1.1.0" + pify "^2.3.0" + strip-bom-buf "^1.0.0" + strip-bom-stream "^2.0.0" + vinyl "^2.0.1" vinyl-fs@^0.3.0: version "0.3.14" @@ -7361,7 +7433,7 @@ vinyl-sourcemaps-apply@^0.2.0, vinyl-sourcemaps-apply@^0.2.1: dependencies: source-map "^0.5.1" -vinyl@1.X, vinyl@^1.0.0, vinyl@^1.1.0: +vinyl@1.X, vinyl@^1.0.0: version "1.2.0" resolved "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz#5c88036cf565e5df05558bfc911f8656df218884" dependencies: @@ -7384,6 +7456,17 @@ vinyl@^0.5.0: clone-stats "^0.0.1" replace-ext "0.0.1" +vinyl@^2.0.1, vinyl@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-2.1.0.tgz#021f9c2cf951d6b939943c89eb5ee5add4fd924c" + dependencies: + clone "^2.1.1" + clone-buffer "^1.0.0" + clone-stats "^1.0.0" + cloneable-readable "^1.0.0" + remove-trailing-separator "^1.0.1" + replace-ext "^1.0.0" + vm-browserify@0.0.4: version "0.0.4" resolved "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz#5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73" From 7895c42f99e62965552120abd3e9ea30f2a1bc9d Mon Sep 17 00:00:00 2001 From: benjtinsley Date: Wed, 31 Jan 2018 09:16:21 -0700 Subject: [PATCH 23/33] removes gulp from description --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1ebfba954..c937c51d3 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "blendid", "version": "4.4.2", - "description": "(formerly gulp-starter) A full featured configurable gulp asset pipeline and static site builder", + "description": "A full featured configurable front-end asset pipeline and static site builder", "license": "MIT", "engines": { "node": ">=6.11.1", From 5ef2ed315c44492219b583bba60f34302e05dc7d Mon Sep 17 00:00:00 2001 From: benjtinsley Date: Wed, 31 Jan 2018 10:06:13 -0700 Subject: [PATCH 24/33] ensures webpack-dev-middleware and plugin-error are updated --- package.json | 4 +- yarn.lock | 153 ++++++++++++--------------------------------------- 2 files changed, 37 insertions(+), 120 deletions(-) diff --git a/package.json b/package.json index c937c51d3..2ca0f7ac0 100644 --- a/package.json +++ b/package.json @@ -63,14 +63,14 @@ "node-fs-extra": "^0.8.2", "node-sass-glob-importer": "^5.0.0-alpha.5", "open": "0.0.5", - "plugin-error": "^0.1.2", + "plugin-error": "1.0.1", "prettier": "^1.10.2", "pretty-hrtime": "1.0.3", "require-dir": "0.3.2", "stylelint": "^8.4.0", "stylelint-order": "^0.8.0", "webpack": "3.10.0", - "webpack-dev-middleware": "^1.12.0", + "webpack-dev-middleware": "2.0.4", "webpack-hot-middleware": "^2.18.2" }, "devDependencies": { diff --git a/yarn.lock b/yarn.lock index a6bbe1ee7..5cfe0200d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1575,10 +1575,6 @@ cliui@^3.0.3, cliui@^3.2.0: strip-ansi "^3.0.1" wrap-ansi "^2.0.0" -clone-buffer@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/clone-buffer/-/clone-buffer-1.0.0.tgz#e3e25b207ac4e701af721e2cb5a16792cac3dc58" - clone-regexp@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/clone-regexp/-/clone-regexp-1.0.0.tgz#eae0a2413f55c0942f818c229fefce845d7f3b1c" @@ -1590,10 +1586,6 @@ clone-stats@^0.0.1: version "0.0.1" resolved "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz#b88f94a82cf38b8791d58046ea4029ad88ca99d1" -clone-stats@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-1.0.0.tgz#b3782dff8bb5474e18b9b6bf0fdfe782f8777680" - clone@^0.2.0: version "0.2.0" resolved "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz#c6126a90ad4f72dbf5acdb243cc37724fe93fc1f" @@ -1602,18 +1594,6 @@ clone@^1.0.0, clone@^1.0.2: version "1.0.2" resolved "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz#260b7a99ebb1edfe247538175f783243cb19d149" -clone@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.1.tgz#d217d1e961118e3ac9a4b8bba3285553bf647cdb" - -cloneable-readable@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/cloneable-readable/-/cloneable-readable-1.0.0.tgz#a6290d413f217a61232f95e458ff38418cfb0117" - dependencies: - inherits "^2.0.1" - process-nextick-args "^1.0.6" - through2 "^2.0.1" - co@^4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184" @@ -2052,20 +2032,9 @@ defined@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693" -del@3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/del/-/del-3.0.0.tgz#53ecf699ffcbcb39637691ab13baf160819766e5" - dependencies: - globby "^6.1.0" - is-path-cwd "^1.0.0" - is-path-in-cwd "^1.0.0" - p-map "^1.1.1" - pify "^3.0.0" - rimraf "^2.2.8" - -del@^2.0.2: +del@2.2.2, del@^2.0.2: version "2.2.2" - resolved "https://registry.npmjs.org/del/-/del-2.2.2.tgz#c12c981d067846c84bcaf862cff930d907ffd1a8" + resolved "https://registry.yarnpkg.com/del/-/del-2.2.2.tgz#c12c981d067846c84bcaf862cff930d907ffd1a8" dependencies: globby "^5.0.0" is-path-cwd "^1.0.0" @@ -2786,12 +2755,6 @@ first-chunk-stream@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz#59bfb50cd905f60d7c394cd3d9acaab4e6ad934e" -first-chunk-stream@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/first-chunk-stream/-/first-chunk-stream-2.0.0.tgz#1bdecdb8e083c0664b91945581577a43a9f31d70" - dependencies: - readable-stream "^2.0.2" - flagged-respawn@^0.3.2: version "0.3.2" resolved "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-0.3.2.tgz#ff191eddcd7088a675b2610fffc976be9b8074b5" @@ -3133,16 +3096,6 @@ globby@^5.0.0: pify "^2.0.0" pinkie-promise "^2.0.0" -globby@^6.1.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c" - dependencies: - array-union "^1.0.1" - glob "^7.0.3" - object-assign "^4.0.1" - pify "^2.0.0" - pinkie-promise "^2.0.0" - globby@^7.0.0: version "7.1.1" resolved "https://registry.yarnpkg.com/globby/-/globby-7.1.1.tgz#fb2ccff9401f8600945dfada97440cca972b8680" @@ -3262,13 +3215,14 @@ gulp-gh-pages@0.5.4: vinyl-fs "^2.2.1" wrap-promise "^1.0.1" -gulp-htmlmin@4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/gulp-htmlmin/-/gulp-htmlmin-4.0.0.tgz#266feaed83588838aedda3666f67d057ec120313" +gulp-htmlmin@3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/gulp-htmlmin/-/gulp-htmlmin-3.0.0.tgz#19ea8002d1231d6b1f18a12d20f2a66a77770fb3" dependencies: bufferstreams "^1.1.0" + gulp-util "^3.0.7" html-minifier "^3.0.3" - plugin-error "^0.1.2" + object-assign "^4.0.1" readable-stream "^2.0.2" tryit "^1.0.1" @@ -3320,18 +3274,18 @@ gulp-rev-replace@0.4.3: gulp-util "^3.0.7" through2 "^2.0.0" -gulp-rev@8.1.1: - version "8.1.1" - resolved "https://registry.yarnpkg.com/gulp-rev/-/gulp-rev-8.1.1.tgz#b1106bfaa5653106a11d1612eb0cffde540cb196" +gulp-rev@7.1.2: + version "7.1.2" + resolved "https://registry.yarnpkg.com/gulp-rev/-/gulp-rev-7.1.2.tgz#5e17cc229f6b45c74256f88ad3f2d3e9a3305829" dependencies: + gulp-util "^3.0.0" modify-filename "^1.1.0" - plugin-error "^0.1.2" - rev-hash "^2.0.0" - rev-path "^2.0.0" - sort-keys "^2.0.0" + object-assign "^4.0.1" + rev-hash "^1.0.0" + rev-path "^1.0.0" + sort-keys "^1.0.0" through2 "^2.0.0" - vinyl "^2.1.0" - vinyl-file "^3.0.0" + vinyl-file "^1.1.0" gulp-sass@^3.1.0: version "3.1.0" @@ -3400,14 +3354,12 @@ gulp-stylelint@^6.0.0: strip-ansi "^4.0.0" through2 "^2.0.3" -gulp-svgstore@6.1.1: - version "6.1.1" - resolved "https://registry.yarnpkg.com/gulp-svgstore/-/gulp-svgstore-6.1.1.tgz#7fa8af005c23bb0338f9f365a6010c86651f13d0" +gulp-svgstore@6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/gulp-svgstore/-/gulp-svgstore-6.1.0.tgz#04b203ac0e13f8ed6dbfc940d25965c4e2456676" dependencies: cheerio "0.*" - fancy-log "^1.3.2" - plugin-error "^0.1.2" - vinyl "^2.1.0" + gulp-util "^3.0.0" gulp-util@^3.0, gulp-util@^3.0.0, gulp-util@^3.0.6, gulp-util@^3.0.7, gulp-util@^3.0.8: version "3.0.8" @@ -3979,7 +3931,7 @@ is-upper-case@^1.1.0: dependencies: upper-case "^1.1.0" -is-utf8@^0.2.0, is-utf8@^0.2.1: +is-utf8@^0.2.0: version "0.2.1" resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72" @@ -5256,10 +5208,6 @@ p-locate@^2.0.0: dependencies: p-limit "^1.1.0" -p-map@^1.1.1: - version "1.2.0" - resolved "https://registry.yarnpkg.com/p-map/-/p-map-1.2.0.tgz#e4e94f311eabbc8633a1e79908165fca26241b6b" - pako@~0.2.0: version "0.2.9" resolved "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz#f3f7522f4ef782348da8161bad9ecfd51bf83a75" @@ -5826,7 +5774,7 @@ private@^0.1.6: version "0.1.7" resolved "https://registry.npmjs.org/private/-/private-0.1.7.tgz#68ce5e8a1ef0a23bb570cc28537b5332aba63ef1" -process-nextick-args@^1.0.6, process-nextick-args@~1.0.6: +process-nextick-args@~1.0.6: version "1.0.7" resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3" @@ -6274,13 +6222,13 @@ restore-cursor@^2.0.0: onetime "^2.0.0" signal-exit "^3.0.2" -rev-hash@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/rev-hash/-/rev-hash-2.0.0.tgz#7720a236ed0c258df3e64bec03ec048b05b924c4" +rev-hash@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/rev-hash/-/rev-hash-1.0.0.tgz#96993959ea9bfb1c59b13adf02ac2e34bb373603" -rev-path@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/rev-path/-/rev-path-2.0.0.tgz#10c978e824d76ce7dd1f7e66e88f50f5e71a0a6a" +rev-path@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/rev-path/-/rev-path-1.0.0.tgz#d4ccb436ac3370c4607175ce88eafc5c65c5d653" dependencies: modify-filename "^1.0.0" @@ -6543,12 +6491,6 @@ sort-keys@^1.0.0: dependencies: is-plain-obj "^1.0.0" -sort-keys@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-2.0.0.tgz#658535584861ec97d730d6cf41822e1f56684128" - dependencies: - is-plain-obj "^1.0.0" - source-list-map@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.0.tgz#aaa47403f7b245a92fbc97ea08f250d6087ed085" @@ -6746,12 +6688,6 @@ strip-ansi@^4.0.0: dependencies: ansi-regex "^3.0.0" -strip-bom-buf@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/strip-bom-buf/-/strip-bom-buf-1.0.0.tgz#1cb45aaf57530f4caf86c7f75179d2c9a51dd572" - dependencies: - is-utf8 "^0.2.1" - strip-bom-stream@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/strip-bom-stream/-/strip-bom-stream-1.0.0.tgz#e7144398577d51a6bed0fa1994fa05f43fd988ee" @@ -6759,13 +6695,6 @@ strip-bom-stream@^1.0.0: first-chunk-stream "^1.0.0" strip-bom "^2.0.0" -strip-bom-stream@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/strip-bom-stream/-/strip-bom-stream-2.0.0.tgz#f87db5ef2613f6968aa545abfe1ec728b6a829ca" - dependencies: - first-chunk-stream "^2.0.0" - strip-bom "^2.0.0" - strip-bom-string@1.X: version "1.0.0" resolved "https://registry.npmjs.org/strip-bom-string/-/strip-bom-string-1.0.0.tgz#e5211e9224369fbb81d633a2f00044dc8cedad92" @@ -7382,15 +7311,14 @@ vfile@^2.0.0: unist-util-stringify-position "^1.0.0" vfile-message "^1.0.0" -vinyl-file@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/vinyl-file/-/vinyl-file-3.0.0.tgz#b104d9e4409ffa325faadd520642d0a3b488b365" +vinyl-file@^1.1.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/vinyl-file/-/vinyl-file-1.3.0.tgz#aa05634d3a867ba91447bedbb34afcb26f44f6e7" dependencies: graceful-fs "^4.1.2" - pify "^2.3.0" - strip-bom-buf "^1.0.0" - strip-bom-stream "^2.0.0" - vinyl "^2.0.1" + strip-bom "^2.0.0" + strip-bom-stream "^1.0.0" + vinyl "^1.1.0" vinyl-fs@^0.3.0: version "0.3.14" @@ -7433,7 +7361,7 @@ vinyl-sourcemaps-apply@^0.2.0, vinyl-sourcemaps-apply@^0.2.1: dependencies: source-map "^0.5.1" -vinyl@1.X, vinyl@^1.0.0: +vinyl@1.X, vinyl@^1.0.0, vinyl@^1.1.0: version "1.2.0" resolved "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz#5c88036cf565e5df05558bfc911f8656df218884" dependencies: @@ -7456,17 +7384,6 @@ vinyl@^0.5.0: clone-stats "^0.0.1" replace-ext "0.0.1" -vinyl@^2.0.1, vinyl@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-2.1.0.tgz#021f9c2cf951d6b939943c89eb5ee5add4fd924c" - dependencies: - clone "^2.1.1" - clone-buffer "^1.0.0" - clone-stats "^1.0.0" - cloneable-readable "^1.0.0" - remove-trailing-separator "^1.0.1" - replace-ext "^1.0.0" - vm-browserify@0.0.4: version "0.0.4" resolved "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz#5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73" From 559d417e33222f968fd9639a16eb9895598aa349 Mon Sep 17 00:00:00 2001 From: benjtinsley Date: Wed, 31 Jan 2018 10:18:51 -0700 Subject: [PATCH 25/33] globs dot prefixed files --- gulpfile.js/tasks/init.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gulpfile.js/tasks/init.js b/gulpfile.js/tasks/init.js index 360651746..529a86886 100644 --- a/gulpfile.js/tasks/init.js +++ b/gulpfile.js/tasks/init.js @@ -5,7 +5,7 @@ var projectPath = require('../lib/projectPath') var merge = require('merge-stream') gulp.task('init', function() { - var rootStream = gulp.src(['root/.eslintrc.js', 'root/.gitignore', 'root/.nvmrc', 'root/.prettierignore', 'root/.stylelintrc']) + var rootStream = gulp.src('root/.*') .pipe(gulp.dest(projectPath(''))) var configStream = gulp.src(['gulpfile.js/path-config.json', 'gulpfile.js/task-config.js']) From 8790767f60eb2ab0dff69961a8644643f620ce70 Mon Sep 17 00:00:00 2001 From: benjtinsley Date: Wed, 31 Jan 2018 11:08:26 -0700 Subject: [PATCH 26/33] moves blendid logo to root/ --- README.md | 2 +- root/blendid-logo.png | Bin 0 -> 5654 bytes 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 root/blendid-logo.png diff --git a/README.md b/README.md index bb670abee..e0d707060 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# ![Blendid](https://raw.githubusercontent.com/vigetlabs/blendid/master/extras/blendid-logo.png) +# ![Blendid](https://raw.githubusercontent.com/vigetlabs/blendid/master/root/blendid-logo.png) [![Build Status](https://travis-ci.org/vigetlabs/blendid.svg?branch=static-server)](https://travis-ci.org/vigetlabs/blendid) [![Stories in Ready](https://badge.waffle.io/vigetlabs/blendid.png?label=ready&title=Ready)](https://waffle.io/vigetlabs/blendid) diff --git a/root/blendid-logo.png b/root/blendid-logo.png new file mode 100644 index 0000000000000000000000000000000000000000..1ceb868812ef0a89838138e1f9e5f84039397f5b GIT binary patch literal 5654 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 Date: Wed, 31 Jan 2018 11:17:17 -0700 Subject: [PATCH 27/33] moves the blendid logo to the project root --- README.md | 2 +- root/blendid-logo.png => blendid-logo.png | Bin 2 files changed, 1 insertion(+), 1 deletion(-) rename root/blendid-logo.png => blendid-logo.png (100%) diff --git a/README.md b/README.md index e0d707060..cdfa8c8f2 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# ![Blendid](https://raw.githubusercontent.com/vigetlabs/blendid/master/root/blendid-logo.png) +# ![Blendid](https://raw.githubusercontent.com/vigetlabs/blendid/master/blendid-logo.png) [![Build Status](https://travis-ci.org/vigetlabs/blendid.svg?branch=static-server)](https://travis-ci.org/vigetlabs/blendid) [![Stories in Ready](https://badge.waffle.io/vigetlabs/blendid.png?label=ready&title=Ready)](https://waffle.io/vigetlabs/blendid) diff --git a/root/blendid-logo.png b/blendid-logo.png similarity index 100% rename from root/blendid-logo.png rename to blendid-logo.png From 625d9e27d39337a922db7aee7a223093a97fd378 Mon Sep 17 00:00:00 2001 From: benjtinsley Date: Wed, 31 Jan 2018 11:30:08 -0700 Subject: [PATCH 28/33] un-aligns variables --- gulpfile.js/tasks/init.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gulpfile.js/tasks/init.js b/gulpfile.js/tasks/init.js index 529a86886..daef7aa67 100644 --- a/gulpfile.js/tasks/init.js +++ b/gulpfile.js/tasks/init.js @@ -1,8 +1,9 @@ -var gulp = require('gulp') -var log = require('fancy-log') -var colors = require('ansi-colors') +var gulp = require('gulp') +var log = require('fancy-log') +var colors = require('ansi-colors') var projectPath = require('../lib/projectPath') -var merge = require('merge-stream') +var merge = require('merge-stream') + gulp.task('init', function() { var rootStream = gulp.src('root/.*') From 9420ab7cefdf38c8c8899a0a5863bf8b28e310a0 Mon Sep 17 00:00:00 2001 From: benjtinsley Date: Wed, 31 Jan 2018 11:32:51 -0700 Subject: [PATCH 29/33] simplifies the default task definition --- README.md | 4 ++-- gulpfile.js/tasks/init.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index cdfa8c8f2..fca516f37 100644 --- a/README.md +++ b/README.md @@ -9,8 +9,8 @@ ```bash yarn init yarn add blendid -yarn run blendid init -yarn run blendid +yarn blendid init +yarn blendid ``` This will create default src and config files in your directory and start compiling and live-updating files! Try editing them and watch your browser auto-update! diff --git a/gulpfile.js/tasks/init.js b/gulpfile.js/tasks/init.js index daef7aa67..b4c94f556 100644 --- a/gulpfile.js/tasks/init.js +++ b/gulpfile.js/tasks/init.js @@ -19,7 +19,7 @@ gulp.task('init', function() { log(colors.yellow(` To start the dev server: `), colors.magenta(` -yarn run blendid +yarn blendid `)) return merge(rootStream, configStream, srcStream) From ab0edf6da61ce83e71a0c65733eacd9ce286c1ff Mon Sep 17 00:00:00 2001 From: benjtinsley Date: Wed, 31 Jan 2018 15:33:34 -0700 Subject: [PATCH 30/33] allows custom loaders in webpack --- gulpfile.js/lib/task-defaults.js | 2 -- gulpfile.js/lib/webpack-multi-config.js | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/gulpfile.js/lib/task-defaults.js b/gulpfile.js/lib/task-defaults.js index 1ff7bde74..7eea39c01 100644 --- a/gulpfile.js/lib/task-defaults.js +++ b/gulpfile.js/lib/task-defaults.js @@ -14,8 +14,6 @@ module.exports = { }, devtool: 'eval-cheap-module-source-map', babelLoader: { - // "test" is derived from TASK_CONFIG.javascripts.extensions - // "options" is derived from TASK_CONFIG.javascripts.babel loader: 'babel-loader', exclude: /node_modules/ }, diff --git a/gulpfile.js/lib/webpack-multi-config.js b/gulpfile.js/lib/webpack-multi-config.js index b3164f673..6ec2a1ede 100644 --- a/gulpfile.js/lib/webpack-multi-config.js +++ b/gulpfile.js/lib/webpack-multi-config.js @@ -51,7 +51,7 @@ module.exports = function (env) { rules: [ TASK_CONFIG.javascripts.eslintLoader, TASK_CONFIG.javascripts.babelLoader - ] + ].concat(TASK_CONFIG.javascript.customLoaders) } } From add4d5d36e2a3c203720ded2934818b9d0d4bb2e Mon Sep 17 00:00:00 2001 From: benjtinsley Date: Wed, 31 Jan 2018 15:42:59 -0700 Subject: [PATCH 31/33] correctly places an empty array for customLoaders in default tasks --- gulpfile.js/lib/task-defaults.js | 1 + gulpfile.js/lib/webpack-multi-config.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/gulpfile.js/lib/task-defaults.js b/gulpfile.js/lib/task-defaults.js index 7eea39c01..f6abd1261 100644 --- a/gulpfile.js/lib/task-defaults.js +++ b/gulpfile.js/lib/task-defaults.js @@ -29,6 +29,7 @@ module.exports = { } ] }, + customLoaders: [], babel: { presets: [["env", { "modules": false diff --git a/gulpfile.js/lib/webpack-multi-config.js b/gulpfile.js/lib/webpack-multi-config.js index 6ec2a1ede..7d7d019cb 100644 --- a/gulpfile.js/lib/webpack-multi-config.js +++ b/gulpfile.js/lib/webpack-multi-config.js @@ -51,7 +51,7 @@ module.exports = function (env) { rules: [ TASK_CONFIG.javascripts.eslintLoader, TASK_CONFIG.javascripts.babelLoader - ].concat(TASK_CONFIG.javascript.customLoaders) + ].concat(TASK_CONFIG.javascripts.customLoaders) } } From ce937b16d3328fe99999d8cea9c83cfa0ac601e8 Mon Sep 17 00:00:00 2001 From: benjtinsley Date: Wed, 31 Jan 2018 17:09:10 -0700 Subject: [PATCH 32/33] adds appropriate changes for v5 release --- CHANGELOG.md | 4 ++++ README.md | 3 +++ package.json | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e6606f961..1574b6886 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## 5.0.0-beta +### updating +If updating to Blendid 5 on an existing project, the default, gh-pages, build and other tasks will still work the same. If adding to a new project, the specific init tasks (Craft, Rails, Drupal, etc) have been taken out in favor of the standard init task. To get the full benefit of the prettier integration, you will need to install the prettier plugin on your editor and set it to update on save within the preferences. + ## 4.4.2 - relatively references directories and files within init task diff --git a/README.md b/README.md index fca516f37..eea59739a 100644 --- a/README.md +++ b/README.md @@ -5,6 +5,9 @@ **Blendid** is a delicious stand-alone blend of tasks and build tools that form a full-featured modern asset pipeline. It can be used as-is as a static site builder, or can be configured and integrated into your own development environment and site or app structure. +## Blendid 5.0 +Blendid is getting an overhaul. We at Viget use Blendid for all of our projects but it is starting to grow stale. In an effort to keep it easy to maintain and valuable for us, we have decided to simplify what it does. This means for version 5, we will be removing the `extras/` directory in favor of the making the default init task as up to date as possible. We will also be adding better documentation to [the wiki](https://github.com/vigetlabs/blendid/wiki) in order to make it clear and useful for the community. + ## Quick start on a fresh project (empty directory) ```bash yarn init diff --git a/package.json b/package.json index 2ca0f7ac0..9bb48ac08 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "blendid", - "version": "4.4.2", + "version": "5.0.0", "description": "A full featured configurable front-end asset pipeline and static site builder", "license": "MIT", "engines": { From 212c4e4d389398c0e076220530c9277868d01c48 Mon Sep 17 00:00:00 2001 From: benjtinsley Date: Wed, 31 Jan 2018 17:11:17 -0700 Subject: [PATCH 33/33] updates tense/intention --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index eea59739a..4e5e5147b 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ **Blendid** is a delicious stand-alone blend of tasks and build tools that form a full-featured modern asset pipeline. It can be used as-is as a static site builder, or can be configured and integrated into your own development environment and site or app structure. ## Blendid 5.0 -Blendid is getting an overhaul. We at Viget use Blendid for all of our projects but it is starting to grow stale. In an effort to keep it easy to maintain and valuable for us, we have decided to simplify what it does. This means for version 5, we will be removing the `extras/` directory in favor of the making the default init task as up to date as possible. We will also be adding better documentation to [the wiki](https://github.com/vigetlabs/blendid/wiki) in order to make it clear and useful for the community. +Blendid is getting an overhaul. We at Viget use Blendid for all of our projects but it is starting to grow stale. In an effort to keep it easy to maintain and valuable for us, we have decided to simplify what it does. This means for version 5, we will be removing the `extras/` directory in favor of the making the default init task as up to date as possible. We are also be adding better documentation to [the wiki](https://github.com/vigetlabs/blendid/wiki) in order to make it clear and useful for the community. ## Quick start on a fresh project (empty directory) ```bash