From dd1821e482e035c7ba92b22e5c7aaf9d4b10e5d5 Mon Sep 17 00:00:00 2001 From: "Dan O. Williams" Date: Wed, 10 Oct 2018 22:19:34 -0700 Subject: [PATCH 1/8] Move settings to separate folder --- css/{ => settings}/_uswds-theme-color.scss | 0 css/{ => settings}/_uswds-theme-components.scss | 0 css/{ => settings}/_uswds-theme-general.scss | 0 css/{ => settings}/_uswds-theme-spacing.scss | 0 css/{ => settings}/_uswds-theme-typography.scss | 0 css/{ => settings}/_uswds-theme-utilities.scss | 0 css/{ => settings}/_variables.scss | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename css/{ => settings}/_uswds-theme-color.scss (100%) rename css/{ => settings}/_uswds-theme-components.scss (100%) rename css/{ => settings}/_uswds-theme-general.scss (100%) rename css/{ => settings}/_uswds-theme-spacing.scss (100%) rename css/{ => settings}/_uswds-theme-typography.scss (100%) rename css/{ => settings}/_uswds-theme-utilities.scss (100%) rename css/{ => settings}/_variables.scss (100%) diff --git a/css/_uswds-theme-color.scss b/css/settings/_uswds-theme-color.scss similarity index 100% rename from css/_uswds-theme-color.scss rename to css/settings/_uswds-theme-color.scss diff --git a/css/_uswds-theme-components.scss b/css/settings/_uswds-theme-components.scss similarity index 100% rename from css/_uswds-theme-components.scss rename to css/settings/_uswds-theme-components.scss diff --git a/css/_uswds-theme-general.scss b/css/settings/_uswds-theme-general.scss similarity index 100% rename from css/_uswds-theme-general.scss rename to css/settings/_uswds-theme-general.scss diff --git a/css/_uswds-theme-spacing.scss b/css/settings/_uswds-theme-spacing.scss similarity index 100% rename from css/_uswds-theme-spacing.scss rename to css/settings/_uswds-theme-spacing.scss diff --git a/css/_uswds-theme-typography.scss b/css/settings/_uswds-theme-typography.scss similarity index 100% rename from css/_uswds-theme-typography.scss rename to css/settings/_uswds-theme-typography.scss diff --git a/css/_uswds-theme-utilities.scss b/css/settings/_uswds-theme-utilities.scss similarity index 100% rename from css/_uswds-theme-utilities.scss rename to css/settings/_uswds-theme-utilities.scss diff --git a/css/_variables.scss b/css/settings/_variables.scss similarity index 100% rename from css/_variables.scss rename to css/settings/_variables.scss From ff7261c3a44588252fbd7e6960e87e0a5924d4bd Mon Sep 17 00:00:00 2001 From: "Dan O. Williams" Date: Wed, 10 Oct 2018 22:20:06 -0700 Subject: [PATCH 2/8] Add separate gulp tasks for each package module --- config/gulp/sass.js | 163 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 154 insertions(+), 9 deletions(-) diff --git a/config/gulp/sass.js b/config/gulp/sass.js index ac140ab6f..a8f83c027 100644 --- a/config/gulp/sass.js +++ b/config/gulp/sass.js @@ -1,5 +1,6 @@ var autoprefixer = require('autoprefixer'); var combineMq = require('gulp-combine-mq'); +var concat = require('gulp-concat'); var cssnano = require('cssnano'); var dutil = require('./doc-util'); var gulp = require('gulp'); @@ -11,17 +12,75 @@ var sourcemaps = require('gulp-sourcemaps'); var strip = require('gulp-strip-css-comments'); var task = 'sass'; -gulp.task('build-sass', function () { - var plugins = [ - autoprefixer({ browsers: ['> 1%','Last 2 versions','IE 11'], cascade: false, }), - packCSS({ sort: true }), - cssnano({ autoprefixer: { browsers: '> 1%, Last 2 versions, IE 11' }}) - ]; - return gulp.src('./css/**/*.scss') +var dev_plugins = [ + autoprefixer({ browsers: ['> 1%','Last 2 versions','IE 11'], cascade: false, }), + packCSS({ sort: true }) +]; + +var prod_plugins = [ + packCSS({ sort: true }), + cssnano({ autoprefixer: { browsers: '> 1%, Last 2 versions, IE 11' }}) +]; + +gulp.task('build-sass-fonts', function () { + return gulp.src('./css/uswds-fonts.scss') + .pipe(sourcemaps.init({largeFile: true})) + .pipe( + sass({ + includePaths: [ + './node_modules/uswds/dist/scss', + './css/settings', + ], + outputStyle: 'expanded', + }) + .on('error', function(error) { + sass.logError.bind(this)(error); + + if (process.env.NODE_ENV !== 'development') { + process.exit(1); + } + }) + ) + .pipe(postcss(dev_plugins)) + .pipe(sourcemaps.write('.')) + .pipe(gulp.dest('assets/css')) + .pipe(gulp.dest('_site/assets/css')) +}); + +gulp.task('build-sass-components', function () { + return gulp.src('./css/uswds-components.scss') + .pipe(sourcemaps.init({largeFile: true})) + .pipe( + sass({ + includePaths: [ + './node_modules/uswds/dist/scss', + './css/settings', + ], + outputStyle: 'expanded', + }) + .on('error', function(error) { + sass.logError.bind(this)(error); + + if (process.env.NODE_ENV !== 'development') { + process.exit(1); + } + }) + ) + .pipe(postcss(dev_plugins)) + .pipe(sourcemaps.write('.')) + .pipe(gulp.dest('assets/css')) + .pipe(gulp.dest('_site/assets/css')) +}); + +gulp.task('build-sass-layout-grid', function () { + return gulp.src('./css/uswds-layout-grid.scss') .pipe(sourcemaps.init({largeFile: true})) .pipe( sass({ - includePaths: [ './node_modules/uswds/dist/scss' ], + includePaths: [ + './node_modules/uswds/dist/scss', + './css/settings', + ], outputStyle: 'expanded', }) .on('error', function(error) { @@ -32,12 +91,98 @@ gulp.task('build-sass', function () { } }) ) - .pipe(postcss(plugins)) + .pipe(postcss(dev_plugins)) .pipe(sourcemaps.write('.')) .pipe(gulp.dest('assets/css')) .pipe(gulp.dest('_site/assets/css')) }); +gulp.task('build-sass-custom', function () { + return gulp.src('./css/uswds-custom.scss') + .pipe(sourcemaps.init({largeFile: true})) + .pipe( + sass({ + includePaths: [ + './node_modules/uswds/dist/scss', + './css/settings', + ], + outputStyle: 'expanded', + }) + .on('error', function(error) { + sass.logError.bind(this)(error); + + if (process.env.NODE_ENV !== 'development') { + process.exit(1); + } + }) + ) + .pipe(postcss(dev_plugins)) + .pipe(sourcemaps.write('.')) + .pipe(gulp.dest('assets/css')) + .pipe(gulp.dest('_site/assets/css')) +}); + +gulp.task('build-sass-utilities', function () { + return gulp.src('./css/uswds-utilities.scss') + .pipe(sourcemaps.init({largeFile: true})) + .pipe( + sass({ + includePaths: [ + './node_modules/uswds/dist/scss', + './css/settings', + ], + outputStyle: 'expanded', + }) + .on('error', function(error) { + sass.logError.bind(this)(error); + + if (process.env.NODE_ENV !== 'development') { + process.exit(1); + } + }) + ) + .pipe(postcss(dev_plugins)) + .pipe(sourcemaps.write('.')) + .pipe(gulp.dest('assets/css')) + .pipe(gulp.dest('_site/assets/css')) +}); + +gulp.task('build-sass-dev', + gulp.parallel( + 'build-sass-fonts', + 'build-sass-components', + 'build-sass-layout-grid', + 'build-sass-custom', + 'build-sass-utilities', + ) +); + +gulp.task('build-sass-prod', function () { + return gulp.src([ + './assets/css/uswds-fonts.css', + './assets/css/uswds-components.css', + './assets/css/uswds-layout-grid.css', + './assets/css/uswds-custom.css', + './assets/css/uswds-utilities.css' + ]) + .pipe(sourcemaps.init({ + largeFile: true, + loadMaps: true + })) + .pipe(concat('styles.css')) + .pipe(postcss(prod_plugins)) + .pipe(sourcemaps.write('.')) + .pipe(gulp.dest('assets/css')) + .pipe(gulp.dest('_site/assets/css')) +}); + +gulp.task('build-sass', + gulp.series( + 'build-sass-dev', + 'build-sass-prod' + ) +); + gulp.task('scss-lint', function (done) { if (!cFlags.test) { dutil.logMessage('scss-lint', 'Skipping linting of Sass files.'); From ea53297508fa59db1faf83700dbaa3ef66524319 Mon Sep 17 00:00:00 2001 From: "Dan O. Williams" Date: Wed, 10 Oct 2018 22:20:38 -0700 Subject: [PATCH 3/8] Add gulp-concat and new gulp scripts --- package.json | 36 ++++++++++++++++++++++++++++++------ 1 file changed, 30 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 9fc204c69..0fb9ae8a4 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,13 @@ "scripts": { "axe": "node config/run-axe.js", "build": "gulp build && bundle exec jekyll build", - "build-css": "gulp sass", + "build-css": "gulp build-sass", + "build-css-components": "gulp build-sass-components", + "build-css-custom": "gulp build-sass-custom", + "build-css-dev": "gulp build-sass-dev", + "build-css-fonts": "gulp build-sass-fonts", + "build-css-layout-grid": "gulp build-sass-layout-grid", + "build-css-utilities": "gulp build-sass-utilities", "build-fonts": "gulp fonts", "build-img": "gulp images", "build-js": "gulp javascript", @@ -72,12 +78,12 @@ "gulp": "^4.0.0", "gulp-clean": "^0.4.0", "gulp-combine-mq": "^0.4.0", - "gulp-concat": "^2.6.0", + "gulp-concat": "^2.6.1", "gulp-eslint": "^4.0.2", "gulp-postcss": "^8.0.0", "gulp-rename": "^1.3.0", "gulp-sass": "^4.0.1", - "gulp-scss-lint": "^0.6.1", + "gulp-scss-lint": "^0.7.1", "gulp-sourcemaps": "^2.6.4", "gulp-strip-css-comments": "^2.0.0", "gulp-uglify": "^3.0.0", @@ -94,8 +100,26 @@ "yamljs": "^0.3.0" }, "watch": { - "./css/**/*.scss": [ - "build-css" + "./css/settings/**/*.scss": [ + "build-css-dev" + ], + "./css/uswds-components.scss": [ + "build-css-components" + ], + "./css/uswds-custom.scss": [ + "build-css-custom" + ], + "./css/_uswds-theme-custom-styles.scss": [ + "build-css-custom" + ], + "./css/uswds-fonts.scss": [ + "build-css-fonts" + ], + "./css/uswds-layout-grid.scss": [ + "build-css-layout-grid" + ], + "./css/uswds-utilities.scss": [ + "build-css-utilities" ], "./img": [ "build-img" @@ -104,7 +128,7 @@ "build-js" ], "./node_modules/uswds/src/stylesheets": [ - "build-css" + "build-css-dev" ], "./node_modules/uswds/src/fonts": [ "build-fonts" From 9d29d4d94bbbe73a3da532fea19c68206e6199ac Mon Sep 17 00:00:00 2001 From: "Dan O. Williams" Date: Wed, 10 Oct 2018 22:20:45 -0700 Subject: [PATCH 4/8] Update uswds --- package-lock.json | 694 ++++++++++++++++------------------------------ 1 file changed, 240 insertions(+), 454 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1cbbe4421..51bdd6e50 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1432,9 +1432,9 @@ } }, "bluebird": { - "version": "3.5.1", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz", - "integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA==", + "version": "3.5.2", + "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.2.tgz", + "integrity": "sha512-dhHTWMI7kMx5whMQntl7Vr9C6BvV10lFXDAasnqnrMYhXVCzzk6IO9Fo2L75jXHT07WrOngL1WDXOp+yYS91Yg==", "dev": true }, "bn.js": { @@ -1710,7 +1710,8 @@ "builtin-modules": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz", - "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=" + "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=", + "dev": true }, "builtin-status-codes": { "version": "3.0.0", @@ -2111,6 +2112,7 @@ "version": "3.2.0", "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz", "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=", + "dev": true, "requires": { "string-width": "^1.0.1", "strip-ansi": "^3.0.1", @@ -2121,6 +2123,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", + "dev": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -2548,6 +2551,7 @@ "version": "5.1.0", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=", + "dev": true, "requires": { "lru-cache": "^4.0.1", "shebang-command": "^1.2.0", @@ -2870,13 +2874,10 @@ } }, "dargs": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/dargs/-/dargs-4.1.0.tgz", - "integrity": "sha1-A6nbtLXC8Tm/FK5T8LiipqhvThc=", - "dev": true, - "requires": { - "number-is-nan": "^1.0.0" - } + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/dargs/-/dargs-6.0.0.tgz", + "integrity": "sha512-6lJauzNaI7MiM8EHQWmGj+s3rP5/i1nYs8GAvKrLAx/9dpc9xS/4seFb1ioR39A+kcfu4v3jnEa/EE5qWYnitQ==", + "dev": true }, "dashdash": { "version": "1.14.1", @@ -2942,7 +2943,8 @@ "decamelize": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", - "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=" + "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=", + "dev": true }, "decode-uri-component": { "version": "0.2.0", @@ -3638,18 +3640,27 @@ } }, "event-stream": { - "version": "3.3.4", - "resolved": "http://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz", - "integrity": "sha1-SrTJoPWlTbkzi0w02Gv86PSzVXE=", + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.6.tgz", + "integrity": "sha512-dGXNg4F/FgVzlApjzItL+7naHutA3fDqbV/zAZqDDlXTjiMnQmZKu+prImWKszeBM5UQeGvAl3u1wBiKeDh61g==", "dev": true, "requires": { - "duplexer": "~0.1.1", - "from": "~0", - "map-stream": "~0.1.0", - "pause-stream": "0.0.11", - "split": "0.3", - "stream-combiner": "~0.0.4", - "through": "~2.3.1" + "duplexer": "^0.1.1", + "flatmap-stream": "^0.1.0", + "from": "^0.1.7", + "map-stream": "0.0.7", + "pause-stream": "^0.0.11", + "split": "^1.0.1", + "stream-combiner": "^0.2.2", + "through": "^2.3.8" + }, + "dependencies": { + "map-stream": { + "version": "0.0.7", + "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.7.tgz", + "integrity": "sha1-ih8HiW2CsQkmvTdEokIACfiJdKg=", + "dev": true + } } }, "events": { @@ -3668,17 +3679,31 @@ } }, "execa": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz", - "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=", + "version": "0.10.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-0.10.0.tgz", + "integrity": "sha512-7XOMnz8Ynx1gGo/3hyV9loYNPWM94jG3+3T3Y8tsfSstFmETmENCMU/A/zj8Lyaj1lkgEepKepvd6240tBRvlw==", "requires": { - "cross-spawn": "^5.0.1", + "cross-spawn": "^6.0.0", "get-stream": "^3.0.0", "is-stream": "^1.1.0", "npm-run-path": "^2.0.0", "p-finally": "^1.0.0", "signal-exit": "^3.0.0", "strip-eof": "^1.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + } } }, "expand-brackets": { @@ -4022,11 +4047,11 @@ } }, "find-up": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", - "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", + "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", "requires": { - "locate-path": "^2.0.0" + "locate-path": "^3.0.0" } }, "findup-sync": { @@ -4065,12 +4090,6 @@ "parse-filepath": "^1.0.1" } }, - "first-chunk-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz", - "integrity": "sha1-Wb+1DNkF9g18OUzT2ayqtOatk04=", - "dev": true - }, "flagged-respawn": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-1.0.0.tgz", @@ -4120,6 +4139,12 @@ } } }, + "flatmap-stream": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/flatmap-stream/-/flatmap-stream-0.1.1.tgz", + "integrity": "sha512-lAq4tLbm3sidmdCN8G3ExaxH7cUCtP5mgDvrYowsx84dcYkJJ4I28N7gkxA6+YlSXzaGLJYIDEi9WGfXzMiXdw==", + "dev": true + }, "flatten": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/flatten/-/flatten-1.0.2.tgz", @@ -5046,7 +5071,8 @@ "graceful-fs": { "version": "4.1.11", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz", - "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=" + "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=", + "dev": true }, "graphlib": { "version": "2.1.5", @@ -5674,307 +5700,66 @@ } }, "gulp-scss-lint": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/gulp-scss-lint/-/gulp-scss-lint-0.6.1.tgz", - "integrity": "sha512-VLXzU+/9ywnIrKv9NVG8exBOTkNVYjpm9AzfbcCkt4/o9ZdD4R5fUQD9h33IyicSxtHQnRZx1qg3WtBR1VJjig==", + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/gulp-scss-lint/-/gulp-scss-lint-0.7.1.tgz", + "integrity": "sha512-vU2VWSzcyl8ZdIHQThu4ZvH7IFRkCJuwbjlRp0gt94NHOgT1Qf4SPez5gAm5v/oIXwhPIllSiuFZeUGm9A+DLw==", "dev": true, "requires": { "bluebird": "^3.3.5", - "chalk": "^1.1.3", - "dargs": "~4.1.0", + "chalk": "^2.4.1", + "dargs": "~6.0.0", "event-stream": "~3.3.2", "fancy-log": "^1.3.2", - "plugin-error": "^0.1.2", + "plugin-error": "^1.0.1", "pretty-data": "^0.40.0", "shell-escape": "^0.2.0", - "slash": "^1.0.0", - "sync-exec": "~0.6.2", - "vinyl": "^1.1.1", - "vinyl-fs": "^2.4.3", + "slash": "^2.0.0", + "vinyl": "^2.2.0", + "vinyl-fs": "^3.0.3", "xml2js": "^0.4.16" }, "dependencies": { - "ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", - "dev": true - }, "arr-diff": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz", - "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=", - "dev": true, - "requires": { - "arr-flatten": "^1.0.1" - } - }, - "array-unique": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz", - "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=", - "dev": true - }, - "braces": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz", - "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=", - "dev": true, - "requires": { - "expand-range": "^1.8.1", - "preserve": "^0.2.0", - "repeat-element": "^1.1.2" - } - }, - "chalk": { - "version": "1.1.3", - "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "dev": true, - "requires": { - "ansi-styles": "^2.2.1", - "escape-string-regexp": "^1.0.2", - "has-ansi": "^2.0.0", - "strip-ansi": "^3.0.0", - "supports-color": "^2.0.0" - } - }, - "clone": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz", - "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz", + "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=", "dev": true }, - "clone-stats": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz", - "integrity": "sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=", + "arr-union": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz", + "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=", "dev": true }, - "expand-brackets": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz", - "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=", - "dev": true, - "requires": { - "is-posix-bracket": "^0.1.0" - } - }, "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "^0.1.0" - } - }, - "extglob": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz", - "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=", - "dev": true, - "requires": { - "is-extglob": "^1.0.0" - } - }, - "glob": { - "version": "5.0.15", - "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz", - "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=", - "dev": true, - "requires": { - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "2 || 3", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, - "glob-stream": { - "version": "5.3.5", - "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-5.3.5.tgz", - "integrity": "sha1-pVZlqajM3EGRWofHAeMtTgFvrSI=", - "dev": true, - "requires": { - "extend": "^3.0.0", - "glob": "^5.0.3", - "glob-parent": "^3.0.0", - "micromatch": "^2.3.7", - "ordered-read-streams": "^0.3.0", - "through2": "^0.6.0", - "to-absolute-glob": "^0.1.1", - "unique-stream": "^2.0.2" - }, - "dependencies": { - "readable-stream": { - "version": "1.0.34", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", - "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", - "dev": true, - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.1", - "isarray": "0.0.1", - "string_decoder": "~0.10.x" - } - }, - "through2": { - "version": "0.6.5", - "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz", - "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=", - "dev": true, - "requires": { - "readable-stream": ">=1.0.33-1 <1.1.0-0", - "xtend": ">=4.0.0 <4.1.0-0" - } - } - } - }, - "gulp-sourcemaps": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-1.6.0.tgz", - "integrity": "sha1-uG/zSdgBzrVuHZ59x7vLS33uYAw=", - "dev": true, - "requires": { - "convert-source-map": "^1.1.1", - "graceful-fs": "^4.1.2", - "strip-bom": "^2.0.0", - "through2": "^2.0.0", - "vinyl": "^1.0.0" - } - }, - "is-extglob": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", - "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=", - "dev": true - }, - "is-glob": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", - "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", - "dev": true, - "requires": { - "is-extglob": "^1.0.0" - } - }, - "is-valid-glob": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-0.3.0.tgz", - "integrity": "sha1-1LVcafUYhvm2XHDWwmItN+KfSP4=", - "dev": true - }, - "isarray": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", - "dev": true - }, - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "requires": { - "is-buffer": "^1.1.5" - } - }, - "micromatch": { - "version": "2.3.11", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz", - "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=", - "dev": true, - "requires": { - "arr-diff": "^2.0.0", - "array-unique": "^0.2.1", - "braces": "^1.8.2", - "expand-brackets": "^0.1.4", - "extglob": "^0.3.1", - "filename-regex": "^2.0.0", - "is-extglob": "^1.0.0", - "is-glob": "^2.0.1", - "kind-of": "^3.0.2", - "normalize-path": "^2.0.1", - "object.omit": "^2.0.0", - "parse-glob": "^3.0.4", - "regex-cache": "^0.4.2" - } - }, - "ordered-read-streams": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.3.0.tgz", - "integrity": "sha1-cTfmmzKYuzQiR6G77jiByA4v14s=", - "dev": true, - "requires": { - "is-stream": "^1.0.1", - "readable-stream": "^2.0.1" - } - }, - "replace-ext": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz", - "integrity": "sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=", - "dev": true - }, - "strip-bom": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", - "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", - "dev": true, - "requires": { - "is-utf8": "^0.2.0" - } - }, - "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", - "dev": true - }, - "to-absolute-glob": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-0.1.1.tgz", - "integrity": "sha1-HN+kcqnvUMI57maZm2YsoOs5k38=", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", + "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", "dev": true, "requires": { - "extend-shallow": "^2.0.1" + "assign-symbols": "^1.0.0", + "is-extendable": "^1.0.1" } }, - "vinyl": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz", - "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=", + "is-extendable": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", + "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", "dev": true, "requires": { - "clone": "^1.0.0", - "clone-stats": "^0.0.1", - "replace-ext": "0.0.1" + "is-plain-object": "^2.0.4" } }, - "vinyl-fs": { - "version": "2.4.4", - "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-2.4.4.tgz", - "integrity": "sha1-vm/zJwy1Xf19MGNkDegfJddTIjk=", + "plugin-error": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz", + "integrity": "sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==", "dev": true, "requires": { - "duplexify": "^3.2.0", - "glob-stream": "^5.3.2", - "graceful-fs": "^4.0.0", - "gulp-sourcemaps": "1.6.0", - "is-valid-glob": "^0.3.0", - "lazystream": "^1.0.0", - "lodash.isequal": "^4.0.0", - "merge-stream": "^1.0.0", - "mkdirp": "^0.5.0", - "object-assign": "^4.0.0", - "readable-stream": "^2.0.4", - "strip-bom": "^2.0.0", - "strip-bom-stream": "^1.0.0", - "through2": "^2.0.0", - "through2-filter": "^2.0.0", - "vali-date": "^1.0.0", - "vinyl": "^1.0.0" + "ansi-colors": "^1.0.1", + "arr-diff": "^4.0.0", + "arr-union": "^3.1.0", + "extend-shallow": "^3.0.2" } } } @@ -6343,7 +6128,8 @@ "hosted-git-info": { "version": "2.7.1", "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.7.1.tgz", - "integrity": "sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w==" + "integrity": "sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w==", + "dev": true }, "hsl-regex": { "version": "1.0.0", @@ -6642,7 +6428,8 @@ "invert-kv": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz", - "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=" + "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=", + "dev": true }, "ip": { "version": "1.1.5", @@ -6715,6 +6502,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz", "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=", + "dev": true, "requires": { "builtin-modules": "^1.0.0" } @@ -7253,6 +7041,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz", "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=", + "dev": true, "requires": { "invert-kv": "^1.0.0" } @@ -7311,23 +7100,12 @@ "marky": "^1.2.0" } }, - "load-json-file": { - "version": "2.0.0", - "resolved": "http://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz", - "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=", - "requires": { - "graceful-fs": "^4.1.2", - "parse-json": "^2.2.0", - "pify": "^2.0.0", - "strip-bom": "^3.0.0" - } - }, "locate-path": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", - "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", + "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", "requires": { - "p-locate": "^2.0.0", + "p-locate": "^3.0.0", "path-exists": "^3.0.0" } }, @@ -7511,12 +7289,6 @@ "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=", "dev": true }, - "lodash.isequal": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz", - "integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA=", - "dev": true - }, "lodash.isobject": { "version": "2.4.1", "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz", @@ -7623,6 +7395,7 @@ "version": "4.1.3", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.3.tgz", "integrity": "sha512-fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA==", + "dev": true, "requires": { "pseudomap": "^1.0.2", "yallist": "^2.1.2" @@ -7692,6 +7465,14 @@ } } }, + "map-age-cleaner": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.2.tgz", + "integrity": "sha512-UN1dNocxQq44IhJyMI4TU8phc2m9BddacHRPRjKGLYaF0jqd3xLz0jS0skpAU9WgYyoR4gHtUpzytNBS385FWQ==", + "requires": { + "p-defer": "^1.0.0" + } + }, "map-cache": { "version": "0.2.2", "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz", @@ -7770,11 +7551,13 @@ "dev": true }, "mem": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz", - "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/mem/-/mem-4.0.0.tgz", + "integrity": "sha512-WQxG/5xYc3tMbYLXoXPm81ET2WDULiU5FxbuIoNbJqLOOI8zehXFdZuiUEgfdrU2mVB1pxBZUGlYORSrpuJreA==", "requires": { - "mimic-fn": "^1.0.0" + "map-age-cleaner": "^0.1.1", + "mimic-fn": "^1.0.0", + "p-is-promise": "^1.1.0" } }, "memoizee": { @@ -8273,6 +8056,11 @@ "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=", "dev": true }, + "nice-try": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz", + "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==" + }, "node-gyp": { "version": "3.8.0", "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.8.0.tgz", @@ -8399,6 +8187,7 @@ "version": "2.4.0", "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz", "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==", + "dev": true, "requires": { "hosted-git-info": "^2.1.4", "is-builtin-module": "^1.0.0", @@ -8965,25 +8754,35 @@ "os-tmpdir": "^1.0.0" } }, + "p-defer": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz", + "integrity": "sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=" + }, "p-finally": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz", "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=" }, + "p-is-promise": { + "version": "1.1.0", + "resolved": "http://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz", + "integrity": "sha1-nJRWmJ6fZYgBewQ01WCXZ1w9oF4=" + }, "p-limit": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", - "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.0.0.tgz", + "integrity": "sha512-fl5s52lI5ahKCernzzIyAP0QAZbGIovtVHGwpcu1Jr/EpzLVDI2myISHwGqK7m8uQFugVWSrbxH7XnhGtvEc+A==", "requires": { - "p-try": "^1.0.0" + "p-try": "^2.0.0" } }, "p-locate": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", - "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", + "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", "requires": { - "p-limit": "^1.1.0" + "p-limit": "^2.0.0" } }, "p-map": { @@ -8993,9 +8792,9 @@ "dev": true }, "p-try": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", - "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=" + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.0.0.tgz", + "integrity": "sha512-hMp0onDKIajHfIkdRk3P4CdCmErkYAxxDtP3Wx/4nZ3aGlau2VKh3mZpcuFkH27WQkL/3WBCPOktzA9ZOAnMQQ==" }, "pac-proxy-agent": { "version": "2.0.2", @@ -9213,14 +9012,6 @@ "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=", "dev": true }, - "path-type": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz", - "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=", - "requires": { - "pify": "^2.0.0" - } - }, "pause-stream": { "version": "0.0.11", "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz", @@ -9251,7 +9042,8 @@ "pify": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=" + "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", + "dev": true }, "pinkie": { "version": "2.0.4", @@ -9840,7 +9632,8 @@ "pseudomap": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", - "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=" + "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=", + "dev": true }, "public-encrypt": { "version": "4.0.2", @@ -9996,25 +9789,6 @@ "readable-stream": "^2.0.2" } }, - "read-pkg": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz", - "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=", - "requires": { - "load-json-file": "^2.0.0", - "normalize-package-data": "^2.3.2", - "path-type": "^2.0.0" - } - }, - "read-pkg-up": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz", - "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=", - "requires": { - "find-up": "^2.0.0", - "read-pkg": "^2.0.0" - } - }, "readable-stream": { "version": "2.3.6", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", @@ -10847,9 +10621,9 @@ } }, "slash": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz", - "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz", + "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==", "dev": true }, "slice-ansi": { @@ -11479,6 +11253,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.0.0.tgz", "integrity": "sha512-N19o9z5cEyc8yQQPukRCZ9EUmb4HUpnrmaL/fxS2pBo2jbfcFRVuFZ/oFC+vZz0MNNk0h80iMn5/S6qGZOL5+g==", + "dev": true, "requires": { "spdx-expression-parse": "^3.0.0", "spdx-license-ids": "^3.0.0" @@ -11487,12 +11262,14 @@ "spdx-exceptions": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.1.0.tgz", - "integrity": "sha512-4K1NsmrlCU1JJgUrtgEeTVyfx8VaYea9J9LvARxhbHtVtohPs/gFGG5yy49beySjlIMhhXZ4QqujIZEfS4l6Cg==" + "integrity": "sha512-4K1NsmrlCU1JJgUrtgEeTVyfx8VaYea9J9LvARxhbHtVtohPs/gFGG5yy49beySjlIMhhXZ4QqujIZEfS4l6Cg==", + "dev": true }, "spdx-expression-parse": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz", "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==", + "dev": true, "requires": { "spdx-exceptions": "^2.1.0", "spdx-license-ids": "^3.0.0" @@ -11501,12 +11278,13 @@ "spdx-license-ids": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.0.tgz", - "integrity": "sha512-2+EPwgbnmOIl8HjGBXXMd9NAu02vLjOO1nWw4kmeRDFyHn+M/ETfHxQUK0oXg8ctgVnl9t3rosNVsZ1jG61nDA==" + "integrity": "sha512-2+EPwgbnmOIl8HjGBXXMd9NAu02vLjOO1nWw4kmeRDFyHn+M/ETfHxQUK0oXg8ctgVnl9t3rosNVsZ1jG61nDA==", + "dev": true }, "split": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/split/-/split-0.3.3.tgz", - "integrity": "sha1-zQ7qXmOiEd//frDwkcQTPi0N0o8=", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/split/-/split-1.0.1.tgz", + "integrity": "sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==", "dev": true, "requires": { "through": "2" @@ -11622,12 +11400,13 @@ } }, "stream-combiner": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz", - "integrity": "sha1-TV5DPBhSYd3mI8o/RMWGvPXErRQ=", + "version": "0.2.2", + "resolved": "http://registry.npmjs.org/stream-combiner/-/stream-combiner-0.2.2.tgz", + "integrity": "sha1-rsjLrBd7Vrb0+kec7YwZEs7lKFg=", "dev": true, "requires": { - "duplexer": "~0.1.1" + "duplexer": "~0.1.1", + "through": "~2.3.4" } }, "stream-combiner2": { @@ -11714,32 +11493,6 @@ "ansi-regex": "^2.0.0" } }, - "strip-bom": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", - "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=" - }, - "strip-bom-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/strip-bom-stream/-/strip-bom-stream-1.0.0.tgz", - "integrity": "sha1-5xRDmFd9Uaa+0PoZlPoF9D/ZiO4=", - "dev": true, - "requires": { - "first-chunk-stream": "^1.0.0", - "strip-bom": "^2.0.0" - }, - "dependencies": { - "strip-bom": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", - "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", - "dev": true, - "requires": { - "is-utf8": "^0.2.0" - } - } - } - }, "strip-bom-string": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/strip-bom-string/-/strip-bom-string-1.0.0.tgz", @@ -11887,12 +11640,6 @@ } } }, - "sync-exec": { - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/sync-exec/-/sync-exec-0.6.2.tgz", - "integrity": "sha1-cX0izFPwzh3vVZQ2LzqJouu5EQU=", - "dev": true - }, "syntax-error": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/syntax-error/-/syntax-error-1.4.0.tgz", @@ -12507,7 +12254,7 @@ "dev": true }, "uswds": { - "version": "github:uswds/uswds#3101c7e6fd4e667115aeb6744dc5370abc162cbd", + "version": "github:uswds/uswds#a6a58c9e90d5aeeecaf90c667916c509cbf27e5b", "from": "github:uswds/uswds#release-2.0", "requires": { "@types/node": "^8.5.5", @@ -12522,9 +12269,14 @@ "receptor": "^1.0.0", "resolve-id-refs": "^0.1.0", "typescript": "^2.4.1", - "yargs": "^8.0.2" + "yargs": "^12.0.2" }, "dependencies": { + "ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=" + }, "array-filter": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/array-filter/-/array-filter-1.0.0.tgz", @@ -12602,10 +12354,15 @@ "isarray": "^1.0.0" } }, - "camelcase": { + "cliui": { "version": "4.1.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", - "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=" + "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz", + "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==", + "requires": { + "string-width": "^2.1.1", + "strip-ansi": "^4.0.0", + "wrap-ansi": "^2.0.0" + } }, "concat-stream": { "version": "1.5.2", @@ -12632,6 +12389,14 @@ } } }, + "decamelize": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-2.0.0.tgz", + "integrity": "sha512-Ikpp5scV3MSYxY39ymh45ZLEecsTdv/Xj2CaQfI8RLMuwi7XvjX9H/fhraiSuU+C5w5NTDu4ZU72xNiZnurBPg==", + "requires": { + "xregexp": "4.0.0" + } + }, "detective": { "version": "4.7.1", "resolved": "https://registry.npmjs.org/detective/-/detective-4.7.1.tgz", @@ -12668,6 +12433,19 @@ "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.1.tgz", "integrity": "sha1-P5E2XKvmC3ftDruiS0VOPgnZWoI=" }, + "invert-kv": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz", + "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==" + }, + "lcid": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz", + "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==", + "requires": { + "invert-kv": "^2.0.0" + } + }, "module-deps": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/module-deps/-/module-deps-4.1.1.tgz", @@ -12696,13 +12474,13 @@ "integrity": "sha1-ScoCk+CxlZCl9d4Qx/JlphfY/lQ=" }, "os-locale": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz", - "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.0.1.tgz", + "integrity": "sha512-7g5e7dmXPtzcP4bgsZ8ixDVqA7oWYuEz4lOSujeWyliPai4gfVDiFIcwBg3aGCPnmSGfzOKTK3ccPn0CKv3DBw==", "requires": { - "execa": "^0.7.0", - "lcid": "^1.0.0", - "mem": "^1.1.0" + "execa": "^0.10.0", + "lcid": "^2.0.0", + "mem": "^4.0.0" } }, "pako": { @@ -12730,6 +12508,14 @@ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" }, + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "requires": { + "ansi-regex": "^3.0.0" + } + }, "vm-browserify": { "version": "0.0.4", "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz", @@ -12738,24 +12524,28 @@ "indexof": "0.0.1" } }, + "xregexp": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/xregexp/-/xregexp-4.0.0.tgz", + "integrity": "sha512-PHyM+sQouu7xspQQwELlGwwd05mXUFqwFYfqPO0cC7x4fxyHnnuetmQr6CjJiafIDoH4MogHb9dOoJzR/Y4rFg==" + }, "yargs": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-8.0.2.tgz", - "integrity": "sha1-YpmpBVsc78lp/355wdkY3Osiw2A=", + "version": "12.0.2", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.2.tgz", + "integrity": "sha512-e7SkEx6N6SIZ5c5H22RTZae61qtn3PYUE8JYbBFlK9sYmh3DMQ6E5ygtaG/2BW0JZi4WGgTR2IV5ChqlqrDGVQ==", "requires": { - "camelcase": "^4.1.0", - "cliui": "^3.2.0", - "decamelize": "^1.1.1", + "cliui": "^4.0.0", + "decamelize": "^2.0.0", + "find-up": "^3.0.0", "get-caller-file": "^1.0.1", - "os-locale": "^2.0.0", - "read-pkg-up": "^2.0.0", + "os-locale": "^3.0.0", "require-directory": "^2.1.1", "require-main-filename": "^1.0.1", "set-blocking": "^2.0.0", "string-width": "^2.0.0", "which-module": "^2.0.0", - "y18n": "^3.2.1", - "yargs-parser": "^7.0.0" + "y18n": "^3.2.1 || ^4.0.0", + "yargs-parser": "^10.1.0" } } } @@ -12804,16 +12594,11 @@ "homedir-polyfill": "^1.0.1" } }, - "vali-date": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/vali-date/-/vali-date-1.0.0.tgz", - "integrity": "sha1-G5BKWWCfsyjvB4E4Qgk09rhnCaY=", - "dev": true - }, "validate-npm-package-license": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==", + "dev": true, "requires": { "spdx-correct": "^3.0.0", "spdx-expression-parse": "^3.0.0" @@ -13085,7 +12870,8 @@ "yallist": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", - "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=" + "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=", + "dev": true }, "yamljs": { "version": "0.3.0", @@ -13126,9 +12912,9 @@ } }, "yargs-parser": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-7.0.0.tgz", - "integrity": "sha1-jQrELxbqVd69MyyvTEA4s+P139k=", + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-10.1.0.tgz", + "integrity": "sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==", "requires": { "camelcase": "^4.1.0" }, From d31f829218314d916785e5462503a6923777d439 Mon Sep 17 00:00:00 2001 From: "Dan O. Williams" Date: Wed, 10 Oct 2018 22:21:05 -0700 Subject: [PATCH 5/8] Add package modules --- css/uswds-components.scss | 7 +++++++ css/uswds-custom.scss | 33 +++++++++++++++++++++++++++++++++ css/uswds-fonts.scss | 7 +++++++ css/uswds-layout-grid.scss | 7 +++++++ css/uswds-utilities.scss | 7 +++++++ 5 files changed, 61 insertions(+) create mode 100644 css/uswds-components.scss create mode 100644 css/uswds-custom.scss create mode 100644 css/uswds-fonts.scss create mode 100644 css/uswds-layout-grid.scss create mode 100644 css/uswds-utilities.scss diff --git a/css/uswds-components.scss b/css/uswds-components.scss new file mode 100644 index 000000000..89c359a3c --- /dev/null +++ b/css/uswds-components.scss @@ -0,0 +1,7 @@ +@import 'variables'; +@import 'uswds-theme-general'; +@import 'uswds-theme-typography'; +@import 'uswds-theme-spacing'; +@import 'uswds-theme-color'; +@import 'uswds-theme-utilities'; +@import 'packages/uswds-components'; diff --git a/css/uswds-custom.scss b/css/uswds-custom.scss new file mode 100644 index 000000000..1dc82bba6 --- /dev/null +++ b/css/uswds-custom.scss @@ -0,0 +1,33 @@ +// Imports +@import 'variables'; +@import 'uswds-theme-general'; +@import 'uswds-theme-typography'; +@import 'uswds-theme-spacing'; +@import 'uswds-theme-color'; +@import 'uswds-theme-utilities'; + +// Settings +// ------------------------------------- +@import 'settings/settings-general'; +@import 'settings/settings-typography'; +@import 'settings/settings-color'; +@import 'settings/settings-spacing'; +@import 'settings/settings-utilities'; +@import 'settings/settings-components'; + +// Tools +// ------------------------------------- +@import 'core/font-definitions'; +@import 'core/functions'; +@import 'core/system-tokens'; +@import 'core/variables'; +@import 'core/properties'; +@import 'core/mixins/all'; + +// Generic +// ------------------------------------- +@import 'core/font-face'; +@import 'lib/normalize'; +@import 'core/base'; + +@import 'uswds-theme-custom-styles'; diff --git a/css/uswds-fonts.scss b/css/uswds-fonts.scss new file mode 100644 index 000000000..d84492313 --- /dev/null +++ b/css/uswds-fonts.scss @@ -0,0 +1,7 @@ +@import 'variables'; +@import 'uswds-theme-general'; +@import 'uswds-theme-typography'; +@import 'uswds-theme-spacing'; +@import 'uswds-theme-color'; +@import 'uswds-theme-utilities'; +@import 'packages/uswds-fonts'; diff --git a/css/uswds-layout-grid.scss b/css/uswds-layout-grid.scss new file mode 100644 index 000000000..f78cfabb1 --- /dev/null +++ b/css/uswds-layout-grid.scss @@ -0,0 +1,7 @@ +@import 'variables'; +@import 'uswds-theme-general'; +@import 'uswds-theme-typography'; +@import 'uswds-theme-spacing'; +@import 'uswds-theme-color'; +@import 'uswds-theme-utilities'; +@import 'packages/uswds-layout-grid'; diff --git a/css/uswds-utilities.scss b/css/uswds-utilities.scss new file mode 100644 index 000000000..69427d69a --- /dev/null +++ b/css/uswds-utilities.scss @@ -0,0 +1,7 @@ +@import 'variables'; +@import 'uswds-theme-general'; +@import 'uswds-theme-typography'; +@import 'uswds-theme-spacing'; +@import 'uswds-theme-color'; +@import 'uswds-theme-utilities'; +@import 'packages/uswds-utilities'; From dff3793dd102752309473533133d7d1e09f27711 Mon Sep 17 00:00:00 2001 From: "Dan O. Williams" Date: Wed, 10 Oct 2018 22:21:19 -0700 Subject: [PATCH 6/8] Remove old styleguide file --- css/styleguide.scss | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 css/styleguide.scss diff --git a/css/styleguide.scss b/css/styleguide.scss deleted file mode 100644 index 8b52b098f..000000000 --- a/css/styleguide.scss +++ /dev/null @@ -1,9 +0,0 @@ -// Imports -@import 'variables'; -@import 'uswds-theme-general'; -@import 'uswds-theme-typography'; -@import 'uswds-theme-spacing'; -@import 'uswds-theme-color'; -@import 'uswds-theme-utilities'; -@import 'uswds'; -@import 'uswds-theme-custom-styles'; From 695653c5fa0eaaa314568bd4c21a7811bc4d7351 Mon Sep 17 00:00:00 2001 From: "Dan O. Williams" Date: Wed, 10 Oct 2018 22:21:32 -0700 Subject: [PATCH 7/8] Add conditional stylesheets to head --- _includes/head.html | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/_includes/head.html b/_includes/head.html index 5a312773a..2bef66d98 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -38,4 +38,12 @@ - +{% if site.env == 'production' or site.env == 'demo' %} + +{% else %} + + + + + +{% endif %} From 7eb809d4619ca602d7441282745dda0a576e0c17 Mon Sep 17 00:00:00 2001 From: "Dan O. Williams" Date: Wed, 10 Oct 2018 22:34:37 -0700 Subject: [PATCH 8/8] Improve stylesheet conditional --- _config.yml | 2 ++ _includes/head.html | 8 +++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/_config.yml b/_config.yml index 8994e2add..5dcff49b9 100644 --- a/_config.yml +++ b/_config.yml @@ -78,3 +78,5 @@ exclude: - gulpfile.js - circle.yml - css + +env: dev diff --git a/_includes/head.html b/_includes/head.html index 2bef66d98..aa931062c 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -38,12 +38,14 @@ -{% if site.env == 'production' or site.env == 'demo' %} - -{% else %} + + +{% if site.env == 'dev' %} +{% else %} + {% endif %}