diff --git a/lib/build/browserify.js b/lib/build/browserify.js index 6714177..78a0638 100644 --- a/lib/build/browserify.js +++ b/lib/build/browserify.js @@ -1,6 +1,7 @@ var fs = require('fs'); var path = require('path'); var through = require('through2'); +var merge = require('lodash.merge'); var trackFilenames = require('gulp-track-filenames'); var transformTools = require('browserify-transform-tools'); var browserify = require('browserify'); @@ -230,10 +231,11 @@ function compile(bannerWidth, transforms) { // transforms transforms .concat(requireTransform(false)) - .filter(function (candidate) { - return (typeof candidate === 'function'); - }).forEach(function (item) { - bundler.transform(item, { global: true }); + .forEach(function (item, i, list) { + if (typeof item === 'function') { + var opts = (typeof list[i+1] === 'object') ? merge({ global: true }, list[i+1]) : { global: true }; + bundler.transform(item, opts); + } }); // require statements diff --git a/lib/build/node-sass.js b/lib/build/node-sass.js index 7a72e7a..0c120a0 100644 --- a/lib/build/node-sass.js +++ b/lib/build/node-sass.js @@ -1,7 +1,6 @@ var path = require('path'); var fs = require('fs'); var through = require('through2'); -var minimatch = require('minimatch'); var sass = require('node-sass'); var gutil = require('gulp-util'); var slash = require('gulp-slash'); @@ -12,52 +11,76 @@ var SourceMapConsumer = require('source-map').SourceMapConsumer; var mime = require('mime'); /** - * Search for the relative file reference from the startPath up to, but not including, the process - * working directory. - * @param {string} startPath The path to which the relative path might be specified - * @param {string} relative A possibly relative file path - * @param {string} [callerPath] The full path of the invoking function instance where recursion has occured + * Search for the relative file reference from the startPath up to the process + * working directory, avoiding any other directories with a package.json or bower.json. + * @param {string} startPath The location of the uri declaration and the place to start the search from + * @param {string} uri The content of the url() statement, expected to be a relative file path * @returns {string} dataURI of the file where found or undefined otherwise */ -function encodeRelativeURL(startPath, relative, callerPath) { - - // ensure we are at a valid start path that is not process working directory - var absStart = path.resolve(startPath); - var parentDir = path.resolve(path.join(absStart, '..')); - if (fs.existsSync(absStart)) { - var fullPath = path.resolve(path.join(startPath, relative)); - if (fs.existsSync(fullPath)) { - - // file exists so get the dataURI - var type = mime.lookup(fullPath); - var contents = fs.readFileSync(fullPath); - var base64 = new Buffer(contents).toString('base64'); - return 'url(data:' + type + ';base64,' + base64 + ')'; - - } else if (parentDir !== process.cwd()) { // will not jump across bower or npm packages - - // find parent and child directories - var childDirs = fs.readdirSync(absStart) - .map(function toAbsolute(filename) { - return path.join(absStart, filename); - }).filter(function directoriesOnly(absolute) { - return fs.statSync(absolute).isDirectory(); - }); +function encodeRelativeURL(startPath, uri) { + 'use strict'; - // recurse paths down and up except the caller path - // return the first success - var result; - childDirs.concat(parentDir) - .filter(function excludeCallerDir(absoluteDir) { - return (absoluteDir !== callerPath); - }) - .some(function encode(absoluteDir) { - result = encodeRelativeURL(absoluteDir, relative, absStart); - return result; - }); + /** + * Test whether the given directory is the root of its own package + * @param {string} absolutePath An absolute path + * @returns {boolean} True where a package.json or bower.json exists, else False + */ + function notPackage(absolutePath) { + return ['package.json', 'bower.json'].every(function fileNotFound(file) { + return !(fs.existsSync(path.resolve(absolutePath, file))); + }); + } + + // ignore data uris and ensure we are at a valid start path + var absoluteStart = !(/^data\:/.test(uri)) && path.resolve(startPath); + if (absoluteStart) { + + // find path to the root, stopping at cwd, package.json or bower.json + var pathToRoot = [ ]; + do { + pathToRoot.push(absoluteStart); + var isWorking = (absoluteStart !== process.cwd()) && notPackage(absoluteStart); + absoluteStart = path.resolve(absoluteStart, '..'); + } while (isWorking); - // may be undefined - return result; + // start a queue with the path to the root + var queue = pathToRoot.concat(); + + // process the queue until empty + // the queue pattern ensures that we favour paths closest the the start path + while (queue.length) { + + // shift the first item off the queue, consider it the base for our relative uri + var basePath = queue.shift(); + var fullPath = path.resolve(basePath, uri); + + // file exists so convert to a dataURI and end + if (fs.existsSync(fullPath)) { + var type = mime.lookup(fullPath); + var contents = fs.readFileSync(fullPath); + var base64 = new Buffer(contents).toString('base64'); + return 'url(data:' + type + ';base64,' + base64 + ')'; + } + // enqueue subdirectories that are not packages and are not in the root path + else { + fs.readdirSync(basePath) + .filter(function notHidden(filename) { + return (filename.charAt(0) !== '.'); + }) + .map(function toAbsolute(filename) { + return path.join(basePath, filename); + }) + .filter(function directoriesOnly(absolutePath) { + return fs.statSync(absolutePath).isDirectory(); + }) + .filter(function notInRootPath(absolutePath) { + return (pathToRoot.indexOf(absolutePath) < 0); + }) + .filter(notPackage) + .forEach(function enqueue(absolutePath) { + queue.push(absolutePath); + }); + } } } } @@ -124,10 +147,13 @@ module.exports = function (bannerWidth, libraryPaths) { line: cssStart.line, column: cssStart.column }); + if (!sassStart.source) { + throw new Error('failed to decode node-sass source map'); // this can occur with regressions in libsass + } var sassDir = path.dirname(sassStart.source); // allow multiple url() values in the declaration - // the url will be every second value (i % 2) + // the uri will be every second value (i % 2) declaration.value = declaration.value .split(/url\s*\(\s*['"]?([^'"?#]*)[^)]*\)/g) // split by url statements .map(function (token, i) { @@ -139,21 +165,20 @@ module.exports = function (bannerWidth, libraryPaths) { /** * Handler for successful transpilation using node-sass. + * This functions gets called with an object containing a CSS file and its source-map, + * which is modified and passed through CSS rework, before being pushed to the results. * @param {string} css Compiled css * @param {string} map The source-map for the compiled css */ function successHandler(css, map) { - // adjust sourcemap - var source = minimatch.makeRe(file.cwd).source - .replace(/^\^|\$$/g, '') // match text anywhere on the line by removing line start/end - .replace(/\\\//g, '[\\\\\\/]') + // detect any platform path format - '|\\.\\.\\/'; // relative paths are an artifact and must be removed - var parsable = slash(map.replace(new RegExp(source, 'g'), '')); - var sourceMap = JSON.parse(parsable); + // adjust source-map + var sourceMap = convert.fromJSON(map).toObject(); sourceMap.sources.forEach(function (value, i, array) { array[i] = path.resolve(value.replace(/^\//, '').replace(/\b\/+\b/g, '/')); // ensure single slash absolute }); + + // prepare the adjusted sass source-map for later look-ups sourceMapConsumer = new SourceMapConsumer(sourceMap); // embed sourcemap in css @@ -179,7 +204,7 @@ module.exports = function (bannerWidth, libraryPaths) { // write stream output pushResult('.css', reworked.code + '\n/*# sourceMappingURL=' + mapName + ' */'); - pushResult('.css.map', JSON.stringify(reworked.map, null, ' ')); + pushResult('.css.map', JSON.stringify(reworked.map, null, 2)); done(); } @@ -208,19 +233,20 @@ module.exports = function (bannerWidth, libraryPaths) { } // perform the sass render - sass.render({ - file: file.path, - data: file.contents.toString(), - success: successHandler, - error: errorHandler, + sass.render({ + file : file.path, + data : file.contents.toString(), + success : successHandler, + error : errorHandler, includePaths: libList, - outputStyle: 'compressed', - stats: { }, - sourceMap: mapName + outputStyle : 'compressed', + stats : { }, + sourceMap : mapName }); - // display the output buffer with padding before and after and between each item }, function (done) { + + // display the output buffer with padding before and after and between each item if (output.length) { var width = Number(bannerWidth) || 0; var hr = new Array(width + 1); // this is a good trick to repeat a character N times diff --git a/lib/test/karma.js b/lib/test/karma.js index f1850f4..51dbf50 100644 --- a/lib/test/karma.js +++ b/lib/test/karma.js @@ -42,7 +42,7 @@ var karmaReporterMatchNameRegex = /^karma-(.+)-reporter$/ ; */ function getKarmaReporterPluginPath(reporterName) { if (typeof reporterName !== 'string') { - throw 'Get Karma Reporter Plugin Path: Reporter name is unspecified'; + throw 'Reporter name is unspecified'; } //Default reporter is a dependency of angularity @@ -61,8 +61,7 @@ function getKarmaReporterPluginPath(reporterName) { require(reporterPath); } catch (ex) { - throw 'Get Karma Reporter Plugin Path: Attempt to require reporter from path ' + - reporterPath + ' with no success.'; + throw 'Attempt to require reporter from path ' + reporterPath + ' with no success.'; } reporterPath = path.normalize(reporterPath); @@ -128,8 +127,8 @@ function karmaCreateConfig(reporters, configFileName) { else { //non-javascript files, such as source maps, should be included but not tested files.push({ - pattern: file.path, - included: false, + pattern : file.path, + included: false }); } transformDone(); @@ -164,8 +163,8 @@ function karmaCreateConfig(reporters, configFileName) { function specTransformFn(file, encoding, specFileDone) { files.push({ - pattern: file.path, - included: false, + pattern : file.path, + included: false }); specFileDone(); } @@ -219,8 +218,8 @@ function karmaRun(reporters, bannerWidth) { //NOTE this workaround is necessary, see issue: //https://github.com/sindresorhus/supports-color/issues/13 //TODO @bguiz remove workaround when issue has been resolved - SUPPORTS_COLOR: true, - }), + SUPPORTS_COLOR: true + }) }); karmaBackground.on('close', function(exitCode) { done(); @@ -229,14 +228,14 @@ function karmaRun(reporters, bannerWidth) { }); }; -var yargsOptionDefiniton = { - key: 'karmareporter', +var yargsOptionDefinition = { + key: 'karma-reporter', value: { - describe: 'Specify a custom Karma reporter to use. ' + - 'Either a locally npm installed module, or an asolute path to one.', - alias: ['k'], - default: defaultReporterName, - string:true, + describe: 'Specify a custom Karma reporter to use. Either a locally npm installed module, or an asolute path to ' + + 'one.', + alias : ['k'], + default : defaultReporterName, + string : true } }; var checkKarmaReporter = yargs.createCheck() @@ -244,22 +243,22 @@ var checkKarmaReporter = yargs.createCheck() return !argv.help; }) .withTest({ - karmareporter: function(value) { + 'karma-reporter': function(value) { if (typeof value !== 'undefined') { try { getKarmaReporterPluginPath(value); } catch (ex) { - return 'Illegal value for "reporter"\n' + ex; + return 'Illegal value for "karma-reporter": ' + ex; } } - }, + } }) .commit(); module.exports = { createConfig: karmaCreateConfig, - run: karmaRun, - yargsCheck: checkKarmaReporter, - yargsOption: yargsOptionDefiniton, + run : karmaRun, + yargsCheck : checkKarmaReporter, + yargsOption : yargsOptionDefinition }; diff --git a/lib/util/jshint-reporter.js b/lib/util/jshint-reporter.js index fa81aec..9b08eb0 100644 --- a/lib/util/jshint-reporter.js +++ b/lib/util/jshint-reporter.js @@ -32,7 +32,7 @@ function getJsHintReporter(reporterName) { // establish a cached copy if (!resolvedReporter) { if (typeof reporterName !== 'string') { - throw 'Get JsHint Reporter: Reporter name is unspecified'; + throw 'Reporter name is unspecified'; } else { var reporterPath; @@ -58,7 +58,7 @@ function getJsHintReporter(reporterName) { } }); if (!resolvedReporter) { - throw 'Get JsHint Reporter: Attempt to require specified reporter with no success.'; + throw 'Attempt to require specified reporter with no success.'; } } } @@ -73,18 +73,18 @@ function getJsHintReporter(reporterName) { return gulpJshint.reporter(resolvedReporter); } else { - throw 'Get JsHint Reporter: Given reporter is badly formed'; + throw 'Given reporter is badly formed'; } } var yargsOptionDefiniton = { - key: 'reporter', + key: 'jshint-reporter', value: { describe: 'Specify a custom JsHint reporter to use. Either a locally npm installed module, or the absolute path ' + 'to one.', - alias: ['r'], - default: defaultReporterName, - string: true + alias : ['j'], + default : defaultReporterName, + string : true } }; var checkJsHintReporter = yargs.createCheck() @@ -92,7 +92,7 @@ var checkJsHintReporter = yargs.createCheck() return !argv.help; }) .withTest({ - reporter: function(value) { + 'jshint-reporter': function(value) { if (typeof value === 'undefined') { return; } @@ -100,7 +100,7 @@ var checkJsHintReporter = yargs.createCheck() getJsHintReporter(value); } catch (ex) { - return 'Illegal value for "reporter"\n' + ex; + return 'Illegal value for "jshint-reporter": ' + ex; } } }) diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 10f329e..8339291 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -1,6 +1,6 @@ { "name": "angularity", - "version": "0.0.20", + "version": "0.1.0-rc", "dependencies": { "6to5ify": { "version": "3.1.0", @@ -100,11 +100,6 @@ "version": "1.0.4", "from": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz" - }, - "once": { - "version": "1.3.1", - "from": "https://registry.npmjs.org/once/-/once-1.3.1.tgz", - "resolved": "https://registry.npmjs.org/once/-/once-1.3.1.tgz" } } }, @@ -260,42 +255,29 @@ }, "angularity-jshint-reporter": { "version": "0.0.4", + "from": "angularity-jshint-reporter@0.0.4", + "resolved": "https://registry.npmjs.org/angularity-jshint-reporter/-/angularity-jshint-reporter-0.0.4.tgz", "dependencies": { "through2": { "version": "0.6.3", - "from": "through2@>=0.6.3 <0.7.0", + "from": "https://registry.npmjs.org/through2/-/through2-0.6.3.tgz", "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.3.tgz", "dependencies": { "readable-stream": { "version": "1.0.33", - "from": "readable-stream@>=1.0.33-1 <1.1.0-0", + "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz", "dependencies": { - "core-util-is": { - "version": "1.0.1", - "from": "core-util-is@>=1.0.0 <1.1.0", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz" - }, - "isarray": { - "version": "0.0.1", - "from": "isarray@0.0.1", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz" - }, "string_decoder": { "version": "0.10.31", - "from": "string_decoder@>=0.10.0 <0.11.0", + "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz" - }, - "inherits": { - "version": "2.0.1", - "from": "inherits@>=2.0.1 <2.1.0", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" } } }, "xtend": { "version": "4.0.0", - "from": "xtend@>=4.0.0 <4.1.0-0", + "from": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz", "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz" } } @@ -1100,11 +1082,6 @@ "version": "3.0.2", "from": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.2.tgz", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.2.tgz" - }, - "once": { - "version": "1.3.1", - "from": "https://registry.npmjs.org/once/-/once-1.3.1.tgz", - "resolved": "https://registry.npmjs.org/once/-/once-1.3.1.tgz" } } }, @@ -1224,11 +1201,6 @@ "from": "https://registry.npmjs.org/escodegen/-/escodegen-1.1.0.tgz", "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.1.0.tgz", "dependencies": { - "esprima": { - "version": "1.0.4", - "from": "https://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz" - }, "estraverse": { "version": "1.5.1", "from": "https://registry.npmjs.org/estraverse/-/estraverse-1.5.1.tgz", @@ -1521,71 +1493,71 @@ } }, "browserify-ngannotate": { - "version": "0.5.0", - "from": "https://registry.npmjs.org/browserify-ngannotate/-/browserify-ngannotate-0.5.0.tgz", - "resolved": "https://registry.npmjs.org/browserify-ngannotate/-/browserify-ngannotate-0.5.0.tgz", + "version": "0.7.1", + "from": "browserify-ngannotate@0.7.1", + "resolved": "https://registry.npmjs.org/browserify-ngannotate/-/browserify-ngannotate-0.7.1.tgz", "dependencies": { "ng-annotate": { - "version": "0.14.1", - "from": "https://registry.npmjs.org/ng-annotate/-/ng-annotate-0.14.1.tgz", - "resolved": "https://registry.npmjs.org/ng-annotate/-/ng-annotate-0.14.1.tgz", + "version": "0.15.4", + "from": "ng-annotate@>=0.15.1 <0.16.0", + "resolved": "https://registry.npmjs.org/ng-annotate/-/ng-annotate-0.15.4.tgz", "dependencies": { "acorn": { - "version": "0.9.0", - "from": "https://registry.npmjs.org/acorn/-/acorn-0.9.0.tgz", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-0.9.0.tgz" - }, - "esprima": { - "version": "1.2.2", - "from": "https://registry.npmjs.org/esprima/-/esprima-1.2.2.tgz", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-1.2.2.tgz" + "version": "0.11.0", + "from": "acorn@>=0.11.0 <0.12.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-0.11.0.tgz" }, "optimist": { "version": "0.6.1", - "from": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", + "from": "optimist@>=0.6.1 <0.7.0", "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", "dependencies": { "minimist": { "version": "0.0.10", - "from": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz", + "from": "minimist@>=0.0.1 <0.1.0", "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz" } } }, "ordered-ast-traverse": { - "version": "0.1.1", - "from": "https://registry.npmjs.org/ordered-ast-traverse/-/ordered-ast-traverse-0.1.1.tgz", - "resolved": "https://registry.npmjs.org/ordered-ast-traverse/-/ordered-ast-traverse-0.1.1.tgz", + "version": "1.1.1", + "from": "ordered-ast-traverse@>=1.1.1 <1.2.0", + "resolved": "https://registry.npmjs.org/ordered-ast-traverse/-/ordered-ast-traverse-1.1.1.tgz", "dependencies": { "ordered-esprima-props": { - "version": "1.0.0", - "from": "https://registry.npmjs.org/ordered-esprima-props/-/ordered-esprima-props-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/ordered-esprima-props/-/ordered-esprima-props-1.0.0.tgz" + "version": "1.1.0", + "from": "ordered-esprima-props@>=1.1.0 <1.2.0", + "resolved": "https://registry.npmjs.org/ordered-esprima-props/-/ordered-esprima-props-1.1.0.tgz" } } + }, + "source-map": { + "version": "0.1.43", + "from": "source-map@>=0.1.43 <0.2.0", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz" } } }, "through2": { "version": "0.6.3", - "from": "https://registry.npmjs.org/through2/-/through2-0.6.3.tgz", + "from": "through2@>=0.6.3 <0.7.0", "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.3.tgz", "dependencies": { "readable-stream": { "version": "1.0.33", - "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz", + "from": "readable-stream@>=1.0.33-1 <1.1.0-0", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz", "dependencies": { "string_decoder": { "version": "0.10.31", - "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "from": "string_decoder@>=0.10.0 <0.11.0", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz" } } }, "xtend": { "version": "4.0.0", - "from": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz", + "from": "xtend@>=4.0.0 <4.1.0-0", "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz" } } @@ -1605,14 +1577,7 @@ "falafel": { "version": "0.3.1", "from": "https://registry.npmjs.org/falafel/-/falafel-0.3.1.tgz", - "resolved": "https://registry.npmjs.org/falafel/-/falafel-0.3.1.tgz", - "dependencies": { - "esprima": { - "version": "1.1.0-dev", - "from": "git://github.com/substack/esprima#is-keyword", - "resolved": "git://github.com/substack/esprima#0a7f8489a11b44b019ce168506f535f22d0be290" - } - } + "resolved": "https://registry.npmjs.org/falafel/-/falafel-0.3.1.tgz" } } }, @@ -1863,7 +1828,7 @@ }, "end-of-stream": { "version": "0.1.5", - "from": "end-of-stream@0.1.5", + "from": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-0.1.5.tgz", "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-0.1.5.tgz" }, "escape-string-regexp": { @@ -1871,6 +1836,11 @@ "from": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.2.tgz", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.2.tgz" }, + "esprima": { + "version": "1.0.4", + "from": "https://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz" + }, "event-stream": { "version": "3.1.7", "from": "https://registry.npmjs.org/event-stream/-/event-stream-3.1.7.tgz", @@ -2069,14 +2039,7 @@ "glob": { "version": "4.0.6", "from": "https://registry.npmjs.org/glob/-/glob-4.0.6.tgz", - "resolved": "https://registry.npmjs.org/glob/-/glob-4.0.6.tgz", - "dependencies": { - "once": { - "version": "1.3.1", - "from": "https://registry.npmjs.org/once/-/once-1.3.1.tgz", - "resolved": "https://registry.npmjs.org/once/-/once-1.3.1.tgz" - } - } + "resolved": "https://registry.npmjs.org/glob/-/glob-4.0.6.tgz" }, "ordered-read-streams": { "version": "0.0.8", @@ -2154,11 +2117,6 @@ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz" } } - }, - "xtend": { - "version": "3.0.0", - "from": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz" } } }, @@ -2178,49 +2136,49 @@ }, "gulp-filter": { "version": "2.0.1", - "from": "gulp-filter@*", + "from": "https://registry.npmjs.org/gulp-filter/-/gulp-filter-2.0.1.tgz", "resolved": "https://registry.npmjs.org/gulp-filter/-/gulp-filter-2.0.1.tgz", "dependencies": { "multimatch": { "version": "2.0.0", - "from": "multimatch@>=2.0.0 <3.0.0", + "from": "https://registry.npmjs.org/multimatch/-/multimatch-2.0.0.tgz", "resolved": "https://registry.npmjs.org/multimatch/-/multimatch-2.0.0.tgz", "dependencies": { "array-differ": { "version": "1.0.0", - "from": "array-differ@>=1.0.0 <2.0.0", + "from": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz", "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz" }, "array-union": { "version": "1.0.1", - "from": "array-union@>=1.0.1 <2.0.0", + "from": "https://registry.npmjs.org/array-union/-/array-union-1.0.1.tgz", "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.1.tgz", "dependencies": { "array-uniq": { "version": "1.0.2", - "from": "array-uniq@>=1.0.1 <2.0.0", + "from": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.2.tgz", "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.2.tgz" } } }, "minimatch": { "version": "2.0.1", - "from": "minimatch@>=2.0.1 <3.0.0", + "from": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.1.tgz", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.1.tgz", "dependencies": { "brace-expansion": { "version": "1.1.0", - "from": "brace-expansion@>=1.0.0 <2.0.0", + "from": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz", "dependencies": { "balanced-match": { "version": "0.2.0", - "from": "balanced-match@>=0.2.0 <0.3.0", + "from": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz" }, "concat-map": { "version": "0.0.1", - "from": "concat-map@0.0.1", + "from": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz" } } @@ -2231,17 +2189,17 @@ }, "plexer": { "version": "0.0.3", - "from": "plexer@0.0.3", + "from": "https://registry.npmjs.org/plexer/-/plexer-0.0.3.tgz", "resolved": "https://registry.npmjs.org/plexer/-/plexer-0.0.3.tgz", "dependencies": { "readable-stream": { "version": "1.0.33", - "from": "readable-stream@>=1.0.26-2 <2.0.0", + "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz", "dependencies": { "string_decoder": { "version": "0.10.31", - "from": "string_decoder@>=0.10.0 <0.11.0", + "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz" } } @@ -2250,24 +2208,24 @@ }, "streamqueue": { "version": "0.1.1", - "from": "streamqueue@>=0.1.1 <0.2.0", + "from": "https://registry.npmjs.org/streamqueue/-/streamqueue-0.1.1.tgz", "resolved": "https://registry.npmjs.org/streamqueue/-/streamqueue-0.1.1.tgz", "dependencies": { "readable-stream": { "version": "1.0.33", - "from": "readable-stream@>=1.0.26-2 <2.0.0", + "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz", "dependencies": { "string_decoder": { "version": "0.10.31", - "from": "string_decoder@>=0.10.0 <0.11.0", + "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz" } } }, "isstream": { "version": "0.1.1", - "from": "isstream@>=0.1.0 <0.2.0", + "from": "https://registry.npmjs.org/isstream/-/isstream-0.1.1.tgz", "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.1.tgz" } } @@ -2324,11 +2282,6 @@ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz" } } - }, - "xtend": { - "version": "3.0.0", - "from": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz" } } } @@ -2420,11 +2373,6 @@ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz" } } - }, - "xtend": { - "version": "3.0.0", - "from": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz" } } } @@ -2471,11 +2419,6 @@ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz" } } - }, - "xtend": { - "version": "3.0.0", - "from": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz" } } }, @@ -2533,11 +2476,6 @@ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz" } } - }, - "xtend": { - "version": "3.0.0", - "from": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz" } } }, @@ -2581,11 +2519,6 @@ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz" } } - }, - "xtend": { - "version": "3.0.0", - "from": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz" } } } @@ -2612,11 +2545,6 @@ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz" } } - }, - "xtend": { - "version": "3.0.0", - "from": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz" } } }, @@ -2708,11 +2636,6 @@ "version": "3.0.2", "from": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.2.tgz", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.2.tgz" - }, - "once": { - "version": "1.3.1", - "from": "https://registry.npmjs.org/once/-/once-1.3.1.tgz", - "resolved": "https://registry.npmjs.org/once/-/once-1.3.1.tgz" } } } @@ -2787,11 +2710,6 @@ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz" } } - }, - "xtend": { - "version": "3.0.0", - "from": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz" } } }, @@ -2879,190 +2797,81 @@ }, "ide-template": { "version": "1.1.0", + "from": "ide-template@1.1.0", + "resolved": "https://registry.npmjs.org/ide-template/-/ide-template-1.1.0.tgz", "dependencies": { "gulp": { "version": "3.8.8", - "from": "gulp@3.8.8", + "from": "https://registry.npmjs.org/gulp/-/gulp-3.8.8.tgz", "resolved": "https://registry.npmjs.org/gulp/-/gulp-3.8.8.tgz", "dependencies": { - "archy": { - "version": "0.0.2", - "from": "archy@0.0.2", - "resolved": "https://registry.npmjs.org/archy/-/archy-0.0.2.tgz" - }, - "chalk": { - "version": "0.5.1", - "from": "chalk@0.5.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz", - "dependencies": { - "ansi-styles": { - "version": "1.1.0", - "from": "ansi-styles@1.1.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz" - }, - "escape-string-regexp": { - "version": "1.0.2", - "from": "escape-string-regexp@1.0.2", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.2.tgz" - }, - "has-ansi": { - "version": "0.1.0", - "from": "has-ansi@0.1.0", - "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz", - "dependencies": { - "ansi-regex": { - "version": "0.2.1", - "from": "ansi-regex@0.2.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz" - } - } - }, - "strip-ansi": { - "version": "0.3.0", - "from": "strip-ansi@0.3.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz", - "dependencies": { - "ansi-regex": { - "version": "0.2.1", - "from": "ansi-regex@0.2.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz" - } - } - }, - "supports-color": { - "version": "0.2.0", - "from": "supports-color@0.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz" - } - } - }, "deprecated": { "version": "0.0.1", - "from": "deprecated@0.0.1", + "from": "https://registry.npmjs.org/deprecated/-/deprecated-0.0.1.tgz", "resolved": "https://registry.npmjs.org/deprecated/-/deprecated-0.0.1.tgz" }, "interpret": { "version": "0.3.7", - "from": "interpret@0.3.7", + "from": "https://registry.npmjs.org/interpret/-/interpret-0.3.7.tgz", "resolved": "https://registry.npmjs.org/interpret/-/interpret-0.3.7.tgz" }, "liftoff": { "version": "0.12.1", - "from": "liftoff@0.12.1", + "from": "https://registry.npmjs.org/liftoff/-/liftoff-0.12.1.tgz", "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-0.12.1.tgz", "dependencies": { - "findup-sync": { - "version": "0.1.3", - "from": "findup-sync@0.1.3", - "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz", - "dependencies": { - "glob": { - "version": "3.2.11", - "from": "glob@3.2.11", - "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz", - "dependencies": { - "inherits": { - "version": "2.0.1", - "from": "inherits@2.0.1", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" - }, - "minimatch": { - "version": "0.3.0", - "from": "minimatch@0.3.0", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz", - "dependencies": { - "lru-cache": { - "version": "2.5.0", - "from": "lru-cache@2.5.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz" - }, - "sigmund": { - "version": "1.0.0", - "from": "sigmund@1.0.0", - "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz" - } - } - } - } - } - } - }, "resolve": { "version": "0.7.4", - "from": "resolve@0.7.4", + "from": "https://registry.npmjs.org/resolve/-/resolve-0.7.4.tgz", "resolved": "https://registry.npmjs.org/resolve/-/resolve-0.7.4.tgz" }, "minimist": { "version": "0.2.0", - "from": "minimist@0.2.0", + "from": "https://registry.npmjs.org/minimist/-/minimist-0.2.0.tgz", "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.2.0.tgz" }, "extend": { "version": "1.3.0", - "from": "extend@1.3.0", + "from": "https://registry.npmjs.org/extend/-/extend-1.3.0.tgz", "resolved": "https://registry.npmjs.org/extend/-/extend-1.3.0.tgz" } } }, "minimist": { "version": "1.1.0", - "from": "minimist@1.1.0", + "from": "https://registry.npmjs.org/minimist/-/minimist-1.1.0.tgz", "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.1.0.tgz" }, "orchestrator": { "version": "0.3.7", - "from": "orchestrator@0.3.7", + "from": "https://registry.npmjs.org/orchestrator/-/orchestrator-0.3.7.tgz", "resolved": "https://registry.npmjs.org/orchestrator/-/orchestrator-0.3.7.tgz", "dependencies": { - "end-of-stream": { - "version": "0.1.5", - "from": "end-of-stream@0.1.5", - "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-0.1.5.tgz", - "dependencies": { - "once": { - "version": "1.3.1", - "from": "once@1.3.1", - "resolved": "https://registry.npmjs.org/once/-/once-1.3.1.tgz", - "dependencies": { - "wrappy": { - "version": "1.0.1", - "from": "wrappy@1.0.1", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz" - } - } - } - } - }, "sequencify": { "version": "0.0.7", - "from": "sequencify@0.0.7", + "from": "https://registry.npmjs.org/sequencify/-/sequencify-0.0.7.tgz", "resolved": "https://registry.npmjs.org/sequencify/-/sequencify-0.0.7.tgz" }, "stream-consume": { "version": "0.1.0", - "from": "stream-consume@0.1.0", + "from": "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.0.tgz", "resolved": "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.0.tgz" } } }, - "pretty-hrtime": { - "version": "0.2.2", - "from": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-0.2.2.tgz", - "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-0.2.2.tgz" - }, "semver": { "version": "3.0.1", - "from": "semver@3.0.1", + "from": "https://registry.npmjs.org/semver/-/semver-3.0.1.tgz", "resolved": "https://registry.npmjs.org/semver/-/semver-3.0.1.tgz" }, "tildify": { "version": "1.0.0", - "from": "tildify@1.0.0", + "from": "https://registry.npmjs.org/tildify/-/tildify-1.0.0.tgz", "resolved": "https://registry.npmjs.org/tildify/-/tildify-1.0.0.tgz", "dependencies": { "user-home": { "version": "1.0.0", - "from": "user-home@1.0.0", + "from": "https://registry.npmjs.org/user-home/-/user-home-1.0.0.tgz", "resolved": "https://registry.npmjs.org/user-home/-/user-home-1.0.0.tgz" } } @@ -3074,127 +2883,26 @@ "dependencies": { "glob-stream": { "version": "3.1.15", - "from": "glob-stream@3.1.15", + "from": "https://registry.npmjs.org/glob-stream/-/glob-stream-3.1.15.tgz", "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-3.1.15.tgz", "dependencies": { "glob": { "version": "4.0.6", - "from": "glob@4.0.6", - "resolved": "https://registry.npmjs.org/glob/-/glob-4.0.6.tgz", - "dependencies": { - "inherits": { - "version": "2.0.1", - "from": "inherits@2.0.1", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" - }, - "once": { - "version": "1.3.1", - "from": "once@1.3.1", - "resolved": "https://registry.npmjs.org/once/-/once-1.3.1.tgz", - "dependencies": { - "wrappy": { - "version": "1.0.1", - "from": "wrappy@1.0.1", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz" - } - } - } - } - }, - "minimatch": { - "version": "1.0.0", - "from": "minimatch@1.0.0", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz", - "dependencies": { - "lru-cache": { - "version": "2.5.0", - "from": "lru-cache@2.5.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz" - }, - "sigmund": { - "version": "1.0.0", - "from": "sigmund@1.0.0", - "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz" - } - } + "from": "https://registry.npmjs.org/glob/-/glob-4.0.6.tgz", + "resolved": "https://registry.npmjs.org/glob/-/glob-4.0.6.tgz" }, "ordered-read-streams": { "version": "0.0.8", "from": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.0.8.tgz", "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.0.8.tgz" }, - "glob2base": { - "version": "0.0.11", - "from": "glob2base@0.0.11", - "resolved": "https://registry.npmjs.org/glob2base/-/glob2base-0.0.11.tgz" - }, "unique-stream": { "version": "1.0.0", - "from": "unique-stream@1.0.0", + "from": "https://registry.npmjs.org/unique-stream/-/unique-stream-1.0.0.tgz", "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-1.0.0.tgz" } } }, - "glob-watcher": { - "version": "0.0.6", - "from": "glob-watcher@0.0.6", - "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.6.tgz", - "dependencies": { - "gaze": { - "version": "0.5.1", - "from": "gaze@0.5.1", - "resolved": "https://registry.npmjs.org/gaze/-/gaze-0.5.1.tgz", - "dependencies": { - "globule": { - "version": "0.1.0", - "from": "globule@0.1.0", - "resolved": "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz", - "dependencies": { - "lodash": { - "version": "1.0.1", - "from": "lodash@1.0.1", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-1.0.1.tgz" - }, - "glob": { - "version": "3.1.21", - "from": "glob@3.1.21", - "resolved": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz", - "dependencies": { - "graceful-fs": { - "version": "1.2.3", - "from": "graceful-fs@1.2.3", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz" - }, - "inherits": { - "version": "1.0.0", - "from": "inherits@1.0.0", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-1.0.0.tgz" - } - } - }, - "minimatch": { - "version": "0.2.14", - "from": "minimatch@0.2.14", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz", - "dependencies": { - "lru-cache": { - "version": "2.5.0", - "from": "lru-cache@2.5.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz" - }, - "sigmund": { - "version": "1.0.0", - "from": "sigmund@1.0.0", - "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz" - } - } - } - } - } - } - } - } - }, "graceful-fs": { "version": "3.0.3", "from": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.3.tgz", @@ -3202,83 +2910,15 @@ }, "mkdirp": { "version": "0.5.0", - "from": "mkdirp@0.5.0", + "from": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz", "dependencies": { "minimist": { "version": "0.0.8", - "from": "minimist@0.0.8", + "from": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz" } } - }, - "strip-bom": { - "version": "1.0.0", - "from": "strip-bom@1.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz", - "dependencies": { - "first-chunk-stream": { - "version": "1.0.0", - "from": "first-chunk-stream@1.0.0", - "resolved": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz" - }, - "is-utf8": { - "version": "0.2.0", - "from": "is-utf8@0.2.0", - "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.0.tgz" - } - } - }, - "through2": { - "version": "0.6.2", - "from": "https://registry.npmjs.org/through2/-/through2-0.6.2.tgz", - "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.2.tgz", - "dependencies": { - "readable-stream": { - "version": "1.0.32", - "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.32.tgz", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.32.tgz", - "dependencies": { - "core-util-is": { - "version": "1.0.1", - "from": "core-util-is@1.0.1", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz" - }, - "isarray": { - "version": "0.0.1", - "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz" - }, - "string_decoder": { - "version": "0.10.31", - "from": "string_decoder@0.10.31", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz" - }, - "inherits": { - "version": "2.0.1", - "from": "inherits@2.0.1", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" - } - } - }, - "xtend": { - "version": "4.0.0", - "from": "xtend@4.0.0", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz" - } - } - }, - "vinyl": { - "version": "0.4.3", - "from": "vinyl@0.4.3", - "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.3.tgz", - "dependencies": { - "clone-stats": { - "version": "0.0.1", - "from": "clone-stats@0.0.1", - "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz" - } - } } } } @@ -3286,12 +2926,12 @@ }, "gulp-conflict": { "version": "0.2.0", - "from": "gulp-conflict@0.2.0", + "from": "https://registry.npmjs.org/gulp-conflict/-/gulp-conflict-0.2.0.tgz", "resolved": "https://registry.npmjs.org/gulp-conflict/-/gulp-conflict-0.2.0.tgz", "dependencies": { "through2": { "version": "0.4.2", - "from": "through2@0.4.2", + "from": "https://registry.npmjs.org/through2/-/through2-0.4.2.tgz", "resolved": "https://registry.npmjs.org/through2/-/through2-0.4.2.tgz", "dependencies": { "readable-stream": { @@ -3299,253 +2939,33 @@ "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.32.tgz", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.32.tgz", "dependencies": { - "core-util-is": { - "version": "1.0.1", - "from": "core-util-is@1.0.1", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz" - }, - "isarray": { - "version": "0.0.1", - "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz" - }, "string_decoder": { "version": "0.10.31", - "from": "string_decoder@0.10.31", + "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz" - }, - "inherits": { - "version": "2.0.1", - "from": "inherits@2.0.1", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" } } }, "xtend": { "version": "2.1.2", - "from": "xtend@2.1.2", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz", - "dependencies": { - "object-keys": { - "version": "0.4.0", - "from": "object-keys@0.4.0", - "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-0.4.0.tgz" - } - } + "from": "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz", + "resolved": "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz" } } }, "gulp-util": { "version": "2.2.20", - "from": "gulp-util@2.2.20", + "from": "https://registry.npmjs.org/gulp-util/-/gulp-util-2.2.20.tgz", "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-2.2.20.tgz", "dependencies": { - "chalk": { - "version": "0.5.1", - "from": "chalk@0.5.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz", - "dependencies": { - "ansi-styles": { - "version": "1.1.0", - "from": "ansi-styles@1.1.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz" - }, - "escape-string-regexp": { - "version": "1.0.2", - "from": "escape-string-regexp@1.0.2", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.2.tgz" - }, - "has-ansi": { - "version": "0.1.0", - "from": "has-ansi@0.1.0", - "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz", - "dependencies": { - "ansi-regex": { - "version": "0.2.1", - "from": "ansi-regex@0.2.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz" - } - } - }, - "strip-ansi": { - "version": "0.3.0", - "from": "strip-ansi@0.3.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz", - "dependencies": { - "ansi-regex": { - "version": "0.2.1", - "from": "ansi-regex@0.2.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz" - } - } - }, - "supports-color": { - "version": "0.2.0", - "from": "supports-color@0.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz" - } - } - }, - "dateformat": { - "version": "1.0.8", - "from": "dateformat@1.0.8", - "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.8.tgz" - }, - "lodash._reinterpolate": { - "version": "2.4.1", - "from": "lodash._reinterpolate@2.4.1", - "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-2.4.1.tgz" - }, - "lodash.template": { - "version": "2.4.1", - "from": "lodash.template@2.4.1", - "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-2.4.1.tgz", - "dependencies": { - "lodash.defaults": { - "version": "2.4.1", - "from": "lodash.defaults@2.4.1", - "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-2.4.1.tgz", - "dependencies": { - "lodash._objecttypes": { - "version": "2.4.1", - "from": "lodash._objecttypes@2.4.1", - "resolved": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz" - } - } - }, - "lodash.escape": { - "version": "2.4.1", - "from": "lodash.escape@2.4.1", - "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-2.4.1.tgz", - "dependencies": { - "lodash._escapehtmlchar": { - "version": "2.4.1", - "from": "lodash._escapehtmlchar@2.4.1", - "resolved": "https://registry.npmjs.org/lodash._escapehtmlchar/-/lodash._escapehtmlchar-2.4.1.tgz", - "dependencies": { - "lodash._htmlescapes": { - "version": "2.4.1", - "from": "lodash._htmlescapes@2.4.1", - "resolved": "https://registry.npmjs.org/lodash._htmlescapes/-/lodash._htmlescapes-2.4.1.tgz" - } - } - }, - "lodash._reunescapedhtml": { - "version": "2.4.1", - "from": "lodash._reunescapedhtml@2.4.1", - "resolved": "https://registry.npmjs.org/lodash._reunescapedhtml/-/lodash._reunescapedhtml-2.4.1.tgz", - "dependencies": { - "lodash._htmlescapes": { - "version": "2.4.1", - "from": "lodash._htmlescapes@2.4.1", - "resolved": "https://registry.npmjs.org/lodash._htmlescapes/-/lodash._htmlescapes-2.4.1.tgz" - } - } - } - } - }, - "lodash._escapestringchar": { - "version": "2.4.1", - "from": "lodash._escapestringchar@2.4.1", - "resolved": "https://registry.npmjs.org/lodash._escapestringchar/-/lodash._escapestringchar-2.4.1.tgz" - }, - "lodash.keys": { - "version": "2.4.1", - "from": "lodash.keys@2.4.1", - "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz", - "dependencies": { - "lodash._isnative": { - "version": "2.4.1", - "from": "lodash._isnative@2.4.1", - "resolved": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz" - }, - "lodash.isobject": { - "version": "2.4.1", - "from": "lodash.isobject@2.4.1", - "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz", - "dependencies": { - "lodash._objecttypes": { - "version": "2.4.1", - "from": "lodash._objecttypes@2.4.1", - "resolved": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz" - } - } - }, - "lodash._shimkeys": { - "version": "2.4.1", - "from": "lodash._shimkeys@2.4.1", - "resolved": "https://registry.npmjs.org/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz", - "dependencies": { - "lodash._objecttypes": { - "version": "2.4.1", - "from": "lodash._objecttypes@2.4.1", - "resolved": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz" - } - } - } - } - }, - "lodash.templatesettings": { - "version": "2.4.1", - "from": "lodash.templatesettings@2.4.1", - "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-2.4.1.tgz" - }, - "lodash.values": { - "version": "2.4.1", - "from": "lodash.values@2.4.1", - "resolved": "https://registry.npmjs.org/lodash.values/-/lodash.values-2.4.1.tgz" - } - } - }, "minimist": { "version": "0.2.0", - "from": "minimist@0.2.0", + "from": "https://registry.npmjs.org/minimist/-/minimist-0.2.0.tgz", "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.2.0.tgz" }, - "multipipe": { - "version": "0.1.1", - "from": "multipipe@0.1.1", - "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.1.tgz", - "dependencies": { - "duplexer2": { - "version": "0.0.2", - "from": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz", - "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz", - "dependencies": { - "readable-stream": { - "version": "1.1.13", - "from": "readable-stream@1.1.13", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz", - "dependencies": { - "core-util-is": { - "version": "1.0.1", - "from": "core-util-is@1.0.1", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz" - }, - "isarray": { - "version": "0.0.1", - "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz" - }, - "string_decoder": { - "version": "0.10.31", - "from": "string_decoder@0.10.31", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz" - }, - "inherits": { - "version": "2.0.1", - "from": "inherits@2.0.1", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" - } - } - } - } - } - } - }, "through2": { "version": "0.5.1", - "from": "through2@0.5.1", + "from": "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz", "resolved": "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz", "dependencies": { "readable-stream": { @@ -3553,155 +2973,50 @@ "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.32.tgz", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.32.tgz", "dependencies": { - "core-util-is": { - "version": "1.0.1", - "from": "core-util-is@1.0.1", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz" - }, - "isarray": { - "version": "0.0.1", - "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz" - }, "string_decoder": { "version": "0.10.31", - "from": "string_decoder@0.10.31", + "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz" - }, - "inherits": { - "version": "2.0.1", - "from": "inherits@2.0.1", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" } } - }, - "xtend": { - "version": "3.0.0", - "from": "xtend@3.0.0", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz" } } }, "vinyl": { "version": "0.2.3", - "from": "vinyl@0.2.3", - "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.2.3.tgz", - "dependencies": { - "clone-stats": { - "version": "0.0.1", - "from": "clone-stats@0.0.1", - "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz" - } - } + "from": "https://registry.npmjs.org/vinyl/-/vinyl-0.2.3.tgz", + "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.2.3.tgz" } } }, "inquirer": { "version": "0.5.1", - "from": "inquirer@0.5.1", + "from": "https://registry.npmjs.org/inquirer/-/inquirer-0.5.1.tgz", "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-0.5.1.tgz", "dependencies": { "async": { "version": "0.8.0", - "from": "async@0.8.0", + "from": "https://registry.npmjs.org/async/-/async-0.8.0.tgz", "resolved": "https://registry.npmjs.org/async/-/async-0.8.0.tgz" }, - "cli-color": { - "version": "0.3.2", - "from": "cli-color@0.3.2", - "resolved": "https://registry.npmjs.org/cli-color/-/cli-color-0.3.2.tgz", - "dependencies": { - "d": { - "version": "0.1.1", - "from": "d@0.1.1", - "resolved": "https://registry.npmjs.org/d/-/d-0.1.1.tgz" - }, - "es5-ext": { - "version": "0.10.4", - "from": "es5-ext@0.10.4", - "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.4.tgz", - "dependencies": { - "es6-iterator": { - "version": "0.1.1", - "from": "es6-iterator@0.1.1", - "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-0.1.1.tgz" - }, - "es6-symbol": { - "version": "0.1.1", - "from": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-0.1.1.tgz", - "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-0.1.1.tgz" - } - } - }, - "memoizee": { - "version": "0.3.7", - "from": "memoizee@0.3.7", - "resolved": "https://registry.npmjs.org/memoizee/-/memoizee-0.3.7.tgz", - "dependencies": { - "event-emitter": { - "version": "0.3.1", - "from": "event-emitter@0.3.1", - "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.1.tgz" - }, - "lru-queue": { - "version": "0.1.0", - "from": "lru-queue@0.1.0", - "resolved": "https://registry.npmjs.org/lru-queue/-/lru-queue-0.1.0.tgz" - }, - "next-tick": { - "version": "0.2.2", - "from": "next-tick@0.2.2", - "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-0.2.2.tgz" - } - } - }, - "timers-ext": { - "version": "0.1.0", - "from": "timers-ext@0.1.0", - "resolved": "https://registry.npmjs.org/timers-ext/-/timers-ext-0.1.0.tgz", - "dependencies": { - "next-tick": { - "version": "0.2.2", - "from": "next-tick@0.2.2", - "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-0.2.2.tgz" - } - } - } - } - }, - "mute-stream": { - "version": "0.0.4", - "from": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.4.tgz", - "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.4.tgz" - }, - "readline2": { - "version": "0.1.0", - "from": "readline2@0.1.0", - "resolved": "https://registry.npmjs.org/readline2/-/readline2-0.1.0.tgz" - }, "through": { "version": "2.3.6", - "from": "through@2.3.6", + "from": "https://registry.npmjs.org/through/-/through-2.3.6.tgz", "resolved": "https://registry.npmjs.org/through/-/through-2.3.6.tgz" }, "chalk": { "version": "0.4.0", - "from": "chalk@0.4.0", + "from": "https://registry.npmjs.org/chalk/-/chalk-0.4.0.tgz", "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.4.0.tgz", "dependencies": { - "has-color": { - "version": "0.1.7", - "from": "has-color@0.1.7", - "resolved": "https://registry.npmjs.org/has-color/-/has-color-0.1.7.tgz" - }, "ansi-styles": { "version": "1.0.0", - "from": "ansi-styles@1.0.0", + "from": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.0.0.tgz", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.0.0.tgz" }, "strip-ansi": { "version": "0.1.1", - "from": "strip-ansi@0.1.1", + "from": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.1.1.tgz", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.1.1.tgz" } } @@ -3710,290 +3025,19 @@ }, "diff": { "version": "1.0.8", - "from": "diff@1.0.8", + "from": "https://registry.npmjs.org/diff/-/diff-1.0.8.tgz", "resolved": "https://registry.npmjs.org/diff/-/diff-1.0.8.tgz" } } }, - "gulp-util": { - "version": "3.0.1", - "from": "gulp-util@3.0.1", - "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.1.tgz", - "dependencies": { - "chalk": { - "version": "0.5.1", - "from": "chalk@0.5.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz", - "dependencies": { - "ansi-styles": { - "version": "1.1.0", - "from": "ansi-styles@1.1.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz" - }, - "escape-string-regexp": { - "version": "1.0.2", - "from": "escape-string-regexp@1.0.2", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.2.tgz" - }, - "has-ansi": { - "version": "0.1.0", - "from": "has-ansi@0.1.0", - "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz", - "dependencies": { - "ansi-regex": { - "version": "0.2.1", - "from": "ansi-regex@0.2.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz" - } - } - }, - "strip-ansi": { - "version": "0.3.0", - "from": "strip-ansi@0.3.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz", - "dependencies": { - "ansi-regex": { - "version": "0.2.1", - "from": "ansi-regex@0.2.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz" - } - } - }, - "supports-color": { - "version": "0.2.0", - "from": "supports-color@0.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz" - } - } - }, - "dateformat": { - "version": "1.0.8", - "from": "dateformat@1.0.8", - "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.8.tgz" - }, - "lodash._reinterpolate": { - "version": "2.4.1", - "from": "lodash._reinterpolate@2.4.1", - "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-2.4.1.tgz" - }, - "lodash.template": { - "version": "2.4.1", - "from": "lodash.template@2.4.1", - "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-2.4.1.tgz", - "dependencies": { - "lodash.defaults": { - "version": "2.4.1", - "from": "lodash.defaults@2.4.1", - "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-2.4.1.tgz", - "dependencies": { - "lodash._objecttypes": { - "version": "2.4.1", - "from": "lodash._objecttypes@2.4.1", - "resolved": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz" - } - } - }, - "lodash.escape": { - "version": "2.4.1", - "from": "lodash.escape@2.4.1", - "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-2.4.1.tgz", - "dependencies": { - "lodash._escapehtmlchar": { - "version": "2.4.1", - "from": "lodash._escapehtmlchar@2.4.1", - "resolved": "https://registry.npmjs.org/lodash._escapehtmlchar/-/lodash._escapehtmlchar-2.4.1.tgz", - "dependencies": { - "lodash._htmlescapes": { - "version": "2.4.1", - "from": "lodash._htmlescapes@2.4.1", - "resolved": "https://registry.npmjs.org/lodash._htmlescapes/-/lodash._htmlescapes-2.4.1.tgz" - } - } - }, - "lodash._reunescapedhtml": { - "version": "2.4.1", - "from": "lodash._reunescapedhtml@2.4.1", - "resolved": "https://registry.npmjs.org/lodash._reunescapedhtml/-/lodash._reunescapedhtml-2.4.1.tgz", - "dependencies": { - "lodash._htmlescapes": { - "version": "2.4.1", - "from": "lodash._htmlescapes@2.4.1", - "resolved": "https://registry.npmjs.org/lodash._htmlescapes/-/lodash._htmlescapes-2.4.1.tgz" - } - } - } - } - }, - "lodash._escapestringchar": { - "version": "2.4.1", - "from": "lodash._escapestringchar@2.4.1", - "resolved": "https://registry.npmjs.org/lodash._escapestringchar/-/lodash._escapestringchar-2.4.1.tgz" - }, - "lodash.keys": { - "version": "2.4.1", - "from": "lodash.keys@2.4.1", - "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz", - "dependencies": { - "lodash._isnative": { - "version": "2.4.1", - "from": "lodash._isnative@2.4.1", - "resolved": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz" - }, - "lodash.isobject": { - "version": "2.4.1", - "from": "lodash.isobject@2.4.1", - "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz", - "dependencies": { - "lodash._objecttypes": { - "version": "2.4.1", - "from": "lodash._objecttypes@2.4.1", - "resolved": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz" - } - } - }, - "lodash._shimkeys": { - "version": "2.4.1", - "from": "lodash._shimkeys@2.4.1", - "resolved": "https://registry.npmjs.org/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz", - "dependencies": { - "lodash._objecttypes": { - "version": "2.4.1", - "from": "lodash._objecttypes@2.4.1", - "resolved": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz" - } - } - } - } - }, - "lodash.templatesettings": { - "version": "2.4.1", - "from": "lodash.templatesettings@2.4.1", - "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-2.4.1.tgz" - }, - "lodash.values": { - "version": "2.4.1", - "from": "lodash.values@2.4.1", - "resolved": "https://registry.npmjs.org/lodash.values/-/lodash.values-2.4.1.tgz" - } - } - }, - "minimist": { - "version": "1.1.0", - "from": "minimist@1.1.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.1.0.tgz" - }, - "multipipe": { - "version": "0.1.1", - "from": "multipipe@0.1.1", - "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.1.tgz", - "dependencies": { - "duplexer2": { - "version": "0.0.2", - "from": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz", - "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz", - "dependencies": { - "readable-stream": { - "version": "1.1.13", - "from": "readable-stream@1.1.13", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz", - "dependencies": { - "core-util-is": { - "version": "1.0.1", - "from": "core-util-is@1.0.1", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz" - }, - "isarray": { - "version": "0.0.1", - "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz" - }, - "string_decoder": { - "version": "0.10.31", - "from": "string_decoder@0.10.31", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz" - }, - "inherits": { - "version": "2.0.1", - "from": "inherits@2.0.1", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" - } - } - } - } - } - } - }, - "through2": { - "version": "0.6.2", - "from": "https://registry.npmjs.org/through2/-/through2-0.6.2.tgz", - "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.2.tgz", - "dependencies": { - "readable-stream": { - "version": "1.0.32", - "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.32.tgz", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.32.tgz", - "dependencies": { - "core-util-is": { - "version": "1.0.1", - "from": "core-util-is@1.0.1", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz" - }, - "isarray": { - "version": "0.0.1", - "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz" - }, - "string_decoder": { - "version": "0.10.31", - "from": "string_decoder@0.10.31", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz" - }, - "inherits": { - "version": "2.0.1", - "from": "inherits@2.0.1", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" - } - } - }, - "xtend": { - "version": "4.0.0", - "from": "xtend@4.0.0", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz" - } - } - }, - "vinyl": { - "version": "0.4.3", - "from": "vinyl@0.4.3", - "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.3.tgz", - "dependencies": { - "clone-stats": { - "version": "0.0.1", - "from": "clone-stats@0.0.1", - "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz" - } - } - } - } - }, - "lodash": { - "version": "2.4.1", - "from": "lodash@2.4.1", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz" - }, - "shelljs": { - "version": "0.3.0", - "from": "shelljs@0.3.0", - "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.3.0.tgz" - }, "template": { "version": "0.2.1", - "from": "template@0.2.1", + "from": "https://registry.npmjs.org/template/-/template-0.2.1.tgz", "resolved": "https://registry.npmjs.org/template/-/template-0.2.1.tgz", "dependencies": { "delims": { "version": "0.1.4", - "from": "delims@0.1.4", + "from": "https://registry.npmjs.org/delims/-/delims-0.1.4.tgz", "resolved": "https://registry.npmjs.org/delims/-/delims-0.1.4.tgz" } } @@ -4387,7 +3431,7 @@ }, "karma-angularity-reporter": { "version": "0.0.3", - "from": "karma-angularity-reporter@0.0.3", + "from": "https://registry.npmjs.org/karma-angularity-reporter/-/karma-angularity-reporter-0.0.3.tgz", "resolved": "https://registry.npmjs.org/karma-angularity-reporter/-/karma-angularity-reporter-0.0.3.tgz" }, "karma-chrome-launcher": { @@ -4967,7 +4011,7 @@ }, "once": { "version": "1.3.1", - "from": "once@1.3.1", + "from": "https://registry.npmjs.org/once/-/once-1.3.1.tgz", "resolved": "https://registry.npmjs.org/once/-/once-1.3.1.tgz" }, "opn": { @@ -5339,11 +4383,6 @@ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz" } } - }, - "xtend": { - "version": "3.0.0", - "from": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz" } } }, @@ -5483,7 +4522,7 @@ }, "xtend": { "version": "3.0.0", - "from": "xtend@3.0.0", + "from": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz", "resolved": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz" }, "yargs": { diff --git a/package.json b/package.json index 00bad02..ae2b46b 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "angularity", "description": "An oppionated node-js build system for Ecmascript-6 Angular-js projects", - "version": "0.0.20", + "version": "0.1.0-rc", "tags": [ "build", "system", diff --git a/tasks/javascript.js b/tasks/javascript.js index 465d9d3..c2898be 100644 --- a/tasks/javascript.js +++ b/tasks/javascript.js @@ -107,12 +107,12 @@ gulp.task('javascript:lint', function () { .append(streams.jsLib()) .append(streams.jsSpec()) .pipe(jshint()) - .pipe(jshintReporter.get(cliArgs.reporter)); + .pipe(jshintReporter.get(cliArgs[jshintReporter.yargsOption.key])); }); // karma unit tests in local library only gulp.task('javascript:unit', function () { - var reporters = [].concat(cliArgs.karmareporter) + var reporters = [].concat(cliArgs[karma.yargsOption.key]) .filter(function isString(value) { return (typeof value === 'string'); }); @@ -152,9 +152,10 @@ gulp.task('javascript:build', function () { function init() { cliArgs = cliArgs || yargs.resolveArgv(); transforms = [ - to5ify.configure({ ignoreRegex: /(?!)/ }), // convert any es6 to es5 (ignoreRegex is degenerate) - stringify({ minify: true }), // allow import of html to a string - !cliArgs.unminified && ngAnnotate // @ngInject for angular injection points + to5ify.configure({ ignoreRegex: /(?!)/ }), // convert any es6 to es5 (ignoreRegex is degenerate) + stringify({ minify: false }), // allow import of html to a string + !cliArgs.unminified && ngAnnotate, { sourcemap: true } // @ngInject for angular injection points ]; + // TODO @bholloway fix stringify({ minify: true }) throwing error on badly formed html so that we can minify // TODO @bholloway fix sourcemaps in ngAnnotate so that it may be included even when not minifying } diff --git a/tasks/watch.js b/tasks/watch.js index 368ecd0..caae7fc 100644 --- a/tasks/watch.js +++ b/tasks/watch.js @@ -8,6 +8,7 @@ var gulp = require('gulp'), var defaults = require('../lib/config/defaults'), yargs = require('../lib/util/yargs'), hr = require('../lib/util/hr'), + karma = require('../lib/test/karma'), jshintReporter = require('../lib/util/jshint-reporter'), streams = require('../lib/config/streams'); @@ -55,10 +56,12 @@ yargs.getInstance('watch') default : config.get('port') }) .options(jshintReporter.yargsOption.key, jshintReporter.yargsOption.value) + .options(karma.yargsOption.key, karma.yargsOption.value) .strict() .check(yargs.subCommandCheck) .check(check) .check(jshintReporter.yargsCheck) + .check(karma.yargsCheck) .wrap(80); gulp.task('watch', ['server'], function () {