From 04f9add9d3003fd35f6c97c37ebc644fd310e384 Mon Sep 17 00:00:00 2001 From: Ashley Nolan Date: Mon, 20 Aug 2018 11:08:08 +0100 Subject: [PATCH] =?UTF-8?q?v7.24.0=20=E2=80=93=20gh-pages=20dependency=20c?= =?UTF-8?q?hanged=20and=20lintModules=20flag=20added=20(#135)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 15 ++++ README.md | 7 +- config.js | 8 +- package.json | 5 +- tasks-dev/docs.js | 2 +- test/config.test.js | 2 +- test/env.test.js | 24 ++++++ yarn.lock | 202 +++++++------------------------------------- 8 files changed, 88 insertions(+), 177 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 62abda5..0635177 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,21 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). +v7.23.0 +------------------------------ +*August 20, 2018* + +### Added +Can now lint sub-modules Sass (for local development) by using the `--lintModules` flag. + +### Changed +- Dependency on gulp-gh-pages removed in favour of our own forked version (as the maintainer had moved it to Gulp 4, which hasn't been released). +- Tests updated in line with config changes to CSS lintPaths + +### Removed +- Gemnasium removed from README + + v7.22.0 ------------------------------ *August 3, 2018* diff --git a/README.md b/README.md index 30d0143..e2b249c 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,6 @@ [![npm version](https://badge.fury.io/js/%40justeat%2Fgulp-build-fozzie.svg)](https://badge.fury.io/js/%40justeat%2Fgulp-build-fozzie) [![Build Status](https://travis-ci.org/justeat/gulp-build-fozzie.svg)](https://travis-ci.org/justeat/gulp-build-fozzie) [![Coverage Status](https://coveralls.io/repos/github/justeat/gulp-build-fozzie/badge.svg)](https://coveralls.io/github/justeat/gulp-build-fozzie) -[![Dependency Status](https://gemnasium.com/badges/github.com/justeat/gulp-build-fozzie.svg)](https://gemnasium.com/github.com/justeat/gulp-build-fozzie) Gulp build tasks for use across Fozzie modules. @@ -899,6 +898,12 @@ The following options are also present in the config but cannot be overridden. Set to the opposite value of `isProduction`. +- #### `lintModules` + + Type: `boolean` + + When set to true, by setting the `--lintModules` flag when running the build, the build will also lint SCSS files within sub-dependencies. This is intended to help with local development when using dependency linking. + ## Path Builder diff --git a/config.js b/config.js index e6bf967..eac3fb3 100644 --- a/config.js +++ b/config.js @@ -1,5 +1,6 @@ const gutil = require('gulp-util'); const path = require('path'); +const union = require('lodash.union'); const packageConfig = require('./package.json'); const consumingPackageConfig = require(`${process.cwd()}/package.json`); // eslint-disable-line import/no-dynamic-require @@ -9,6 +10,7 @@ const ConfigOptions = () => { const isProduction = !!gutil.env.prod; const isDev = !isProduction; const envLog = isProduction ? 'production' : 'development'; + const { lintModules } = gutil.env; const stripDebug = !gutil.env.noStripDebug; gutil.log(gutil.colors.yellow(`🐻 Running Gulp task for ${consumingPackageConfig.name}@${consumingPackageConfig.version} in ${gutil.colors.bold(envLog)} mode ${gutil.colors.gray(`(v${packageConfig.version})`)}`)); @@ -28,7 +30,7 @@ const ConfigOptions = () => { css: { scssDir: 'scss', cssDir: 'css', - lintPaths: [''], + lintPaths: [...lintModules ? ['node_modules/@justeat/**/*.scss', '!node_modules/@justeat/**/node_modules/**/*.scss'] : []], sourcemaps: isDev, usePackageVersion: false }, @@ -182,7 +184,9 @@ const ConfigOptions = () => { update (options = {}) { config = Object.assign(config, options, { - css: Object.assign(config.css, options.css), + css: Object.assign(config.css, options.css, { + lintPaths: union(config.css.lintPaths, (options.css ? options.css.lintPaths : [])) + }), js: Object.assign(config.js, options.js, { files: Object.assign(config.js.files, (options.js ? options.js.files : {}), { main: Object.assign(config.js.files.main, (options.js && options.js.files ? options.js.files.main : {})) diff --git a/package.json b/package.json index 522e316..fdb7519 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@justeat/gulp-build-fozzie", - "version": "7.22.0", + "version": "7.23.0", "description": "Gulp build tasks for use across Fozzie modules", "main": "index.js", "author": "Damian Mullins (http://www.damianmullins.com)", @@ -30,6 +30,7 @@ "@justeat/eslint-config-fozzie": "^2.0.1", "@justeat/f-copy-assets": "^0.6.0", "@justeat/f-templates-loader": "0.1.0", + "@justeat/gulp-gh-pages": "^1.0.3", "@justeat/stylelint-config-fozzie": "^2.0.1", "assemble": "^0.24.3", "autoprefixer": "^9.1.0", @@ -52,7 +53,6 @@ "gulp-extname": "^0.2.2", "gulp-file": "^0.4.0", "gulp-filenames": "^4.0.1", - "gulp-gh-pages": "^0.6.0-1", "gulp-if": "^2.0.2", "gulp-imagemin": "^4.1.0", "gulp-newer": "^1.4.0", @@ -75,6 +75,7 @@ "helper-markdown": "^1.0.0", "helper-md": "^0.2.2", "jest-cli": "^23.4.2", + "lodash.union": "^4.6.0", "merge-stream": "^1.0.1", "postcss-assets": "^5.0.0", "postcss-reporter": "^5.0.0", diff --git a/tasks-dev/docs.js b/tasks-dev/docs.js index c7c8b83..29ee827 100644 --- a/tasks-dev/docs.js +++ b/tasks-dev/docs.js @@ -1,6 +1,6 @@ const gulp = require('gulp'); const runSequence = require('run-sequence'); -const ghPages = require('gulp-gh-pages'); +const ghPages = require('@justeat/gulp-gh-pages'); const config = require('../config'); const pathBuilder = require('../pathBuilder'); diff --git a/test/config.test.js b/test/config.test.js index 7fa7dd1..06b1d52 100644 --- a/test/config.test.js +++ b/test/config.test.js @@ -123,7 +123,7 @@ describe('css config', () => { }); it('`lintPaths` should be set', () => { - expect(config.css.lintPaths).toEqual(['']); + expect(config.css.lintPaths).toEqual([]); }); it('`lintPaths` can be updated', () => { diff --git a/test/env.test.js b/test/env.test.js index 390549f..aad9cc0 100644 --- a/test/env.test.js +++ b/test/env.test.js @@ -1,6 +1,8 @@ const gutil = require('gulp-util'); +// Act – set environment variables up gutil.env.prod = true; +gutil.env.lintModules = true; // Mock the log function to capture log outputs const logMock = jest.fn(); @@ -16,4 +18,26 @@ describe('Environment variable', () => { expect(config.isProduction).toBe(true); }); }); + + describe('Setting `gutil.env.lintModules`', () => { + it('Will set `lintPaths` to include sub-module scss', () => { + // Assert + expect(config.css.lintPaths).toEqual(['node_modules/@justeat/**/*.scss', '!node_modules/@justeat/**/node_modules/**/*.scss']); + }); + + it('if config is updated, lintPaths should still include node_modules folder', () => { + // Arrange + const newConfig = { + css: { + lintPaths: ['./myFolder/'] + } + }; + + // Act + config.update(newConfig); + + // Assert + expect(config.css.lintPaths).toEqual(['node_modules/@justeat/**/*.scss', '!node_modules/@justeat/**/node_modules/**/*.scss', './myFolder/']); + }); + }); }); diff --git a/yarn.lock b/yarn.lock index e6b4513..193d377 100644 --- a/yarn.lock +++ b/yarn.lock @@ -54,6 +54,17 @@ handlebars-helper-i18n "^0.1.0" handlebars-helper-inlinesvg "^1.0.2" +"@justeat/gulp-gh-pages@^1.0.3": + version "1.0.3" + resolved "https://registry.npmjs.org/@justeat/gulp-gh-pages/-/gulp-gh-pages-1.0.3.tgz#45e4aa7fcd6a4e97194ea6833eafccdf68300dfe" + dependencies: + fancy-log "^1.3.2" + finished "^1.2.2" + gift "^0.10.2" + plugin-error "^1.0.1" + rimraf "^2.6.2" + vinyl-fs "^2.0.2" + "@justeat/stylelint-config-fozzie@^2.0.1": version "2.0.1" resolved "https://registry.npmjs.org/@justeat/stylelint-config-fozzie/-/stylelint-config-fozzie-2.0.1.tgz#7723b62a0e9b9d10519edcd8f05b995e85a0708e" @@ -479,12 +490,6 @@ anymatch@^2.0.0: micromatch "^3.1.4" normalize-path "^2.1.1" -append-buffer@^1.0.2: - version "1.0.2" - resolved "https://registry.npmjs.org/append-buffer/-/append-buffer-1.0.2.tgz#d8220cf466081525efea50614f3de6514dfa58f1" - dependencies: - buffer-equal "^1.0.0" - append-transform@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/append-transform/-/append-transform-1.0.0.tgz#046a52ae582a228bd72f58acfbe2967c678759ab" @@ -2171,10 +2176,6 @@ buffer-equal-constant-time@1.0.1: version "1.0.1" resolved "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz#f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819" -buffer-equal@^1.0.0: - version "1.0.0" - resolved "https://registry.npmjs.org/buffer-equal/-/buffer-equal-1.0.0.tgz#59616b498304d556abd466966b22eeda3eca5fbe" - buffer-fill@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c" @@ -3039,7 +3040,7 @@ conventional-recommended-bump@4.0.0: meow "^4.0.0" q "^1.5.1" -convert-source-map@1.X, convert-source-map@^1.1.0, convert-source-map@^1.1.1, convert-source-map@^1.4.0, convert-source-map@^1.5.0, convert-source-map@^1.5.1: +convert-source-map@1.X, convert-source-map@^1.1.0, convert-source-map@^1.1.1, convert-source-map@^1.4.0, convert-source-map@^1.5.1: version "1.5.1" resolved "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.1.tgz#b8278097b9bc229365de5c62cf5fcaed8b5599e5" @@ -3902,7 +3903,7 @@ duplexer@^0.1.1, duplexer@~0.1.1: version "0.1.1" resolved "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1" -duplexify@^3.2.0, duplexify@^3.4.2, duplexify@^3.5.0, duplexify@^3.6.0: +duplexify@^3.2.0, duplexify@^3.4.2, duplexify@^3.5.0: version "3.6.0" resolved "https://registry.npmjs.org/duplexify/-/duplexify-3.6.0.tgz#592903f5d80b38d037220541264d69a198fb3410" dependencies: @@ -3942,6 +3943,10 @@ ecdsa-sig-formatter@1.0.10: dependencies: safe-buffer "^5.0.1" +ee-first@1.0.3: + version "1.0.3" + resolved "https://registry.npmjs.org/ee-first/-/ee-first-1.0.3.tgz#6c98c4089abecb5a7b85c1ac449aa603d3b3dabe" + ee-first@1.1.1: version "1.1.1" resolved "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" @@ -4160,10 +4165,6 @@ es6-iterator@^2.0.1, es6-iterator@~2.0.3: es5-ext "^0.10.35" es6-symbol "^3.1.1" -es6-promise@^2.3.0: - version "2.3.0" - resolved "https://registry.npmjs.org/es6-promise/-/es6-promise-2.3.0.tgz#96edb9f2fdb01995822b263dd8aadab6748181bc" - es6-promise@^4.0.3, es6-promise@^4.0.5: version "4.2.4" resolved "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.4.tgz#dc4221c2b16518760bd8c39a52d8f356fc00ed29" @@ -4884,6 +4885,12 @@ fined@^1.0.1: object.pick "^1.2.0" parse-filepath "^1.0.1" +finished@^1.2.2: + version "1.2.2" + resolved "https://registry.npmjs.org/finished/-/finished-1.2.2.tgz#41608eafadfd65683b46a1220bc4b1ec3daedcd8" + dependencies: + ee-first "1.0.3" + 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" @@ -4915,13 +4922,6 @@ flex-exec@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/flex-exec/-/flex-exec-1.0.0.tgz#06974b68532839d2a12c32debcdb12378200fdf0" -flush-write-stream@^1.0.2: - version "1.0.3" - resolved "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.0.3.tgz#c5d586ef38af6097650b49bc41b55fabb19f35bd" - dependencies: - inherits "^2.0.1" - readable-stream "^2.0.4" - follow-redirects@^1.2.5: version "1.5.1" resolved "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.1.tgz#67a8f14f5a1f67f962c2c46469c79eaec0a90291" @@ -5029,13 +5029,6 @@ fs-minipass@^1.2.5: dependencies: minipass "^2.2.1" -fs-mkdirp-stream@^1.0.0: - version "1.0.0" - resolved "https://registry.npmjs.org/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz#0b7815fc3201c6a69e14db98ce098c16935259eb" - dependencies: - graceful-fs "^4.1.11" - through2 "^2.0.3" - fs.realpath@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" @@ -5268,21 +5261,6 @@ glob-stream@^5.3.2: to-absolute-glob "^0.1.1" unique-stream "^2.0.2" -glob-stream@^6.1.0: - version "6.1.0" - resolved "https://registry.npmjs.org/glob-stream/-/glob-stream-6.1.0.tgz#7045c99413b3eb94888d83ab46d0b404cc7bdde4" - dependencies: - extend "^3.0.0" - glob "^7.1.1" - glob-parent "^3.1.0" - is-negated-glob "^1.0.0" - ordered-read-streams "^1.0.0" - pumpify "^1.3.5" - readable-stream "^2.1.5" - remove-trailing-separator "^1.0.1" - to-absolute-glob "^2.0.0" - unique-stream "^2.0.2" - glob-to-regexp@^0.3.0: version "0.3.0" resolved "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab" @@ -5627,17 +5605,6 @@ gulp-filenames@^4.0.1: gulp-util ">=2.2.0" through2 "*" -gulp-gh-pages@^0.6.0-1: - version "0.6.0-1" - resolved "https://registry.npmjs.org/gulp-gh-pages/-/gulp-gh-pages-0.6.0-1.tgz#e647179de365ceb5003a0fa0751d9e5c0dfa2690" - dependencies: - fancy-log "^1.3.2" - gift "^0.10.2" - plugin-error "^1.0.1" - rimraf "^2.6.2" - vinyl-fs "^3.0.3" - wrap-promise "^1.0.1" - gulp-if@^2.0.2: version "2.0.2" resolved "https://registry.npmjs.org/gulp-if/-/gulp-if-2.0.2.tgz#a497b7e7573005041caa2bc8b7dda3c80444d629" @@ -6784,10 +6751,6 @@ is-natural-number@^2.0.0: version "2.1.1" resolved "https://registry.npmjs.org/is-natural-number/-/is-natural-number-2.1.1.tgz#7d4c5728377ef386c3e194a9911bf57c6dc335e7" -is-negated-glob@^1.0.0: - version "1.0.0" - resolved "https://registry.npmjs.org/is-negated-glob/-/is-negated-glob-1.0.0.tgz#6910bca5da8c95e784b5751b976cf5a10fee36d2" - is-npm@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/is-npm/-/is-npm-1.0.0.tgz#f2fb63a65e4905b406c86072765a1a4dc793b9f4" @@ -7768,12 +7731,6 @@ lcov-parse@^0.0.10: version "0.0.10" resolved "https://registry.npmjs.org/lcov-parse/-/lcov-parse-0.0.10.tgz#1b0b8ff9ac9c7889250582b70b71315d9da6d9a3" -lead@^1.0.0: - version "1.0.0" - resolved "https://registry.npmjs.org/lead/-/lead-1.0.0.tgz#6f14f99a37be3a9dd784f5495690e5903466ee42" - dependencies: - flush-write-stream "^1.0.2" - left-pad@^1.2.0: version "1.3.0" resolved "https://registry.npmjs.org/left-pad/-/left-pad-1.3.0.tgz#5b8a3a7765dfe001261dde915589e782f8c94d1e" @@ -8182,6 +8139,10 @@ lodash.templatesettings@^4.0.0: dependencies: lodash._reinterpolate "~3.0.0" +lodash.union@^4.6.0: + version "4.6.0" + resolved "https://registry.npmjs.org/lodash.union/-/lodash.union-4.6.0.tgz#48bb5088409f16f1821666641c44dd1aaae3cd88" + lodash.uniq@^4.5.0: version "4.5.0" resolved "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" @@ -9161,7 +9122,7 @@ object-visit@^1.0.0: dependencies: isobject "^3.0.0" -object.assign@^4.0.4, object.assign@^4.1.0: +object.assign@^4.1.0: version "4.1.0" resolved "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz#968bf1100d7956bb3ca086f006f846b3bc4008da" dependencies: @@ -9247,7 +9208,7 @@ on-finished@~2.3.0: dependencies: ee-first "1.1.1" -once@^1.3.0, once@^1.3.1, once@^1.3.2, once@^1.4.0: +once@^1.3.0, once@^1.3.2, once@^1.4.0: version "1.4.0" resolved "https://registry.npmjs.org/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" dependencies: @@ -9350,12 +9311,6 @@ ordered-read-streams@^0.3.0: is-stream "^1.0.1" readable-stream "^2.0.1" -ordered-read-streams@^1.0.0: - version "1.0.1" - resolved "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-1.0.1.tgz#77c0cb37c41525d64166d990ffad7ec6a0e1363e" - dependencies: - readable-stream "^2.0.1" - os-browserify@~0.3.0: version "0.3.0" resolved "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27" @@ -10284,21 +10239,6 @@ public-encrypt@^4.0.0: parse-asn1 "^5.0.0" randombytes "^2.0.1" -pump@^2.0.0: - version "2.0.1" - resolved "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909" - dependencies: - end-of-stream "^1.1.0" - once "^1.3.1" - -pumpify@^1.3.5: - version "1.5.1" - resolved "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz#36513be246ab27570b1a374a5ce278bfd74370ce" - dependencies: - duplexify "^3.6.0" - inherits "^2.0.3" - pump "^2.0.0" - punycode@1.3.2: version "1.3.2" resolved "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d" @@ -10523,7 +10463,7 @@ read-pkg@^3.0.0: isarray "0.0.1" string_decoder "~0.10.x" -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.5, readable-stream@^2.2.2, readable-stream@^2.3.0, readable-stream@^2.3.3, readable-stream@^2.3.5, readable-stream@^2.3.6: +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.5, readable-stream@^2.2.2, readable-stream@^2.3.0, readable-stream@^2.3.5, readable-stream@^2.3.6: version "2.3.6" resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf" dependencies: @@ -10782,21 +10722,6 @@ remote-origin-url@^0.5.1: dependencies: parse-git-config "^1.1.1" -remove-bom-buffer@^3.0.0: - version "3.0.0" - resolved "https://registry.npmjs.org/remove-bom-buffer/-/remove-bom-buffer-3.0.0.tgz#c2bf1e377520d324f623892e33c10cac2c252b53" - dependencies: - is-buffer "^1.1.5" - is-utf8 "^0.2.1" - -remove-bom-stream@^1.2.0: - version "1.2.0" - resolved "https://registry.npmjs.org/remove-bom-stream/-/remove-bom-stream-1.2.0.tgz#05f1a593f16e42e1fb90ebf59de8e569525f9523" - dependencies: - remove-bom-buffer "^3.0.0" - safe-buffer "^5.1.0" - through2 "^2.0.3" - remove-trailing-separator@^1.0.1: version "1.1.0" resolved "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef" @@ -10979,12 +10904,6 @@ resolve-glob@^1.0.0: relative "^3.0.2" resolve-dir "^1.0.0" -resolve-options@^1.1.0: - version "1.1.0" - resolved "https://registry.npmjs.org/resolve-options/-/resolve-options-1.1.0.tgz#32bb9e39c06d67338dc9378c0d6d6074566ad131" - dependencies: - value-or-function "^3.0.0" - resolve-url@^0.2.1: version "0.2.1" resolved "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" @@ -12465,13 +12384,6 @@ to-absolute-glob@^0.1.1: dependencies: extend-shallow "^2.0.1" -to-absolute-glob@^2.0.0: - version "2.0.2" - resolved "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz#1865f43d9e74b0822db9f145b78cff7d0f7c849b" - dependencies: - is-absolute "^1.0.0" - is-negated-glob "^1.0.0" - to-array@0.1.4: version "0.1.4" resolved "https://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz#17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890" @@ -12528,12 +12440,6 @@ to-regex@^3.0.1, to-regex@^3.0.2: regex-not "^1.0.2" safe-regex "^1.1.0" -to-through@^2.0.0: - version "2.0.0" - resolved "https://registry.npmjs.org/to-through/-/to-through-2.0.0.tgz#fc92adaba072647bc0b67d6b03664aa195093af6" - dependencies: - through2 "^2.0.3" - touch@^3.1.0: version "3.1.0" resolved "https://registry.npmjs.org/touch/-/touch-3.1.0.tgz#fe365f5f75ec9ed4e56825e0bb76d24ab74af83b" @@ -12974,10 +12880,6 @@ validate-npm-package-license@^3.0.1: spdx-correct "^3.0.0" spdx-expression-parse "^3.0.0" -value-or-function@^3.0.0: - version "3.0.0" - resolved "https://registry.npmjs.org/value-or-function/-/value-or-function-3.0.0.tgz#1c243a50b595c1be54a754bfece8563b9ff8d813" - vendors@^1.0.0: version "1.0.2" resolved "https://registry.npmjs.org/vendors/-/vendors-1.0.2.tgz#7fcb5eef9f5623b156bcea89ec37d63676f21801" @@ -13046,7 +12948,7 @@ vinyl-fs@^0.3.0: through2 "^0.6.1" vinyl "^0.4.0" -vinyl-fs@^2.2.0, vinyl-fs@^2.4.4: +vinyl-fs@^2.0.2, vinyl-fs@^2.2.0, vinyl-fs@^2.4.4: version "2.4.4" resolved "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-2.4.4.tgz#be6ff3270cb55dfd7d3063640de81f25d7532239" dependencies: @@ -13068,28 +12970,6 @@ vinyl-fs@^2.2.0, vinyl-fs@^2.4.4: vali-date "^1.0.0" vinyl "^1.0.0" -vinyl-fs@^3.0.3: - version "3.0.3" - resolved "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-3.0.3.tgz#c85849405f67428feabbbd5c5dbdd64f47d31bc7" - dependencies: - fs-mkdirp-stream "^1.0.0" - glob-stream "^6.1.0" - graceful-fs "^4.0.0" - is-valid-glob "^1.0.0" - lazystream "^1.0.0" - lead "^1.0.0" - object.assign "^4.0.4" - pumpify "^1.3.5" - readable-stream "^2.3.3" - remove-bom-buffer "^3.0.0" - remove-bom-stream "^1.2.0" - resolve-options "^1.1.0" - through2 "^2.0.0" - to-through "^2.0.0" - value-or-function "^3.0.0" - vinyl "^2.0.0" - vinyl-sourcemap "^1.1.0" - vinyl-item@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/vinyl-item/-/vinyl-item-1.0.0.tgz#e4188fab795154de9e74588eaad3df4ba5151692" @@ -13112,18 +12992,6 @@ vinyl-source-stream@^2.0.0: through2 "^2.0.3" vinyl "^2.1.0" -vinyl-sourcemap@^1.1.0: - version "1.1.0" - resolved "https://registry.npmjs.org/vinyl-sourcemap/-/vinyl-sourcemap-1.1.0.tgz#92a800593a38703a8cdb11d8b300ad4be63b3e16" - dependencies: - append-buffer "^1.0.2" - convert-source-map "^1.5.0" - graceful-fs "^4.1.6" - normalize-path "^2.1.1" - now-and-later "^2.0.0" - remove-bom-buffer "^3.0.0" - vinyl "^2.0.0" - vinyl-sourcemaps-apply@^0.2.0, vinyl-sourcemaps-apply@^0.2.1: version "0.2.1" resolved "https://registry.npmjs.org/vinyl-sourcemaps-apply/-/vinyl-sourcemaps-apply-0.2.1.tgz#ab6549d61d172c2b1b87be5c508d239c8ef87705" @@ -13165,7 +13033,7 @@ vinyl@^1.0.0: clone-stats "^0.0.1" replace-ext "0.0.1" -vinyl@^2.0.0, vinyl@^2.0.1, vinyl@^2.1.0: +vinyl@^2.0.1, vinyl@^2.1.0: version "2.2.0" resolved "https://registry.npmjs.org/vinyl/-/vinyl-2.2.0.tgz#d85b07da96e458d25b2ffe19fece9f2caa13ed86" dependencies: @@ -13321,12 +13189,6 @@ wrap-fn@^0.1.0: dependencies: co "3.1.0" -wrap-promise@^1.0.1: - version "1.0.1" - resolved "https://registry.npmjs.org/wrap-promise/-/wrap-promise-1.0.1.tgz#b019f4236ccbf1fb560921b4b4870b7bda2f5255" - dependencies: - es6-promise "^2.3.0" - wrappy@1: version "1.0.2" resolved "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"