diff --git a/resources/[system]/[builders]/yarn/yarn_builder.js b/resources/[system]/[builders]/yarn/yarn_builder.js index e203f80..6293d84 100644 --- a/resources/[system]/[builders]/yarn/yarn_builder.js +++ b/resources/[system]/[builders]/yarn/yarn_builder.js @@ -14,7 +14,7 @@ const yarnBuildTask = { try { const yarnStat = fs.statSync(yarnLock); - + if (packageStat.mtimeMs > yarnStat.mtimeMs) { return true; } @@ -43,6 +43,15 @@ const yarnBuildTask = { cb(false, 'yarn failed!'); return; } + + const resourcePath = GetResourcePath(resourceName); + const yarnLock = path.resolve(resourcePath, 'yarn.lock'); + + try { + fs.utimesSync(yarnLock, new Date(), new Date()); + } catch (e) { + + } cb(true); }); diff --git a/resources/[system]/[builders]/yarn/yarn_cli.js b/resources/[system]/[builders]/yarn/yarn_cli.js index b28c715..71b556e 100644 --- a/resources/[system]/[builders]/yarn/yarn_cli.js +++ b/resources/[system]/[builders]/yarn/yarn_cli.js @@ -65,7 +65,7 @@ module.exports = /******/ __webpack_require__.p = ""; /******/ /******/ // Load entry module and return exports -/******/ return __webpack_require__(__webpack_require__.s = 411); +/******/ return __webpack_require__(__webpack_require__.s = 416); /******/ }) /************************************************************************/ /******/ ([ @@ -83,7 +83,7 @@ module.exports = require("path"); exports.__esModule = true; -var _promise = __webpack_require__(6); +var _promise = __webpack_require__(5); var _promise2 = _interopRequireDefault(_promise); @@ -137,7 +137,7 @@ exports.default = function (instance, Constructor) { /* 3 */ /***/ (function(module, exports, __webpack_require__) { -module.exports = { "default": __webpack_require__(474), __esModule: true }; +module.exports = { "default": __webpack_require__(481), __esModule: true }; /***/ }), /* 4 */ @@ -149,6 +149,12 @@ module.exports = require("util"); /* 5 */ /***/ (function(module, exports, __webpack_require__) { +module.exports = { "default": __webpack_require__(489), __esModule: true }; + +/***/ }), +/* 6 */ +/***/ (function(module, exports, __webpack_require__) { + "use strict"; @@ -160,31 +166,31 @@ exports.ResponseError = exports.ProcessTermError = exports.SecurityError = expor var _create; function _load_create() { - return _create = _interopRequireDefault(__webpack_require__(253)); + return _create = _interopRequireDefault(__webpack_require__(254)); } var _getPrototypeOf; function _load_getPrototypeOf() { - return _getPrototypeOf = _interopRequireDefault(__webpack_require__(452)); + return _getPrototypeOf = _interopRequireDefault(__webpack_require__(457)); } var _setPrototypeOf; function _load_setPrototypeOf() { - return _setPrototypeOf = _interopRequireDefault(__webpack_require__(163)); + return _setPrototypeOf = _interopRequireDefault(__webpack_require__(165)); } var _from; function _load_from() { - return _from = _interopRequireDefault(__webpack_require__(66)); + return _from = _interopRequireDefault(__webpack_require__(55)); } var _construct; function _load_construct() { - return _construct = _interopRequireDefault(__webpack_require__(453)); + return _construct = _interopRequireDefault(__webpack_require__(458)); } var _classCallCheck2; @@ -196,13 +202,13 @@ function _load_classCallCheck() { var _possibleConstructorReturn2; function _load_possibleConstructorReturn() { - return _possibleConstructorReturn2 = _interopRequireDefault(__webpack_require__(12)); + return _possibleConstructorReturn2 = _interopRequireDefault(__webpack_require__(13)); } var _inherits2; function _load_inherits() { - return _inherits2 = _interopRequireDefault(__webpack_require__(11)); + return _inherits2 = _interopRequireDefault(__webpack_require__(12)); } function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -324,12 +330,6 @@ var ResponseError = exports.ResponseError = function (_extendableBuiltin4) { return ResponseError; }(_extendableBuiltin3(Error)); -/***/ }), -/* 6 */ -/***/ (function(module, exports, __webpack_require__) { - -module.exports = { "default": __webpack_require__(482), __esModule: true }; - /***/ }), /* 7 */ /***/ (function(module, exports, __webpack_require__) { @@ -340,7 +340,7 @@ module.exports = { "default": __webpack_require__(482), __esModule: true }; Object.defineProperty(exports, "__esModule", { value: true }); -exports.getFirstSuitableFolder = exports.readFirstAvailableStream = exports.makeTempDir = exports.hardlinksWork = exports.writeFilePreservingEol = exports.getFileSizeOnDisk = exports.walk = exports.symlink = exports.find = exports.readJsonAndFile = exports.readJson = exports.readFileAny = exports.hardlinkBulk = exports.copyBulk = exports.unlink = exports.glob = exports.link = exports.chmod = exports.lstat = exports.exists = exports.mkdirp = exports.stat = exports.access = exports.rename = exports.readdir = exports.realpath = exports.readlink = exports.writeFile = exports.readFileBuffer = exports.lockQueue = exports.constants = undefined; +exports.getFirstSuitableFolder = exports.readFirstAvailableStream = exports.makeTempDir = exports.hardlinksWork = exports.writeFilePreservingEol = exports.getFileSizeOnDisk = exports.walk = exports.symlink = exports.find = exports.readJsonAndFile = exports.readJson = exports.readFileAny = exports.hardlinkBulk = exports.copyBulk = exports.unlink = exports.glob = exports.link = exports.chmod = exports.lstat = exports.exists = exports.mkdirp = exports.stat = exports.access = exports.rename = exports.readdir = exports.realpath = exports.readlink = exports.writeFile = exports.open = exports.readFileBuffer = exports.lockQueue = exports.constants = undefined; var _map; @@ -357,7 +357,7 @@ function _load_getIterator() { var _promise; function _load_promise() { - return _promise = _interopRequireDefault(__webpack_require__(6)); + return _promise = _interopRequireDefault(__webpack_require__(5)); } var _set; @@ -1167,44 +1167,37 @@ var symlink = exports.symlink = function () { var _ref26 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (src, dest) { try { var stats = yield lstat(dest); - - if (stats.isSymbolicLink() && (yield exists(dest))) { + if (stats.isSymbolicLink()) { var resolved = yield realpath(dest); if (resolved === src) { return; } } - - yield (0, (_fsNormalized || _load_fsNormalized()).unlink)(dest); } catch (err) { if (err.code !== 'ENOENT') { throw err; } } + // We use rimraf for unlink which never throws an ENOENT on missing target + yield (0, (_fsNormalized || _load_fsNormalized()).unlink)(dest); - try { - if (process.platform === 'win32') { - // use directory junctions if possible on win32, this requires absolute paths - yield fsSymlink(src, dest, 'junction'); - } else { - // use relative paths otherwise which will be retained if the directory is moved - var _relative = void 0; - if (yield exists(src)) { - _relative = (_path || _load_path()).default.relative((_fs || _load_fs()).default.realpathSync((_path || _load_path()).default.dirname(dest)), (_fs || _load_fs()).default.realpathSync(src)); - } else { - _relative = (_path || _load_path()).default.relative((_path || _load_path()).default.dirname(dest), src); + if (process.platform === 'win32') { + // use directory junctions if possible on win32, this requires absolute paths + yield fsSymlink(src, dest, 'junction'); + } else { + // use relative paths otherwise which will be retained if the directory is moved + var _relative = void 0; + try { + _relative = (_path || _load_path()).default.relative((_fs || _load_fs()).default.realpathSync((_path || _load_path()).default.dirname(dest)), (_fs || _load_fs()).default.realpathSync(src)); + } catch (err) { + if (err.code !== 'ENOENT') { + throw err; } - // When path.relative returns an empty string for the current directory, we should instead use - // '.', which is a valid fs.symlink target. - yield fsSymlink(_relative || '.', dest); - } - } catch (err) { - if (err.code === 'EEXIST') { - // race condition - yield symlink(src, dest); - } else { - throw err; + _relative = (_path || _load_path()).default.relative((_path || _load_path()).default.dirname(dest), src); } + // When path.relative returns an empty string for the current directory, we should instead use + // '.', which is a valid fs.symlink target. + yield fsSymlink(_relative || '.', dest); } }); @@ -1357,31 +1350,8 @@ var makeTempDir = exports.makeTempDir = function () { var readFirstAvailableStream = exports.readFirstAvailableStream = function () { var _ref34 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (paths) { - var _this = this; - var stream = void 0; var triedPaths = []; - - var _loop3 = function* _loop3(tarballPath) { - if (tarballPath) { - try { - // We need the weird `await new Promise()` construct for `createReadStream` because - // it always returns a ReadStream object but immediately triggers an `error` event - // on it if it fails to open the file, instead of throwing an exception. If this event - // is not handled, it crashes node. A saner way to handle this with multiple tries is - // the following construct. - stream = yield new (_promise || _load_promise()).default(function (resolve, reject) { - var maybeStream = (_fs || _load_fs()).default.createReadStream(tarballPath); - maybeStream.on('error', reject).on('readable', resolve.bind(_this, maybeStream)); - }); - return 'break'; - } catch (err) { - // Try the next one - triedPaths.push(tarballPath); - } - } - }; - for (var _iterator15 = paths, _isArray15 = Array.isArray(_iterator15), _i15 = 0, _iterator15 = _isArray15 ? _iterator15 : (0, (_getIterator2 || _load_getIterator()).default)(_iterator15);;) { var _ref35; @@ -1396,11 +1366,17 @@ var readFirstAvailableStream = exports.readFirstAvailableStream = function () { var tarballPath = _ref35; - var _ret5 = yield* _loop3(tarballPath); - - if (_ret5 === 'break') break; + if (tarballPath) { + try { + var fd = yield open(tarballPath, 'r'); + stream = (_fs || _load_fs()).default.createReadStream('', { fd }); + break; + } catch (err) { + // Try the next one + triedPaths.push(tarballPath); + } + } } - return { stream, triedPaths }; }); @@ -1468,13 +1444,13 @@ function _load_fs() { var _glob; function _load_glob() { - return _glob = _interopRequireDefault(__webpack_require__(185)); + return _glob = _interopRequireDefault(__webpack_require__(187)); } var _os; function _load_os() { - return _os = _interopRequireDefault(__webpack_require__(72)); + return _os = _interopRequireDefault(__webpack_require__(73)); } var _path; @@ -1492,13 +1468,13 @@ function _load_blockingQueue() { var _promise2; function _load_promise2() { - return _promise2 = _interopRequireWildcard(__webpack_require__(65)); + return _promise2 = _interopRequireWildcard(__webpack_require__(66)); } var _promise3; function _load_promise3() { - return _promise3 = __webpack_require__(65); + return _promise3 = __webpack_require__(66); } var _map2; @@ -1510,7 +1486,7 @@ function _load_map2() { var _fsNormalized; function _load_fsNormalized() { - return _fsNormalized = __webpack_require__(439); + return _fsNormalized = __webpack_require__(443); } function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } } @@ -1526,6 +1502,7 @@ var constants = exports.constants = typeof (_fs || _load_fs()).default.constants var lockQueue = exports.lockQueue = new (_blockingQueue || _load_blockingQueue()).default('fs lock'); var readFileBuffer = exports.readFileBuffer = (0, (_promise3 || _load_promise3()).promisify)((_fs || _load_fs()).default.readFile); +var open = exports.open = (0, (_promise3 || _load_promise3()).promisify)((_fs || _load_fs()).default.open); var writeFile = exports.writeFile = (0, (_promise3 || _load_promise3()).promisify)((_fs || _load_fs()).default.writeFile); var readlink = exports.readlink = (0, (_promise3 || _load_promise3()).promisify)((_fs || _load_fs()).default.readlink); var realpath = exports.realpath = (0, (_promise3 || _load_promise3()).promisify)((_fs || _load_fs()).default.realpath); @@ -1533,7 +1510,7 @@ var readdir = exports.readdir = (0, (_promise3 || _load_promise3()).promisify)(( var rename = exports.rename = (0, (_promise3 || _load_promise3()).promisify)((_fs || _load_fs()).default.rename); var access = exports.access = (0, (_promise3 || _load_promise3()).promisify)((_fs || _load_fs()).default.access); var stat = exports.stat = (0, (_promise3 || _load_promise3()).promisify)((_fs || _load_fs()).default.stat); -var mkdirp = exports.mkdirp = (0, (_promise3 || _load_promise3()).promisify)(__webpack_require__(194)); +var mkdirp = exports.mkdirp = (0, (_promise3 || _load_promise3()).promisify)(__webpack_require__(196)); var exists = exports.exists = (0, (_promise3 || _load_promise3()).promisify)((_fs || _load_fs()).default.exists, true); var lstat = exports.lstat = (0, (_promise3 || _load_promise3()).promisify)((_fs || _load_fs()).default.lstat); var chmod = exports.chmod = (0, (_promise3 || _load_promise3()).promisify)((_fs || _load_fs()).default.chmod); @@ -1549,7 +1526,7 @@ var CONCURRENT_QUEUE_ITEMS = (_fs || _load_fs()).default.copyFile ? 128 : 4; var fsSymlink = (0, (_promise3 || _load_promise3()).promisify)((_fs || _load_fs()).default.symlink); var invariant = __webpack_require__(9); -var stripBOM = __webpack_require__(323); +var stripBOM = __webpack_require__(327); var noop = function noop() {}; @@ -1581,8 +1558,8 @@ function normalizeOS(body) { return body.replace(/\r\n/g, '\n'); } -var cr = new Buffer('\r', 'utf8')[0]; -var lf = new Buffer('\n', 'utf8')[0]; +var cr = '\r'.charCodeAt(0); +var lf = '\n'.charCodeAt(0); /***/ }), /* 8 */ @@ -1595,16 +1572,16 @@ Object.defineProperty(exports, "__esModule", { value: true }); exports.getPathKey = getPathKey; -var os = __webpack_require__(72); +var os = __webpack_require__(73); var path = __webpack_require__(0); -var userHome = __webpack_require__(75).default; +var userHome = __webpack_require__(76).default; -var _require = __webpack_require__(451), +var _require = __webpack_require__(456), getCacheDir = _require.getCacheDir, getConfigDir = _require.getConfigDir, getDataDir = _require.getDataDir; -var isWebpackBundle = __webpack_require__(629); +var isWebpackBundle = __webpack_require__(637); var DEPENDENCY_TYPES = exports.DEPENDENCY_TYPES = ['devDependencies', 'dependencies', 'optionalDependencies', 'peerDependencies']; var RESOLUTIONS = exports.RESOLUTIONS = 'resolutions'; @@ -1619,8 +1596,6 @@ var YARN_INSTALLER_SH = exports.YARN_INSTALLER_SH = 'https://yarnpkg.com/install var YARN_INSTALLER_MSI = exports.YARN_INSTALLER_MSI = 'https://yarnpkg.com/latest.msi'; var SELF_UPDATE_VERSION_URL = exports.SELF_UPDATE_VERSION_URL = 'https://yarnpkg.com/latest-version'; -var SELF_UPDATE_TARBALL_URL = exports.SELF_UPDATE_TARBALL_URL = 'https://yarnpkg.com/latest.tar.gz'; -var SELF_UPDATE_DOWNLOAD_FOLDER = exports.SELF_UPDATE_DOWNLOAD_FOLDER = 'updates'; // cache version, bump whenever we make backwards incompatible changes var CACHE_VERSION = exports.CACHE_VERSION = 1; @@ -1682,7 +1657,8 @@ var LOCKFILE_FILENAME = exports.LOCKFILE_FILENAME = 'yarn.lock'; var METADATA_FILENAME = exports.METADATA_FILENAME = '.yarn-metadata.json'; var TARBALL_FILENAME = exports.TARBALL_FILENAME = '.yarn-tarball.tgz'; var CLEAN_FILENAME = exports.CLEAN_FILENAME = '.yarnclean'; -var ACCESS_FILENAME = exports.ACCESS_FILENAME = '.yarn-access'; + +var NPM_LOCK_FILENAME = exports.NPM_LOCK_FILENAME = 'package-lock.json'; var DEFAULT_INDENT = exports.DEFAULT_INDENT = ' '; var SINGLE_INSTANCE_PORT = exports.SINGLE_INSTANCE_PORT = 31997; @@ -1789,20 +1765,26 @@ module.exports = require("fs"); /* 11 */ /***/ (function(module, exports, __webpack_require__) { +module.exports = { "default": __webpack_require__(487), __esModule: true }; + +/***/ }), +/* 12 */ +/***/ (function(module, exports, __webpack_require__) { + "use strict"; exports.__esModule = true; -var _setPrototypeOf = __webpack_require__(163); +var _setPrototypeOf = __webpack_require__(165); var _setPrototypeOf2 = _interopRequireDefault(_setPrototypeOf); -var _create = __webpack_require__(253); +var _create = __webpack_require__(254); var _create2 = _interopRequireDefault(_create); -var _typeof2 = __webpack_require__(254); +var _typeof2 = __webpack_require__(255); var _typeof3 = _interopRequireDefault(_typeof2); @@ -1825,7 +1807,7 @@ exports.default = function (subClass, superClass) { }; /***/ }), -/* 12 */ +/* 13 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -1833,7 +1815,7 @@ exports.default = function (subClass, superClass) { exports.__esModule = true; -var _typeof2 = __webpack_require__(254); +var _typeof2 = __webpack_require__(255); var _typeof3 = _interopRequireDefault(_typeof2); @@ -1848,25 +1830,25 @@ exports.default = function (self, call) { }; /***/ }), -/* 13 */ +/* 14 */ /***/ (function(module, exports) { module.exports = require("crypto"); /***/ }), -/* 14 */ +/* 15 */ /***/ (function(module, exports, __webpack_require__) { -module.exports = { "default": __webpack_require__(480), __esModule: true }; +module.exports = { "default": __webpack_require__(491), __esModule: true }; /***/ }), -/* 15 */ +/* 16 */ /***/ (function(module, exports, __webpack_require__) { module.exports = { "default": __webpack_require__(484), __esModule: true }; /***/ }), -/* 16 */ +/* 17 */ /***/ (function(module, exports, __webpack_require__) { // Copyright (c) 2012, Mark Cavage. All rights reserved. @@ -2082,12 +2064,6 @@ function _setExports(ndebug) { module.exports = _setExports(process.env.NODE_NDEBUG); -/***/ }), -/* 17 */ -/***/ (function(module, exports, __webpack_require__) { - -module.exports = { "default": __webpack_require__(477), __esModule: true }; - /***/ }), /* 18 */ /***/ (function(module, exports, __webpack_require__) { @@ -2102,7 +2078,7 @@ Object.defineProperty(exports, "__esModule", { var _promise; function _load_promise() { - return _promise = _interopRequireDefault(__webpack_require__(6)); + return _promise = _interopRequireDefault(__webpack_require__(5)); } exports.sortAlpha = sortAlpha; @@ -2117,7 +2093,7 @@ exports.sleep = sleep; function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } -var _camelCase = __webpack_require__(462); +var _camelCase = __webpack_require__(469); function sortAlpha(a, b) { // sort alphabetically in a deterministic way @@ -2206,308 +2182,6 @@ module.exports = require("url"); /***/ }), /* 20 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -Object.defineProperty(exports, "__esModule", { - value: true -}); -exports.stringify = exports.parse = undefined; - -var _getIterator2; - -function _load_getIterator() { - return _getIterator2 = _interopRequireDefault(__webpack_require__(3)); -} - -var _map; - -function _load_map() { - return _map = _interopRequireDefault(__webpack_require__(37)); -} - -var _asyncToGenerator2; - -function _load_asyncToGenerator() { - return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(1)); -} - -var _classCallCheck2; - -function _load_classCallCheck() { - return _classCallCheck2 = _interopRequireDefault(__webpack_require__(2)); -} - -var _keys; - -function _load_keys() { - return _keys = _interopRequireDefault(__webpack_require__(14)); -} - -var _parse; - -function _load_parse() { - return _parse = __webpack_require__(236); -} - -Object.defineProperty(exports, 'parse', { - enumerable: true, - get: function get() { - return _interopRequireDefault(_parse || _load_parse()).default; - } -}); - -var _stringify; - -function _load_stringify() { - return _stringify = __webpack_require__(416); -} - -Object.defineProperty(exports, 'stringify', { - enumerable: true, - get: function get() { - return _interopRequireDefault(_stringify || _load_stringify()).default; - } -}); -exports.implodeEntry = implodeEntry; -exports.explodeEntry = explodeEntry; - -var _misc; - -function _load_misc() { - return _misc = __webpack_require__(18); -} - -var _normalizePattern; - -function _load_normalizePattern() { - return _normalizePattern = __webpack_require__(42); -} - -var _parse2; - -function _load_parse2() { - return _parse2 = _interopRequireDefault(__webpack_require__(236)); -} - -var _constants; - -function _load_constants() { - return _constants = __webpack_require__(8); -} - -var _fs; - -function _load_fs() { - return _fs = _interopRequireWildcard(__webpack_require__(7)); -} - -function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } } - -function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } - -var invariant = __webpack_require__(9); - -var path = __webpack_require__(0); - -function getName(pattern) { - return (0, (_normalizePattern || _load_normalizePattern()).normalizePattern)(pattern).name; -} - -function blankObjectUndefined(obj) { - return obj && (0, (_keys || _load_keys()).default)(obj).length ? obj : undefined; -} - -function keyForRemote(remote) { - return remote.resolved || (remote.reference && remote.hash ? `${remote.reference}#${remote.hash}` : null); -} - -function implodeEntry(pattern, obj) { - var inferredName = getName(pattern); - return { - name: inferredName === obj.name ? undefined : obj.name, - version: obj.version, - uid: obj.uid === obj.version ? undefined : obj.uid, - resolved: obj.resolved, - registry: obj.registry === 'npm' ? undefined : obj.registry, - dependencies: blankObjectUndefined(obj.dependencies), - optionalDependencies: blankObjectUndefined(obj.optionalDependencies), - permissions: blankObjectUndefined(obj.permissions), - prebuiltVariants: blankObjectUndefined(obj.prebuiltVariants) - }; -} - -function explodeEntry(pattern, obj) { - obj.optionalDependencies = obj.optionalDependencies || {}; - obj.dependencies = obj.dependencies || {}; - obj.uid = obj.uid || obj.version; - obj.permissions = obj.permissions || {}; - obj.registry = obj.registry || 'npm'; - obj.name = obj.name || getName(pattern); - return obj; -} - -var Lockfile = function () { - function Lockfile() { - var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {}, - cache = _ref.cache, - source = _ref.source, - parseResultType = _ref.parseResultType; - - (0, (_classCallCheck2 || _load_classCallCheck()).default)(this, Lockfile); - - this.source = source || ''; - this.cache = cache; - this.parseResultType = parseResultType; - } - - // source string if the `cache` was parsed - - - Lockfile.fromDirectory = function () { - var _ref2 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (dir, reporter) { - // read the manifest in this directory - var lockfileLoc = path.join(dir, (_constants || _load_constants()).LOCKFILE_FILENAME); - - var lockfile = void 0; - var rawLockfile = ''; - var parseResult = void 0; - - if (yield (_fs || _load_fs()).exists(lockfileLoc)) { - rawLockfile = yield (_fs || _load_fs()).readFile(lockfileLoc); - parseResult = (0, (_parse2 || _load_parse2()).default)(rawLockfile, lockfileLoc); - - if (reporter) { - if (parseResult.type === 'merge') { - reporter.info(reporter.lang('lockfileMerged')); - } else if (parseResult.type === 'conflict') { - reporter.warn(reporter.lang('lockfileConflict')); - } - } - - lockfile = parseResult.object; - } else if (reporter) { - reporter.info(reporter.lang('noLockfileFound')); - } - - return new Lockfile({ cache: lockfile, source: rawLockfile, parseResultType: parseResult && parseResult.type }); - }); - - function fromDirectory(_x2, _x3) { - return _ref2.apply(this, arguments); - } - - return fromDirectory; - }(); - - Lockfile.prototype.getLocked = function getLocked(pattern) { - var cache = this.cache; - if (!cache) { - return undefined; - } - - var shrunk = pattern in cache && cache[pattern]; - - if (typeof shrunk === 'string') { - return this.getLocked(shrunk); - } else if (shrunk) { - explodeEntry(pattern, shrunk); - return shrunk; - } - - return undefined; - }; - - Lockfile.prototype.removePattern = function removePattern(pattern) { - var cache = this.cache; - if (!cache) { - return; - } - delete cache[pattern]; - }; - - Lockfile.prototype.getLockfile = function getLockfile(patterns) { - var lockfile = {}; - var seen = new (_map || _load_map()).default(); - - // order by name so that lockfile manifest is assigned to the first dependency with this manifest - // the others that have the same remoteKey will just refer to the first - // ordering allows for consistency in lockfile when it is serialized - var sortedPatternsKeys = (0, (_keys || _load_keys()).default)(patterns).sort((_misc || _load_misc()).sortAlpha); - - for (var _iterator = sortedPatternsKeys, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : (0, (_getIterator2 || _load_getIterator()).default)(_iterator);;) { - var _ref3; - - if (_isArray) { - if (_i >= _iterator.length) break; - _ref3 = _iterator[_i++]; - } else { - _i = _iterator.next(); - if (_i.done) break; - _ref3 = _i.value; - } - - var pattern = _ref3; - - var pkg = patterns[pattern]; - var remote = pkg._remote, - ref = pkg._reference; - - invariant(ref, 'Package is missing a reference'); - invariant(remote, 'Package is missing a remote'); - - var remoteKey = keyForRemote(remote); - var seenPattern = remoteKey && seen.get(remoteKey); - if (seenPattern) { - // no point in duplicating it - lockfile[pattern] = seenPattern; - - // if we're relying on our name being inferred and two of the patterns have - // different inferred names then we need to set it - if (!seenPattern.name && getName(pattern) !== pkg.name) { - seenPattern.name = pkg.name; - } - continue; - } - var obj = implodeEntry(pattern, { - name: pkg.name, - version: pkg.version, - uid: pkg._uid, - resolved: remote.resolved, - registry: remote.registry, - dependencies: pkg.dependencies, - peerDependencies: pkg.peerDependencies, - optionalDependencies: pkg.optionalDependencies, - permissions: ref.permissions, - prebuiltVariants: pkg.prebuiltVariants - }); - - lockfile[pattern] = obj; - - if (remoteKey) { - seen.set(remoteKey, obj); - } - } - - return lockfile; - }; - - return Lockfile; -}(); - -exports.default = Lockfile; - -/***/ }), -/* 21 */ -/***/ (function(module, exports) { - -var core = module.exports = {version: '2.4.0'}; -if(typeof __e == 'number')__e = core; // eslint-disable-line no-undef - -/***/ }), -/* 22 */ /***/ (function(module, exports) { exports = module.exports = SemVer; @@ -3715,8 +3389,339 @@ function prerelease(version, loose) { } +/***/ }), +/* 21 */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +Object.defineProperty(exports, "__esModule", { + value: true +}); +exports.stringify = exports.parse = undefined; + +var _getIterator2; + +function _load_getIterator() { + return _getIterator2 = _interopRequireDefault(__webpack_require__(3)); +} + +var _map; + +function _load_map() { + return _map = _interopRequireDefault(__webpack_require__(37)); +} + +var _asyncToGenerator2; + +function _load_asyncToGenerator() { + return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(1)); +} + +var _classCallCheck2; + +function _load_classCallCheck() { + return _classCallCheck2 = _interopRequireDefault(__webpack_require__(2)); +} + +var _keys; + +function _load_keys() { + return _keys = _interopRequireDefault(__webpack_require__(11)); +} + +var _parse; + +function _load_parse() { + return _parse = __webpack_require__(238); +} + +Object.defineProperty(exports, 'parse', { + enumerable: true, + get: function get() { + return _interopRequireDefault(_parse || _load_parse()).default; + } +}); + +var _stringify; + +function _load_stringify() { + return _stringify = __webpack_require__(421); +} + +Object.defineProperty(exports, 'stringify', { + enumerable: true, + get: function get() { + return _interopRequireDefault(_stringify || _load_stringify()).default; + } +}); +exports.implodeEntry = implodeEntry; +exports.explodeEntry = explodeEntry; + +var _misc; + +function _load_misc() { + return _misc = __webpack_require__(18); +} + +var _normalizePattern; + +function _load_normalizePattern() { + return _normalizePattern = __webpack_require__(42); +} + +var _parse2; + +function _load_parse2() { + return _parse2 = _interopRequireDefault(__webpack_require__(238)); +} + +var _constants; + +function _load_constants() { + return _constants = __webpack_require__(8); +} + +var _fs; + +function _load_fs() { + return _fs = _interopRequireWildcard(__webpack_require__(7)); +} + +function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } } + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + +var invariant = __webpack_require__(9); + +var path = __webpack_require__(0); + +function getName(pattern) { + return (0, (_normalizePattern || _load_normalizePattern()).normalizePattern)(pattern).name; +} + +function blankObjectUndefined(obj) { + return obj && (0, (_keys || _load_keys()).default)(obj).length ? obj : undefined; +} + +function keyForRemote(remote) { + return remote.resolved || (remote.reference && remote.hash ? `${remote.reference}#${remote.hash}` : null); +} + +function implodeEntry(pattern, obj) { + var inferredName = getName(pattern); + return { + name: inferredName === obj.name ? undefined : obj.name, + version: obj.version, + uid: obj.uid === obj.version ? undefined : obj.uid, + resolved: obj.resolved, + registry: obj.registry === 'npm' ? undefined : obj.registry, + dependencies: blankObjectUndefined(obj.dependencies), + optionalDependencies: blankObjectUndefined(obj.optionalDependencies), + permissions: blankObjectUndefined(obj.permissions), + prebuiltVariants: blankObjectUndefined(obj.prebuiltVariants) + }; +} + +function explodeEntry(pattern, obj) { + obj.optionalDependencies = obj.optionalDependencies || {}; + obj.dependencies = obj.dependencies || {}; + obj.uid = obj.uid || obj.version; + obj.permissions = obj.permissions || {}; + obj.registry = obj.registry || 'npm'; + obj.name = obj.name || getName(pattern); + return obj; +} + +var Lockfile = function () { + function Lockfile() { + var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {}, + cache = _ref.cache, + source = _ref.source, + parseResultType = _ref.parseResultType; + + (0, (_classCallCheck2 || _load_classCallCheck()).default)(this, Lockfile); + + this.source = source || ''; + this.cache = cache; + this.parseResultType = parseResultType; + } + + // source string if the `cache` was parsed + + + Lockfile.fromDirectory = function () { + var _ref2 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (dir, reporter) { + // read the manifest in this directory + var lockfileLoc = path.join(dir, (_constants || _load_constants()).LOCKFILE_FILENAME); + + var lockfile = void 0; + var rawLockfile = ''; + var parseResult = void 0; + + if (yield (_fs || _load_fs()).exists(lockfileLoc)) { + rawLockfile = yield (_fs || _load_fs()).readFile(lockfileLoc); + parseResult = (0, (_parse2 || _load_parse2()).default)(rawLockfile, lockfileLoc); + + if (reporter) { + if (parseResult.type === 'merge') { + reporter.info(reporter.lang('lockfileMerged')); + } else if (parseResult.type === 'conflict') { + reporter.warn(reporter.lang('lockfileConflict')); + } + } + + lockfile = parseResult.object; + } else if (reporter) { + reporter.info(reporter.lang('noLockfileFound')); + } + + return new Lockfile({ cache: lockfile, source: rawLockfile, parseResultType: parseResult && parseResult.type }); + }); + + function fromDirectory(_x2, _x3) { + return _ref2.apply(this, arguments); + } + + return fromDirectory; + }(); + + Lockfile.prototype.getLocked = function getLocked(pattern) { + var cache = this.cache; + if (!cache) { + return undefined; + } + + var shrunk = pattern in cache && cache[pattern]; + + if (typeof shrunk === 'string') { + return this.getLocked(shrunk); + } else if (shrunk) { + explodeEntry(pattern, shrunk); + return shrunk; + } + + return undefined; + }; + + Lockfile.prototype.removePattern = function removePattern(pattern) { + var cache = this.cache; + if (!cache) { + return; + } + delete cache[pattern]; + }; + + Lockfile.prototype.getLockfile = function getLockfile(patterns) { + var lockfile = {}; + var seen = new (_map || _load_map()).default(); + + // order by name so that lockfile manifest is assigned to the first dependency with this manifest + // the others that have the same remoteKey will just refer to the first + // ordering allows for consistency in lockfile when it is serialized + var sortedPatternsKeys = (0, (_keys || _load_keys()).default)(patterns).sort((_misc || _load_misc()).sortAlpha); + + for (var _iterator = sortedPatternsKeys, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : (0, (_getIterator2 || _load_getIterator()).default)(_iterator);;) { + var _ref3; + + if (_isArray) { + if (_i >= _iterator.length) break; + _ref3 = _iterator[_i++]; + } else { + _i = _iterator.next(); + if (_i.done) break; + _ref3 = _i.value; + } + + var pattern = _ref3; + + var pkg = patterns[pattern]; + var remote = pkg._remote, + ref = pkg._reference; + + invariant(ref, 'Package is missing a reference'); + invariant(remote, 'Package is missing a remote'); + + var remoteKey = keyForRemote(remote); + var seenPattern = remoteKey && seen.get(remoteKey); + if (seenPattern) { + // no point in duplicating it + lockfile[pattern] = seenPattern; + + // if we're relying on our name being inferred and two of the patterns have + // different inferred names then we need to set it + if (!seenPattern.name && getName(pattern) !== pkg.name) { + seenPattern.name = pkg.name; + } + continue; + } + var obj = implodeEntry(pattern, { + name: pkg.name, + version: pkg.version, + uid: pkg._uid, + resolved: remote.resolved, + registry: remote.registry, + dependencies: pkg.dependencies, + peerDependencies: pkg.peerDependencies, + optionalDependencies: pkg.optionalDependencies, + permissions: ref.permissions, + prebuiltVariants: pkg.prebuiltVariants + }); + + lockfile[pattern] = obj; + + if (remoteKey) { + seen.set(remoteKey, obj); + } + } + + return lockfile; + }; + + return Lockfile; +}(); + +exports.default = Lockfile; + +/***/ }), +/* 22 */ +/***/ (function(module, exports) { + +var core = module.exports = {version: '2.4.0'}; +if(typeof __e == 'number')__e = core; // eslint-disable-line no-undef + /***/ }), /* 23 */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +exports.__esModule = true; + +var _assign = __webpack_require__(16); + +var _assign2 = _interopRequireDefault(_assign); + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + +exports.default = _assign2.default || function (target) { + for (var i = 1; i < arguments.length; i++) { + var source = arguments[i]; + + for (var key in source) { + if (Object.prototype.hasOwnProperty.call(source, key)) { + target[key] = source[key]; + } + } + } + + return target; +}; + +/***/ }), +/* 24 */ /***/ (function(module, exports) { module.exports = function(module) { @@ -3744,7 +3749,7 @@ module.exports = function(module) { /***/ }), -/* 24 */ +/* 25 */ /***/ (function(module, exports, __webpack_require__) { // Copyright 2015 Joyent, Inc. @@ -3762,9 +3767,9 @@ module.exports = { opensshCipherInfo: opensshCipherInfo }; -var assert = __webpack_require__(16); +var assert = __webpack_require__(17); var PrivateKey = __webpack_require__(28); -var crypto = __webpack_require__(13); +var crypto = __webpack_require__(14); var MAX_CLASS_DEPTH = 3; @@ -3951,7 +3956,7 @@ function calculateDSAPublic(g, p, x) { assert.buffer(p); assert.buffer(x); try { - var bigInt = __webpack_require__(61).BigInteger; + var bigInt = __webpack_require__(62).BigInteger; } catch (e) { throw (new Error('To load a PKCS#8 format DSA private key, ' + 'the node jsbn library is required.')); @@ -3968,7 +3973,7 @@ function addRSAMissing(key) { assert.object(key); assertCompatible(key, PrivateKey, [1, 1]); try { - var bigInt = __webpack_require__(61).BigInteger; + var bigInt = __webpack_require__(62).BigInteger; } catch (e) { throw (new Error('To write a PEM private key from ' + 'this source, the node jsbn lib is required.')); @@ -4037,35 +4042,6 @@ function opensshCipherInfo(cipher) { } -/***/ }), -/* 25 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -exports.__esModule = true; - -var _assign = __webpack_require__(17); - -var _assign2 = _interopRequireDefault(_assign); - -function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } - -exports.default = _assign2.default || function (target) { - for (var i = 1; i < arguments.length; i++) { - var source = arguments[i]; - - for (var key in source) { - if (Object.prototype.hasOwnProperty.call(source, key)) { - target[key] = source[key]; - } - } - } - - return target; -}; - /***/ }), /* 26 */ /***/ (function(module, exports) { @@ -4248,19 +4224,19 @@ module.exports = { module.exports = Key; -var assert = __webpack_require__(16); +var assert = __webpack_require__(17); var algs = __webpack_require__(26); -var crypto = __webpack_require__(13); +var crypto = __webpack_require__(14); var Fingerprint = __webpack_require__(102); var Signature = __webpack_require__(51); -var DiffieHellman = __webpack_require__(318).DiffieHellman; +var DiffieHellman = __webpack_require__(322).DiffieHellman; var errs = __webpack_require__(50); -var utils = __webpack_require__(24); +var utils = __webpack_require__(25); var PrivateKey = __webpack_require__(28); var edCompat; try { - edCompat = __webpack_require__(319); + edCompat = __webpack_require__(323); } catch (e) { /* Just continue through, and bail out if we try to use it. */ } @@ -4269,12 +4245,12 @@ var InvalidAlgorithmError = errs.InvalidAlgorithmError; var KeyParseError = errs.KeyParseError; var formats = {}; -formats['auto'] = __webpack_require__(320); -formats['pem'] = __webpack_require__(62); -formats['pkcs1'] = __webpack_require__(199); +formats['auto'] = __webpack_require__(324); +formats['pem'] = __webpack_require__(63); +formats['pkcs1'] = __webpack_require__(201); formats['pkcs8'] = __webpack_require__(103); -formats['rfc4253'] = __webpack_require__(70); -formats['ssh'] = __webpack_require__(321); +formats['rfc4253'] = __webpack_require__(71); +formats['ssh'] = __webpack_require__(325); formats['ssh-private'] = __webpack_require__(138); formats['openssh'] = formats['ssh-private']; @@ -4528,22 +4504,22 @@ Key._oldVersionDetect = function (obj) { module.exports = PrivateKey; -var assert = __webpack_require__(16); +var assert = __webpack_require__(17); var algs = __webpack_require__(26); -var crypto = __webpack_require__(13); +var crypto = __webpack_require__(14); var Fingerprint = __webpack_require__(102); var Signature = __webpack_require__(51); var errs = __webpack_require__(50); var util = __webpack_require__(4); -var utils = __webpack_require__(24); -var dhe = __webpack_require__(318); +var utils = __webpack_require__(25); +var dhe = __webpack_require__(322); var generateECDSA = dhe.generateECDSA; var generateED25519 = dhe.generateED25519; var edCompat; var ed; try { - edCompat = __webpack_require__(319); + edCompat = __webpack_require__(323); } catch (e) { /* Just continue through, and bail out if we try to use it. */ } @@ -4555,11 +4531,11 @@ var KeyParseError = errs.KeyParseError; var KeyEncryptedError = errs.KeyEncryptedError; var formats = {}; -formats['auto'] = __webpack_require__(320); -formats['pem'] = __webpack_require__(62); -formats['pkcs1'] = __webpack_require__(199); +formats['auto'] = __webpack_require__(324); +formats['pem'] = __webpack_require__(63); +formats['pkcs1'] = __webpack_require__(201); formats['pkcs8'] = __webpack_require__(103); -formats['rfc4253'] = __webpack_require__(70); +formats['rfc4253'] = __webpack_require__(71); formats['ssh-private'] = __webpack_require__(138); formats['openssh'] = formats['ssh-private']; formats['ssh'] = formats['ssh-private']; @@ -4616,7 +4592,7 @@ PrivateKey.prototype.derive = function (newType, newSize) { if (this.type === 'ed25519' && newType === 'curve25519') { if (ed === undefined) - ed = __webpack_require__(190); + ed = __webpack_require__(192); priv = this.part.r.data; if (priv[0] === 0x00) @@ -4635,7 +4611,7 @@ PrivateKey.prototype.derive = function (newType, newSize) { })); } else if (this.type === 'curve25519' && newType === 'ed25519') { if (ed === undefined) - ed = __webpack_require__(190); + ed = __webpack_require__(192); priv = this.part.r.data; if (priv[0] === 0x00) @@ -4800,7 +4776,7 @@ if(typeof __g == 'number')__g = global; // eslint-disable-line no-undef /* 31 */ /***/ (function(module, exports, __webpack_require__) { -var store = __webpack_require__(176)('wks') +var store = __webpack_require__(178)('wks') , uid = __webpack_require__(121) , Symbol = __webpack_require__(30).Symbol , USE_SYMBOL = typeof Symbol == 'function'; @@ -21902,13 +21878,13 @@ $exports.store = store; } }.call(this)); -/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(23)(module))) +/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(24)(module))) /***/ }), /* 33 */ /***/ (function(module, exports, __webpack_require__) { -module.exports = { "default": __webpack_require__(475), __esModule: true }; +module.exports = { "default": __webpack_require__(482), __esModule: true }; /***/ }), /* 34 */ @@ -21931,19 +21907,19 @@ function _load_set() { var _extends2; function _load_extends() { - return _extends2 = _interopRequireDefault(__webpack_require__(25)); + return _extends2 = _interopRequireDefault(__webpack_require__(23)); } var _assign; function _load_assign() { - return _assign = _interopRequireDefault(__webpack_require__(17)); + return _assign = _interopRequireDefault(__webpack_require__(16)); } var _keys; function _load_keys() { - return _keys = _interopRequireDefault(__webpack_require__(14)); + return _keys = _interopRequireDefault(__webpack_require__(11)); } var _getIterator2; @@ -22050,19 +22026,19 @@ exports.setFlags = setFlags; var _hooks; function _load_hooks() { - return _hooks = __webpack_require__(441); + return _hooks = __webpack_require__(445); } var _index; function _load_index() { - return _index = _interopRequireDefault(__webpack_require__(158)); + return _index = _interopRequireDefault(__webpack_require__(160)); } var _errors; function _load_errors() { - return _errors = __webpack_require__(5); + return _errors = __webpack_require__(6); } var _integrityChecker; @@ -22074,43 +22050,43 @@ function _load_integrityChecker() { var _lockfile; function _load_lockfile() { - return _lockfile = _interopRequireDefault(__webpack_require__(20)); + return _lockfile = _interopRequireDefault(__webpack_require__(21)); } var _lockfile2; function _load_lockfile2() { - return _lockfile2 = __webpack_require__(20); + return _lockfile2 = __webpack_require__(21); } var _packageFetcher; function _load_packageFetcher() { - return _packageFetcher = _interopRequireWildcard(__webpack_require__(238)); + return _packageFetcher = _interopRequireWildcard(__webpack_require__(151)); } var _packageInstallScripts; function _load_packageInstallScripts() { - return _packageInstallScripts = _interopRequireDefault(__webpack_require__(419)); + return _packageInstallScripts = _interopRequireDefault(__webpack_require__(424)); } var _packageCompatibility; function _load_packageCompatibility() { - return _packageCompatibility = _interopRequireWildcard(__webpack_require__(237)); + return _packageCompatibility = _interopRequireWildcard(__webpack_require__(239)); } var _packageResolver; function _load_packageResolver() { - return _packageResolver = _interopRequireDefault(__webpack_require__(239)); + return _packageResolver = _interopRequireDefault(__webpack_require__(241)); } var _packageLinker; function _load_packageLinker() { - return _packageLinker = _interopRequireDefault(__webpack_require__(151)); + return _packageLinker = _interopRequireDefault(__webpack_require__(152)); } var _index2; @@ -22128,7 +22104,7 @@ function _load_index3() { var _autoclean; function _load_autoclean() { - return _autoclean = __webpack_require__(227); + return _autoclean = __webpack_require__(229); } var _constants; @@ -22164,13 +22140,13 @@ function _load_yarnVersion() { var _workspaceLayout; function _load_workspaceLayout() { - return _workspaceLayout = _interopRequireDefault(__webpack_require__(76)); + return _workspaceLayout = _interopRequireDefault(__webpack_require__(67)); } var _resolutionMap; function _load_resolutionMap() { - return _resolutionMap = _interopRequireDefault(__webpack_require__(242)); + return _resolutionMap = _interopRequireDefault(__webpack_require__(155)); } var _guessName; @@ -22183,12 +22159,12 @@ function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } -var deepEqual = __webpack_require__(529); +var deepEqual = __webpack_require__(536); -var emoji = __webpack_require__(195); +var emoji = __webpack_require__(197); var invariant = __webpack_require__(9); var path = __webpack_require__(0); -var semver = __webpack_require__(22); +var semver = __webpack_require__(20); var uuid = __webpack_require__(83); var ONE_DAY = 1000 * 60 * 60 * 24; @@ -22268,7 +22244,10 @@ function normalizeFlags(config, rawFlags) { includeWorkspaceDeps: !!rawFlags.includeWorkspaceDeps, // add, remove, update - workspaceRootIsCwd: rawFlags.workspaceRootIsCwd !== false + workspaceRootIsCwd: rawFlags.workspaceRootIsCwd !== false, + + // focus + focus: !!rawFlags.focus }; if (config.getOption('ignore-scripts')) { @@ -22774,6 +22753,11 @@ var Install = exports.Install = function () { this.reporter.warn(this.reporter.lang('shrinkwrapWarning')); } + // running a focused install in a workspace root is not allowed + if (this.flags.focus && (!this.config.workspaceRootFolder || this.config.cwd === this.config.workspaceRootFolder)) { + throw new (_errors || _load_errors()).MessageError(this.reporter.lang('workspacesFocusRootCheck')); + } + var flattenedTopLevelPatterns = []; var steps = []; @@ -22811,7 +22795,8 @@ var Install = exports.Install = function () { yield _this2.resolver.init(_this2.prepareRequests(depRequests), { isFlat: _this2.flags.flat, isFrozen: _this2.flags.frozenLockfile, - workspaceLayout + workspaceLayout, + focus: _this2.flags.focus }); topLevelPatterns = _this2.preparePatterns(rawPatterns); flattenedTopLevelPatterns = yield _this2.flatten(topLevelPatterns); @@ -22837,7 +22822,8 @@ var Install = exports.Install = function () { flattenedTopLevelPatterns = _this2.preparePatternsForLinking(flattenedTopLevelPatterns, manifest, _this2.config.lockfileFolder === _this2.config.cwd); yield _this2.linker.init(flattenedTopLevelPatterns, workspaceLayout, { linkDuplicates: _this2.flags.linkDuplicates, - ignoreOptional: _this2.flags.ignoreOptional + ignoreOptional: _this2.flags.ignoreOptional, + focus: _this2.flags.focus }); })); }); @@ -22905,12 +22891,7 @@ var Install = exports.Install = function () { } // fin! - // The second condition is to make sure lockfile can be updated when running `remove` command. - if (topLevelPatterns.length || (yield (_fs || _load_fs()).exists(path.join(this.config.lockfileFolder, (_constants || _load_constants()).LOCKFILE_FILENAME)))) { - yield this.saveLockfileAndIntegrity(topLevelPatterns, workspaceLayout); - } else { - this.reporter.info(this.reporter.lang('notSavedLockfileNoDependencies')); - } + yield this.saveLockfileAndIntegrity(topLevelPatterns, workspaceLayout); this.maybeOutputUpdate(); this.config.requestManager.clearCache(); return flattenedTopLevelPatterns; @@ -23141,7 +23122,7 @@ var Install = exports.Install = function () { // write integrity hash yield this.integrityChecker.save(patterns, lockfileBasedOnResolver, this.flags, workspaceLayout, this.scripts.getArtifacts()); - // --no-lockfile or --pure-lockfile or --frozen-lockfile flag + // --no-lockfile or --pure-lockfile or --frozen-lockfile or --focus flag if (this.flags.lockfile === false || this.flags.pureLockfile || this.flags.frozenLockfile) { return; } @@ -23239,7 +23220,7 @@ var Install = exports.Install = function () { } _loc = ref.remote.reference; } else { - _loc = this.config.generateHardModulePath(ref); + _loc = this.config.generateModuleCachePath(ref); } var newPkg = yield this.config.readManifest(_loc); yield this.resolver.updateManifest(ref, newPkg); @@ -23346,6 +23327,7 @@ function hasWrapper(commander, args) { function setFlags(commander) { commander.description('Yarn install is used to install all dependencies for a project.'); commander.usage('install [flags]'); + commander.option('--focus', 'Focus on a single workspace by installing remote copies of its sibling workspaces.'); commander.option('-g, --global', 'DEPRECATED'); commander.option('-S, --save', 'DEPRECATED - save package to your `dependencies`'); commander.option('-D, --save-dev', 'DEPRECATED - save package to your `devDependencies`'); @@ -23369,7 +23351,7 @@ Object.defineProperty(exports, "__esModule", { var _setPrototypeOf; function _load_setPrototypeOf() { - return _setPrototypeOf = _interopRequireDefault(__webpack_require__(163)); + return _setPrototypeOf = _interopRequireDefault(__webpack_require__(165)); } var _getIterator2; @@ -23426,16 +23408,16 @@ module.exports = require("assert"); /* 37 */ /***/ (function(module, exports, __webpack_require__) { -module.exports = { "default": __webpack_require__(476), __esModule: true }; +module.exports = { "default": __webpack_require__(483), __esModule: true }; /***/ }), /* 38 */ /***/ (function(module, exports, __webpack_require__) { var global = __webpack_require__(30) - , core = __webpack_require__(21) - , ctx = __webpack_require__(55) - , hide = __webpack_require__(57) + , core = __webpack_require__(22) + , ctx = __webpack_require__(56) + , hide = __webpack_require__(58) , PROTOTYPE = 'prototype'; var $export = function(type, name, source){ @@ -23500,11 +23482,11 @@ module.exports = $export; "use strict"; -var escapeStringRegexp = __webpack_require__(182); -var ansiStyles = __webpack_require__(612); -var stripAnsi = __webpack_require__(188); -var hasAnsi = __webpack_require__(584); -var supportsColor = __webpack_require__(614); +var escapeStringRegexp = __webpack_require__(184); +var ansiStyles = __webpack_require__(621); +var stripAnsi = __webpack_require__(190); +var hasAnsi = __webpack_require__(593); +var supportsColor = __webpack_require__(623); var defineProps = Object.defineProperties; var isSimpleWindowsTerm = process.platform === 'win32' && !/^xterm/i.test(process.env.TERM); @@ -23632,13 +23614,13 @@ exports.registryNames = exports.registries = undefined; var _keys; function _load_keys() { - return _keys = _interopRequireDefault(__webpack_require__(14)); + return _keys = _interopRequireDefault(__webpack_require__(11)); } var _yarnRegistry; function _load_yarnRegistry() { - return _yarnRegistry = _interopRequireDefault(__webpack_require__(422)); + return _yarnRegistry = _interopRequireDefault(__webpack_require__(426)); } var _npmRegistry; @@ -23677,13 +23659,13 @@ function _load_classCallCheck() { var _possibleConstructorReturn2; function _load_possibleConstructorReturn() { - return _possibleConstructorReturn2 = _interopRequireDefault(__webpack_require__(12)); + return _possibleConstructorReturn2 = _interopRequireDefault(__webpack_require__(13)); } var _inherits2; function _load_inherits() { - return _inherits2 = _interopRequireDefault(__webpack_require__(11)); + return _inherits2 = _interopRequireDefault(__webpack_require__(12)); } var _getIterator2; @@ -23710,13 +23692,13 @@ function _load_baseResolver() { var _npmResolver; function _load_npmResolver() { - return _npmResolver = _interopRequireDefault(__webpack_require__(156)); + return _npmResolver = _interopRequireDefault(__webpack_require__(158)); } var _yarnResolver; function _load_yarnResolver() { - return _yarnResolver = _interopRequireDefault(__webpack_require__(245)); + return _yarnResolver = _interopRequireDefault(__webpack_require__(246)); } var _gitResolver; @@ -23728,55 +23710,55 @@ function _load_gitResolver() { var _tarballResolver; function _load_tarballResolver() { - return _tarballResolver = _interopRequireDefault(__webpack_require__(435)); + return _tarballResolver = _interopRequireDefault(__webpack_require__(439)); } var _githubResolver; function _load_githubResolver() { - return _githubResolver = _interopRequireDefault(__webpack_require__(243)); + return _githubResolver = _interopRequireDefault(__webpack_require__(244)); } var _fileResolver; function _load_fileResolver() { - return _fileResolver = _interopRequireDefault(__webpack_require__(154)); + return _fileResolver = _interopRequireDefault(__webpack_require__(156)); } var _linkResolver; function _load_linkResolver() { - return _linkResolver = _interopRequireDefault(__webpack_require__(244)); + return _linkResolver = _interopRequireDefault(__webpack_require__(245)); } var _gitlabResolver; function _load_gitlabResolver() { - return _gitlabResolver = _interopRequireDefault(__webpack_require__(433)); + return _gitlabResolver = _interopRequireDefault(__webpack_require__(437)); } var _gistResolver; function _load_gistResolver() { - return _gistResolver = _interopRequireDefault(__webpack_require__(155)); + return _gistResolver = _interopRequireDefault(__webpack_require__(157)); } var _bitbucketResolver; function _load_bitbucketResolver() { - return _bitbucketResolver = _interopRequireDefault(__webpack_require__(432)); + return _bitbucketResolver = _interopRequireDefault(__webpack_require__(436)); } var _hostedGitResolver; function _load_hostedGitResolver() { - return _hostedGitResolver = __webpack_require__(74); + return _hostedGitResolver = __webpack_require__(75); } var _registryResolver; function _load_registryResolver() { - return _registryResolver = _interopRequireDefault(__webpack_require__(434)); + return _registryResolver = _interopRequireDefault(__webpack_require__(438)); } function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -23922,8 +23904,8 @@ module.exports = function(it){ /***/ (function(module, exports, __webpack_require__) { var anObject = __webpack_require__(43) - , IE8_DOM_DEFINE = __webpack_require__(265) - , toPrimitive = __webpack_require__(178) + , IE8_DOM_DEFINE = __webpack_require__(267) + , toPrimitive = __webpack_require__(180) , dP = Object.defineProperty; exports.f = __webpack_require__(49) ? Object.defineProperty : function defineProperty(O, P, Attributes){ @@ -30127,7 +30109,7 @@ observableProto.flatMapLatest = observableProto.switchMap = function(selector, r }.call(this)); -/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(23)(module))) +/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(24)(module))) /***/ }), /* 47 */ @@ -30150,13 +30132,13 @@ function _load_getIterator() { var _keys; function _load_keys() { - return _keys = _interopRequireDefault(__webpack_require__(14)); + return _keys = _interopRequireDefault(__webpack_require__(11)); } var _promise; function _load_promise() { - return _promise = _interopRequireDefault(__webpack_require__(6)); + return _promise = _interopRequireDefault(__webpack_require__(5)); } exports.forkp = forkp; @@ -30179,13 +30161,13 @@ function _load_blockingQueue() { var _errors; function _load_errors() { - return _errors = __webpack_require__(5); + return _errors = __webpack_require__(6); } var _promise2; function _load_promise2() { - return _promise2 = __webpack_require__(65); + return _promise2 = __webpack_require__(66); } function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } } @@ -30349,7 +30331,7 @@ function _load_getIterator() { var _promise; function _load_promise() { - return _promise = _interopRequireDefault(__webpack_require__(6)); + return _promise = _interopRequireDefault(__webpack_require__(5)); } var _asyncToGenerator2; @@ -30361,7 +30343,7 @@ function _load_asyncToGenerator() { var _keys; function _load_keys() { - return _keys = _interopRequireDefault(__webpack_require__(14)); + return _keys = _interopRequireDefault(__webpack_require__(11)); } exports.default = function (rootCommandName, subCommands) { @@ -30425,7 +30407,7 @@ exports.default = function (rootCommandName, subCommands) { var _errors; function _load_errors() { - return _errors = __webpack_require__(5); + return _errors = __webpack_require__(6); } var _misc; @@ -30441,7 +30423,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de /***/ (function(module, exports, __webpack_require__) { // Thank's IE8 for his funny defineProperty -module.exports = !__webpack_require__(56)(function(){ +module.exports = !__webpack_require__(57)(function(){ return Object.defineProperty({}, 'a', {get: function(){ return 7; }}).a != 7; }); @@ -30451,7 +30433,7 @@ module.exports = !__webpack_require__(56)(function(){ // Copyright 2015 Joyent, Inc. -var assert = __webpack_require__(16); +var assert = __webpack_require__(17); var util = __webpack_require__(4); function FingerprintFormatError(fp, format) { @@ -30543,11 +30525,11 @@ module.exports = { module.exports = Signature; -var assert = __webpack_require__(16); +var assert = __webpack_require__(17); var algs = __webpack_require__(26); -var crypto = __webpack_require__(13); +var crypto = __webpack_require__(14); var errs = __webpack_require__(50); -var utils = __webpack_require__(24); +var utils = __webpack_require__(25); var asn1 = __webpack_require__(53); var SSHBuffer = __webpack_require__(139); @@ -30869,7 +30851,7 @@ module.exports = require("http"); // If you have no idea what ASN.1 or BER is, see this: // ftp://ftp.rsa.com/pub/pkcs/ascii/layman.asc -var Ber = __webpack_require__(376); +var Ber = __webpack_require__(381); @@ -30898,6 +30880,12 @@ Object.defineProperty(exports, "__esModule", { }); exports.SCOPE_SEPARATOR = undefined; +var _assign; + +function _load_assign() { + return _assign = _interopRequireDefault(__webpack_require__(16)); +} + var _getIterator2; function _load_getIterator() { @@ -30913,13 +30901,13 @@ function _load_asyncToGenerator() { var _keys; function _load_keys() { - return _keys = _interopRequireDefault(__webpack_require__(14)); + return _keys = _interopRequireDefault(__webpack_require__(11)); } -var _assign; +var _extends2; -function _load_assign() { - return _assign = _interopRequireDefault(__webpack_require__(17)); +function _load_extends() { + return _extends2 = _interopRequireDefault(__webpack_require__(23)); } var _classCallCheck2; @@ -30931,13 +30919,13 @@ function _load_classCallCheck() { var _possibleConstructorReturn2; function _load_possibleConstructorReturn() { - return _possibleConstructorReturn2 = _interopRequireDefault(__webpack_require__(12)); + return _possibleConstructorReturn2 = _interopRequireDefault(__webpack_require__(13)); } var _inherits2; function _load_inherits() { - return _inherits2 = _interopRequireDefault(__webpack_require__(11)); + return _inherits2 = _interopRequireDefault(__webpack_require__(12)); } var _set; @@ -30961,19 +30949,19 @@ function _load_fs() { var _npmResolver; function _load_npmResolver() { - return _npmResolver = _interopRequireDefault(__webpack_require__(156)); + return _npmResolver = _interopRequireDefault(__webpack_require__(158)); } var _envReplace; function _load_envReplace() { - return _envReplace = _interopRequireDefault(__webpack_require__(437)); + return _envReplace = _interopRequireDefault(__webpack_require__(441)); } var _baseRegistry; function _load_baseRegistry() { - return _baseRegistry = _interopRequireDefault(__webpack_require__(421)); + return _baseRegistry = _interopRequireDefault(__webpack_require__(425)); } var _misc; @@ -30985,25 +30973,25 @@ function _load_misc() { var _path; function _load_path() { - return _path = __webpack_require__(251); + return _path = __webpack_require__(252); } var _normalizeUrl; function _load_normalizeUrl() { - return _normalizeUrl = _interopRequireDefault(__webpack_require__(655)); + return _normalizeUrl = _interopRequireDefault(__webpack_require__(663)); } var _userHomeDir; function _load_userHomeDir() { - return _userHomeDir = _interopRequireDefault(__webpack_require__(75)); + return _userHomeDir = _interopRequireDefault(__webpack_require__(76)); } var _userHomeDir2; function _load_userHomeDir2() { - return _userHomeDir2 = __webpack_require__(75); + return _userHomeDir2 = __webpack_require__(76); } var _path2; @@ -31021,7 +31009,7 @@ function _load_url() { var _ini; function _load_ini() { - return _ini = _interopRequireDefault(__webpack_require__(597)); + return _ini = _interopRequireDefault(__webpack_require__(606)); } function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } } @@ -31145,8 +31133,11 @@ var NpmRegistry = function (_Registry) { var alwaysAuth = this.getRegistryOrGlobalOption(registry, 'always-auth'); - var headers = (0, (_assign || _load_assign()).default)({ - Accept: 'application/vnd.npm.install-v1+json; q=1.0, application/json; q=0.8, */*' + var headers = (0, (_extends2 || _load_extends()).default)({ + Accept: + // This is to use less bandwidth unless we really need to get the full response. + // See https://github.com/npm/npm-registry-client#requests + opts.unfiltered ? 'application/json' : 'application/vnd.npm.install-v1+json; q=1.0, application/json; q=0.8, */*' }, opts.headers); var isToRegistry = this.isRequestToRegistry(requestUrl, registry) || this.requestNeedsAuth(requestUrl); @@ -31189,9 +31180,7 @@ var NpmRegistry = function (_Registry) { NpmRegistry.prototype.checkOutdated = function () { var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, name, range) { - var req = yield this.request(NpmRegistry.escapeName(name), { - headers: { Accept: 'application/json' } - }); + var req = yield this.request(NpmRegistry.escapeName(name), { unfiltered: true }); if (!req) { throw new Error('couldnt find ' + name); } @@ -31415,8 +31404,8 @@ var NpmRegistry = function (_Registry) { var username = this.getRegistryOrGlobalOption(registry, 'username'); var password = this.getRegistryOrGlobalOption(registry, '_password'); if (username && password) { - var pw = new Buffer(String(password), 'base64').toString(); - return 'Basic ' + new Buffer(String(username) + ':' + pw).toString('base64'); + var pw = Buffer.from(String(password), 'base64').toString(); + return 'Basic ' + Buffer.from(String(username) + ':' + pw).toString('base64'); } } @@ -31454,6 +31443,12 @@ exports.default = NpmRegistry; /* 55 */ /***/ (function(module, exports, __webpack_require__) { +module.exports = { "default": __webpack_require__(480), __esModule: true }; + +/***/ }), +/* 56 */ +/***/ (function(module, exports, __webpack_require__) { + // optional / simple context binding var aFunction = __webpack_require__(93); module.exports = function(fn, that, length){ @@ -31476,7 +31471,7 @@ module.exports = function(fn, that, length){ }; /***/ }), -/* 56 */ +/* 57 */ /***/ (function(module, exports) { module.exports = function(exec){ @@ -31488,7 +31483,7 @@ module.exports = function(exec){ }; /***/ }), -/* 57 */ +/* 58 */ /***/ (function(module, exports, __webpack_require__) { var dP = __webpack_require__(45) @@ -31501,7 +31496,7 @@ module.exports = __webpack_require__(49) ? function(object, key, value){ }; /***/ }), -/* 58 */ +/* 59 */ /***/ (function(module, exports, __webpack_require__) { try { @@ -31509,12 +31504,12 @@ try { if (typeof util.inherits !== 'function') throw ''; module.exports = util.inherits; } catch (e) { - module.exports = __webpack_require__(596); + module.exports = __webpack_require__(605); } /***/ }), -/* 59 */ +/* 60 */ /***/ (function(module, exports, __webpack_require__) { /** @@ -31525,8 +31520,8 @@ try { var _ = __webpack_require__(32); var chalk = __webpack_require__(39); var runAsync = __webpack_require__(136); -var Choices = __webpack_require__(599); -var ScreenManager = __webpack_require__(610); +var Choices = __webpack_require__(608); +var ScreenManager = __webpack_require__(619); var Prompt = module.exports = function (question, rl, answers) { // Setup instance defaults property @@ -31657,7 +31652,7 @@ Prompt.prototype.getQuestion = function () { /***/ }), -/* 60 */ +/* 61 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -31709,7 +31704,7 @@ module.exports = function (rl) { /***/ }), -/* 61 */ +/* 62 */ /***/ (function(module, exports, __webpack_require__) { (function(){ @@ -33072,7 +33067,7 @@ module.exports = function (rl) { /***/ }), -/* 62 */ +/* 63 */ /***/ (function(module, exports, __webpack_require__) { // Copyright 2015 Joyent, Inc. @@ -33082,18 +33077,18 @@ module.exports = { write: write }; -var assert = __webpack_require__(16); +var assert = __webpack_require__(17); var asn1 = __webpack_require__(53); -var crypto = __webpack_require__(13); +var crypto = __webpack_require__(14); var algs = __webpack_require__(26); -var utils = __webpack_require__(24); +var utils = __webpack_require__(25); var Key = __webpack_require__(27); var PrivateKey = __webpack_require__(28); -var pkcs1 = __webpack_require__(199); +var pkcs1 = __webpack_require__(201); var pkcs8 = __webpack_require__(103); var sshpriv = __webpack_require__(138); -var rfc4253 = __webpack_require__(70); +var rfc4253 = __webpack_require__(71); var errors = __webpack_require__(50); @@ -33264,7 +33259,7 @@ function write(key, options, type) { /***/ }), -/* 63 */ +/* 64 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -33279,14 +33274,14 @@ module.exports = { toHash: toHash, getProperty: getProperty, escapeQuotes: escapeQuotes, - ucs2length: __webpack_require__(347), + ucs2length: __webpack_require__(352), varOccurences: varOccurences, varReplace: varReplace, cleanUpCode: cleanUpCode, cleanUpVarErrors: cleanUpVarErrors, schemaHasRules: schemaHasRules, schemaHasRulesExcept: schemaHasRulesExcept, - stableStringify: __webpack_require__(192), + stableStringify: __webpack_require__(194), toQuotedString: toQuotedString, getPathExpr: getPathExpr, getPath: getPath, @@ -33528,7 +33523,7 @@ function unescapeJsonPointer(str) { /***/ }), -/* 64 */ +/* 65 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -33547,13 +33542,13 @@ function _load_classCallCheck() { var _possibleConstructorReturn2; function _load_possibleConstructorReturn() { - return _possibleConstructorReturn2 = _interopRequireDefault(__webpack_require__(12)); + return _possibleConstructorReturn2 = _interopRequireDefault(__webpack_require__(13)); } var _inherits2; function _load_inherits() { - return _inherits2 = _interopRequireDefault(__webpack_require__(11)); + return _inherits2 = _interopRequireDefault(__webpack_require__(12)); } var _baseResolver; @@ -33587,7 +33582,7 @@ var ExoticResolver = function (_BaseResolver) { exports.default = ExoticResolver; /***/ }), -/* 65 */ +/* 66 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -33600,7 +33595,7 @@ Object.defineProperty(exports, "__esModule", { var _promise; function _load_promise() { - return _promise = _interopRequireDefault(__webpack_require__(6)); + return _promise = _interopRequireDefault(__webpack_require__(5)); } exports.wait = wait; @@ -33690,13 +33685,63 @@ function queue(arr, promiseProducer) { } /***/ }), -/* 66 */ +/* 67 */ /***/ (function(module, exports, __webpack_require__) { -module.exports = { "default": __webpack_require__(473), __esModule: true }; +"use strict"; + + +Object.defineProperty(exports, "__esModule", { + value: true +}); + +var _classCallCheck2; + +function _load_classCallCheck() { + return _classCallCheck2 = _interopRequireDefault(__webpack_require__(2)); +} + +var _normalizePattern2; + +function _load_normalizePattern() { + return _normalizePattern2 = __webpack_require__(42); +} + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + +var semver = __webpack_require__(20); + +var WorkspaceLayout = function () { + function WorkspaceLayout(workspaces, config) { + (0, (_classCallCheck2 || _load_classCallCheck()).default)(this, WorkspaceLayout); + + this.workspaces = workspaces; + this.config = config; + } + + WorkspaceLayout.prototype.getWorkspaceManifest = function getWorkspaceManifest(key) { + return this.workspaces[key]; + }; + + WorkspaceLayout.prototype.getManifestByPattern = function getManifestByPattern(pattern) { + var _normalizePattern = (0, (_normalizePattern2 || _load_normalizePattern()).normalizePattern)(pattern), + name = _normalizePattern.name, + range = _normalizePattern.range; + + var workspace = this.getWorkspaceManifest(name); + if (!workspace || !semver.satisfies(workspace.manifest.version, range, this.config.looseSemver)) { + return null; + } + return workspace; + }; + + return WorkspaceLayout; +}(); + +exports.default = WorkspaceLayout; /***/ }), -/* 67 */ +/* 68 */ /***/ (function(module, exports) { var hasOwnProperty = {}.hasOwnProperty; @@ -33705,18 +33750,18 @@ module.exports = function(it, key){ }; /***/ }), -/* 68 */ +/* 69 */ /***/ (function(module, exports, __webpack_require__) { // to indexed object, toObject with fallback for non-array-like ES3 strings -var IObject = __webpack_require__(170) +var IObject = __webpack_require__(172) , defined = __webpack_require__(116); module.exports = function(it){ return IObject(defined(it)); }; /***/ }), -/* 69 */ +/* 70 */ /***/ (function(module, exports, __webpack_require__) { var Stream = __webpack_require__(29); @@ -33730,18 +33775,18 @@ if (process.env.READABLE_STREAM === 'disable' && Stream) { exports.PassThrough = Stream.PassThrough; exports.Stream = Stream; } else { - exports = module.exports = __webpack_require__(303); + exports = module.exports = __webpack_require__(305); exports.Stream = Stream || exports; exports.Readable = exports; - exports.Writable = __webpack_require__(305); + exports.Writable = __webpack_require__(307); exports.Duplex = __webpack_require__(81); - exports.Transform = __webpack_require__(304); - exports.PassThrough = __webpack_require__(676); + exports.Transform = __webpack_require__(306); + exports.PassThrough = __webpack_require__(685); } /***/ }), -/* 70 */ +/* 71 */ /***/ (function(module, exports, __webpack_require__) { // Copyright 2015 Joyent, Inc. @@ -33759,9 +33804,9 @@ module.exports = { algToKeyType: algToKeyType }; -var assert = __webpack_require__(16); +var assert = __webpack_require__(17); var algs = __webpack_require__(26); -var utils = __webpack_require__(24); +var utils = __webpack_require__(25); var Key = __webpack_require__(27); var PrivateKey = __webpack_require__(28); var SSHBuffer = __webpack_require__(139); @@ -33893,19 +33938,19 @@ function write(key, options) { /***/ }), -/* 71 */ +/* 72 */ /***/ (function(module, exports) { module.exports = require("events"); /***/ }), -/* 72 */ +/* 73 */ /***/ (function(module, exports) { module.exports = require("os"); /***/ }), -/* 73 */ +/* 74 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -33924,7 +33969,7 @@ function _load_asyncToGenerator() { var _promise; function _load_promise() { - return _promise = _interopRequireDefault(__webpack_require__(6)); + return _promise = _interopRequireDefault(__webpack_require__(5)); } var _classCallCheck2; @@ -33944,25 +33989,25 @@ exports.stringifyLangArgs = stringifyLangArgs; var _format; function _load_format() { - return _format = __webpack_require__(240); + return _format = __webpack_require__(242); } var _index; function _load_index() { - return _index = _interopRequireWildcard(__webpack_require__(241)); + return _index = _interopRequireWildcard(__webpack_require__(243)); } var _isCi; function _load_isCi() { - return _isCi = _interopRequireDefault(__webpack_require__(189)); + return _isCi = _interopRequireDefault(__webpack_require__(191)); } var _os; function _load_os() { - return _os = _interopRequireDefault(__webpack_require__(72)); + return _os = _interopRequireDefault(__webpack_require__(73)); } function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } } @@ -33972,7 +34017,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de var util = __webpack_require__(4); /* eslint no-unused-vars: 0 */ -var EventEmitter = __webpack_require__(71).EventEmitter; +var EventEmitter = __webpack_require__(72).EventEmitter; function stringifyLangArgs(args) { return args.map(function (val) { @@ -33984,7 +34029,11 @@ function stringifyLangArgs(args) { // should match all literal line breaks and // "u001b" that follow an odd number of backslashes and convert them to ESC // we do this because the JSON.stringify process has escaped these characters - return str.replace(/((?:^|[^\\])(?:\\{2})*)\\u001[bB]/g, '$1\u001b').replace(/[\\]r[\\]n|[\\]n/g, (_os || _load_os()).default.EOL); + return str.replace(/((?:^|[^\\])(?:\\{2})*)\\u001[bB]/g, '$1\u001b').replace(/[\\]r[\\]n|([\\])?[\\]n/g, function (match, precededBacklash) { + // precededBacklash not null when "\n" is preceded by a backlash ("\\n") + // match will be "\\n" and we don't replace it with os.EOL + return precededBacklash ? match : (_os || _load_os()).default.EOL; + }); } catch (e) { return util.inspect(val); } @@ -34290,7 +34339,7 @@ var BaseReporter = function () { exports.default = BaseReporter; /***/ }), -/* 74 */ +/* 75 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -34315,13 +34364,13 @@ function _load_classCallCheck() { var _possibleConstructorReturn2; function _load_possibleConstructorReturn() { - return _possibleConstructorReturn2 = _interopRequireDefault(__webpack_require__(12)); + return _possibleConstructorReturn2 = _interopRequireDefault(__webpack_require__(13)); } var _inherits2; function _load_inherits() { - return _inherits2 = _interopRequireDefault(__webpack_require__(11)); + return _inherits2 = _interopRequireDefault(__webpack_require__(12)); } exports.explodeHostedGitFragment = explodeHostedGitFragment; @@ -34329,7 +34378,7 @@ exports.explodeHostedGitFragment = explodeHostedGitFragment; var _errors; function _load_errors() { - return _errors = __webpack_require__(5); + return _errors = __webpack_require__(6); } var _index; @@ -34347,13 +34396,13 @@ function _load_gitResolver() { var _exoticResolver; function _load_exoticResolver() { - return _exoticResolver = _interopRequireDefault(__webpack_require__(64)); + return _exoticResolver = _interopRequireDefault(__webpack_require__(65)); } var _git; function _load_git() { - return _git = _interopRequireDefault(__webpack_require__(157)); + return _git = _interopRequireDefault(__webpack_require__(159)); } var _guessName; @@ -34643,7 +34692,7 @@ var HostedGitResolver = function (_ExoticResolver) { exports.default = HostedGitResolver; /***/ }), -/* 75 */ +/* 76 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -34657,82 +34706,26 @@ exports.home = undefined; var _rootUser; function _load_rootUser() { - return _rootUser = _interopRequireDefault(__webpack_require__(450)); + return _rootUser = _interopRequireDefault(__webpack_require__(455)); } function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } var path = __webpack_require__(0); -var home = exports.home = __webpack_require__(72).homedir(); +var home = exports.home = __webpack_require__(73).homedir(); var userHomeDir = (_rootUser || _load_rootUser()).default ? path.resolve('/usr/local/share') : home; exports.default = userHomeDir; -/***/ }), -/* 76 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -Object.defineProperty(exports, "__esModule", { - value: true -}); - -var _classCallCheck2; - -function _load_classCallCheck() { - return _classCallCheck2 = _interopRequireDefault(__webpack_require__(2)); -} - -var _normalizePattern2; - -function _load_normalizePattern() { - return _normalizePattern2 = __webpack_require__(42); -} - -function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } - -var semver = __webpack_require__(22); - -var WorkspaceLayout = function () { - function WorkspaceLayout(workspaces, config) { - (0, (_classCallCheck2 || _load_classCallCheck()).default)(this, WorkspaceLayout); - - this.workspaces = workspaces; - this.config = config; - } - - WorkspaceLayout.prototype.getWorkspaceManifest = function getWorkspaceManifest(key) { - return this.workspaces[key]; - }; - - WorkspaceLayout.prototype.getManifestByPattern = function getManifestByPattern(pattern) { - var _normalizePattern = (0, (_normalizePattern2 || _load_normalizePattern()).normalizePattern)(pattern), - name = _normalizePattern.name, - range = _normalizePattern.range; - - var workspace = this.getWorkspaceManifest(name); - if (!workspace || !semver.satisfies(workspace.manifest.version, range, this.config.looseSemver)) { - return null; - } - return workspace; - }; - - return WorkspaceLayout; -}(); - -exports.default = WorkspaceLayout; - /***/ }), /* 77 */ /***/ (function(module, exports, __webpack_require__) { // 19.1.2.14 / 15.2.3.14 Object.keys(O) -var $keys = __webpack_require__(275) - , enumBugKeys = __webpack_require__(169); +var $keys = __webpack_require__(277) + , enumBugKeys = __webpack_require__(171); module.exports = Object.keys || function keys(O){ return $keys(O, enumBugKeys); @@ -34754,10 +34747,10 @@ module.exports = function(it){ "use strict"; -var $at = __webpack_require__(504)(true); +var $at = __webpack_require__(511)(true); // 21.1.3.27 String.prototype[@@iterator]() -__webpack_require__(171)(String, 'String', function(iterated){ +__webpack_require__(173)(String, 'String', function(iterated){ this._t = String(iterated); // target this._i = 0; // next index // 21.1.5.2.1 %StringIteratorPrototype%.next() @@ -34785,8 +34778,8 @@ __webpack_require__(171)(String, 'String', function(iterated){ -var expand = __webpack_require__(642); -var utils = __webpack_require__(193); +var expand = __webpack_require__(650); +var utils = __webpack_require__(195); /** * The main function. Pass an array of filepaths, @@ -35234,16 +35227,16 @@ var objectKeys = Object.keys || function (obj) { module.exports = Duplex; /**/ -var processNextTick = __webpack_require__(197); +var processNextTick = __webpack_require__(199); /**/ /**/ var util = __webpack_require__(100); -util.inherits = __webpack_require__(58); +util.inherits = __webpack_require__(59); /**/ -var Readable = __webpack_require__(303); -var Writable = __webpack_require__(305); +var Readable = __webpack_require__(305); +var Writable = __webpack_require__(307); util.inherits(Duplex, Readable); @@ -35358,8 +35351,8 @@ SafeBuffer.allocUnsafeSlow = function (size) { /* 83 */ /***/ (function(module, exports, __webpack_require__) { -var v1 = __webpack_require__(735); -var v4 = __webpack_require__(736); +var v1 = __webpack_require__(745); +var v4 = __webpack_require__(746); var uuid = v4; uuid.v1 = v1; @@ -35438,7 +35431,7 @@ function _load_path() { function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } // This will be bundled directly in the .js file for production builds -var _require = __webpack_require__(330), +var _require = __webpack_require__(335), version = _require.version, originalInstallationMethod = _require.installationMethod; /** * Determines the current version of Yarn itself. @@ -35462,7 +35455,7 @@ exports.run = exports.getBinFolder = undefined; var _keys; function _load_keys() { - return _keys = _interopRequireDefault(__webpack_require__(14)); + return _keys = _interopRequireDefault(__webpack_require__(11)); } var _set; @@ -35486,7 +35479,7 @@ function _load_getIterator() { var _promise; function _load_promise() { - return _promise = _interopRequireDefault(__webpack_require__(6)); + return _promise = _interopRequireDefault(__webpack_require__(5)); } var _classCallCheck2; @@ -35498,13 +35491,13 @@ function _load_classCallCheck() { var _possibleConstructorReturn2; function _load_possibleConstructorReturn() { - return _possibleConstructorReturn2 = _interopRequireDefault(__webpack_require__(12)); + return _possibleConstructorReturn2 = _interopRequireDefault(__webpack_require__(13)); } var _inherits2; function _load_inherits() { - return _inherits2 = _interopRequireDefault(__webpack_require__(11)); + return _inherits2 = _interopRequireDefault(__webpack_require__(12)); } var updateCwd = function () { @@ -35777,7 +35770,7 @@ exports.setFlags = setFlags; var _errors; function _load_errors() { - return _errors = __webpack_require__(5); + return _errors = __webpack_require__(6); } var _index; @@ -35789,7 +35782,7 @@ function _load_index() { var _baseReporter; function _load_baseReporter() { - return _baseReporter = _interopRequireDefault(__webpack_require__(73)); + return _baseReporter = _interopRequireDefault(__webpack_require__(74)); } var _buildSubCommands2; @@ -35801,7 +35794,7 @@ function _load_buildSubCommands() { var _lockfile; function _load_lockfile() { - return _lockfile = _interopRequireDefault(__webpack_require__(20)); + return _lockfile = _interopRequireDefault(__webpack_require__(21)); } var _install; @@ -35819,7 +35812,7 @@ function _load_add() { var _remove; function _load_remove() { - return _remove = __webpack_require__(231); + return _remove = __webpack_require__(233); } var _upgrade; @@ -35831,13 +35824,13 @@ function _load_upgrade() { var _upgradeInteractive; function _load_upgradeInteractive() { - return _upgradeInteractive = __webpack_require__(233); + return _upgradeInteractive = __webpack_require__(235); } var _packageLinker; function _load_packageLinker() { - return _packageLinker = __webpack_require__(151); + return _packageLinker = __webpack_require__(152); } var _constants; @@ -36029,7 +36022,7 @@ exports.run = exports.getToken = undefined; var _promise; function _load_promise() { - return _promise = _interopRequireDefault(__webpack_require__(6)); + return _promise = _interopRequireDefault(__webpack_require__(5)); } var _asyncToGenerator2; @@ -36183,7 +36176,7 @@ exports.setFlags = setFlags; var _errors; function _load_errors() { - return _errors = __webpack_require__(5); + return _errors = __webpack_require__(6); } function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -36210,7 +36203,7 @@ Object.defineProperty(exports, "__esModule", { var _promise; function _load_promise() { - return _promise = _interopRequireDefault(__webpack_require__(6)); + return _promise = _interopRequireDefault(__webpack_require__(5)); } var _getIterator2; @@ -36222,7 +36215,7 @@ function _load_getIterator() { var _assign; function _load_assign() { - return _assign = _interopRequireDefault(__webpack_require__(17)); + return _assign = _interopRequireDefault(__webpack_require__(16)); } var _asyncToGenerator2; @@ -36252,7 +36245,7 @@ function _load_invariant() { var _semver; function _load_semver() { - return _semver = _interopRequireDefault(__webpack_require__(22)); + return _semver = _interopRequireDefault(__webpack_require__(20)); } var _validate; @@ -36264,13 +36257,13 @@ function _load_validate() { var _lockfile; function _load_lockfile() { - return _lockfile = _interopRequireDefault(__webpack_require__(20)); + return _lockfile = _interopRequireDefault(__webpack_require__(21)); } var _packageReference; function _load_packageReference() { - return _packageReference = _interopRequireDefault(__webpack_require__(420)); + return _packageReference = _interopRequireDefault(__webpack_require__(240)); } var _index; @@ -36282,7 +36275,7 @@ function _load_index() { var _errors; function _load_errors() { - return _errors = __webpack_require__(5); + return _errors = __webpack_require__(6); } var _constants; @@ -36294,13 +36287,13 @@ function _load_constants() { var _version; function _load_version() { - return _version = _interopRequireWildcard(__webpack_require__(162)); + return _version = _interopRequireWildcard(__webpack_require__(164)); } var _workspaceResolver; function _load_workspaceResolver() { - return _workspaceResolver = _interopRequireDefault(__webpack_require__(431)); + return _workspaceResolver = _interopRequireDefault(__webpack_require__(435)); } var _fs; @@ -36492,18 +36485,34 @@ var PackageRequest = function () { * the registry. */ - PackageRequest.prototype.findVersionInfo = function findVersionInfo() { - var exoticResolver = (0, (_index || _load_index()).getExoticResolver)(this.pattern); - if (exoticResolver) { - return this.findExoticVersionInfo(exoticResolver, this.pattern); - } else if ((_workspaceResolver || _load_workspaceResolver()).default.isWorkspace(this.pattern, this.resolver.workspaceLayout)) { - (0, (_invariant || _load_invariant()).default)(this.resolver.workspaceLayout, 'expected workspaceLayout'); - var resolver = new (_workspaceResolver || _load_workspaceResolver()).default(this, this.pattern, this.resolver.workspaceLayout); - return resolver.resolve(); - } else { - return this.findVersionOnRegistry(this.pattern); + PackageRequest.prototype.findVersionInfo = function () { + var _ref5 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () { + var exoticResolver = (0, (_index || _load_index()).getExoticResolver)(this.pattern); + if (exoticResolver) { + return this.findExoticVersionInfo(exoticResolver, this.pattern); + } else if ((_workspaceResolver || _load_workspaceResolver()).default.isWorkspace(this.pattern, this.resolver.workspaceLayout)) { + (0, (_invariant || _load_invariant()).default)(this.resolver.workspaceLayout, 'expected workspaceLayout'); + var resolver = new (_workspaceResolver || _load_workspaceResolver()).default(this, this.pattern, this.resolver.workspaceLayout); + var manifest = void 0; + if (this.resolver.focus && !(this.pattern.indexOf(this.resolver.workspaceLayout.virtualManifestName) !== -1) && !this.pattern.startsWith((_path || _load_path()).default.basename(this.config.cwd) + '@')) { + var localInfo = this.resolver.workspaceLayout.getManifestByPattern(this.pattern); + (0, (_invariant || _load_invariant()).default)(localInfo, 'expected local info for ' + this.pattern); + var localManifest = localInfo.manifest; + var requestPattern = localManifest.name + '@' + localManifest.version; + manifest = yield this.findVersionOnRegistry(requestPattern); + } + return resolver.resolve(manifest); + } else { + return this.findVersionOnRegistry(this.pattern); + } + }); + + function findVersionInfo() { + return _ref5.apply(this, arguments); } - }; + + return findVersionInfo; + }(); PackageRequest.prototype.reportResolvedRangeMatch = function reportResolvedRangeMatch(info, resolved) {}; @@ -36538,9 +36547,9 @@ var PackageRequest = function () { PackageRequest.prototype.find = function () { - var _ref5 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (_ref6) { - var fresh = _ref6.fresh, - frozen = _ref6.frozen; + var _ref6 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (_ref7) { + var fresh = _ref7.fresh, + frozen = _ref7.frozen; // find version info for this package pattern var info = yield this.findVersionInfo(); @@ -36635,18 +36644,18 @@ var PackageRequest = function () { } for (var _iterator = promises, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : (0, (_getIterator2 || _load_getIterator()).default)(_iterator);;) { - var _ref7; + var _ref8; if (_isArray) { if (_i >= _iterator.length) break; - _ref7 = _iterator[_i++]; + _ref8 = _iterator[_i++]; } else { _i = _iterator.next(); if (_i.done) break; - _ref7 = _i.value; + _ref8 = _i.value; } - var promise = _ref7; + var promise = _ref8; yield promise; } @@ -36655,25 +36664,25 @@ var PackageRequest = function () { // Now that we have all dependencies, it's safe to propagate optional for (var _iterator2 = ref.requests.slice(1), _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : (0, (_getIterator2 || _load_getIterator()).default)(_iterator2);;) { - var _ref8; + var _ref9; if (_isArray2) { if (_i2 >= _iterator2.length) break; - _ref8 = _iterator2[_i2++]; + _ref9 = _iterator2[_i2++]; } else { _i2 = _iterator2.next(); if (_i2.done) break; - _ref8 = _i2.value; + _ref9 = _i2.value; } - var otherRequest = _ref8; + var otherRequest = _ref9; ref.addOptional(otherRequest.optional); } }); function find(_x4) { - return _ref5.apply(this, arguments); + return _ref6.apply(this, arguments); } return find; @@ -36690,18 +36699,18 @@ var PackageRequest = function () { info.version = PackageRequest.getPackageVersion(info); for (var _iterator3 = (_constants || _load_constants()).REQUIRED_PACKAGE_KEYS, _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : (0, (_getIterator2 || _load_getIterator()).default)(_iterator3);;) { - var _ref9; + var _ref10; if (_isArray3) { if (_i3 >= _iterator3.length) break; - _ref9 = _iterator3[_i3++]; + _ref10 = _iterator3[_i3++]; } else { _i3 = _iterator3.next(); if (_i3.done) break; - _ref9 = _i3.value; + _ref10 = _i3.value; } - var key = _ref9; + var key = _ref10; if (!info[key]) { throw new (_errors || _load_errors()).MessageError(reporter.lang('missingRequiredPackageKey', human, key)); @@ -36723,10 +36732,10 @@ var PackageRequest = function () { */ PackageRequest.getOutdatedPackages = function () { - var _ref10 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (lockfile, install, config, reporter, filterByPatterns, flags) { - var _ref11 = yield install.fetchRequestFromCwd(), - reqPatterns = _ref11.requests, - workspaceLayout = _ref11.workspaceLayout; + var _ref11 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (lockfile, install, config, reporter, filterByPatterns, flags) { + var _ref12 = yield install.fetchRequestFromCwd(), + reqPatterns = _ref12.requests, + workspaceLayout = _ref12.workspaceLayout; // Filter out workspace patterns if necessary @@ -36737,21 +36746,21 @@ var PackageRequest = function () { // filter the list down to just the packages requested. // prevents us from having to query the metadata for all packages. - if (filterByPatterns && filterByPatterns.length) { - var filterByNames = filterByPatterns.map(function (pattern) { + if (filterByPatterns && filterByPatterns.length || flags && flags.pattern) { + var filterByNames = filterByPatterns && filterByPatterns.length ? filterByPatterns.map(function (pattern) { return (0, (_normalizePattern4 || _load_normalizePattern()).normalizePattern)(pattern).name; - }); + }) : []; depReqPatterns = depReqPatterns.filter(function (dep) { return filterByNames.indexOf((0, (_normalizePattern4 || _load_normalizePattern()).normalizePattern)(dep.pattern).name) >= 0 || flags && flags.pattern && micromatch.contains((0, (_normalizePattern4 || _load_normalizePattern()).normalizePattern)(dep.pattern).name, flags.pattern); }); } var deps = yield (_promise || _load_promise()).default.all(depReqPatterns.map(function () { - var _ref12 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (_ref13) { - var pattern = _ref13.pattern, - hint = _ref13.hint, - workspaceName = _ref13.workspaceName, - workspaceLoc = _ref13.workspaceLoc; + var _ref13 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (_ref14) { + var pattern = _ref14.pattern, + hint = _ref14.hint, + workspaceName = _ref14.workspaceName, + workspaceLoc = _ref14.workspaceLoc; var locked = lockfile.getLocked(pattern); if (!locked) { @@ -36773,11 +36782,11 @@ var PackageRequest = function () { } else { var registry = config.registries[locked.registry]; - var _ref14 = yield registry.checkOutdated(config, name, normalized.range); + var _ref15 = yield registry.checkOutdated(config, name, normalized.range); - latest = _ref14.latest; - wanted = _ref14.wanted; - url = _ref14.url; + latest = _ref15.latest; + wanted = _ref15.wanted; + url = _ref15.url; } return { @@ -36795,15 +36804,15 @@ var PackageRequest = function () { }); return function (_x11) { - return _ref12.apply(this, arguments); + return _ref13.apply(this, arguments); }; }())); // Make sure to always output `exotic` versions to be compatible with npm - var isDepOld = function isDepOld(_ref15) { - var current = _ref15.current, - latest = _ref15.latest, - wanted = _ref15.wanted; + var isDepOld = function isDepOld(_ref16) { + var current = _ref16.current, + latest = _ref16.latest, + wanted = _ref16.wanted; return latest === 'exotic' || (_semver || _load_semver()).default.lt(current, wanted) || (_semver || _load_semver()).default.lt(current, latest); }; var orderByName = function orderByName(depA, depB) { @@ -36813,7 +36822,7 @@ var PackageRequest = function () { }); function getOutdatedPackages(_x5, _x6, _x7, _x8, _x9, _x10) { - return _ref10.apply(this, arguments); + return _ref11.apply(this, arguments); } return getOutdatedPackages; @@ -36907,13 +36916,13 @@ function _load_classCallCheck() { var _possibleConstructorReturn2; function _load_possibleConstructorReturn() { - return _possibleConstructorReturn2 = _interopRequireDefault(__webpack_require__(12)); + return _possibleConstructorReturn2 = _interopRequireDefault(__webpack_require__(13)); } var _inherits2; function _load_inherits() { - return _inherits2 = _interopRequireDefault(__webpack_require__(11)); + return _inherits2 = _interopRequireDefault(__webpack_require__(12)); } var _index; @@ -36931,7 +36940,7 @@ function _load_misc() { var _version; function _load_version() { - return _version = _interopRequireWildcard(__webpack_require__(162)); + return _version = _interopRequireWildcard(__webpack_require__(164)); } var _guessName; @@ -36949,13 +36958,13 @@ function _load_index2() { var _exoticResolver; function _load_exoticResolver() { - return _exoticResolver = _interopRequireDefault(__webpack_require__(64)); + return _exoticResolver = _interopRequireDefault(__webpack_require__(65)); } var _git; function _load_git() { - return _git = _interopRequireDefault(__webpack_require__(157)); + return _git = _interopRequireDefault(__webpack_require__(159)); } function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } } @@ -37152,20 +37161,20 @@ function _load_classCallCheck() { var _possibleConstructorReturn2; function _load_possibleConstructorReturn() { - return _possibleConstructorReturn2 = _interopRequireDefault(__webpack_require__(12)); + return _possibleConstructorReturn2 = _interopRequireDefault(__webpack_require__(13)); } var _inherits2; function _load_inherits() { - return _inherits2 = _interopRequireDefault(__webpack_require__(11)); + return _inherits2 = _interopRequireDefault(__webpack_require__(12)); } exports.hash = hash; function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } -var crypto = __webpack_require__(13); +var crypto = __webpack_require__(14); var stream = __webpack_require__(29); function hash(content) { @@ -37214,12 +37223,12 @@ var HashStream = exports.HashStream = function (_stream$Transform) { Object.defineProperty(exports, "__esModule", { value: true }); -exports.execCommand = exports.execFromManifest = exports.executeLifecycleScript = exports.makeEnv = undefined; +exports.execCommand = exports.execFromManifest = exports.executeLifecycleScript = exports.makeEnv = exports.IGNORE_MANIFEST_KEYS = undefined; var _promise; function _load_promise() { - return _promise = _interopRequireDefault(__webpack_require__(6)); + return _promise = _interopRequireDefault(__webpack_require__(5)); } var _getIterator2; @@ -37231,19 +37240,13 @@ function _load_getIterator() { var _from; function _load_from() { - return _from = _interopRequireDefault(__webpack_require__(66)); + return _from = _interopRequireDefault(__webpack_require__(55)); } var _keys; function _load_keys() { - return _keys = _interopRequireDefault(__webpack_require__(14)); -} - -var _set; - -function _load_set() { - return _set = _interopRequireDefault(__webpack_require__(15)); + return _keys = _interopRequireDefault(__webpack_require__(11)); } var _stringify; @@ -37255,13 +37258,13 @@ function _load_stringify() { var _assign; function _load_assign() { - return _assign = _interopRequireDefault(__webpack_require__(17)); + return _assign = _interopRequireDefault(__webpack_require__(16)); } var _extends2; function _load_extends() { - return _extends2 = _interopRequireDefault(__webpack_require__(25)); + return _extends2 = _interopRequireDefault(__webpack_require__(23)); } var _asyncToGenerator2; @@ -37270,10 +37273,17 @@ function _load_asyncToGenerator() { return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(1)); } +var _set; + +function _load_set() { + return _set = _interopRequireDefault(__webpack_require__(15)); +} + var makeEnv = exports.makeEnv = function () { var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (stage, cwd, config) { var env = (0, (_extends2 || _load_extends()).default)({ - NODE: process.execPath + NODE: process.execPath, + INIT_CWD: process.cwd() }, process.env); // Merge in the `env` object specified in .yarnrc @@ -37313,18 +37323,14 @@ var makeEnv = exports.makeEnv = function () { _key = _queue$pop[0], val = _queue$pop[1]; - if (_key[0] === '_') { - continue; - } - if (typeof val === 'object') { for (var subKey in val) { - var completeKey = [_key, subKey].filter(function (part) { - return !!part; - }).join('_'); - queue.push([completeKey, val[subKey]]); + var fullKey = [_key, subKey].filter(Boolean).join('_'); + if (fullKey && fullKey[0] !== '_' && !IGNORE_MANIFEST_KEYS.has(fullKey)) { + queue.push([fullKey, val[subKey]]); + } } - } else if (IGNORE_MANIFEST_KEYS.indexOf(_key) < 0) { + } else { var cleanVal = String(val); if (cleanVal.indexOf('\n') >= 0) { cleanVal = (0, (_stringify || _load_stringify()).default)(cleanVal); @@ -37410,6 +37416,10 @@ var makeEnv = exports.makeEnv = function () { var envPath = env[(_constants || _load_constants()).ENV_PATH_KEY]; var pathParts = envPath ? envPath.split(path.delimiter) : []; + // Include the directory that contains node so that we can guarantee that the scripts + // will always run with the exact same Node release than the one use to run Yarn + pathParts.unshift(path.dirname(process.execPath)); + // Include node-gyp version that was bundled with the current Node.js version, // if available. pathParts.unshift(path.join(path.dirname(process.execPath), 'node_modules', 'npm', 'bin', 'node-gyp-bin')); @@ -37463,9 +37473,14 @@ var makeEnv = exports.makeEnv = function () { }(); var executeLifecycleScript = exports.executeLifecycleScript = function () { - var _ref7 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (stage, config, cwd, cmd, spinner, customShell) { - // if we don't have a spinner then pipe everything to the terminal - var stdio = spinner ? undefined : 'inherit'; + var _ref7 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (_ref8) { + var stage = _ref8.stage, + config = _ref8.config, + cwd = _ref8.cwd, + cmd = _ref8.cmd, + isInteractive = _ref8.isInteractive, + onProgress = _ref8.onProgress, + customShell = _ref8.customShell; var env = yield makeEnv(stage, cwd, config); @@ -37476,34 +37491,29 @@ var executeLifecycleScript = exports.executeLifecycleScript = function () { cmd = (0, (_fixCmdWinSlashes || _load_fixCmdWinSlashes()).fixCmdWinSlashes)(cmd); } - var updateProgress = void 0; - if (spinner) { - updateProgress = function updateProgress(data) { - var dataStr = data.toString() // turn buffer into string - .trim(); // trim whitespace + // By default (non-interactive), pipe everything to the terminal and run child process detached + // as long as it's not Windows (since windows does not have /dev/tty) + var stdio = ['ignore', 'pipe', 'pipe']; + var detached = process.platform !== 'win32'; - invariant(spinner && spinner.tick, 'We should have spinner and its ticker here'); - if (dataStr) { - spinner.tick(dataStr - // Only get the last line - .substr(dataStr.lastIndexOf('\n') + 1) - // change tabs to spaces as they can interfere with the console - .replace(/\t/g, ' ')); - } - }; + if (isInteractive) { + stdio = 'inherit'; + detached = false; } - var stdout = customShell ? yield (_child || _load_child()).spawn(customShell, [cmd], { cwd, env, stdio, windowsVerbatimArguments: true }, updateProgress) : yield (_child || _load_child()).spawn(cmd, [], { cwd, env, stdio, shell: true }, updateProgress); + + var shell = customShell || true; + var stdout = yield (_child || _load_child()).spawn(cmd, [], { cwd, env, stdio, detached, shell }, onProgress); return { cwd, command: cmd, stdout }; }); - return function executeLifecycleScript(_x4, _x5, _x6, _x7, _x8, _x9) { + return function executeLifecycleScript(_x4) { return _ref7.apply(this, arguments); }; }(); var _checkForGyp = function () { - var _ref8 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, paths) { + var _ref9 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, paths) { var reporter = config.reporter; // Check every directory in the PATH @@ -37525,13 +37535,13 @@ var _checkForGyp = function () { } }); - return function _checkForGyp(_x10, _x11) { - return _ref8.apply(this, arguments); + return function _checkForGyp(_x5, _x6) { + return _ref9.apply(this, arguments); }; }(); var execFromManifest = exports.execFromManifest = function () { - var _ref9 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, commandName, cwd) { + var _ref10 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, commandName, cwd) { var pkg = yield config.maybeReadManifest(cwd); if (!pkg || !pkg.scripts) { return; @@ -37539,22 +37549,28 @@ var execFromManifest = exports.execFromManifest = function () { var cmd = pkg.scripts[commandName]; if (cmd) { - yield execCommand(commandName, config, cmd, cwd); + yield execCommand({ stage: commandName, config, cmd, cwd, isInteractive: true }); } }); - return function execFromManifest(_x12, _x13, _x14) { - return _ref9.apply(this, arguments); + return function execFromManifest(_x7, _x8, _x9) { + return _ref10.apply(this, arguments); }; }(); var execCommand = exports.execCommand = function () { - var _ref10 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (stage, config, cmd, cwd, customShell) { + var _ref11 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (_ref12) { + var stage = _ref12.stage, + config = _ref12.config, + cmd = _ref12.cmd, + cwd = _ref12.cwd, + isInteractive = _ref12.isInteractive, + customShell = _ref12.customShell; var reporter = config.reporter; try { reporter.command(cmd); - yield executeLifecycleScript(stage, config, cwd, cmd, undefined, customShell); + yield executeLifecycleScript({ stage, config, cwd, cmd, isInteractive, customShell }); return (_promise || _load_promise()).default.resolve(); } catch (err) { if (err instanceof (_errors || _load_errors()).ProcessTermError) { @@ -37565,15 +37581,15 @@ var execCommand = exports.execCommand = function () { } }); - return function execCommand(_x15, _x16, _x17, _x18, _x19) { - return _ref10.apply(this, arguments); + return function execCommand(_x10) { + return _ref11.apply(this, arguments); }; }(); var _errors; function _load_errors() { - return _errors = __webpack_require__(5); + return _errors = __webpack_require__(6); } var _constants; @@ -37603,7 +37619,7 @@ function _load_index() { var _fixCmdWinSlashes; function _load_fixCmdWinSlashes() { - return _fixCmdWinSlashes = __webpack_require__(438); + return _fixCmdWinSlashes = __webpack_require__(442); } var _global; @@ -37616,18 +37632,16 @@ function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } -var invariant = __webpack_require__(9); - var path = __webpack_require__(0); -var IGNORE_MANIFEST_KEYS = ['readme']; +var IGNORE_MANIFEST_KEYS = exports.IGNORE_MANIFEST_KEYS = new (_set || _load_set()).default(['readme', 'notice', 'licenseText']); // We treat these configs as internal, thus not expose them to process.env. // This helps us avoid some gyp issues when building native modules. // See https://github.com/yarnpkg/yarn/issues/2286. var IGNORE_CONFIG_KEYS = ['lastUpdateCheck']; -var INVALID_CHAR_REGEX = /[^a-zA-Z0-9_]/g; +var INVALID_CHAR_REGEX = /\W/g; exports.default = executeLifecycleScript; @@ -37664,7 +37678,7 @@ Object.defineProperty(exports, "__esModule", { var _keys; function _load_keys() { - return _keys = _interopRequireDefault(__webpack_require__(14)); + return _keys = _interopRequireDefault(__webpack_require__(11)); } var _set; @@ -37762,24 +37776,24 @@ exports.cleanDependencies = cleanDependencies; var _errors; function _load_errors() { - return _errors = __webpack_require__(5); + return _errors = __webpack_require__(6); } var _util; function _load_util() { - return _util = __webpack_require__(159); + return _util = __webpack_require__(161); } var _typos; function _load_typos() { - return _typos = _interopRequireDefault(__webpack_require__(447)); + return _typos = _interopRequireDefault(__webpack_require__(452)); } function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } -var isBuiltinModule = __webpack_require__(617); +var isBuiltinModule = __webpack_require__(625); var strings = ['name', 'version']; @@ -37957,22 +37971,22 @@ module.exports = {}; // 19.1.2.2 / 15.2.3.5 Object.create(O [, Properties]) var anObject = __webpack_require__(43) - , dPs = __webpack_require__(500) - , enumBugKeys = __webpack_require__(169) - , IE_PROTO = __webpack_require__(175)('IE_PROTO') + , dPs = __webpack_require__(507) + , enumBugKeys = __webpack_require__(171) + , IE_PROTO = __webpack_require__(177)('IE_PROTO') , Empty = function(){ /* empty */ } , PROTOTYPE = 'prototype'; // Create object with fake `null` prototype: use iframe Object with cleared prototype var createDict = function(){ // Thrash, waste and sodomy: IE GC bug - var iframe = __webpack_require__(168)('iframe') + var iframe = __webpack_require__(170)('iframe') , i = enumBugKeys.length , lt = '<' , gt = '>' , iframeDocument; iframe.style.display = 'none'; - __webpack_require__(264).appendChild(iframe); + __webpack_require__(266).appendChild(iframe); iframe.src = 'javascript:'; // eslint-disable-line no-script-url // createDict = iframe.contentWindow.Object; // html.removeChild(iframe); @@ -38016,7 +38030,7 @@ module.exports = function(bitmap, value){ /***/ (function(module, exports, __webpack_require__) { var def = __webpack_require__(45).f - , has = __webpack_require__(67) + , has = __webpack_require__(68) , TAG = __webpack_require__(31)('toStringTag'); module.exports = function(it, tag, stat){ @@ -38027,9 +38041,9 @@ module.exports = function(it, tag, stat){ /* 99 */ /***/ (function(module, exports, __webpack_require__) { -__webpack_require__(508); +__webpack_require__(515); var global = __webpack_require__(30) - , hide = __webpack_require__(57) + , hide = __webpack_require__(58) , Iterators = __webpack_require__(95) , TO_STRING_TAG = __webpack_require__(31)('toStringTag'); @@ -38162,22 +38176,22 @@ function objectToString(o) { module.exports = Certificate; -var assert = __webpack_require__(16); +var assert = __webpack_require__(17); var algs = __webpack_require__(26); -var crypto = __webpack_require__(13); +var crypto = __webpack_require__(14); var Fingerprint = __webpack_require__(102); var Signature = __webpack_require__(51); var errs = __webpack_require__(50); var util = __webpack_require__(4); -var utils = __webpack_require__(24); +var utils = __webpack_require__(25); var Key = __webpack_require__(27); var PrivateKey = __webpack_require__(28); var Identity = __webpack_require__(104); var formats = {}; -formats['openssh'] = __webpack_require__(720); -formats['x509'] = __webpack_require__(322); -formats['pem'] = __webpack_require__(721); +formats['openssh'] = __webpack_require__(730); +formats['x509'] = __webpack_require__(326); +formats['pem'] = __webpack_require__(731); var CertificateParseError = errs.CertificateParseError; var InvalidAlgorithmError = errs.InvalidAlgorithmError; @@ -38545,13 +38559,13 @@ Certificate._oldVersionDetect = function (obj) { module.exports = Fingerprint; -var assert = __webpack_require__(16); +var assert = __webpack_require__(17); var algs = __webpack_require__(26); -var crypto = __webpack_require__(13); +var crypto = __webpack_require__(14); var errs = __webpack_require__(50); var Key = __webpack_require__(27); var Certificate = __webpack_require__(101); -var utils = __webpack_require__(24); +var utils = __webpack_require__(25); var FingerprintFormatError = errs.FingerprintFormatError; var InvalidAlgorithmError = errs.InvalidAlgorithmError; @@ -38720,13 +38734,13 @@ module.exports = { writeECDSACurve: writeECDSACurve }; -var assert = __webpack_require__(16); +var assert = __webpack_require__(17); var asn1 = __webpack_require__(53); var algs = __webpack_require__(26); -var utils = __webpack_require__(24); +var utils = __webpack_require__(25); var Key = __webpack_require__(27); var PrivateKey = __webpack_require__(28); -var pem = __webpack_require__(62); +var pem = __webpack_require__(63); function read(buf, options) { return (pem.read(buf, options, 'pkcs8')); @@ -39223,14 +39237,14 @@ function writePkcs8ECDSAPrivate(key, der) { module.exports = Identity; -var assert = __webpack_require__(16); +var assert = __webpack_require__(17); var algs = __webpack_require__(26); -var crypto = __webpack_require__(13); +var crypto = __webpack_require__(14); var Fingerprint = __webpack_require__(102); var Signature = __webpack_require__(51); var errs = __webpack_require__(50); var util = __webpack_require__(4); -var utils = __webpack_require__(24); +var utils = __webpack_require__(25); var asn1 = __webpack_require__(53); /*JSSTYLED*/ @@ -39530,7 +39544,7 @@ function _load_stringify() { var _extends2; function _load_extends() { - return _extends2 = _interopRequireDefault(__webpack_require__(25)); + return _extends2 = _interopRequireDefault(__webpack_require__(23)); } var _set; @@ -39542,7 +39556,7 @@ function _load_set() { var _promise; function _load_promise() { - return _promise = _interopRequireDefault(__webpack_require__(6)); + return _promise = _interopRequireDefault(__webpack_require__(5)); } var _getIterator2; @@ -39566,7 +39580,7 @@ function _load_classCallCheck() { var _keys; function _load_keys() { - return _keys = _interopRequireDefault(__webpack_require__(14)); + return _keys = _interopRequireDefault(__webpack_require__(11)); } exports.extractWorkspaces = extractWorkspaces; @@ -39580,19 +39594,19 @@ function _load_executeLifecycleScript() { var _path; function _load_path() { - return _path = __webpack_require__(251); + return _path = __webpack_require__(252); } var _index; function _load_index() { - return _index = _interopRequireDefault(__webpack_require__(158)); + return _index = _interopRequireDefault(__webpack_require__(160)); } var _errors; function _load_errors() { - return _errors = __webpack_require__(5); + return _errors = __webpack_require__(6); } var _fs; @@ -39610,13 +39624,13 @@ function _load_constants() { var _packageConstraintResolver; function _load_packageConstraintResolver() { - return _packageConstraintResolver = _interopRequireDefault(__webpack_require__(417)); + return _packageConstraintResolver = _interopRequireDefault(__webpack_require__(422)); } var _requestManager; function _load_requestManager() { - return _requestManager = _interopRequireDefault(__webpack_require__(252)); + return _requestManager = _interopRequireDefault(__webpack_require__(253)); } var _index2; @@ -39641,12 +39655,12 @@ function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } -var detectIndent = __webpack_require__(531); +var detectIndent = __webpack_require__(540); var invariant = __webpack_require__(9); var path = __webpack_require__(0); var micromatch = __webpack_require__(80); -var isCi = __webpack_require__(189); +var isCi = __webpack_require__(191); function sortObject(object) { var sortedObject = {}; @@ -39981,6 +39995,8 @@ var Config = function () { // $FlowFixMe$ this.nonInteractive = !!opts.nonInteractive || isCi || !process.stdout.isTTY; + this.scriptsPrependNodePath = !!opts.scriptsPrependNodePath; + this.requestManager.setOptions({ offline: !!opts.offline && !opts.preferOffline, captureHar: !!opts.captureHar @@ -39995,14 +40011,10 @@ var Config = function () { * Generate an absolute module path. */ - Config.prototype.generateHardModulePath = function generateHardModulePath(pkg, ignoreLocation) { + Config.prototype.generateModuleCachePath = function generateModuleCachePath(pkg) { invariant(this.cacheFolder, 'No package root'); invariant(pkg, 'Undefined package'); - if (pkg.location && !ignoreLocation) { - return pkg.location; - } - var name = pkg.name; var uid = pkg.uid; if (pkg.registry) { @@ -40647,7 +40659,7 @@ exports.run = exports.Add = undefined; var _keys; function _load_keys() { - return _keys = _interopRequireDefault(__webpack_require__(14)); + return _keys = _interopRequireDefault(__webpack_require__(11)); } var _set; @@ -40671,7 +40683,7 @@ function _load_getIterator() { var _extends2; function _load_extends() { - return _extends2 = _interopRequireDefault(__webpack_require__(25)); + return _extends2 = _interopRequireDefault(__webpack_require__(23)); } var _classCallCheck2; @@ -40683,13 +40695,13 @@ function _load_classCallCheck() { var _possibleConstructorReturn2; function _load_possibleConstructorReturn() { - return _possibleConstructorReturn2 = _interopRequireDefault(__webpack_require__(12)); + return _possibleConstructorReturn2 = _interopRequireDefault(__webpack_require__(13)); } var _inherits2; function _load_inherits() { - return _inherits2 = _interopRequireDefault(__webpack_require__(11)); + return _inherits2 = _interopRequireDefault(__webpack_require__(12)); } var run = exports.run = function () { @@ -40717,7 +40729,7 @@ exports.setFlags = setFlags; var _lockfile; function _load_lockfile() { - return _lockfile = _interopRequireDefault(__webpack_require__(20)); + return _lockfile = _interopRequireDefault(__webpack_require__(21)); } var _normalizePattern2; @@ -40729,7 +40741,7 @@ function _load_normalizePattern() { var _workspaceLayout; function _load_workspaceLayout() { - return _workspaceLayout = _interopRequireDefault(__webpack_require__(76)); + return _workspaceLayout = _interopRequireDefault(__webpack_require__(67)); } var _index; @@ -40741,7 +40753,7 @@ function _load_index() { var _list; function _load_list() { - return _list = __webpack_require__(230); + return _list = __webpack_require__(232); } var _install; @@ -40753,7 +40765,7 @@ function _load_install() { var _errors; function _load_errors() { - return _errors = __webpack_require__(5); + return _errors = __webpack_require__(6); } var _constants; @@ -40783,7 +40795,7 @@ function _load_path() { var _semver; function _load_semver() { - return _semver = _interopRequireDefault(__webpack_require__(22)); + return _semver = _interopRequireDefault(__webpack_require__(20)); } function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } } @@ -41186,7 +41198,7 @@ exports.run = exports.pack = exports.packTarball = undefined; var _promise; function _load_promise() { - return _promise = _interopRequireDefault(__webpack_require__(6)); + return _promise = _interopRequireDefault(__webpack_require__(5)); } var _getIterator2; @@ -41198,7 +41210,7 @@ function _load_getIterator() { var _from; function _load_from() { - return _from = _interopRequireDefault(__webpack_require__(66)); + return _from = _interopRequireDefault(__webpack_require__(55)); } var _set; @@ -41292,29 +41304,18 @@ var packTarball = exports.packTarball = function () { // apply filters (0, (_filter || _load_filter()).sortFilter)(files, filters, keepFiles, possibleKeepFiles, ignoredFiles); - var packer = tar.pack(config.cwd, { - ignore: function ignore(name) { - var relative = path.relative(config.cwd, name); - // Don't ignore directories, since we need to recurse inside them to check for unignored files. - if (fs2.lstatSync(name).isDirectory()) { - var isParentOfKeptFile = (0, (_from || _load_from()).default)(keepFiles).some(function (name) { - return !path.relative(relative, name).startsWith('..'); - }); - return !isParentOfKeptFile; - } - // Otherwise, ignore a file if we're not supposed to keep it. - return !keepFiles.has(relative); - }, - map: function map(header) { - var suffix = header.name === '.' ? '' : `/${header.name}`; - header.name = `package${suffix}`; - delete header.uid; - delete header.gid; - return mapHeader ? mapHeader(header) : header; + return packWithIgnoreAndHeaders(config.cwd, function (name) { + var relative = path.relative(config.cwd, name); + // Don't ignore directories, since we need to recurse inside them to check for unignored files. + if (fs2.lstatSync(name).isDirectory()) { + var isParentOfKeptFile = (0, (_from || _load_from()).default)(keepFiles).some(function (name) { + return !path.relative(relative, name).startsWith('..'); + }); + return !isParentOfKeptFile; } - }); - - return packer; + // Otherwise, ignore a file if we're not supposed to keep it. + return !keepFiles.has(relative); + }, { mapHeader }); }); return function packTarball(_x) { @@ -41323,20 +41324,20 @@ var packTarball = exports.packTarball = function () { }(); var pack = exports.pack = function () { - var _ref4 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, dir) { + var _ref5 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config) { var packer = yield packTarball(config); var compressor = packer.pipe(new zlib.Gzip()); return compressor; }); - return function pack(_x3, _x4) { - return _ref4.apply(this, arguments); + return function pack(_x4) { + return _ref5.apply(this, arguments); }; }(); var run = exports.run = function () { - var _ref5 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) { + var _ref6 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) { var pkg = yield config.readRootManifest(); if (!pkg.name) { throw new (_errors || _load_errors()).MessageError(reporter.lang('noName')); @@ -41352,7 +41353,7 @@ var run = exports.run = function () { yield config.executeLifecycleScript('prepack'); - var stream = yield pack(config, config.cwd); + var stream = yield pack(config); yield new (_promise || _load_promise()).default(function (resolve, reject) { stream.pipe(fs2.createWriteStream(filename)); @@ -41366,10 +41367,11 @@ var run = exports.run = function () { }); return function run(_x5, _x6, _x7, _x8) { - return _ref5.apply(this, arguments); + return _ref6.apply(this, arguments); }; }(); +exports.packWithIgnoreAndHeaders = packWithIgnoreAndHeaders; exports.setFlags = setFlags; exports.hasWrapper = hasWrapper; @@ -41382,20 +41384,20 @@ function _load_fs() { var _filter; function _load_filter() { - return _filter = __webpack_require__(248); + return _filter = __webpack_require__(249); } var _errors; function _load_errors() { - return _errors = __webpack_require__(5); + return _errors = __webpack_require__(6); } function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } } function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } -var zlib = __webpack_require__(204); +var zlib = __webpack_require__(206); var path = __webpack_require__(0); var tar = __webpack_require__(140); var fs2 = __webpack_require__(10); @@ -41413,6 +41415,22 @@ var NEVER_IGNORE = (0, (_filter || _load_filter()).ignoreLinesToRegex)([ // never ignore these files '!/package.json', '!/readme*', '!/+(license|licence)*', '!/+(changes|changelog|history)*']); +function packWithIgnoreAndHeaders(cwd, ignoreFunction) { + var _ref4 = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {}, + mapHeader = _ref4.mapHeader; + + return tar.pack(cwd, { + ignore: ignoreFunction, + map: function map(header) { + var suffix = header.name === '.' ? '' : `/${header.name}`; + header.name = `package${suffix}`; + delete header.uid; + delete header.gid; + return mapHeader ? mapHeader(header) : header; + } + }); +} + function setFlags(commander) { commander.description('Creates a compressed gzip archive of package dependencies.'); commander.option('-f, --filename ', 'filename'); @@ -41448,7 +41466,7 @@ function _load_asyncToGenerator() { var _promise; function _load_promise() { - return _promise = _interopRequireDefault(__webpack_require__(6)); + return _promise = _interopRequireDefault(__webpack_require__(5)); } var _classCallCheck2; @@ -41460,7 +41478,7 @@ function _load_classCallCheck() { var _index; function _load_index() { - return _index = _interopRequireDefault(__webpack_require__(158)); + return _index = _interopRequireDefault(__webpack_require__(160)); } var _constants; @@ -41566,13 +41584,13 @@ Object.defineProperty(exports, "__esModule", { var _promise; function _load_promise() { - return _promise = _interopRequireDefault(__webpack_require__(6)); + return _promise = _interopRequireDefault(__webpack_require__(5)); } var _keys; function _load_keys() { - return _keys = _interopRequireDefault(__webpack_require__(14)); + return _keys = _interopRequireDefault(__webpack_require__(11)); } var _stringify; @@ -41595,7 +41613,7 @@ function _load_map() { function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } -var debug = __webpack_require__(526)('yarn'); +var debug = __webpack_require__(533)('yarn'); var BlockingQueue = function () { function BlockingQueue(alias) { @@ -41826,7 +41844,7 @@ function guessName(source) { // Load modules var Http = __webpack_require__(52); -var Hoek = __webpack_require__(459); +var Hoek = __webpack_require__(464); // Declare internals @@ -42149,11 +42167,11 @@ exports.badImplementation = function (message, data) { "use strict"; -const escapeStringRegexp = __webpack_require__(182); -const ansiStyles = __webpack_require__(372); -const supportsColor = __webpack_require__(464); +const escapeStringRegexp = __webpack_require__(184); +const ansiStyles = __webpack_require__(377); +const supportsColor = __webpack_require__(471); -const template = __webpack_require__(465); +const template = __webpack_require__(472); const isSimpleWindowsTerm = process.platform === 'win32' && !(process.env.TERM || '').toLowerCase().startsWith('xterm'); @@ -42384,12 +42402,12 @@ module.exports = function(it){ /* 117 */ /***/ (function(module, exports, __webpack_require__) { -var ctx = __webpack_require__(55) - , call = __webpack_require__(269) - , isArrayIter = __webpack_require__(267) +var ctx = __webpack_require__(56) + , call = __webpack_require__(271) + , isArrayIter = __webpack_require__(269) , anObject = __webpack_require__(43) , toLength = __webpack_require__(120) - , getIterFn = __webpack_require__(181) + , getIterFn = __webpack_require__(183) , BREAK = {} , RETURN = {}; var exports = module.exports = function(iterable, entries, fn, that, ITERATOR){ @@ -42427,7 +42445,7 @@ exports.f = {}.propertyIsEnumerable; /***/ (function(module, exports, __webpack_require__) { // 7.1.15 ToLength -var toInteger = __webpack_require__(177) +var toInteger = __webpack_require__(179) , min = Math.min; module.exports = function(it){ return it > 0 ? min(toInteger(it), 0x1fffffffffffff) : 0; // pow(2, 53) - 1 == 9007199254740991 @@ -42458,7 +42476,7 @@ module.exports = function(key){ // Only Fp curves implemented for now // Requires jsbn.js and jsbn2.js -var BigInteger = __webpack_require__(61).BigInteger +var BigInteger = __webpack_require__(62).BigInteger var Barrett = BigInteger.prototype.Barrett // ---------------- @@ -43022,7 +43040,7 @@ module.exports = exports // Load modules -var Sntp = __webpack_require__(317); +var Sntp = __webpack_require__(319); var Boom = __webpack_require__(114); @@ -43033,7 +43051,7 @@ var internals = {}; exports.version = function () { - return __webpack_require__(590).version; + return __webpack_require__(599).version; }; @@ -43213,7 +43231,7 @@ exports.unauthorized = function (message, attributes) { // Copyright 2012 Joyent, Inc. All rights reserved. var assert = __webpack_require__(126); -var sshpk = __webpack_require__(200); +var sshpk = __webpack_require__(202); var util = __webpack_require__(4); var HASH_ALGOS = { @@ -43543,7 +43561,7 @@ module.exports = _setExports(process.env.NODE_NDEBUG); "use strict"; var chalk = __webpack_require__(39); -var figures = __webpack_require__(184); +var figures = __webpack_require__(186); /** * Separator object @@ -43679,7 +43697,7 @@ module.exports = function isGlob(str) { * You should have received a copy of the license along with this program. */ -var crypto = __webpack_require__(13); +var crypto = __webpack_require__(14); /** * @exports jodid25519/core @@ -44355,7 +44373,7 @@ module.exports = ns; /* 133 */ /***/ (function(module, exports, __webpack_require__) { -var isBuffer = __webpack_require__(616); +var isBuffer = __webpack_require__(624); var toString = Object.prototype.toString; /** @@ -44486,7 +44504,7 @@ try { } catch (er) {} var GLOBSTAR = minimatch.GLOBSTAR = Minimatch.GLOBSTAR = {} -var expand = __webpack_require__(460) +var expand = __webpack_require__(465) var plTypes = { '!': { open: '(?:(?!(?:', close: '))[^/]*?)'}, @@ -45406,7 +45424,7 @@ function regExpEscape (s) { /* 135 */ /***/ (function(module, exports, __webpack_require__) { -var wrappy = __webpack_require__(201) +var wrappy = __webpack_require__(203) module.exports = wrappy(once) module.exports.strict = wrappy(onceStrict) @@ -45457,7 +45475,7 @@ function onceStrict (fn) { "use strict"; -var isPromise = __webpack_require__(627); +var isPromise = __webpack_require__(635); /** * Return a function that will run a function asynchronously or synchronously @@ -45523,17 +45541,17 @@ runAsync.cb = function (func, cb) { /***/ (function(module, exports, __webpack_require__) { var Rx = __webpack_require__(46); -__webpack_require__(702); -__webpack_require__(703); -__webpack_require__(704); -__webpack_require__(314); -__webpack_require__(705); -__webpack_require__(706); -__webpack_require__(707); -__webpack_require__(708); -__webpack_require__(315); -__webpack_require__(709); -__webpack_require__(710); +__webpack_require__(711); +__webpack_require__(712); +__webpack_require__(713); +__webpack_require__(316); +__webpack_require__(714); +__webpack_require__(715); +__webpack_require__(716); +__webpack_require__(717); +__webpack_require__(317); +__webpack_require__(718); +__webpack_require__(719); module.exports = Rx; @@ -45550,16 +45568,16 @@ module.exports = { write: write }; -var assert = __webpack_require__(16); +var assert = __webpack_require__(17); var asn1 = __webpack_require__(53); var algs = __webpack_require__(26); -var utils = __webpack_require__(24); -var crypto = __webpack_require__(13); +var utils = __webpack_require__(25); +var crypto = __webpack_require__(14); var Key = __webpack_require__(27); var PrivateKey = __webpack_require__(28); -var pem = __webpack_require__(62); -var rfc4253 = __webpack_require__(70); +var pem = __webpack_require__(63); +var rfc4253 = __webpack_require__(71); var SSHBuffer = __webpack_require__(139); var errors = __webpack_require__(50); @@ -45610,7 +45628,7 @@ function readSSHPrivate(type, buf, options) { var rounds = kdfOptsBuf.readInt(); var cinf = utils.opensshCipherInfo(cipher); if (bcrypt === undefined) { - bcrypt = __webpack_require__(255); + bcrypt = __webpack_require__(256); } if (typeof (options.passphrase) === 'string') { @@ -45731,7 +45749,7 @@ function write(key, options) { kdfopts = kdfssh.toBuffer(); if (bcrypt === undefined) { - bcrypt = __webpack_require__(255); + bcrypt = __webpack_require__(256); } var pass = new Uint8Array(passphrase); var salti = new Uint8Array(salt); @@ -45813,7 +45831,7 @@ function write(key, options) { module.exports = SSHBuffer; -var assert = __webpack_require__(16); +var assert = __webpack_require__(17); function SSHBuffer(opts) { assert.object(opts, 'options'); @@ -45963,13 +45981,13 @@ SSHBuffer.prototype.write = function (buf) { /* 140 */ /***/ (function(module, exports, __webpack_require__) { -var chownr = __webpack_require__(466) -var tar = __webpack_require__(325) -var pump = __webpack_require__(299) -var mkdirp = __webpack_require__(194) +var chownr = __webpack_require__(473) +var tar = __webpack_require__(329) +var pump = __webpack_require__(301) +var mkdirp = __webpack_require__(196) var fs = __webpack_require__(10) var path = __webpack_require__(0) -var os = __webpack_require__(72) +var os = __webpack_require__(73) var win32 = os.platform() === 'win32' @@ -45980,7 +45998,7 @@ var echo = function (name) { } var normalize = !win32 ? echo : function (name) { - return name.replace(/\\/g, '/').replace(/:/g, '_') + return name.replace(/\\/g, '/').replace(/[:?<>|]/g, '_') } var statAll = function (fs, stat, cwd, ignore, entries, sort) { @@ -46037,6 +46055,7 @@ exports.pack = function (cwd, opts) { var dmode = typeof opts.dmode === 'number' ? opts.dmode : 0 var fmode = typeof opts.fmode === 'number' ? opts.fmode : 0 var pack = opts.pack || tar.pack() + var finish = opts.finish || noop if (opts.strip) map = strip(map, opts.strip) @@ -46059,7 +46078,10 @@ exports.pack = function (cwd, opts) { var onstat = function (err, filename, stat) { if (err) return pack.destroy(err) - if (!filename) return pack.finalize() + if (!filename) { + if (opts.finalize !== false) pack.finalize() + return finish(pack) + } if (stat.isSocket()) return onnextentry() // tar does not support sockets... @@ -46274,6 +46296,8 @@ exports.extract = function (cwd, opts) { }) }) + if (opts.finish) extract.on('finish', opts.finish) + return extract } @@ -48668,7 +48692,7 @@ nacl.setPRNG = function(fn) { }); } else if (true) { // Node.js. - crypto = __webpack_require__(13); + crypto = __webpack_require__(14); if (crypto && crypto.randomBytes) { nacl.setPRNG(function(x, n) { var i, v = crypto.randomBytes(n); @@ -48720,7 +48744,7 @@ Object.defineProperty(exports, "__esModule", { var _consoleReporter; function _load_consoleReporter() { - return _consoleReporter = __webpack_require__(424); + return _consoleReporter = __webpack_require__(428); } Object.defineProperty(exports, 'ConsoleReporter', { @@ -48733,7 +48757,7 @@ Object.defineProperty(exports, 'ConsoleReporter', { var _bufferReporter; function _load_bufferReporter() { - return _bufferReporter = __webpack_require__(423); + return _bufferReporter = __webpack_require__(427); } Object.defineProperty(exports, 'BufferReporter', { @@ -48746,7 +48770,7 @@ Object.defineProperty(exports, 'BufferReporter', { var _eventReporter; function _load_eventReporter() { - return _eventReporter = __webpack_require__(428); + return _eventReporter = __webpack_require__(432); } Object.defineProperty(exports, 'EventReporter', { @@ -48759,7 +48783,7 @@ Object.defineProperty(exports, 'EventReporter', { var _jsonReporter; function _load_jsonReporter() { - return _jsonReporter = __webpack_require__(153); + return _jsonReporter = __webpack_require__(154); } Object.defineProperty(exports, 'JSONReporter', { @@ -48772,7 +48796,7 @@ Object.defineProperty(exports, 'JSONReporter', { var _noopReporter; function _load_noopReporter() { - return _noopReporter = __webpack_require__(430); + return _noopReporter = __webpack_require__(434); } Object.defineProperty(exports, 'NoopReporter', { @@ -48785,7 +48809,7 @@ Object.defineProperty(exports, 'NoopReporter', { var _baseReporter; function _load_baseReporter() { - return _baseReporter = __webpack_require__(73); + return _baseReporter = __webpack_require__(74); } Object.defineProperty(exports, 'Reporter', { @@ -48879,13 +48903,13 @@ function _load_asyncToGenerator() { var _keys; function _load_keys() { - return _keys = _interopRequireDefault(__webpack_require__(14)); + return _keys = _interopRequireDefault(__webpack_require__(11)); } var _assign; function _load_assign() { - return _assign = _interopRequireDefault(__webpack_require__(17)); + return _assign = _interopRequireDefault(__webpack_require__(16)); } var run = exports.run = function () { @@ -48983,7 +49007,7 @@ function _load_add() { var _lockfile; function _load_lockfile() { - return _lockfile = _interopRequireDefault(__webpack_require__(20)); + return _lockfile = _interopRequireDefault(__webpack_require__(21)); } var _packageRequest; @@ -49178,7 +49202,7 @@ function _load_stringify() { var _extends2; function _load_extends() { - return _extends2 = _interopRequireDefault(__webpack_require__(25)); + return _extends2 = _interopRequireDefault(__webpack_require__(23)); } var _getIterator2; @@ -49190,7 +49214,7 @@ function _load_getIterator() { var _keys; function _load_keys() { - return _keys = _interopRequireDefault(__webpack_require__(14)); + return _keys = _interopRequireDefault(__webpack_require__(11)); } var _asyncToGenerator2; @@ -49226,13 +49250,13 @@ function _load_misc() { var _packageNameUtils; function _load_packageNameUtils() { - return _packageNameUtils = __webpack_require__(160); + return _packageNameUtils = __webpack_require__(162); } var _workspaceLayout; function _load_workspaceLayout() { - return _workspaceLayout = _interopRequireDefault(__webpack_require__(76)); + return _workspaceLayout = _interopRequireDefault(__webpack_require__(67)); } function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } } @@ -49543,6 +49567,9 @@ var InstallationIntegrityChecker = function () { if (flags.ignoreScripts) { result.flags.push('ignoreScripts'); } + if (flags.focus) { + result.flags.push('focus: ' + path.basename(this.config.cwd)); + } if (this.config.production) { result.flags.push('production'); @@ -49858,6 +49885,229 @@ exports.default = InstallationIntegrityChecker; "use strict"; +Object.defineProperty(exports, "__esModule", { + value: true +}); +exports.fetchOneRemote = undefined; + +var _keys; + +function _load_keys() { + return _keys = _interopRequireDefault(__webpack_require__(11)); +} + +var _map; + +function _load_map() { + return _map = _interopRequireDefault(__webpack_require__(37)); +} + +var _promise; + +function _load_promise() { + return _promise = _interopRequireDefault(__webpack_require__(5)); +} + +var _asyncToGenerator2; + +function _load_asyncToGenerator() { + return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(1)); +} + +var fetchCache = function () { + var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (dest, fetcher, config) { + var _ref2 = yield config.readPackageMetadata(dest), + hash = _ref2.hash, + pkg = _ref2.package; + + yield fetcher.setupMirrorFromCache(); + return { + package: pkg, + hash, + dest, + cached: true + }; + }); + + return function fetchCache(_x, _x2, _x3) { + return _ref.apply(this, arguments); + }; +}(); + +var fetchOneRemote = exports.fetchOneRemote = function () { + var _ref3 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (remote, name, version, dest, config) { + // Mock metadata for symlinked dependencies + if (remote.type === 'link') { + var mockPkg = { _uid: '', name: '', version: '0.0.0' }; + return (_promise || _load_promise()).default.resolve({ resolved: null, hash: '', dest, package: mockPkg, cached: false }); + } + + var Fetcher = (_index || _load_index())[remote.type]; + if (!Fetcher) { + throw new (_errors || _load_errors()).MessageError(config.reporter.lang('unknownFetcherFor', remote.type)); + } + + var fetcher = new Fetcher(dest, remote, config); + if (yield config.isValidModuleDest(dest)) { + return fetchCache(dest, fetcher, config); + } + + // remove as the module may be invalid + yield (_fs || _load_fs()).unlink(dest); + + try { + return yield fetcher.fetch({ + name, + version + }); + } catch (err) { + try { + yield (_fs || _load_fs()).unlink(dest); + } catch (err2) { + // what do? + } + throw err; + } + }); + + return function fetchOneRemote(_x4, _x5, _x6, _x7, _x8) { + return _ref3.apply(this, arguments); + }; +}(); + +var maybeFetchOne = function () { + var _ref4 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (ref, config) { + try { + return yield fetchOne(ref, config); + } catch (err) { + if (ref.optional) { + config.reporter.error(err.message); + return null; + } else { + throw err; + } + } + }); + + return function maybeFetchOne(_x9, _x10) { + return _ref4.apply(this, arguments); + }; +}(); + +exports.fetch = fetch; + +var _errors; + +function _load_errors() { + return _errors = __webpack_require__(6); +} + +var _index; + +function _load_index() { + return _index = _interopRequireWildcard(__webpack_require__(419)); +} + +var _fs; + +function _load_fs() { + return _fs = _interopRequireWildcard(__webpack_require__(7)); +} + +var _promise2; + +function _load_promise2() { + return _promise2 = _interopRequireWildcard(__webpack_require__(66)); +} + +function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } } + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + +function fetchOne(ref, config) { + var dest = config.generateModuleCachePath(ref); + + return fetchOneRemote(ref.remote, ref.name, ref.version, dest, config); +} + +function fetch(pkgs, config) { + var pkgsPerDest = new (_map || _load_map()).default(); + pkgs = pkgs.filter(function (pkg) { + var ref = pkg._reference; + if (!ref) { + return false; + } + var dest = config.generateModuleCachePath(ref); + var otherPkg = pkgsPerDest.get(dest); + if (otherPkg) { + config.reporter.warn(config.reporter.lang('multiplePackagesCantUnpackInSameDestination', ref.patterns, dest, otherPkg.patterns)); + return false; + } + pkgsPerDest.set(dest, ref); + return true; + }); + var tick = config.reporter.progress(pkgs.length); + + return (_promise2 || _load_promise2()).queue(pkgs, function () { + var _ref5 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (pkg) { + var ref = pkg._reference; + if (!ref) { + return pkg; + } + + var res = yield maybeFetchOne(ref, config); + var newPkg = void 0; + + if (res) { + newPkg = res.package; + + // update with new remote + // but only if there was a hash previously as the tarball fetcher does not provide a hash. + if (ref.remote.hash) { + // if the checksum was updated, also update resolved and cache + if (ref.remote.hash !== res.hash && config.updateChecksums) { + var oldHash = ref.remote.hash; + if (ref.remote.resolved) { + ref.remote.resolved = ref.remote.resolved.replace(oldHash, res.hash); + } + ref.config.cache = (0, (_keys || _load_keys()).default)(ref.config.cache).reduce(function (cache, entry) { + var entryWithNewHash = entry.replace(oldHash, res.hash); + cache[entryWithNewHash] = ref.config.cache[entry]; + return cache; + }, {}); + } + ref.remote.hash = res.hash || ref.remote.hash; + } + } + + if (tick) { + tick(); + } + + if (newPkg) { + newPkg._reference = ref; + newPkg._remote = ref.remote; + newPkg.name = pkg.name; + newPkg.fresh = pkg.fresh; + return newPkg; + } + + return pkg; + }); + + return function (_x11) { + return _ref5.apply(this, arguments); + }; + }(), config.networkConcurrency); +} + +/***/ }), +/* 152 */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + Object.defineProperty(exports, "__esModule", { value: true }); @@ -49866,7 +50116,7 @@ exports.linkBin = undefined; var _from; function _load_from() { - return _from = _interopRequireDefault(__webpack_require__(66)); + return _from = _interopRequireDefault(__webpack_require__(55)); } var _set; @@ -49881,10 +50131,16 @@ function _load_map() { return _map = _interopRequireDefault(__webpack_require__(37)); } +var _promise; + +function _load_promise() { + return _promise = _interopRequireDefault(__webpack_require__(5)); +} + var _keys; function _load_keys() { - return _keys = _interopRequireDefault(__webpack_require__(14)); + return _keys = _interopRequireDefault(__webpack_require__(11)); } var _getIterator2; @@ -49929,7 +50185,7 @@ var linkBin = exports.linkBin = function () { var _packageHoister; function _load_packageHoister() { - return _packageHoister = _interopRequireDefault(__webpack_require__(418)); + return _packageHoister = _interopRequireDefault(__webpack_require__(423)); } var _constants; @@ -49938,10 +50194,10 @@ function _load_constants() { return _constants = _interopRequireWildcard(__webpack_require__(8)); } -var _promise; +var _promise2; -function _load_promise() { - return _promise = _interopRequireWildcard(__webpack_require__(65)); +function _load_promise2() { + return _promise2 = _interopRequireWildcard(__webpack_require__(66)); } var _misc; @@ -49959,19 +50215,19 @@ function _load_fs() { var _mutex; function _load_mutex() { - return _mutex = _interopRequireDefault(__webpack_require__(442)); + return _mutex = _interopRequireDefault(__webpack_require__(447)); } var _semver; function _load_semver() { - return _semver = __webpack_require__(161); + return _semver = __webpack_require__(163); } var _workspaceLayout; function _load_workspaceLayout() { - return _workspaceLayout = _interopRequireDefault(__webpack_require__(76)); + return _workspaceLayout = _interopRequireDefault(__webpack_require__(67)); } function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } } @@ -49980,7 +50236,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de var invariant = __webpack_require__(9); -var cmdShim = (_promise || _load_promise()).promisify(__webpack_require__(257)); +var cmdShim = (_promise2 || _load_promise2()).promisify(__webpack_require__(259)); var path = __webpack_require__(0); // Concurrency for creating bin links disabled because of the issue #1961 var linkBinConcurrency = 1; @@ -50049,6 +50305,8 @@ var PackageLinker = function () { PackageLinker.prototype.linkBinDependencies = function () { var _ref5 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (pkg, dir) { + var _this = this; + var deps = []; var ref = pkg._reference; @@ -50074,17 +50332,36 @@ var PackageLinker = function () { var _dep = this.resolver.getStrictResolvedPattern(pattern); if ( - // Missing location means not installed inside node_modules - _dep._reference && _dep._reference.location && _dep.bin && (0, (_keys || _load_keys()).default)(_dep.bin).length) { - deps.push({ - dep: _dep, - loc: this.config.generateHardModulePath(_dep._reference) - }); + // Missing locations means not installed inside node_modules + _dep._reference && _dep._reference.locations.length && _dep.bin && (0, (_keys || _load_keys()).default)(_dep.bin).length) { + var _loc2 = yield this.findNearestInstalledVersionOfPackage(_dep, dir); + deps.push({ dep: _dep, loc: _loc2 }); } } // link up the `bin` scripts in bundled dependencies if (pkg.bundleDependencies) { + var _loop = function* _loop(depName) { + var locs = ref.locations.map(function (loc) { + return path.join(loc, _this.config.getFolder(pkg), depName); + }); + try { + var _dep2 = yield _this.config.readManifest(locs[0], remote.registry); //all of them should be the same + + if (_dep2.bin && (0, (_keys || _load_keys()).default)(_dep2.bin).length) { + deps.push.apply(deps, locs.map(function (loc) { + return { dep: _dep2, loc }; + })); + } + } catch (ex) { + if (ex.code !== 'ENOENT') { + throw ex; + } + // intentionally ignoring ENOENT error. + // bundledDependency either does not exist or does not contain a package.json + } + }; + for (var _iterator3 = pkg.bundleDependencies, _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : (0, (_getIterator2 || _load_getIterator()).default)(_iterator3);;) { var _ref7; @@ -50098,21 +50375,7 @@ var PackageLinker = function () { } var depName = _ref7; - - var _loc = path.join(this.config.generateHardModulePath(ref), this.config.getFolder(pkg), depName); - try { - var _dep2 = yield this.config.readManifest(_loc, remote.registry); - - if (_dep2.bin && (0, (_keys || _load_keys()).default)(_dep2.bin).length) { - deps.push({ dep: _dep2, loc: _loc }); - } - } catch (ex) { - if (ex.code !== 'ENOENT') { - throw ex; - } - // intentionally ignoring ENOENT error. - // bundledDependency either does not exist or does not contain a package.json - } + yield* _loop(depName); } } @@ -50136,10 +50399,10 @@ var PackageLinker = function () { var _ref8 = _ref9; var _dep3 = _ref8.dep, - _loc2 = _ref8.loc; + _loc = _ref8.loc; - if (_dep3._reference && _dep3._reference.location) { - yield this.linkSelfDependencies(_dep3, _loc2, dir); + if (_dep3._reference && _dep3._reference.locations.length) { + yield this.linkSelfDependencies(_dep3, _loc, dir); } } }); @@ -50151,24 +50414,88 @@ var PackageLinker = function () { return linkBinDependencies; }(); - PackageLinker.prototype.getFlatHoistedTree = function getFlatHoistedTree(patterns) { - var _ref10 = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {}, - ignoreOptional = _ref10.ignoreOptional; + //find the installation location of ref that would be used in binLoc based on node module resolution - var hoister = new (_packageHoister || _load_packageHoister()).default(this.config, this.resolver, { ignoreOptional }); + + PackageLinker.prototype.findNearestInstalledVersionOfPackage = function () { + var _ref10 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (pkg, binLoc) { + var ref = pkg._reference; + invariant(ref, 'expected pkg reference for ' + pkg.name); + var moduleFolder = this.config.getFolder(pkg); + yield (_fs || _load_fs()).mkdirp(binLoc); + var realBinLoc = yield (_fs || _load_fs()).realpath(binLoc); + + var allLocations = [].concat(ref.locations); + var realLocations = yield (_promise || _load_promise()).default.all(ref.locations.map(function (loc) { + return (_fs || _load_fs()).realpath(loc); + })); + realLocations.forEach(function (loc) { + return allLocations.indexOf(loc) !== -1 || allLocations.push(loc); + }); + + var distancePairs = allLocations.map(function (loc) { + var distance = 0; + var curLoc = realBinLoc; + var notFound = false; + + while (path.join(curLoc, ref.name) !== loc && path.join(curLoc, moduleFolder, ref.name) !== loc) { + var next = path.dirname(curLoc); + if (curLoc === next) { + notFound = true; + break; + } + + distance++; + curLoc = next; + } + return notFound ? null : [loc, distance]; + }); + + //remove items where path was not found + var filteredDistancePairs = distancePairs.filter(function (d) { + return d; + }); + filteredDistancePairs; + + //get smallest distance from package location + var minItem = filteredDistancePairs.reduce(function (min, cur) { + return cur[1] < min[1] ? cur : min; + }); + + invariant(minItem[1] >= 0, 'could not find a target for bin dir of ' + minItem.toString()); + return minItem[0]; + }); + + function findNearestInstalledVersionOfPackage(_x9, _x10) { + return _ref10.apply(this, arguments); + } + + return findNearestInstalledVersionOfPackage; + }(); + + PackageLinker.prototype.getFlatHoistedTree = function getFlatHoistedTree(patterns, workspaceLayout) { + var _ref11 = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {}, + ignoreOptional = _ref11.ignoreOptional, + focus = _ref11.focus; + + var hoister = new (_packageHoister || _load_packageHoister()).default(this.config, this.resolver, { ignoreOptional, workspaceLayout }); hoister.seed(patterns); + if (focus) { + hoister.markShallowWorkspaceEntries(); + } return hoister.init(); }; PackageLinker.prototype.copyModules = function () { - var _ref11 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (patterns, workspaceLayout) { - var _this = this; + var _ref12 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (patterns, workspaceLayout) { + var _this2 = this; - var _ref12 = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {}, - linkDuplicates = _ref12.linkDuplicates, - ignoreOptional = _ref12.ignoreOptional; + var _ref13 = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {}, + linkDuplicates = _ref13.linkDuplicates, + ignoreOptional = _ref13.ignoreOptional, + focus = _ref13.focus; - var flatTree = this.getFlatHoistedTree(patterns, { ignoreOptional }); + var flatTree = this.getFlatHoistedTree(patterns, workspaceLayout, { ignoreOptional, focus }); // sorted tree makes file creation and copying not to interfere with each other flatTree = flatTree.sort(function (dep1, dep2) { return dep1[0].localeCompare(dep2[0]); @@ -50184,7 +50511,7 @@ var PackageLinker = function () { var copiedSrcs = new (_map || _load_map()).default(); var symlinkPaths = new (_map || _load_map()).default(); - var _loop = function* _loop(folder, pkg, _loc3) { + var _loop2 = function* _loop2(folder, pkg, isShallow, _loc3) { var remote = pkg._remote || { type: '' }; var ref = pkg._reference; var dest = folder; @@ -50197,7 +50524,7 @@ var PackageLinker = function () { // with a symlink source src = remote.reference; type = 'symlink'; - } else if (workspaceLayout && remote.type === 'workspace') { + } else if (workspaceLayout && remote.type === 'workspace' && !isShallow) { src = remote.reference; type = 'symlink'; if (dest.indexOf(workspaceLayout.virtualManifestName) !== -1) { @@ -50209,40 +50536,40 @@ var PackageLinker = function () { } else { // backwards compatibility: get build artifacts from metadata // does not apply to symlinked dependencies - var metadata = yield _this.config.readPackageMetadata(src); + var metadata = yield _this2.config.readPackageMetadata(src); for (var _iterator15 = metadata.artifacts, _isArray15 = Array.isArray(_iterator15), _i15 = 0, _iterator15 = _isArray15 ? _iterator15 : (0, (_getIterator2 || _load_getIterator()).default)(_iterator15);;) { - var _ref30; + var _ref31; if (_isArray15) { if (_i15 >= _iterator15.length) break; - _ref30 = _iterator15[_i15++]; + _ref31 = _iterator15[_i15++]; } else { _i15 = _iterator15.next(); if (_i15.done) break; - _ref30 = _i15.value; + _ref31 = _i15.value; } - var file = _ref30; + var file = _ref31; artifactFiles.push(path.join(dest, file)); } } for (var _iterator16 = symlinkPaths.entries(), _isArray16 = Array.isArray(_iterator16), _i16 = 0, _iterator16 = _isArray16 ? _iterator16 : (0, (_getIterator2 || _load_getIterator()).default)(_iterator16);;) { - var _ref32; + var _ref33; if (_isArray16) { if (_i16 >= _iterator16.length) break; - _ref32 = _iterator16[_i16++]; + _ref33 = _iterator16[_i16++]; } else { _i16 = _iterator16.next(); if (_i16.done) break; - _ref32 = _i16.value; + _ref33 = _i16.value; } - var _ref31 = _ref32; - var symlink = _ref31[0]; - var realpath = _ref31[1]; + var _ref32 = _ref33; + var symlink = _ref32[0]; + var realpath = _ref32[1]; if (dest.indexOf(symlink + path.sep) === 0) { // after hoisting we end up with this structure @@ -50253,23 +50580,23 @@ var PackageLinker = function () { } } - ref.setLocation(dest); + ref.addLocation(dest); - var integrityArtifacts = _this.artifacts[`${pkg.name}@${pkg.version}`]; + var integrityArtifacts = _this2.artifacts[`${pkg.name}@${pkg.version}`]; if (integrityArtifacts) { for (var _iterator17 = integrityArtifacts, _isArray17 = Array.isArray(_iterator17), _i17 = 0, _iterator17 = _isArray17 ? _iterator17 : (0, (_getIterator2 || _load_getIterator()).default)(_iterator17);;) { - var _ref33; + var _ref34; if (_isArray17) { if (_i17 >= _iterator17.length) break; - _ref33 = _iterator17[_i17++]; + _ref34 = _iterator17[_i17++]; } else { _i17 = _iterator17.next(); if (_i17.done) break; - _ref33 = _i17.value; + _ref34 = _i17.value; } - var _file = _ref33; + var _file = _ref34; artifactFiles.push(path.join(dest, _file)); } @@ -50305,46 +50632,47 @@ var PackageLinker = function () { }; for (var _iterator5 = flatTree, _isArray5 = Array.isArray(_iterator5), _i5 = 0, _iterator5 = _isArray5 ? _iterator5 : (0, (_getIterator2 || _load_getIterator()).default)(_iterator5);;) { - var _ref14; + var _ref15; if (_isArray5) { if (_i5 >= _iterator5.length) break; - _ref14 = _iterator5[_i5++]; + _ref15 = _iterator5[_i5++]; } else { _i5 = _iterator5.next(); if (_i5.done) break; - _ref14 = _i5.value; + _ref15 = _i5.value; } - var _ref13 = _ref14; - var folder = _ref13[0]; - var _ref13$ = _ref13[1]; - var pkg = _ref13$.pkg; - var _loc3 = _ref13$.loc; + var _ref14 = _ref15; + var folder = _ref14[0]; + var _ref14$ = _ref14[1]; + var pkg = _ref14$.pkg; + var _loc3 = _ref14$.loc; + var isShallow = _ref14$.isShallow; - var _ret = yield* _loop(folder, pkg, _loc3); + var _ret2 = yield* _loop2(folder, pkg, isShallow, _loc3); - if (_ret === 'continue') continue; + if (_ret2 === 'continue') continue; } var possibleExtraneous = new (_set || _load_set()).default(); var scopedPaths = new (_set || _load_set()).default(); var findExtraneousFiles = function () { - var _ref15 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (basePath) { - for (var _iterator6 = _this.config.registryFolders, _isArray6 = Array.isArray(_iterator6), _i6 = 0, _iterator6 = _isArray6 ? _iterator6 : (0, (_getIterator2 || _load_getIterator()).default)(_iterator6);;) { - var _ref16; + var _ref16 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (basePath) { + for (var _iterator6 = _this2.config.registryFolders, _isArray6 = Array.isArray(_iterator6), _i6 = 0, _iterator6 = _isArray6 ? _iterator6 : (0, (_getIterator2 || _load_getIterator()).default)(_iterator6);;) { + var _ref17; if (_isArray6) { if (_i6 >= _iterator6.length) break; - _ref16 = _iterator6[_i6++]; + _ref17 = _iterator6[_i6++]; } else { _i6 = _iterator6.next(); if (_i6.done) break; - _ref16 = _i6.value; + _ref17 = _i6.value; } - var folder = _ref16; + var folder = _ref17; var _loc4 = path.join(basePath, folder); @@ -50352,18 +50680,18 @@ var PackageLinker = function () { var files = yield (_fs || _load_fs()).readdir(_loc4); for (var _iterator7 = files, _isArray7 = Array.isArray(_iterator7), _i7 = 0, _iterator7 = _isArray7 ? _iterator7 : (0, (_getIterator2 || _load_getIterator()).default)(_iterator7);;) { - var _ref17; + var _ref18; if (_isArray7) { if (_i7 >= _iterator7.length) break; - _ref17 = _iterator7[_i7++]; + _ref18 = _iterator7[_i7++]; } else { _i7 = _iterator7.next(); if (_i7.done) break; - _ref17 = _i7.value; + _ref18 = _i7.value; } - var file = _ref17; + var file = _ref18; var filepath = path.join(_loc4, file); @@ -50372,18 +50700,18 @@ var PackageLinker = function () { scopedPaths.add(filepath); for (var _iterator8 = yield (_fs || _load_fs()).readdir(filepath), _isArray8 = Array.isArray(_iterator8), _i8 = 0, _iterator8 = _isArray8 ? _iterator8 : (0, (_getIterator2 || _load_getIterator()).default)(_iterator8);;) { - var _ref18; + var _ref19; if (_isArray8) { if (_i8 >= _iterator8.length) break; - _ref18 = _iterator8[_i8++]; + _ref19 = _iterator8[_i8++]; } else { _i8 = _iterator8.next(); if (_i8.done) break; - _ref18 = _i8.value; + _ref19 = _i8.value; } - var subfile = _ref18; + var subfile = _ref19; possibleExtraneous.add(path.join(filepath, subfile)); } @@ -50395,26 +50723,26 @@ var PackageLinker = function () { } }); - return function findExtraneousFiles(_x13) { - return _ref15.apply(this, arguments); + return function findExtraneousFiles(_x15) { + return _ref16.apply(this, arguments); }; }(); yield findExtraneousFiles(this.config.lockfileFolder); if (workspaceLayout) { for (var _iterator9 = (0, (_keys || _load_keys()).default)(workspaceLayout.workspaces), _isArray9 = Array.isArray(_iterator9), _i9 = 0, _iterator9 = _isArray9 ? _iterator9 : (0, (_getIterator2 || _load_getIterator()).default)(_iterator9);;) { - var _ref19; + var _ref20; if (_isArray9) { if (_i9 >= _iterator9.length) break; - _ref19 = _iterator9[_i9++]; + _ref20 = _iterator9[_i9++]; } else { _i9 = _iterator9.next(); if (_i9.done) break; - _ref19 = _i9.value; + _ref20 = _i9.value; } - var workspaceName = _ref19; + var workspaceName = _ref20; yield findExtraneousFiles(workspaceLayout.workspaces[workspaceName].loc); } @@ -50441,18 +50769,18 @@ var PackageLinker = function () { // TODO: Consolidate this logic with `this.config.linkedModules` logic for (var _iterator10 = linkedModules, _isArray10 = Array.isArray(_iterator10), _i10 = 0, _iterator10 = _isArray10 ? _iterator10 : (0, (_getIterator2 || _load_getIterator()).default)(_iterator10);;) { - var _ref20; + var _ref21; if (_isArray10) { if (_i10 >= _iterator10.length) break; - _ref20 = _iterator10[_i10++]; + _ref21 = _iterator10[_i10++]; } else { _i10 = _iterator10.next(); if (_i10.done) break; - _ref20 = _i10.value; + _ref21 = _i10.value; } - var entry = _ref20; + var entry = _ref21; var entryPath = path.join(this.config.linkFolder, entry); var stat = yield (_fs || _load_fs()).lstat(entryPath); @@ -50471,18 +50799,18 @@ var PackageLinker = function () { var scopeName = entry; for (var _iterator18 = yield (_fs || _load_fs()).readdir(entryPath), _isArray18 = Array.isArray(_iterator18), _i18 = 0, _iterator18 = _isArray18 ? _iterator18 : (0, (_getIterator2 || _load_getIterator()).default)(_iterator18);;) { - var _ref34; + var _ref35; if (_isArray18) { if (_i18 >= _iterator18.length) break; - _ref34 = _iterator18[_i18++]; + _ref35 = _iterator18[_i18++]; } else { _i18 = _iterator18.next(); if (_i18.done) break; - _ref34 = _i18.value; + _ref35 = _i18.value; } - var entry2 = _ref34; + var entry2 = _ref35; var entryPath2 = path.join(entryPath, entry2); var stat2 = yield (_fs || _load_fs()).lstat(entryPath2); @@ -50502,18 +50830,18 @@ var PackageLinker = function () { } for (var _iterator11 = possibleExtraneous, _isArray11 = Array.isArray(_iterator11), _i11 = 0, _iterator11 = _isArray11 ? _iterator11 : (0, (_getIterator2 || _load_getIterator()).default)(_iterator11);;) { - var _ref21; + var _ref22; if (_isArray11) { if (_i11 >= _iterator11.length) break; - _ref21 = _iterator11[_i11++]; + _ref22 = _iterator11[_i11++]; } else { _i11 = _iterator11.next(); if (_i11.done) break; - _ref21 = _i11.value; + _ref22 = _i11.value; } - var _loc5 = _ref21; + var _loc5 = _ref22; var packageName = path.basename(_loc5); var scopeName = path.basename(path.dirname(_loc5)); @@ -50537,7 +50865,7 @@ var PackageLinker = function () { ignoreBasenames: [(_constants || _load_constants()).METADATA_FILENAME, (_constants || _load_constants()).TARBALL_FILENAME], onStart: function onStart(num) { - tick = _this.reporter.progress(num); + tick = _this2.reporter.progress(num); }, onProgress(src) { @@ -50551,7 +50879,7 @@ var PackageLinker = function () { artifactFiles, onStart: function onStart(num) { - tick = _this.reporter.progress(num); + tick = _this2.reporter.progress(num); }, onProgress(src) { @@ -50563,18 +50891,18 @@ var PackageLinker = function () { // remove all extraneous files that weren't in the tree for (var _iterator12 = possibleExtraneous, _isArray12 = Array.isArray(_iterator12), _i12 = 0, _iterator12 = _isArray12 ? _iterator12 : (0, (_getIterator2 || _load_getIterator()).default)(_iterator12);;) { - var _ref22; + var _ref23; if (_isArray12) { if (_i12 >= _iterator12.length) break; - _ref22 = _iterator12[_i12++]; + _ref23 = _iterator12[_i12++]; } else { _i12 = _iterator12.next(); if (_i12.done) break; - _ref22 = _i12.value; + _ref23 = _i12.value; } - var _loc6 = _ref22; + var _loc6 = _ref23; this.reporter.verbose(this.reporter.lang('verboseFileRemoveExtraneous', _loc6)); yield (_fs || _load_fs()).unlink(_loc6); @@ -50582,18 +50910,18 @@ var PackageLinker = function () { // remove any empty scoped directories for (var _iterator13 = scopedPaths, _isArray13 = Array.isArray(_iterator13), _i13 = 0, _iterator13 = _isArray13 ? _iterator13 : (0, (_getIterator2 || _load_getIterator()).default)(_iterator13);;) { - var _ref23; + var _ref24; if (_isArray13) { if (_i13 >= _iterator13.length) break; - _ref23 = _iterator13[_i13++]; + _ref24 = _iterator13[_i13++]; } else { _i13 = _iterator13.next(); if (_i13.done) break; - _ref23 = _i13.value; + _ref24 = _i13.value; } - var scopedPath = _ref23; + var scopedPath = _ref24; var files = yield (_fs || _load_fs()).readdir(scopedPath); if (files.length === 0) { @@ -50602,76 +50930,76 @@ var PackageLinker = function () { } // create binary links - if (this.config.binLinks) { + if (this.config.getOption('bin-links') && this.config.binLinks !== false) { var topLevelDependencies = this.determineTopLevelBinLinkOrder(flatTree); var tickBin = this.reporter.progress(flatTree.length + topLevelDependencies.length); // create links in transient dependencies - yield (_promise || _load_promise()).queue(flatTree, function () { - var _ref24 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (_ref25) { - var dest = _ref25[0], - _ref25$ = _ref25[1], - pkg = _ref25$.pkg, - isNohoist = _ref25$.isNohoist, - parts = _ref25$.parts; + yield (_promise2 || _load_promise2()).queue(flatTree, function () { + var _ref25 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (_ref26) { + var dest = _ref26[0], + _ref26$ = _ref26[1], + pkg = _ref26$.pkg, + isNohoist = _ref26$.isNohoist, + parts = _ref26$.parts; - if (pkg._reference && pkg._reference.location) { - var binLoc = path.join(dest, _this.config.getFolder(pkg)); - yield _this.linkBinDependencies(pkg, binLoc); + if (pkg._reference && pkg._reference.locations.length) { + var binLoc = path.join(dest, _this2.config.getFolder(pkg)); + yield _this2.linkBinDependencies(pkg, binLoc); if (isNohoist) { // if nohoist, we need to override the binLink to point to the local destination - var parentBinLoc = _this.getParentBinLoc(parts, flatTree); - yield _this.linkSelfDependencies(pkg, dest, parentBinLoc, true); + var parentBinLoc = _this2.getParentBinLoc(parts, flatTree); + yield _this2.linkSelfDependencies(pkg, dest, parentBinLoc, true); } tickBin(); } }); - return function (_x14) { - return _ref24.apply(this, arguments); + return function (_x16) { + return _ref25.apply(this, arguments); }; }(), linkBinConcurrency); // create links at top level for all dependencies. - yield (_promise || _load_promise()).queue(topLevelDependencies, function () { - var _ref26 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (_ref27) { - var dest = _ref27[0], - pkg = _ref27[1].pkg; + yield (_promise2 || _load_promise2()).queue(topLevelDependencies, function () { + var _ref27 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (_ref28) { + var dest = _ref28[0], + pkg = _ref28[1].pkg; - if (pkg._reference && pkg._reference.location && pkg.bin && (0, (_keys || _load_keys()).default)(pkg.bin).length) { - var binLoc = path.join(_this.config.lockfileFolder, _this.config.getFolder(pkg)); - yield _this.linkSelfDependencies(pkg, dest, binLoc); + if (pkg._reference && pkg._reference.locations.length && pkg.bin && (0, (_keys || _load_keys()).default)(pkg.bin).length) { + var binLoc = path.join(_this2.config.lockfileFolder, _this2.config.getFolder(pkg)); + yield _this2.linkSelfDependencies(pkg, dest, binLoc); tickBin(); } }); - return function (_x15) { - return _ref26.apply(this, arguments); + return function (_x17) { + return _ref27.apply(this, arguments); }; }(), linkBinConcurrency); } for (var _iterator14 = flatTree, _isArray14 = Array.isArray(_iterator14), _i14 = 0, _iterator14 = _isArray14 ? _iterator14 : (0, (_getIterator2 || _load_getIterator()).default)(_iterator14);;) { - var _ref29; + var _ref30; if (_isArray14) { if (_i14 >= _iterator14.length) break; - _ref29 = _iterator14[_i14++]; + _ref30 = _iterator14[_i14++]; } else { _i14 = _iterator14.next(); if (_i14.done) break; - _ref29 = _i14.value; + _ref30 = _i14.value; } - var _ref28 = _ref29; - var pkg = _ref28[1].pkg; + var _ref29 = _ref30; + var pkg = _ref29[1].pkg; yield this._warnForMissingBundledDependencies(pkg); } }); - function copyModules(_x10, _x11) { - return _ref11.apply(this, arguments); + function copyModules(_x12, _x13) { + return _ref12.apply(this, arguments); } return copyModules; @@ -50680,20 +51008,20 @@ var PackageLinker = function () { PackageLinker.prototype._buildTreeHash = function _buildTreeHash(flatTree) { var hash = new (_map || _load_map()).default(); for (var _iterator19 = flatTree, _isArray19 = Array.isArray(_iterator19), _i19 = 0, _iterator19 = _isArray19 ? _iterator19 : (0, (_getIterator2 || _load_getIterator()).default)(_iterator19);;) { - var _ref36; + var _ref37; if (_isArray19) { if (_i19 >= _iterator19.length) break; - _ref36 = _iterator19[_i19++]; + _ref37 = _iterator19[_i19++]; } else { _i19 = _iterator19.next(); if (_i19.done) break; - _ref36 = _i19.value; + _ref37 = _i19.value; } - var _ref35 = _ref36; - var _dest = _ref35[0]; - var hoistManifest = _ref35[1]; + var _ref36 = _ref37; + var _dest = _ref36[0]; + var hoistManifest = _ref36[1]; var key = hoistManifest.parts.join('#'); hash.set(key, [_dest, hoistManifest]); @@ -50720,28 +51048,29 @@ var PackageLinker = function () { PackageLinker.prototype.determineTopLevelBinLinkOrder = function determineTopLevelBinLinkOrder(flatTree) { var linksToCreate = new (_map || _load_map()).default(); for (var _iterator20 = flatTree, _isArray20 = Array.isArray(_iterator20), _i20 = 0, _iterator20 = _isArray20 ? _iterator20 : (0, (_getIterator2 || _load_getIterator()).default)(_iterator20);;) { - var _ref38; + var _ref39; if (_isArray20) { if (_i20 >= _iterator20.length) break; - _ref38 = _iterator20[_i20++]; + _ref39 = _iterator20[_i20++]; } else { _i20 = _iterator20.next(); if (_i20.done) break; - _ref38 = _i20.value; + _ref39 = _i20.value; } - var _ref37 = _ref38; - var _dest2 = _ref37[0]; - var hoistManifest = _ref37[1]; + var _ref38 = _ref39; + var _dest2 = _ref38[0]; + var hoistManifest = _ref38[1]; var pkg = hoistManifest.pkg, isDirectRequire = hoistManifest.isDirectRequire, - isNohoist = hoistManifest.isNohoist; + isNohoist = hoistManifest.isNohoist, + isShallow = hoistManifest.isShallow; var name = pkg.name; - // a nohoist package should not be linked at topLevel bin + // nohoist and shallow packages should not be linked at topLevel bin - if (!isNohoist && (isDirectRequire || this.topLevelBinLinking && !linksToCreate.has(name))) { + if (!isNohoist && !isShallow && (isDirectRequire || this.topLevelBinLinking && !linksToCreate.has(name))) { linksToCreate.set(name, [_dest2, hoistManifest]); } } @@ -50754,18 +51083,18 @@ var PackageLinker = function () { var transientBins = []; var topLevelBins = []; for (var _iterator21 = (0, (_from || _load_from()).default)(linksToCreate.values()), _isArray21 = Array.isArray(_iterator21), _i21 = 0, _iterator21 = _isArray21 ? _iterator21 : (0, (_getIterator2 || _load_getIterator()).default)(_iterator21);;) { - var _ref39; + var _ref40; if (_isArray21) { if (_i21 >= _iterator21.length) break; - _ref39 = _iterator21[_i21++]; + _ref40 = _iterator21[_i21++]; } else { _i21 = _iterator21.next(); if (_i21.done) break; - _ref39 = _i21.value; + _ref40 = _i21.value; } - var linkToCreate = _ref39; + var linkToCreate = _ref40; if (linkToCreate[1].isDirectRequire) { topLevelBins.push(linkToCreate); @@ -50777,9 +51106,9 @@ var PackageLinker = function () { }; PackageLinker.prototype.resolvePeerModules = function resolvePeerModules() { - var _this2 = this; + var _this3 = this; - var _loop2 = function _loop2(pkg) { + var _loop3 = function _loop3(pkg) { var peerDeps = pkg.peerDependencies; if (!peerDeps) { return 'continue'; @@ -50796,18 +51125,18 @@ var PackageLinker = function () { var getLevelDistance = function getLevelDistance(pkgRef) { var minDistance = Infinity; for (var _iterator23 = pkgRef.requests, _isArray23 = Array.isArray(_iterator23), _i23 = 0, _iterator23 = _isArray23 ? _iterator23 : (0, (_getIterator2 || _load_getIterator()).default)(_iterator23);;) { - var _ref41; + var _ref42; if (_isArray23) { if (_i23 >= _iterator23.length) break; - _ref41 = _iterator23[_i23++]; + _ref42 = _iterator23[_i23++]; } else { _i23 = _iterator23.next(); if (_i23.done) break; - _ref41 = _i23.value; + _ref42 = _i23.value; } - var req = _ref41; + var req = _ref42; var distance = refTree.length - req.parentNames.length; @@ -50823,24 +51152,24 @@ var PackageLinker = function () { for (var peerDepName in peerDeps) { var range = peerDeps[peerDepName]; - var peerPkgs = _this2.resolver.getAllInfoForPackageName(peerDepName); + var peerPkgs = _this3.resolver.getAllInfoForPackageName(peerDepName); var peerError = 'unmetPeer'; var resolvedLevelDistance = Infinity; var resolvedPeerPkg = void 0; for (var _iterator24 = peerPkgs, _isArray24 = Array.isArray(_iterator24), _i24 = 0, _iterator24 = _isArray24 ? _iterator24 : (0, (_getIterator2 || _load_getIterator()).default)(_iterator24);;) { - var _ref42; + var _ref43; if (_isArray24) { if (_i24 >= _iterator24.length) break; - _ref42 = _iterator24[_i24++]; + _ref43 = _iterator24[_i24++]; } else { _i24 = _iterator24.next(); if (_i24.done) break; - _ref42 = _i24.value; + _ref43 = _i24.value; } - var peerPkg = _ref42; + var peerPkg = _ref43; var peerPkgRef = peerPkg._reference; if (!(peerPkgRef && peerPkgRef.patterns)) { @@ -50848,7 +51177,7 @@ var PackageLinker = function () { } var levelDistance = getLevelDistance(peerPkgRef); if (isFinite(levelDistance) && levelDistance < resolvedLevelDistance) { - if (_this2._satisfiesPeerDependency(range, peerPkgRef.version)) { + if (_this3._satisfiesPeerDependency(range, peerPkgRef.version)) { resolvedLevelDistance = levelDistance; resolvedPeerPkg = peerPkgRef; } else { @@ -50859,30 +51188,30 @@ var PackageLinker = function () { if (resolvedPeerPkg) { ref.addDependencies(resolvedPeerPkg.patterns); - _this2.reporter.verbose(_this2.reporter.lang('selectedPeer', `${pkg.name}@${pkg.version}`, `${peerDepName}@${resolvedPeerPkg.version}`, resolvedPeerPkg.level)); + _this3.reporter.verbose(_this3.reporter.lang('selectedPeer', `${pkg.name}@${pkg.version}`, `${peerDepName}@${resolvedPeerPkg.version}`, resolvedPeerPkg.level)); } else { - _this2.reporter.warn(_this2.reporter.lang(peerError, `${refTree.join(' > ')} > ${pkg.name}@${pkg.version}`, `${peerDepName}@${range}`)); + _this3.reporter.warn(_this3.reporter.lang(peerError, `${refTree.join(' > ')} > ${pkg.name}@${pkg.version}`, `${peerDepName}@${range}`)); } } }; for (var _iterator22 = this.resolver.getManifests(), _isArray22 = Array.isArray(_iterator22), _i22 = 0, _iterator22 = _isArray22 ? _iterator22 : (0, (_getIterator2 || _load_getIterator()).default)(_iterator22);;) { - var _ref40; + var _ref41; if (_isArray22) { if (_i22 >= _iterator22.length) break; - _ref40 = _iterator22[_i22++]; + _ref41 = _iterator22[_i22++]; } else { _i22 = _iterator22.next(); if (_i22.done) break; - _ref40 = _i22.value; + _ref41 = _i22.value; } - var pkg = _ref40; + var pkg = _ref41; - var _ret2 = _loop2(pkg); + var _ret3 = _loop3(pkg); - if (_ret2 === 'continue') continue; + if (_ret3 === 'continue') continue; } }; @@ -50891,52 +51220,67 @@ var PackageLinker = function () { }; PackageLinker.prototype._warnForMissingBundledDependencies = function () { - var _ref43 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (pkg) { + var _ref44 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (pkg) { + var _this4 = this; + var ref = pkg._reference; + invariant(ref, 'missing package ref ' + pkg.name); if (pkg.bundleDependencies) { + var _loop4 = function* _loop4(depName) { + var locs = ref.locations.map(function (loc) { + return path.join(loc, _this4.config.getFolder(pkg), depName); + }); + var locsExist = yield (_promise || _load_promise()).default.all(locs.map(function (loc) { + return (_fs || _load_fs()).exists(loc); + })); + if (locsExist.some(function (e) { + return !e; + })) { + //if any of the locs do not exist + var pkgHuman = `${pkg.name}@${pkg.version}`; + _this4.reporter.warn(_this4.reporter.lang('missingBundledDependency', pkgHuman, depName)); + } + }; + for (var _iterator25 = pkg.bundleDependencies, _isArray25 = Array.isArray(_iterator25), _i25 = 0, _iterator25 = _isArray25 ? _iterator25 : (0, (_getIterator2 || _load_getIterator()).default)(_iterator25);;) { - var _ref44; + var _ref45; if (_isArray25) { if (_i25 >= _iterator25.length) break; - _ref44 = _iterator25[_i25++]; + _ref45 = _iterator25[_i25++]; } else { _i25 = _iterator25.next(); if (_i25.done) break; - _ref44 = _i25.value; + _ref45 = _i25.value; } - var depName = _ref44; - - var _loc7 = path.join(this.config.generateHardModulePath(ref), this.config.getFolder(pkg), depName); - if (!(yield (_fs || _load_fs()).exists(_loc7))) { - var pkgHuman = `${pkg.name}@${pkg.version}`; - this.reporter.warn(this.reporter.lang('missingBundledDependency', pkgHuman, depName)); - } + var depName = _ref45; + yield* _loop4(depName); } } }); - function _warnForMissingBundledDependencies(_x16) { - return _ref43.apply(this, arguments); + function _warnForMissingBundledDependencies(_x18) { + return _ref44.apply(this, arguments); } return _warnForMissingBundledDependencies; }(); PackageLinker.prototype.init = function () { - var _ref45 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (patterns, workspaceLayout) { - var _ref46 = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {}, - linkDuplicates = _ref46.linkDuplicates, - ignoreOptional = _ref46.ignoreOptional; + var _ref46 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (patterns, workspaceLayout) { + var _ref47 = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {}, + linkDuplicates = _ref47.linkDuplicates, + ignoreOptional = _ref47.ignoreOptional, + focus = _ref47.focus; this.resolvePeerModules(); - yield this.copyModules(patterns, workspaceLayout, { linkDuplicates, ignoreOptional }); + yield this.copyModules(patterns, workspaceLayout, { linkDuplicates, ignoreOptional, focus }); }); - function init(_x17, _x18) { - return _ref45.apply(this, arguments); + function init(_x19, _x20) { + return _ref46.apply(this, arguments); } return init; @@ -50948,7 +51292,7 @@ var PackageLinker = function () { exports.default = PackageLinker; /***/ }), -/* 152 */ +/* 153 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -51037,7 +51381,7 @@ function clearNthLine(stdout, n) { } /***/ }), -/* 153 */ +/* 154 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -51050,7 +51394,7 @@ Object.defineProperty(exports, "__esModule", { var _extends2; function _load_extends() { - return _extends2 = _interopRequireDefault(__webpack_require__(25)); + return _extends2 = _interopRequireDefault(__webpack_require__(23)); } var _stringify; @@ -51068,19 +51412,19 @@ function _load_classCallCheck() { var _possibleConstructorReturn2; function _load_possibleConstructorReturn() { - return _possibleConstructorReturn2 = _interopRequireDefault(__webpack_require__(12)); + return _possibleConstructorReturn2 = _interopRequireDefault(__webpack_require__(13)); } var _inherits2; function _load_inherits() { - return _inherits2 = _interopRequireDefault(__webpack_require__(11)); + return _inherits2 = _interopRequireDefault(__webpack_require__(12)); } var _baseReporter; function _load_baseReporter() { - return _baseReporter = _interopRequireDefault(__webpack_require__(73)); + return _baseReporter = _interopRequireDefault(__webpack_require__(74)); } function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -51262,7 +51606,173 @@ var JSONReporter = function (_BaseReporter) { exports.default = JSONReporter; /***/ }), -/* 154 */ +/* 155 */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +Object.defineProperty(exports, "__esModule", { + value: true +}); +exports.shouldUpdateLockfile = undefined; + +var _set; + +function _load_set() { + return _set = _interopRequireDefault(__webpack_require__(15)); +} + +var _classCallCheck2; + +function _load_classCallCheck() { + return _classCallCheck2 = _interopRequireDefault(__webpack_require__(2)); +} + +var _semver; + +function _load_semver() { + return _semver = _interopRequireDefault(__webpack_require__(20)); +} + +var _minimatch; + +function _load_minimatch() { + return _minimatch = _interopRequireDefault(__webpack_require__(134)); +} + +var _map; + +function _load_map() { + return _map = _interopRequireDefault(__webpack_require__(35)); +} + +var _normalizePattern2; + +function _load_normalizePattern() { + return _normalizePattern2 = __webpack_require__(42); +} + +var _parsePackagePath; + +function _load_parsePackagePath() { + return _parsePackagePath = _interopRequireDefault(__webpack_require__(251)); +} + +var _parsePackagePath2; + +function _load_parsePackagePath2() { + return _parsePackagePath2 = __webpack_require__(251); +} + +var _resolvers; + +function _load_resolvers() { + return _resolvers = __webpack_require__(41); +} + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + +var DIRECTORY_SEPARATOR = '/'; +var GLOBAL_NESTED_DEP_PATTERN = '**/'; + +var ResolutionMap = function () { + function ResolutionMap(config) { + (0, (_classCallCheck2 || _load_classCallCheck()).default)(this, ResolutionMap); + + this.resolutionsByPackage = (0, (_map || _load_map()).default)(); + this.config = config; + this.reporter = config.reporter; + this.delayQueue = new (_set || _load_set()).default(); + } + + ResolutionMap.prototype.init = function init() { + var resolutions = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {}; + + for (var _globPattern in resolutions) { + var info = this.parsePatternInfo(_globPattern, resolutions[_globPattern]); + + if (info) { + var resolution = this.resolutionsByPackage[info.name] || []; + this.resolutionsByPackage[info.name] = [].concat(resolution, [info]); + } + } + }; + + ResolutionMap.prototype.addToDelayQueue = function addToDelayQueue(req) { + this.delayQueue.add(req); + }; + + ResolutionMap.prototype.parsePatternInfo = function parsePatternInfo(globPattern, range) { + if (!(0, (_parsePackagePath2 || _load_parsePackagePath2()).isValidPackagePath)(globPattern)) { + this.reporter.warn(this.reporter.lang('invalidResolutionName', globPattern)); + return null; + } + + var directories = (0, (_parsePackagePath || _load_parsePackagePath()).default)(globPattern); + var name = directories.pop(); + + if (!(_semver || _load_semver()).default.validRange(range) && !(0, (_resolvers || _load_resolvers()).getExoticResolver)(range)) { + this.reporter.warn(this.reporter.lang('invalidResolutionVersion', range)); + return null; + } + + // For legacy support of resolutions, replace `name` with `**/name` + if (name === globPattern) { + globPattern = `${GLOBAL_NESTED_DEP_PATTERN}${name}`; + } + + return { + name, + range, + globPattern, + pattern: `${name}@${range}` + }; + }; + + ResolutionMap.prototype.find = function find(reqPattern, parentNames) { + var _normalizePattern = (0, (_normalizePattern2 || _load_normalizePattern()).normalizePattern)(reqPattern), + name = _normalizePattern.name, + reqRange = _normalizePattern.range; + + var resolutions = this.resolutionsByPackage[name]; + + if (!resolutions) { + return ''; + } + + var modulePath = [].concat(parentNames, [name]).join(DIRECTORY_SEPARATOR); + + var _ref = resolutions.find(function (_ref2) { + var globPattern = _ref2.globPattern; + return (0, (_minimatch || _load_minimatch()).default)(modulePath, globPattern); + }) || {}, + pattern = _ref.pattern, + range = _ref.range; + + if (pattern) { + if ((_semver || _load_semver()).default.validRange(reqRange) && (_semver || _load_semver()).default.valid(range) && !(_semver || _load_semver()).default.satisfies(range, reqRange)) { + this.reporter.warn(this.reporter.lang('incompatibleResolutionVersion', pattern, reqPattern)); + } + } + + return pattern; + }; + + return ResolutionMap; +}(); + +exports.default = ResolutionMap; +var shouldUpdateLockfile = exports.shouldUpdateLockfile = function shouldUpdateLockfile(lockfileEntry, resolutionEntry) { + if (!lockfileEntry || !resolutionEntry) { + return false; + } + + return lockfileEntry.resolved !== resolutionEntry.remote.resolved; +}; + +/***/ }), +/* 156 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -51288,13 +51798,13 @@ function _load_classCallCheck() { var _possibleConstructorReturn2; function _load_possibleConstructorReturn() { - return _possibleConstructorReturn2 = _interopRequireDefault(__webpack_require__(12)); + return _possibleConstructorReturn2 = _interopRequireDefault(__webpack_require__(13)); } var _inherits2; function _load_inherits() { - return _inherits2 = _interopRequireDefault(__webpack_require__(11)); + return _inherits2 = _interopRequireDefault(__webpack_require__(12)); } var _path; @@ -51318,13 +51828,13 @@ function _load_uuid() { var _errors; function _load_errors() { - return _errors = __webpack_require__(5); + return _errors = __webpack_require__(6); } var _exoticResolver; function _load_exoticResolver() { - return _exoticResolver = _interopRequireDefault(__webpack_require__(64)); + return _exoticResolver = _interopRequireDefault(__webpack_require__(65)); } var _misc; @@ -51433,7 +51943,7 @@ FileResolver.prefixMatcher = /^\.{1,2}\//; exports.default = FileResolver; /***/ }), -/* 155 */ +/* 157 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -51452,13 +51962,13 @@ function _load_classCallCheck() { var _possibleConstructorReturn2; function _load_possibleConstructorReturn() { - return _possibleConstructorReturn2 = _interopRequireDefault(__webpack_require__(12)); + return _possibleConstructorReturn2 = _interopRequireDefault(__webpack_require__(13)); } var _inherits2; function _load_inherits() { - return _inherits2 = _interopRequireDefault(__webpack_require__(11)); + return _inherits2 = _interopRequireDefault(__webpack_require__(12)); } exports.explodeGistFragment = explodeGistFragment; @@ -51466,7 +51976,7 @@ exports.explodeGistFragment = explodeGistFragment; var _errors; function _load_errors() { - return _errors = __webpack_require__(5); + return _errors = __webpack_require__(6); } var _gitResolver; @@ -51478,7 +51988,7 @@ function _load_gitResolver() { var _exoticResolver; function _load_exoticResolver() { - return _exoticResolver = _interopRequireDefault(__webpack_require__(64)); + return _exoticResolver = _interopRequireDefault(__webpack_require__(65)); } var _misc; @@ -51534,7 +52044,7 @@ GistResolver.protocol = 'gist'; exports.default = GistResolver; /***/ }), -/* 156 */ +/* 158 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -51547,7 +52057,7 @@ Object.defineProperty(exports, "__esModule", { var _assign; function _load_assign() { - return _assign = _interopRequireDefault(__webpack_require__(17)); + return _assign = _interopRequireDefault(__webpack_require__(16)); } var _getIterator2; @@ -51559,7 +52069,7 @@ function _load_getIterator() { var _keys; function _load_keys() { - return _keys = _interopRequireDefault(__webpack_require__(14)); + return _keys = _interopRequireDefault(__webpack_require__(11)); } var _asyncToGenerator2; @@ -51577,25 +52087,25 @@ function _load_classCallCheck() { var _possibleConstructorReturn2; function _load_possibleConstructorReturn() { - return _possibleConstructorReturn2 = _interopRequireDefault(__webpack_require__(12)); + return _possibleConstructorReturn2 = _interopRequireDefault(__webpack_require__(13)); } var _inherits2; function _load_inherits() { - return _inherits2 = _interopRequireDefault(__webpack_require__(11)); + return _inherits2 = _interopRequireDefault(__webpack_require__(12)); } var _errors; function _load_errors() { - return _errors = __webpack_require__(5); + return _errors = __webpack_require__(6); } var _registryResolver; function _load_registryResolver() { - return _registryResolver = _interopRequireDefault(__webpack_require__(436)); + return _registryResolver = _interopRequireDefault(__webpack_require__(440)); } var _npmRegistry; @@ -51631,18 +52141,18 @@ function _load_constants() { var _packageNameUtils; function _load_packageNameUtils() { - return _packageNameUtils = __webpack_require__(160); + return _packageNameUtils = __webpack_require__(162); } function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } } function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } -var inquirer = __webpack_require__(187); +var inquirer = __webpack_require__(189); var tty = __webpack_require__(106); var invariant = __webpack_require__(9); var path = __webpack_require__(0); -var semver = __webpack_require__(22); +var semver = __webpack_require__(20); var NPM_REGISTRY = /http[s]:\/\/registry.npmjs.org/g; var NPM_REGISTRY_ID = 'npm'; @@ -51913,7 +52423,7 @@ NpmResolver.registry = NPM_REGISTRY_ID; exports.default = NpmResolver; /***/ }), -/* 157 */ +/* 159 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -51926,7 +52436,7 @@ Object.defineProperty(exports, "__esModule", { var _from; function _load_from() { - return _from = _interopRequireDefault(__webpack_require__(66)); + return _from = _interopRequireDefault(__webpack_require__(55)); } var _asyncToGenerator2; @@ -51944,7 +52454,7 @@ function _load_classCallCheck() { var _extends2; function _load_extends() { - return _extends2 = _interopRequireDefault(__webpack_require__(25)); + return _extends2 = _interopRequireDefault(__webpack_require__(23)); } var _invariant; @@ -51956,7 +52466,7 @@ function _load_invariant() { var _string_decoder; function _load_string_decoder() { - return _string_decoder = __webpack_require__(203); + return _string_decoder = __webpack_require__(205); } var _tarFs; @@ -51968,7 +52478,7 @@ function _load_tarFs() { var _tarStream; function _load_tarStream() { - return _tarStream = _interopRequireDefault(__webpack_require__(325)); + return _tarStream = _interopRequireDefault(__webpack_require__(329)); } var _url; @@ -51986,19 +52496,19 @@ function _load_fs() { var _errors; function _load_errors() { - return _errors = __webpack_require__(5); + return _errors = __webpack_require__(6); } var _gitSpawn; function _load_gitSpawn() { - return _gitSpawn = __webpack_require__(249); + return _gitSpawn = __webpack_require__(250); } var _gitRefResolver; function _load_gitRefResolver() { - return _gitRefResolver = __webpack_require__(440); + return _gitRefResolver = __webpack_require__(444); } var _crypto; @@ -52214,7 +52724,8 @@ var Git = function () { if (yield Git.repoExists(secureUrl)) { return secureUrl; } else { - throw new (_errors || _load_errors()).SecurityError(reporter.lang('refusingDownloadGitWithoutCommit', ref)); + reporter.warn(reporter.lang('downloadGitWithoutCommit', ref.repository)); + return ref; } } @@ -52223,19 +52734,8 @@ var Git = function () { if (yield Git.repoExists(secureRef)) { return secureRef; } else { - if (yield Git.repoExists(ref)) { - return ref; - } else { - throw new (_errors || _load_errors()).SecurityError(reporter.lang('refusingDownloadHTTPWithoutCommit', ref)); - } - } - } - - if (ref.protocol === 'https:') { - if (yield Git.repoExists(ref)) { + reporter.warn(reporter.lang('downloadHTTPWithoutCommit', ref.repository)); return ref; - } else { - throw new (_errors || _load_errors()).SecurityError(reporter.lang('refusingDownloadHTTPSWithoutCommit', ref)); } } @@ -52649,7 +53149,7 @@ var Git = function () { exports.default = Git; /***/ }), -/* 158 */ +/* 160 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -52668,7 +53168,7 @@ function _load_asyncToGenerator() { var _resolveRelative; function _load_resolveRelative() { - return _resolveRelative = _interopRequireDefault(__webpack_require__(446)); + return _resolveRelative = _interopRequireDefault(__webpack_require__(451)); } var _validate; @@ -52680,7 +53180,7 @@ function _load_validate() { var _fix; function _load_fix() { - return _fix = _interopRequireDefault(__webpack_require__(443)); + return _fix = _interopRequireDefault(__webpack_require__(448)); } function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -52736,7 +53236,7 @@ exports.default = function () { }(); /***/ }), -/* 159 */ +/* 161 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -52753,7 +53253,7 @@ exports.extractDescription = extractDescription; exports.extractRepositoryUrl = extractRepositoryUrl; -var validateLicense = __webpack_require__(737); +var validateLicense = __webpack_require__(747); function isValidLicense(license) { return !!license && validateLicense(license).validForNewPackages; @@ -52858,7 +53358,7 @@ function extractRepositoryUrl(repository) { } /***/ }), -/* 160 */ +/* 162 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -52884,7 +53384,7 @@ function getSystemParams() { } /***/ }), -/* 161 */ +/* 163 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -52899,7 +53399,7 @@ exports.diffWithUnstable = diffWithUnstable; var _semver; function _load_semver() { - return _semver = _interopRequireDefault(__webpack_require__(22)); + return _semver = _interopRequireDefault(__webpack_require__(20)); } function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -53016,7 +53516,7 @@ function diffWithUnstable(version1, version2) { } /***/ }), -/* 162 */ +/* 164 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -53036,13 +53536,13 @@ function explodeHashedUrl(url) { } /***/ }), -/* 163 */ +/* 165 */ /***/ (function(module, exports, __webpack_require__) { -module.exports = { "default": __webpack_require__(481), __esModule: true }; +module.exports = { "default": __webpack_require__(488), __esModule: true }; /***/ }), -/* 164 */ +/* 166 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -53157,7 +53657,7 @@ exports.allocUnsafeSlow = function allocUnsafeSlow(size) { /***/ }), -/* 165 */ +/* 167 */ /***/ (function(module, exports) { function Caseless (dict) { @@ -53230,7 +53730,7 @@ module.exports.httpify = function (resp, headers) { /***/ }), -/* 166 */ +/* 168 */ /***/ (function(module, exports) { module.exports = function(it, Constructor, name, forbiddenField){ @@ -53240,7 +53740,7 @@ module.exports = function(it, Constructor, name, forbiddenField){ }; /***/ }), -/* 167 */ +/* 169 */ /***/ (function(module, exports, __webpack_require__) { // getting tag from 19.1.3.6 Object.prototype.toString() @@ -53268,7 +53768,7 @@ module.exports = function(it){ }; /***/ }), -/* 168 */ +/* 170 */ /***/ (function(module, exports, __webpack_require__) { var isObject = __webpack_require__(44) @@ -53280,7 +53780,7 @@ module.exports = function(it){ }; /***/ }), -/* 169 */ +/* 171 */ /***/ (function(module, exports) { // IE 8- don't enum bug keys @@ -53289,7 +53789,7 @@ module.exports = ( ).split(','); /***/ }), -/* 170 */ +/* 172 */ /***/ (function(module, exports, __webpack_require__) { // fallback for non-array-like ES3 and non-enumerable old V8 strings @@ -53299,20 +53799,20 @@ module.exports = Object('z').propertyIsEnumerable(0) ? Object : function(it){ }; /***/ }), -/* 171 */ +/* 173 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; var LIBRARY = __webpack_require__(118) , $export = __webpack_require__(38) - , redefine = __webpack_require__(277) - , hide = __webpack_require__(57) - , has = __webpack_require__(67) + , redefine = __webpack_require__(279) + , hide = __webpack_require__(58) + , has = __webpack_require__(68) , Iterators = __webpack_require__(95) - , $iterCreate = __webpack_require__(496) + , $iterCreate = __webpack_require__(503) , setToStringTag = __webpack_require__(98) - , getPrototypeOf = __webpack_require__(274) + , getPrototypeOf = __webpack_require__(276) , ITERATOR = __webpack_require__(31)('iterator') , BUGGY = !([].keys && 'next' in [].keys()) // Safari has buggy iterators w/o `next` , FF_ITERATOR = '@@iterator' @@ -53375,18 +53875,18 @@ module.exports = function(Base, NAME, Constructor, next, DEFAULT, IS_SET, FORCED }; /***/ }), -/* 172 */ +/* 174 */ /***/ (function(module, exports, __webpack_require__) { var META = __webpack_require__(121)('meta') , isObject = __webpack_require__(44) - , has = __webpack_require__(67) + , has = __webpack_require__(68) , setDesc = __webpack_require__(45).f , id = 0; var isExtensible = Object.isExtensible || function(){ return true; }; -var FREEZE = !__webpack_require__(56)(function(){ +var FREEZE = !__webpack_require__(57)(function(){ return isExtensible(Object.preventExtensions({})); }); var setMeta = function(it){ @@ -53433,16 +53933,16 @@ var meta = module.exports = { }; /***/ }), -/* 173 */ +/* 175 */ /***/ (function(module, exports) { exports.f = Object.getOwnPropertySymbols; /***/ }), -/* 174 */ +/* 176 */ /***/ (function(module, exports, __webpack_require__) { -var hide = __webpack_require__(57); +var hide = __webpack_require__(58); module.exports = function(target, src, safe){ for(var key in src){ if(safe && target[key])target[key] = src[key]; @@ -53451,17 +53951,17 @@ module.exports = function(target, src, safe){ }; /***/ }), -/* 175 */ +/* 177 */ /***/ (function(module, exports, __webpack_require__) { -var shared = __webpack_require__(176)('keys') +var shared = __webpack_require__(178)('keys') , uid = __webpack_require__(121); module.exports = function(key){ return shared[key] || (shared[key] = uid(key)); }; /***/ }), -/* 176 */ +/* 178 */ /***/ (function(module, exports, __webpack_require__) { var global = __webpack_require__(30) @@ -53472,7 +53972,7 @@ module.exports = function(key){ }; /***/ }), -/* 177 */ +/* 179 */ /***/ (function(module, exports) { // 7.1.4 ToInteger @@ -53483,7 +53983,7 @@ module.exports = function(it){ }; /***/ }), -/* 178 */ +/* 180 */ /***/ (function(module, exports, __webpack_require__) { // 7.1.1 ToPrimitive(input [, PreferredType]) @@ -53500,13 +54000,13 @@ module.exports = function(it, S){ }; /***/ }), -/* 179 */ +/* 181 */ /***/ (function(module, exports, __webpack_require__) { var global = __webpack_require__(30) - , core = __webpack_require__(21) + , core = __webpack_require__(22) , LIBRARY = __webpack_require__(118) - , wksExt = __webpack_require__(180) + , wksExt = __webpack_require__(182) , defineProperty = __webpack_require__(45).f; module.exports = function(name){ var $Symbol = core.Symbol || (core.Symbol = LIBRARY ? {} : global.Symbol || {}); @@ -53514,26 +54014,26 @@ module.exports = function(name){ }; /***/ }), -/* 180 */ +/* 182 */ /***/ (function(module, exports, __webpack_require__) { exports.f = __webpack_require__(31); /***/ }), -/* 181 */ +/* 183 */ /***/ (function(module, exports, __webpack_require__) { -var classof = __webpack_require__(167) +var classof = __webpack_require__(169) , ITERATOR = __webpack_require__(31)('iterator') , Iterators = __webpack_require__(95); -module.exports = __webpack_require__(21).getIteratorMethod = function(it){ +module.exports = __webpack_require__(22).getIteratorMethod = function(it){ if(it != undefined)return it[ITERATOR] || it['@@iterator'] || Iterators[classof(it)]; }; /***/ }), -/* 182 */ +/* 184 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -53551,7 +54051,7 @@ module.exports = function (str) { /***/ }), -/* 183 */ +/* 185 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -53644,12 +54144,12 @@ module.exports = function extend() { /***/ }), -/* 184 */ +/* 186 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -const escapeStringRegexp = __webpack_require__(182); +const escapeStringRegexp = __webpack_require__(184); const platform = process.platform; @@ -53798,7 +54298,7 @@ module.exports = Object.assign(fn, figures); /***/ }), -/* 185 */ +/* 187 */ /***/ (function(module, exports, __webpack_require__) { // Approach: @@ -53844,21 +54344,21 @@ module.exports = Object.assign(fn, figures); module.exports = glob var fs = __webpack_require__(10) -var rp = __webpack_require__(286) +var rp = __webpack_require__(288) var minimatch = __webpack_require__(134) var Minimatch = minimatch.Minimatch -var inherits = __webpack_require__(58) -var EE = __webpack_require__(71).EventEmitter +var inherits = __webpack_require__(59) +var EE = __webpack_require__(72).EventEmitter var path = __webpack_require__(0) var assert = __webpack_require__(36) -var isAbsolute = __webpack_require__(196) -var globSync = __webpack_require__(558) -var common = __webpack_require__(287) +var isAbsolute = __webpack_require__(198) +var globSync = __webpack_require__(567) +var common = __webpack_require__(289) var alphasort = common.alphasort var alphasorti = common.alphasorti var setopts = common.setopts var ownProp = common.ownProp -var inflight = __webpack_require__(595) +var inflight = __webpack_require__(604) var util = __webpack_require__(4) var childrenIgnored = common.childrenIgnored var isIgnored = common.isIgnored @@ -54594,12 +55094,12 @@ Glob.prototype._stat2 = function (f, abs, er, stat, cb) { /***/ }), -/* 186 */ +/* 188 */ /***/ (function(module, exports, __webpack_require__) { // Load modules -var Crypto = __webpack_require__(13); +var Crypto = __webpack_require__(14); var Url = __webpack_require__(19); var Utils = __webpack_require__(124); @@ -54726,7 +55226,7 @@ exports.timestampMessage = function (credentials, localtimeOffsetMsec) { /***/ }), -/* 187 */ +/* 189 */ /***/ (function(module, exports, __webpack_require__) { /** @@ -54745,8 +55245,8 @@ inquirer.prompts = {}; inquirer.Separator = __webpack_require__(127); inquirer.ui = { - BottomBar: __webpack_require__(608), - Prompt: __webpack_require__(609) + BottomBar: __webpack_require__(617), + Prompt: __webpack_require__(618) }; /** @@ -54782,14 +55282,14 @@ inquirer.createPromptModule = function (opt) { */ promptModule.restoreDefaultPrompts = function () { - this.registerPrompt('list', __webpack_require__(605)); - this.registerPrompt('input', __webpack_require__(604)); - this.registerPrompt('confirm', __webpack_require__(601)); - this.registerPrompt('rawlist', __webpack_require__(607)); - this.registerPrompt('expand', __webpack_require__(603)); - this.registerPrompt('checkbox', __webpack_require__(600)); - this.registerPrompt('password', __webpack_require__(606)); - this.registerPrompt('editor', __webpack_require__(602)); + this.registerPrompt('list', __webpack_require__(614)); + this.registerPrompt('input', __webpack_require__(613)); + this.registerPrompt('confirm', __webpack_require__(610)); + this.registerPrompt('rawlist', __webpack_require__(616)); + this.registerPrompt('expand', __webpack_require__(612)); + this.registerPrompt('checkbox', __webpack_require__(609)); + this.registerPrompt('password', __webpack_require__(615)); + this.registerPrompt('editor', __webpack_require__(611)); }; promptModule.restoreDefaultPrompts(); @@ -54816,12 +55316,12 @@ inquirer.restoreDefaultPrompts = function () { /***/ }), -/* 188 */ +/* 190 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var ansiRegex = __webpack_require__(219)(); +var ansiRegex = __webpack_require__(221)(); module.exports = function (str) { return typeof str === 'string' ? str.replace(ansiRegex, '') : str; @@ -54829,17 +55329,17 @@ module.exports = function (str) { /***/ }), -/* 189 */ +/* 191 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -module.exports = __webpack_require__(467).isCI +module.exports = __webpack_require__(474).isCI /***/ }), -/* 190 */ +/* 192 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -54854,9 +55354,9 @@ module.exports = __webpack_require__(467).isCI * You should have received a copy of the license along with this program. */ -var dh = __webpack_require__(630); -var eddsa = __webpack_require__(631); -var curve255 = __webpack_require__(191); +var dh = __webpack_require__(638); +var eddsa = __webpack_require__(639); +var curve255 = __webpack_require__(193); var utils = __webpack_require__(132); /** @@ -54881,7 +55381,7 @@ module.exports = ns; /***/ }), -/* 191 */ +/* 193 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -55109,10 +55609,10 @@ module.exports = ns; /***/ }), -/* 192 */ +/* 194 */ /***/ (function(module, exports, __webpack_require__) { -var json = typeof JSON !== 'undefined' ? JSON : __webpack_require__(634); +var json = typeof JSON !== 'undefined' ? JSON : __webpack_require__(642); module.exports = function (obj, opts) { if (!opts) opts = {}; @@ -55199,7 +55699,7 @@ var objectKeys = Object.keys || function (obj) { /***/ }), -/* 193 */ +/* 195 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -55207,25 +55707,25 @@ var objectKeys = Object.keys || function (obj) { var win32 = process && process.platform === 'win32'; var path = __webpack_require__(0); -var fileRe = __webpack_require__(549); +var fileRe = __webpack_require__(557); var utils = module.exports; /** * Module dependencies */ -utils.diff = __webpack_require__(644); -utils.unique = __webpack_require__(646); -utils.braces = __webpack_require__(647); -utils.brackets = __webpack_require__(537); -utils.extglob = __webpack_require__(547); +utils.diff = __webpack_require__(652); +utils.unique = __webpack_require__(654); +utils.braces = __webpack_require__(655); +utils.brackets = __webpack_require__(546); +utils.extglob = __webpack_require__(556); utils.isExtglob = __webpack_require__(129); utils.isGlob = __webpack_require__(130); utils.typeOf = __webpack_require__(133); -utils.normalize = __webpack_require__(654); -utils.omit = __webpack_require__(658); -utils.parseGlob = __webpack_require__(661); -utils.cache = __webpack_require__(679); +utils.normalize = __webpack_require__(662); +utils.omit = __webpack_require__(667); +utils.parseGlob = __webpack_require__(670); +utils.cache = __webpack_require__(688); /** * Get the filename of a filepath @@ -55355,7 +55855,7 @@ module.exports = utils; /***/ }), -/* 194 */ +/* 196 */ /***/ (function(module, exports, __webpack_require__) { var path = __webpack_require__(0); @@ -55459,13 +55959,13 @@ mkdirP.sync = function sync (p, opts, made) { /***/ }), -/* 195 */ +/* 197 */ /***/ (function(module, exports, __webpack_require__) { -module.exports = __webpack_require__(652); +module.exports = __webpack_require__(660); /***/ }), -/* 196 */ +/* 198 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -55492,7 +55992,7 @@ module.exports.win32 = win32; /***/ }), -/* 197 */ +/* 199 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -55542,14 +56042,14 @@ function nextTick(fn, arg1, arg2, arg3) { /***/ }), -/* 198 */ +/* 200 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var jsonSafeStringify = __webpack_require__(633) - , crypto = __webpack_require__(13) +var jsonSafeStringify = __webpack_require__(641) + , crypto = __webpack_require__(14) , Buffer = __webpack_require__(82).Buffer var defer = typeof setImmediate === 'undefined' @@ -55615,7 +56115,7 @@ exports.defer = defer /***/ }), -/* 199 */ +/* 201 */ /***/ (function(module, exports, __webpack_require__) { // Copyright 2015 Joyent, Inc. @@ -55627,14 +56127,14 @@ module.exports = { writePkcs1: writePkcs1 }; -var assert = __webpack_require__(16); +var assert = __webpack_require__(17); var asn1 = __webpack_require__(53); var algs = __webpack_require__(26); -var utils = __webpack_require__(24); +var utils = __webpack_require__(25); var Key = __webpack_require__(27); var PrivateKey = __webpack_require__(28); -var pem = __webpack_require__(62); +var pem = __webpack_require__(63); var pkcs8 = __webpack_require__(103); var readECDSACurve = pkcs8.readECDSACurve; @@ -55941,7 +56441,7 @@ function writePkcs1ECDSAPrivate(der, key) { /***/ }), -/* 200 */ +/* 202 */ /***/ (function(module, exports, __webpack_require__) { // Copyright 2015 Joyent, Inc. @@ -55986,7 +56486,7 @@ module.exports = { /***/ }), -/* 201 */ +/* 203 */ /***/ (function(module, exports) { // Returns a wrapper function that returns a wrapped callback @@ -56025,25 +56525,25 @@ function wrappy (fn, cb) { /***/ }), -/* 202 */ +/* 204 */ /***/ (function(module, exports) { module.exports = require("punycode"); /***/ }), -/* 203 */ +/* 205 */ /***/ (function(module, exports) { module.exports = require("string_decoder"); /***/ }), -/* 204 */ +/* 206 */ /***/ (function(module, exports) { module.exports = require("zlib"); /***/ }), -/* 205 */ +/* 207 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -56062,7 +56562,7 @@ function _load_constants() { var _access; function _load_access() { - return _access = _interopRequireWildcard(__webpack_require__(387)); + return _access = _interopRequireWildcard(__webpack_require__(392)); } var _add; @@ -56074,49 +56574,49 @@ function _load_add() { var _autoclean; function _load_autoclean() { - return _autoclean = _interopRequireWildcard(__webpack_require__(227)); + return _autoclean = _interopRequireWildcard(__webpack_require__(229)); } var _bin; function _load_bin() { - return _bin = _interopRequireWildcard(__webpack_require__(388)); + return _bin = _interopRequireWildcard(__webpack_require__(393)); } var _cache; function _load_cache() { - return _cache = _interopRequireWildcard(__webpack_require__(389)); + return _cache = _interopRequireWildcard(__webpack_require__(394)); } var _check; function _load_check() { - return _check = _interopRequireWildcard(__webpack_require__(228)); + return _check = _interopRequireWildcard(__webpack_require__(230)); } var _config; function _load_config() { - return _config = _interopRequireWildcard(__webpack_require__(390)); + return _config = _interopRequireWildcard(__webpack_require__(395)); } var _create; function _load_create() { - return _create = _interopRequireWildcard(__webpack_require__(391)); + return _create = _interopRequireWildcard(__webpack_require__(396)); } var _exec; function _load_exec() { - return _exec = _interopRequireWildcard(__webpack_require__(392)); + return _exec = _interopRequireWildcard(__webpack_require__(397)); } var _generateLockEntry; function _load_generateLockEntry() { - return _generateLockEntry = _interopRequireWildcard(__webpack_require__(393)); + return _generateLockEntry = _interopRequireWildcard(__webpack_require__(398)); } var _global; @@ -56128,25 +56628,25 @@ function _load_global() { var _help; function _load_help() { - return _help = _interopRequireWildcard(__webpack_require__(394)); + return _help = _interopRequireWildcard(__webpack_require__(399)); } var _import; function _load_import() { - return _import = _interopRequireWildcard(__webpack_require__(395)); + return _import = _interopRequireWildcard(__webpack_require__(400)); } var _info; function _load_info() { - return _info = _interopRequireWildcard(__webpack_require__(396)); + return _info = _interopRequireWildcard(__webpack_require__(401)); } var _init; function _load_init() { - return _init = _interopRequireWildcard(__webpack_require__(397)); + return _init = _interopRequireWildcard(__webpack_require__(402)); } var _install; @@ -56158,13 +56658,13 @@ function _load_install() { var _licenses; function _load_licenses() { - return _licenses = _interopRequireWildcard(__webpack_require__(398)); + return _licenses = _interopRequireWildcard(__webpack_require__(403)); } var _link; function _load_link() { - return _link = _interopRequireWildcard(__webpack_require__(229)); + return _link = _interopRequireWildcard(__webpack_require__(231)); } var _login; @@ -56176,31 +56676,31 @@ function _load_login() { var _logout; function _load_logout() { - return _logout = _interopRequireWildcard(__webpack_require__(399)); + return _logout = _interopRequireWildcard(__webpack_require__(404)); } var _list; function _load_list() { - return _list = _interopRequireWildcard(__webpack_require__(230)); + return _list = _interopRequireWildcard(__webpack_require__(232)); } var _node; function _load_node() { - return _node = _interopRequireWildcard(__webpack_require__(400)); + return _node = _interopRequireWildcard(__webpack_require__(405)); } var _outdated; function _load_outdated() { - return _outdated = _interopRequireWildcard(__webpack_require__(401)); + return _outdated = _interopRequireWildcard(__webpack_require__(406)); } var _owner; function _load_owner() { - return _owner = _interopRequireWildcard(__webpack_require__(402)); + return _owner = _interopRequireWildcard(__webpack_require__(407)); } var _pack; @@ -56212,37 +56712,37 @@ function _load_pack() { var _publish; function _load_publish() { - return _publish = _interopRequireWildcard(__webpack_require__(403)); + return _publish = _interopRequireWildcard(__webpack_require__(408)); } var _remove; function _load_remove() { - return _remove = _interopRequireWildcard(__webpack_require__(231)); + return _remove = _interopRequireWildcard(__webpack_require__(233)); } var _run; function _load_run() { - return _run = _interopRequireWildcard(__webpack_require__(404)); + return _run = _interopRequireWildcard(__webpack_require__(409)); } var _tag; function _load_tag() { - return _tag = _interopRequireWildcard(__webpack_require__(232)); + return _tag = _interopRequireWildcard(__webpack_require__(234)); } var _team; function _load_team() { - return _team = _interopRequireWildcard(__webpack_require__(405)); + return _team = _interopRequireWildcard(__webpack_require__(410)); } var _unlink; function _load_unlink() { - return _unlink = _interopRequireWildcard(__webpack_require__(406)); + return _unlink = _interopRequireWildcard(__webpack_require__(411)); } var _upgrade; @@ -56254,49 +56754,49 @@ function _load_upgrade() { var _version; function _load_version() { - return _version = _interopRequireWildcard(__webpack_require__(234)); + return _version = _interopRequireWildcard(__webpack_require__(236)); } var _versions; function _load_versions() { - return _versions = _interopRequireWildcard(__webpack_require__(407)); + return _versions = _interopRequireWildcard(__webpack_require__(412)); } var _why; function _load_why() { - return _why = _interopRequireWildcard(__webpack_require__(408)); + return _why = _interopRequireWildcard(__webpack_require__(413)); } var _workspaces; function _load_workspaces() { - return _workspaces = _interopRequireWildcard(__webpack_require__(410)); + return _workspaces = _interopRequireWildcard(__webpack_require__(415)); } var _workspace; function _load_workspace() { - return _workspace = _interopRequireWildcard(__webpack_require__(409)); + return _workspace = _interopRequireWildcard(__webpack_require__(414)); } var _upgradeInteractive; function _load_upgradeInteractive() { - return _upgradeInteractive = _interopRequireWildcard(__webpack_require__(233)); + return _upgradeInteractive = _interopRequireWildcard(__webpack_require__(235)); } var _useless; function _load_useless() { - return _useless = _interopRequireDefault(__webpack_require__(386)); + return _useless = _interopRequireDefault(__webpack_require__(391)); } var _aliases; function _load_aliases() { - return _aliases = _interopRequireDefault(__webpack_require__(226)); + return _aliases = _interopRequireDefault(__webpack_require__(228)); } function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -56369,7 +56869,7 @@ for (var _key in (_aliases || _load_aliases()).default) { exports.default = commands; /***/ }), -/* 206 */ +/* 208 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -56389,7 +56889,7 @@ exports.isOffline = isOffline; function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } -var os = __webpack_require__(72); +var os = __webpack_require__(73); var IGNORE_INTERFACES = ['lo0', 'awdl0', 'bridge0']; var LOCAL_IPS = ['127.0.0.1', '::1']; @@ -56441,16 +56941,16 @@ function isOffline() { } /***/ }), -/* 207 */ +/* 209 */ /***/ (function(module, exports, __webpack_require__) { /** * Module dependencies. */ -var EventEmitter = __webpack_require__(71).EventEmitter; +var EventEmitter = __webpack_require__(72).EventEmitter; var spawn = __webpack_require__(142).spawn; -var readlink = __webpack_require__(561).readlinkSync; +var readlink = __webpack_require__(570).readlinkSync; var path = __webpack_require__(0); var dirname = path.dirname; var basename = path.basename; @@ -57557,7 +58057,7 @@ function exists(file) { /***/ }), -/* 208 */ +/* 210 */ /***/ (function(module, exports) { function webpackEmptyContext(req) { @@ -57566,10 +58066,10 @@ function webpackEmptyContext(req) { webpackEmptyContext.keys = function() { return []; }; webpackEmptyContext.resolve = webpackEmptyContext; module.exports = webpackEmptyContext; -webpackEmptyContext.id = 208; +webpackEmptyContext.id = 210; /***/ }), -/* 209 */ +/* 211 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -57581,7 +58081,7 @@ module.exports = { }; -var util = __webpack_require__(63); +var util = __webpack_require__(64); var ASYNC = { '*': checkGenerators, @@ -57794,7 +58294,7 @@ function compileAsync(schema, callback) { /***/ }), -/* 210 */ +/* 212 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -57846,16 +58346,16 @@ module.exports = function equal(a, b) { /***/ }), -/* 211 */ +/* 213 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; var url = __webpack_require__(19) - , equal = __webpack_require__(210) - , util = __webpack_require__(63) - , SchemaObject = __webpack_require__(212); + , equal = __webpack_require__(212) + , util = __webpack_require__(64) + , SchemaObject = __webpack_require__(214); module.exports = resolve; @@ -58120,13 +58620,13 @@ function resolveIds(schema) { /***/ }), -/* 212 */ +/* 214 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var util = __webpack_require__(63); +var util = __webpack_require__(64); module.exports = SchemaObject; @@ -58136,7 +58636,7 @@ function SchemaObject(obj) { /***/ }), -/* 213 */ +/* 215 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -58157,7 +58657,7 @@ ValidationError.prototype.constructor = ValidationError; /***/ }), -/* 214 */ +/* 216 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -58288,7 +58788,7 @@ module.exports = function generate__limit(it, $keyword) { /***/ }), -/* 215 */ +/* 217 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -58371,7 +58871,7 @@ module.exports = function generate__limitItems(it, $keyword) { /***/ }), -/* 216 */ +/* 218 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -58459,7 +58959,7 @@ module.exports = function generate__limitLength(it, $keyword) { /***/ }), -/* 217 */ +/* 219 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -58542,7 +59042,7 @@ module.exports = function generate__limitProperties(it, $keyword) { /***/ }), -/* 218 */ +/* 220 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -58924,7 +59424,7 @@ module.exports = function generate_validate(it, $keyword) { /***/ }), -/* 219 */ +/* 221 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -58935,7 +59435,7 @@ module.exports = function () { /***/ }), -/* 220 */ +/* 222 */ /***/ (function(module, exports) { // API @@ -58970,10 +59470,10 @@ function clean(key) /***/ }), -/* 221 */ +/* 223 */ /***/ (function(module, exports, __webpack_require__) { -var defer = __webpack_require__(380); +var defer = __webpack_require__(385); // API module.exports = async; @@ -59010,11 +59510,11 @@ function async(callback) /***/ }), -/* 222 */ +/* 224 */ /***/ (function(module, exports, __webpack_require__) { -var async = __webpack_require__(221) - , abort = __webpack_require__(220) +var async = __webpack_require__(223) + , abort = __webpack_require__(222) ; // API @@ -59091,7 +59591,7 @@ function runJob(iterator, key, item, callback) /***/ }), -/* 223 */ +/* 225 */ /***/ (function(module, exports) { // API @@ -59134,11 +59634,11 @@ function state(list, sortMethod) /***/ }), -/* 224 */ +/* 226 */ /***/ (function(module, exports, __webpack_require__) { -var abort = __webpack_require__(220) - , async = __webpack_require__(221) +var abort = __webpack_require__(222) + , async = __webpack_require__(223) ; // API @@ -59169,12 +59669,12 @@ function terminator(callback) /***/ }), -/* 225 */ +/* 227 */ /***/ (function(module, exports, __webpack_require__) { -var iterate = __webpack_require__(222) - , initState = __webpack_require__(223) - , terminator = __webpack_require__(224) +var iterate = __webpack_require__(224) + , initState = __webpack_require__(225) + , terminator = __webpack_require__(226) ; // Public API @@ -59250,7 +59750,7 @@ function descending(a, b) /***/ }), -/* 226 */ +/* 228 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -59265,7 +59765,7 @@ exports.default = { }; /***/ }), -/* 227 */ +/* 229 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -59480,7 +59980,7 @@ function _load_index() { var _filter; function _load_filter() { - return _filter = __webpack_require__(248); + return _filter = __webpack_require__(249); } var _constants; @@ -59564,7 +60064,7 @@ function hasWrapper(commander) { } /***/ }), -/* 228 */ +/* 230 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -59578,7 +60078,7 @@ exports.run = exports.verifyTreeCheck = exports.noArguments = exports.requireLoc var _assign; function _load_assign() { - return _assign = _interopRequireDefault(__webpack_require__(17)); + return _assign = _interopRequireDefault(__webpack_require__(16)); } var _getIterator2; @@ -59613,7 +60113,8 @@ var verifyTreeCheck = exports.verifyTreeCheck = function () { // check all dependencies recursively without relying on internal resolver var registryName = 'yarn'; var registry = config.registries[registryName]; - var rootManifest = yield config.readManifest(registry.cwd, registryName); + var cwd = config.workspaceRootFolder ? config.lockfileFolder : config.cwd; + var rootManifest = yield config.readManifest(cwd, registryName); var dependenciesToCheckVersion = []; if (rootManifest.dependencies) { @@ -59627,7 +60128,7 @@ var verifyTreeCheck = exports.verifyTreeCheck = function () { dependenciesToCheckVersion.push({ name: _name, originalKey: _name, - parentCwd: registry.cwd, + parentCwd: cwd, version: _version }); } @@ -59643,7 +60144,7 @@ var verifyTreeCheck = exports.verifyTreeCheck = function () { dependenciesToCheckVersion.push({ name: _name2, originalKey: _name2, - parentCwd: registry.cwd, + parentCwd: cwd, version: _version2 }); } @@ -59674,7 +60175,7 @@ var verifyTreeCheck = exports.verifyTreeCheck = function () { for (var subdep in dependencies) { var subDepPath = path.join(manifestLoc, registry.folder, subdep); var found = false; - var relative = path.relative(registry.cwd, subDepPath); + var relative = path.relative(cwd, subDepPath); var locations = path.normalize(relative).split(registry.folder + path.sep).filter(function (dir) { return !!dir; }); @@ -59682,9 +60183,9 @@ var verifyTreeCheck = exports.verifyTreeCheck = function () { while (locations.length >= 0) { var possiblePath = void 0; if (locations.length > 0) { - possiblePath = path.join(registry.cwd, registry.folder, locations.join(path.sep + registry.folder + path.sep)); + possiblePath = path.join(cwd, registry.folder, locations.join(path.sep + registry.folder + path.sep)); } else { - possiblePath = registry.cwd; + possiblePath = cwd; } if (yield (_fs || _load_fs()).exists(path.join(possiblePath, registry.folder, subdep))) { dependenciesToCheckVersion.push({ @@ -60045,7 +60546,7 @@ exports.setFlags = setFlags; var _errors; function _load_errors() { - return _errors = __webpack_require__(5); + return _errors = __webpack_require__(6); } var _integrityChecker; @@ -60063,7 +60564,7 @@ function _load_integrityChecker2() { var _lockfile; function _load_lockfile() { - return _lockfile = _interopRequireDefault(__webpack_require__(20)); + return _lockfile = _interopRequireDefault(__webpack_require__(21)); } var _fs; @@ -60082,7 +60583,7 @@ function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } -var semver = __webpack_require__(22); +var semver = __webpack_require__(20); var path = __webpack_require__(0); @@ -60100,7 +60601,7 @@ function setFlags(commander) { } /***/ }), -/* 229 */ +/* 231 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -60228,13 +60729,13 @@ exports.setFlags = setFlags; var _errors; function _load_errors() { - return _errors = __webpack_require__(5); + return _errors = __webpack_require__(6); } var _promise; function _load_promise() { - return _promise = _interopRequireWildcard(__webpack_require__(65)); + return _promise = _interopRequireWildcard(__webpack_require__(66)); } var _fs; @@ -60254,7 +60755,7 @@ function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } var invariant = __webpack_require__(9); -var cmdShim = (_promise || _load_promise()).promisify(__webpack_require__(257)); +var cmdShim = (_promise || _load_promise()).promisify(__webpack_require__(259)); var path = __webpack_require__(0); function hasWrapper(commander, args) { @@ -60266,7 +60767,7 @@ function setFlags(commander) { } /***/ }), -/* 230 */ +/* 232 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -60280,7 +60781,7 @@ exports.run = exports.buildTree = exports.requireLockfile = undefined; var _keys; function _load_keys() { - return _keys = _interopRequireDefault(__webpack_require__(14)); + return _keys = _interopRequireDefault(__webpack_require__(11)); } var _set; @@ -60548,7 +61049,7 @@ function _load_install() { var _lockfile; function _load_lockfile() { - return _lockfile = _interopRequireDefault(__webpack_require__(20)); + return _lockfile = _interopRequireDefault(__webpack_require__(21)); } function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -60638,7 +61139,7 @@ function getDevDeps(manifest) { } /***/ }), -/* 231 */ +/* 233 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -60652,7 +61153,7 @@ exports.run = exports.requireLockfile = undefined; var _keys; function _load_keys() { - return _keys = _interopRequireDefault(__webpack_require__(14)); + return _keys = _interopRequireDefault(__webpack_require__(11)); } var _getIterator2; @@ -60664,7 +61165,7 @@ function _load_getIterator() { var _extends2; function _load_extends() { - return _extends2 = _interopRequireDefault(__webpack_require__(25)); + return _extends2 = _interopRequireDefault(__webpack_require__(23)); } var _asyncToGenerator2; @@ -60675,10 +61176,17 @@ function _load_asyncToGenerator() { var run = exports.run = function () { var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) { + var isWorkspaceRoot = config.workspaceRootFolder && config.cwd === config.workspaceRootFolder; + if (!args.length) { throw new (_errors || _load_errors()).MessageError(reporter.lang('tooFewArguments', 1)); } + // running "yarn remove something" in a workspace root is often a mistake + if (isWorkspaceRoot && !flags.ignoreWorkspaceRootCheck) { + throw new (_errors || _load_errors()).MessageError(reporter.lang('workspacesRemoveRootCheck')); + } + var totalSteps = args.length + 1; var step = 0; @@ -60804,7 +61312,7 @@ exports.hasWrapper = hasWrapper; var _lockfile; function _load_lockfile() { - return _lockfile = _interopRequireDefault(__webpack_require__(20)); + return _lockfile = _interopRequireDefault(__webpack_require__(21)); } var _index; @@ -60822,7 +61330,7 @@ function _load_install() { var _errors; function _load_errors() { - return _errors = __webpack_require__(5); + return _errors = __webpack_require__(6); } var _index2; @@ -60849,12 +61357,14 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de var path = __webpack_require__(0); -var emoji = __webpack_require__(195); +var emoji = __webpack_require__(197); var requireLockfile = exports.requireLockfile = true; function setFlags(commander) { commander.description('Removes a package from your direct dependencies updating your package.json and yarn.lock.'); + commander.usage('remove [packages ...] [flags]'); + commander.option('-W, --ignore-workspace-root-check', 'required to run yarn remove inside a workspace root'); } function hasWrapper(commander, args) { @@ -60862,7 +61372,7 @@ function hasWrapper(commander, args) { } /***/ }), -/* 232 */ +/* 234 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -60989,7 +61499,7 @@ function _load_npmRegistry() { var _errors; function _load_errors() { - return _errors = __webpack_require__(5); + return _errors = __webpack_require__(6); } var _normalizePattern2; @@ -61092,7 +61602,7 @@ exports.hasWrapper = hasWrapper; exports.examples = examples; /***/ }), -/* 233 */ +/* 235 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -61106,7 +61616,7 @@ exports.run = exports.requireLockfile = undefined; var _promise; function _load_promise() { - return _promise = _interopRequireDefault(__webpack_require__(6)); + return _promise = _interopRequireDefault(__webpack_require__(5)); } var _getIterator2; @@ -61118,13 +61628,13 @@ function _load_getIterator() { var _keys; function _load_keys() { - return _keys = _interopRequireDefault(__webpack_require__(14)); + return _keys = _interopRequireDefault(__webpack_require__(11)); } var _extends2; function _load_extends() { - return _extends2 = _interopRequireDefault(__webpack_require__(25)); + return _extends2 = _interopRequireDefault(__webpack_require__(23)); } var _asyncToGenerator2; @@ -61338,13 +61848,13 @@ exports.hasWrapper = hasWrapper; var _inquirer; function _load_inquirer() { - return _inquirer = _interopRequireDefault(__webpack_require__(187)); + return _inquirer = _interopRequireDefault(__webpack_require__(189)); } var _lockfile; function _load_lockfile() { - return _lockfile = _interopRequireDefault(__webpack_require__(20)); + return _lockfile = _interopRequireDefault(__webpack_require__(21)); } var _add; @@ -61362,13 +61872,13 @@ function _load_upgrade() { var _colorForVersions; function _load_colorForVersions() { - return _colorForVersions = _interopRequireDefault(__webpack_require__(246)); + return _colorForVersions = _interopRequireDefault(__webpack_require__(247)); } var _colorizeDiff; function _load_colorizeDiff() { - return _colorizeDiff = _interopRequireDefault(__webpack_require__(247)); + return _colorizeDiff = _interopRequireDefault(__webpack_require__(248)); } var _install; @@ -61398,7 +61908,7 @@ function hasWrapper(commander, args) { } /***/ }), -/* 234 */ +/* 236 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -61418,13 +61928,13 @@ function _load_getIterator() { var _assign; function _load_assign() { - return _assign = _interopRequireDefault(__webpack_require__(17)); + return _assign = _interopRequireDefault(__webpack_require__(16)); } var _promise; function _load_promise() { - return _promise = _interopRequireDefault(__webpack_require__(6)); + return _promise = _interopRequireDefault(__webpack_require__(5)); } var _asyncToGenerator2; @@ -61447,12 +61957,16 @@ var setVersion = exports.setVersion = function () { function runLifecycle(lifecycle) { if (scripts[lifecycle]) { - return (0, (_executeLifecycleScript || _load_executeLifecycleScript()).execCommand)(lifecycle, config, scripts[lifecycle], config.cwd); + return (0, (_executeLifecycleScript || _load_executeLifecycleScript()).execCommand)({ stage: lifecycle, config, cmd: scripts[lifecycle], cwd: config.cwd, isInteractive: true }); } return (_promise || _load_promise()).default.resolve(); } + function isCommitHooksDisabled() { + return flags.commitHooks === false || config.getOption('version-commit-hooks') === false; + } + if (pkg.scripts) { // inherit `scripts` from manifest (0, (_assign || _load_assign()).default)(scripts, pkg.scripts); @@ -61471,6 +61985,17 @@ var setVersion = exports.setVersion = function () { throw new (_errors || _load_errors()).MessageError(reporter.lang('invalidVersion')); } + // get new version by bumping old version, if requested + if (!newVersion) { + if (flags.major) { + newVersion = semver.inc(oldVersion, 'major'); + } else if (flags.minor) { + newVersion = semver.inc(oldVersion, 'minor'); + } else if (flags.patch) { + newVersion = semver.inc(oldVersion, 'patch'); + } + } + // wasn't passed a version arg so ask interactively while (!newVersion) { // make sure we're not running in non-interactive mode before asking for new version @@ -61564,6 +62089,7 @@ var setVersion = exports.setVersion = function () { var sign = Boolean(config.getOption('version-sign-git-tag')); var flag = sign ? '-sm' : '-am'; var prefix = String(config.getOption('version-tag-prefix')); + var _args = ['commit', '-m', message].concat(isCommitHooksDisabled() ? ['-n'] : []); var gitRoot = (yield (0, (_gitSpawn || _load_gitSpawn()).spawn)(['rev-parse', '--show-toplevel'], { cwd: config.cwd })).trim(); @@ -61571,7 +62097,7 @@ var setVersion = exports.setVersion = function () { yield (0, (_gitSpawn || _load_gitSpawn()).spawn)(['add', path.relative(gitRoot, pkgLoc)], { cwd: gitRoot }); // create git commit - yield (0, (_gitSpawn || _load_gitSpawn()).spawn)(['commit', '-m', message], { cwd: gitRoot }); + yield (0, (_gitSpawn || _load_gitSpawn()).spawn)(_args, { cwd: gitRoot }); // create git tag yield (0, (_gitSpawn || _load_gitSpawn()).spawn)(['tag', `${prefix}${newVersion}`, flag, message], { cwd: gitRoot }); @@ -61615,13 +62141,13 @@ function _load_executeLifecycleScript() { var _errors; function _load_errors() { - return _errors = __webpack_require__(5); + return _errors = __webpack_require__(6); } var _gitSpawn; function _load_gitSpawn() { - return _gitSpawn = __webpack_require__(249); + return _gitSpawn = __webpack_require__(250); } var _fs; @@ -61641,7 +62167,7 @@ function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } var invariant = __webpack_require__(9); -var semver = __webpack_require__(22); +var semver = __webpack_require__(20); var path = __webpack_require__(0); var NEW_VERSION_FLAG = '--new-version [version]'; @@ -61652,8 +62178,12 @@ function isValidNewVersion(oldVersion, newVersion, looseSemver) { function setFlags(commander) { commander.description('Update the version of your package via the command line.'); commander.option(NEW_VERSION_FLAG, 'new version'); + commander.option('--major', 'auto-increment major version number'); + commander.option('--minor', 'auto-increment minor version number'); + commander.option('--patch', 'auto-increment patch version number'); commander.option('--message [message]', 'message'); commander.option('--no-git-tag-version', 'no git tag version'); + commander.option('--no-commit-hooks', 'bypass git hooks when committing new version'); } function hasWrapper(commander, args) { @@ -61661,7 +62191,7 @@ function hasWrapper(commander, args) { } /***/ }), -/* 235 */ +/* 237 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -61675,7 +62205,7 @@ exports.LocalTarballFetcher = undefined; var _promise; function _load_promise() { - return _promise = _interopRequireDefault(__webpack_require__(6)); + return _promise = _interopRequireDefault(__webpack_require__(5)); } var _asyncToGenerator2; @@ -61693,13 +62223,13 @@ function _load_classCallCheck() { var _possibleConstructorReturn2; function _load_possibleConstructorReturn() { - return _possibleConstructorReturn2 = _interopRequireDefault(__webpack_require__(12)); + return _possibleConstructorReturn2 = _interopRequireDefault(__webpack_require__(13)); } var _inherits2; function _load_inherits() { - return _inherits2 = _interopRequireDefault(__webpack_require__(11)); + return _inherits2 = _interopRequireDefault(__webpack_require__(12)); } var _http; @@ -61711,7 +62241,7 @@ function _load_http() { var _errors; function _load_errors() { - return _errors = __webpack_require__(5); + return _errors = __webpack_require__(6); } var _constants; @@ -61754,7 +62284,7 @@ var tarFs = __webpack_require__(140); var url = __webpack_require__(19); var fs = __webpack_require__(10); var stream = __webpack_require__(29); -var gunzip = __webpack_require__(562); +var gunzip = __webpack_require__(571); var invariant = __webpack_require__(9); var RE_URL_NAME_MATCH = /\/(?:(@[^/]+)\/)?[^/]+\/-\/(?:@[^/]+\/)?([^/]+)$/; @@ -62018,7 +62548,7 @@ var LocalTarballFetcher = exports.LocalTarballFetcher = function (_TarballFetche }(TarballFetcher); /***/ }), -/* 236 */ +/* 238 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -62031,7 +62561,7 @@ Object.defineProperty(exports, "__esModule", { var _assign; function _load_assign() { - return _assign = _interopRequireDefault(__webpack_require__(17)); + return _assign = _interopRequireDefault(__webpack_require__(16)); } var _getIterator2; @@ -62068,7 +62598,7 @@ function _load_invariant() { var _stripBom; function _load_stripBom() { - return _stripBom = _interopRequireDefault(__webpack_require__(323)); + return _stripBom = _interopRequireDefault(__webpack_require__(327)); } var _constants; @@ -62080,7 +62610,7 @@ function _load_constants() { var _errors; function _load_errors() { - return _errors = __webpack_require__(5); + return _errors = __webpack_require__(6); } var _map; @@ -62506,7 +63036,7 @@ function parseWithConflict(str, fileLoc) { } /***/ }), -/* 237 */ +/* 239 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -62525,7 +63055,7 @@ function _load_getIterator() { var _assign; function _load_assign() { - return _assign = _interopRequireDefault(__webpack_require__(17)); + return _assign = _interopRequireDefault(__webpack_require__(16)); } exports.testEngine = testEngine; @@ -62535,7 +63065,7 @@ exports.check = check; var _errors; function _load_errors() { - return _errors = __webpack_require__(5); + return _errors = __webpack_require__(6); } var _map; @@ -62559,14 +63089,14 @@ function _load_yarnVersion() { var _semver; function _load_semver() { - return _semver = __webpack_require__(161); + return _semver = __webpack_require__(163); } function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } var invariant = __webpack_require__(9); -var semver = __webpack_require__(22); +var semver = __webpack_require__(20); var VERSIONS = (0, (_assign || _load_assign()).default)({}, process.versions, { yarn: (_yarnVersion || _load_yarnVersion()).version @@ -62772,7 +63302,7 @@ function check(infos, config, ignoreEngines) { } /***/ }), -/* 238 */ +/* 240 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -62782,216 +63312,152 @@ Object.defineProperty(exports, "__esModule", { value: true }); -var _keys; +var _getIterator2; -function _load_keys() { - return _keys = _interopRequireDefault(__webpack_require__(14)); +function _load_getIterator() { + return _getIterator2 = _interopRequireDefault(__webpack_require__(3)); } -var _map; +var _classCallCheck2; -function _load_map() { - return _map = _interopRequireDefault(__webpack_require__(37)); +function _load_classCallCheck() { + return _classCallCheck2 = _interopRequireDefault(__webpack_require__(2)); } -var _promise; +var _misc; -function _load_promise() { - return _promise = _interopRequireDefault(__webpack_require__(6)); +function _load_misc() { + return _misc = __webpack_require__(18); } -var _asyncToGenerator2; - -function _load_asyncToGenerator() { - return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(1)); -} - -var fetchCache = function () { - var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (dest, fetcher, config) { - var _ref2 = yield config.readPackageMetadata(dest), - hash = _ref2.hash, - pkg = _ref2.package; - - yield fetcher.setupMirrorFromCache(); - return { - package: pkg, - hash, - dest, - cached: true - }; - }); - - return function fetchCache(_x, _x2, _x3) { - return _ref.apply(this, arguments); - }; -}(); - -var fetchOne = function () { - var _ref3 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (ref, config) { - var dest = config.generateHardModulePath(ref); - - var remote = ref.remote; - // Mock metadata for symlinked dependencies - if (remote.type === 'link') { - var mockPkg = { _uid: '', name: '', version: '0.0.0' }; - return (_promise || _load_promise()).default.resolve({ resolved: null, hash: '', dest, package: mockPkg, cached: false }); - } - - var Fetcher = (_index || _load_index())[remote.type]; - if (!Fetcher) { - throw new (_errors || _load_errors()).MessageError(config.reporter.lang('unknownFetcherFor', remote.type)); - } - - var fetcher = new Fetcher(dest, remote, config); - if (yield config.isValidModuleDest(dest)) { - return fetchCache(dest, fetcher, config); - } - - // remove as the module may be invalid - yield (_fs || _load_fs()).unlink(dest); - - try { - return yield fetcher.fetch({ - name: ref.name, - version: ref.version - }); - } catch (err) { - try { - yield (_fs || _load_fs()).unlink(dest); - } catch (err2) { - // what do? - } - throw err; - } - }); - - return function fetchOne(_x4, _x5) { - return _ref3.apply(this, arguments); - }; -}(); - -var maybeFetchOne = function () { - var _ref4 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (ref, config) { - try { - return yield fetchOne(ref, config); - } catch (err) { - if (ref.optional) { - config.reporter.error(err.message); - return null; - } else { - throw err; - } - } - }); - - return function maybeFetchOne(_x6, _x7) { - return _ref4.apply(this, arguments); - }; -}(); - -exports.fetch = fetch; - -var _errors; - -function _load_errors() { - return _errors = __webpack_require__(5); -} - -var _index; - -function _load_index() { - return _index = _interopRequireWildcard(__webpack_require__(414)); -} - -var _fs; - -function _load_fs() { - return _fs = _interopRequireWildcard(__webpack_require__(7)); -} - -var _promise2; - -function _load_promise2() { - return _promise2 = _interopRequireWildcard(__webpack_require__(65)); -} - -function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } } - function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } -function fetch(pkgs, config) { - var pkgsPerDest = new (_map || _load_map()).default(); - pkgs = pkgs.filter(function (pkg) { - var ref = pkg._reference; - if (!ref) { - return false; - } - var dest = config.generateHardModulePath(ref); - var otherPkg = pkgsPerDest.get(dest); - if (otherPkg) { - config.reporter.warn(config.reporter.lang('multiplePackagesCantUnpackInSameDestination', ref.patterns, dest, otherPkg.patterns)); - return false; - } - pkgsPerDest.set(dest, ref); - return true; - }); - var tick = config.reporter.progress(pkgs.length); +var PackageReference = function () { + function PackageReference(request, info, remote) { + (0, (_classCallCheck2 || _load_classCallCheck()).default)(this, PackageReference); - return (_promise2 || _load_promise2()).queue(pkgs, function () { - var _ref5 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (pkg) { - var ref = pkg._reference; - if (!ref) { - return pkg; + this.resolver = request.resolver; + this.lockfile = request.lockfile; + this.requests = []; + this.config = request.config; + this.hint = request.hint; + + this.registry = remote.registry; + this.version = info.version; + this.name = info.name; + this.uid = info._uid; + + this.remote = remote; + + this.dependencies = []; + + this.permissions = {}; + this.patterns = []; + this.optional = null; + this.level = Infinity; + this.ignore = false; + this.incompatible = false; + this.fresh = false; + this.locations = []; + this.addRequest(request); + } + + PackageReference.prototype.setFresh = function setFresh(fresh) { + this.fresh = fresh; + }; + + PackageReference.prototype.addLocation = function addLocation(loc) { + this.locations.push(loc); + }; + + PackageReference.prototype.addRequest = function addRequest(request) { + this.requests.push(request); + + this.level = Math.min(this.level, request.parentNames.length); + }; + + PackageReference.prototype.prune = function prune() { + for (var _iterator = this.patterns, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : (0, (_getIterator2 || _load_getIterator()).default)(_iterator);;) { + var _ref; + + if (_isArray) { + if (_i >= _iterator.length) break; + _ref = _iterator[_i++]; + } else { + _i = _iterator.next(); + if (_i.done) break; + _ref = _i.value; } - var res = yield maybeFetchOne(ref, config); - var newPkg = void 0; + var selfPattern = _ref; - if (res) { - newPkg = res.package; + // remove ourselves from the resolver + this.resolver.removePattern(selfPattern); + } + }; - // update with new remote - // but only if there was a hash previously as the tarball fetcher does not provide a hash. - if (ref.remote.hash) { - // if the checksum was updated, also update resolved and cache - if (ref.remote.hash !== res.hash && config.updateChecksums) { - var oldHash = ref.remote.hash; - if (ref.remote.resolved) { - ref.remote.resolved = ref.remote.resolved.replace(oldHash, res.hash); - } - ref.config.cache = (0, (_keys || _load_keys()).default)(ref.config.cache).reduce(function (cache, entry) { - var entryWithNewHash = entry.replace(oldHash, res.hash); - cache[entryWithNewHash] = ref.config.cache[entry]; - return cache; - }, {}); - } - ref.remote.hash = res.hash; + PackageReference.prototype.addDependencies = function addDependencies(deps) { + this.dependencies = this.dependencies.concat(deps); + }; + + PackageReference.prototype.setPermission = function setPermission(key, val) { + this.permissions[key] = val; + }; + + PackageReference.prototype.hasPermission = function hasPermission(key) { + if (key in this.permissions) { + return this.permissions[key]; + } else { + return false; + } + }; + + PackageReference.prototype.addPattern = function addPattern(pattern, manifest) { + this.resolver.addPattern(pattern, manifest); + + this.patterns.push(pattern); + + var shrunk = this.lockfile.getLocked(pattern); + if (shrunk && shrunk.permissions) { + for (var _iterator2 = (0, (_misc || _load_misc()).entries)(shrunk.permissions), _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : (0, (_getIterator2 || _load_getIterator()).default)(_iterator2);;) { + var _ref3; + + if (_isArray2) { + if (_i2 >= _iterator2.length) break; + _ref3 = _iterator2[_i2++]; + } else { + _i2 = _iterator2.next(); + if (_i2.done) break; + _ref3 = _i2.value; } + + var _ref2 = _ref3; + var _key = _ref2[0]; + var perm = _ref2[1]; + + this.setPermission(_key, perm); } + } + }; - if (tick) { - tick(); - } + PackageReference.prototype.addOptional = function addOptional(optional) { + if (this.optional == null) { + // optional is uninitialised + this.optional = optional; + } else if (!optional) { + // otherwise, ignore all subsequent optional assignments and only accept ones making + // this not optional + this.optional = false; + } + }; - if (newPkg) { - newPkg._reference = ref; - newPkg._remote = ref.remote; - newPkg.name = pkg.name; - newPkg.fresh = pkg.fresh; - return newPkg; - } + return PackageReference; +}(); - return pkg; - }); - - return function (_x8) { - return _ref5.apply(this, arguments); - }; - }(), config.networkConcurrency); -} +exports.default = PackageReference; /***/ }), -/* 239 */ +/* 241 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -63016,7 +63482,7 @@ function _load_getIterator() { var _promise; function _load_promise() { - return _promise = _interopRequireDefault(__webpack_require__(6)); + return _promise = _interopRequireDefault(__webpack_require__(5)); } var _set; @@ -63052,7 +63518,7 @@ function _load_normalizePattern() { var _requestManager; function _load_requestManager() { - return _requestManager = _interopRequireDefault(__webpack_require__(252)); + return _requestManager = _interopRequireDefault(__webpack_require__(253)); } var _blockingQueue; @@ -63064,7 +63530,7 @@ function _load_blockingQueue() { var _lockfile; function _load_lockfile() { - return _lockfile = _interopRequireDefault(__webpack_require__(20)); + return _lockfile = _interopRequireDefault(__webpack_require__(21)); } var _map; @@ -63076,20 +63542,26 @@ function _load_map() { var _workspaceLayout; function _load_workspaceLayout() { - return _workspaceLayout = _interopRequireDefault(__webpack_require__(76)); + return _workspaceLayout = _interopRequireDefault(__webpack_require__(67)); } var _resolutionMap; function _load_resolutionMap() { - return _resolutionMap = _interopRequireDefault(__webpack_require__(242)); + return _resolutionMap = _interopRequireDefault(__webpack_require__(155)); +} + +var _resolutionMap2; + +function _load_resolutionMap2() { + return _resolutionMap2 = __webpack_require__(155); } function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } var invariant = __webpack_require__(9); -var semver = __webpack_require__(22); +var semver = __webpack_require__(20); var PackageResolver = function () { function PackageResolver(config, lockfile) { @@ -63103,6 +63575,7 @@ var PackageResolver = function () { this.resolutionMap = resolutionMap; this.usedRegistries = new (_set || _load_set()).default(); this.flat = false; + this.focus = false; this.reporter = config.reporter; this.lockfile = lockfile; @@ -63217,6 +63690,7 @@ var PackageResolver = function () { var oldPkg = this.patterns[pattern]; newPkg.prebuiltVariants = oldPkg.prebuiltVariants; + this.patterns[pattern] = newPkg; } } @@ -63571,7 +64045,9 @@ var PackageResolver = function () { this.patterns[pattern] = info; var byName = this.patternsByPackage[info.name] = this.patternsByPackage[info.name] || []; - byName.push(pattern); + if (byName.indexOf(pattern) === -1) { + byName.push(pattern); + } }; /** @@ -63773,14 +64249,21 @@ var PackageResolver = function () { PackageResolver.prototype.init = function () { var _ref17 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (deps) { - var _ref18 = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : { isFlat: false, isFrozen: false, workspaceLayout: undefined }, + var _ref18 = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : { + isFlat: false, + isFrozen: false, + workspaceLayout: undefined, + focus: false + }, isFlat = _ref18.isFlat, isFrozen = _ref18.isFrozen, - workspaceLayout = _ref18.workspaceLayout; + workspaceLayout = _ref18.workspaceLayout, + focus = _ref18.focus; this.flat = Boolean(isFlat); this.frozen = Boolean(isFrozen); this.workspaceLayout = workspaceLayout; + this.focus = Boolean(focus); var activity = this.activity = this.reporter.activity(); for (var _iterator14 = deps, _isArray14 = Array.isArray(_iterator14), _i14 = 0, _iterator14 = _isArray14 ? _iterator14 : (0, (_getIterator2 || _load_getIterator()).default)(_iterator14);;) { @@ -63968,6 +64451,10 @@ var PackageResolver = function () { invariant(resolutionManifest._reference, 'resolutions should have a resolved reference'); resolutionManifest._reference.patterns.push(pattern); this.addPattern(pattern, resolutionManifest); + var lockManifest = this.lockfile.getLocked(pattern); + if ((0, (_resolutionMap2 || _load_resolutionMap2()).shouldUpdateLockfile)(lockManifest, resolutionManifest._reference)) { + this.lockfile.removePattern(pattern); + } } else { this.resolutionMap.addToDelayQueue(req); } @@ -63983,7 +64470,7 @@ var PackageResolver = function () { exports.default = PackageResolver; /***/ }), -/* 240 */ +/* 242 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -64021,7 +64508,7 @@ var defaultFormatter = exports.defaultFormatter = { }; /***/ }), -/* 241 */ +/* 243 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -64035,7 +64522,7 @@ exports.en = undefined; var _en; function _load_en() { - return _en = _interopRequireDefault(__webpack_require__(429)); + return _en = _interopRequireDefault(__webpack_require__(433)); } function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -64043,165 +64530,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de exports.en = (_en || _load_en()).default; /***/ }), -/* 242 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -Object.defineProperty(exports, "__esModule", { - value: true -}); - -var _set; - -function _load_set() { - return _set = _interopRequireDefault(__webpack_require__(15)); -} - -var _classCallCheck2; - -function _load_classCallCheck() { - return _classCallCheck2 = _interopRequireDefault(__webpack_require__(2)); -} - -var _semver; - -function _load_semver() { - return _semver = _interopRequireDefault(__webpack_require__(22)); -} - -var _minimatch; - -function _load_minimatch() { - return _minimatch = _interopRequireDefault(__webpack_require__(134)); -} - -var _map; - -function _load_map() { - return _map = _interopRequireDefault(__webpack_require__(35)); -} - -var _normalizePattern2; - -function _load_normalizePattern() { - return _normalizePattern2 = __webpack_require__(42); -} - -var _parsePackagePath; - -function _load_parsePackagePath() { - return _parsePackagePath = _interopRequireDefault(__webpack_require__(250)); -} - -var _parsePackagePath2; - -function _load_parsePackagePath2() { - return _parsePackagePath2 = __webpack_require__(250); -} - -var _resolvers; - -function _load_resolvers() { - return _resolvers = __webpack_require__(41); -} - -function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } - -var DIRECTORY_SEPARATOR = '/'; -var GLOBAL_NESTED_DEP_PATTERN = '**/'; - -var ResolutionMap = function () { - function ResolutionMap(config) { - (0, (_classCallCheck2 || _load_classCallCheck()).default)(this, ResolutionMap); - - this.resolutionsByPackage = (0, (_map || _load_map()).default)(); - this.config = config; - this.reporter = config.reporter; - this.delayQueue = new (_set || _load_set()).default(); - } - - ResolutionMap.prototype.init = function init() { - var resolutions = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {}; - - for (var _globPattern in resolutions) { - var info = this.parsePatternInfo(_globPattern, resolutions[_globPattern]); - - if (info) { - var resolution = this.resolutionsByPackage[info.name] || []; - this.resolutionsByPackage[info.name] = [].concat(resolution, [info]); - } - } - }; - - ResolutionMap.prototype.addToDelayQueue = function addToDelayQueue(req) { - this.delayQueue.add(req); - }; - - ResolutionMap.prototype.parsePatternInfo = function parsePatternInfo(globPattern, range) { - if (!(0, (_parsePackagePath2 || _load_parsePackagePath2()).isValidPackagePath)(globPattern)) { - this.reporter.warn(this.reporter.lang('invalidResolutionName', globPattern)); - return null; - } - - var directories = (0, (_parsePackagePath || _load_parsePackagePath()).default)(globPattern); - var name = directories.pop(); - - if (!(_semver || _load_semver()).default.validRange(range) && !(0, (_resolvers || _load_resolvers()).getExoticResolver)(range)) { - this.reporter.warn(this.reporter.lang('invalidResolutionVersion', range)); - return null; - } - - // For legacy support of resolutions, replace `name` with `**/name` - if (name === globPattern) { - globPattern = `${GLOBAL_NESTED_DEP_PATTERN}${name}`; - } - - return { - name, - range, - globPattern, - pattern: `${name}@${range}` - }; - }; - - ResolutionMap.prototype.find = function find(reqPattern, parentNames) { - var _normalizePattern = (0, (_normalizePattern2 || _load_normalizePattern()).normalizePattern)(reqPattern), - name = _normalizePattern.name, - reqRange = _normalizePattern.range; - - var resolutions = this.resolutionsByPackage[name]; - - if (!resolutions) { - return ''; - } - - var modulePath = [].concat(parentNames, [name]).join(DIRECTORY_SEPARATOR); - - var _ref = resolutions.find(function (_ref2) { - var globPattern = _ref2.globPattern; - return (0, (_minimatch || _load_minimatch()).default)(modulePath, globPattern); - }) || {}, - pattern = _ref.pattern, - range = _ref.range; - - if (pattern) { - if ((_semver || _load_semver()).default.validRange(reqRange) && (_semver || _load_semver()).default.valid(range) && !(_semver || _load_semver()).default.satisfies(range, reqRange)) { - this.reporter.warn(this.reporter.lang('incompatibleResolutionVersion', pattern, reqPattern)); - } - } - - return pattern; - }; - - return ResolutionMap; -}(); - -exports.default = ResolutionMap; - -/***/ }), -/* 243 */ +/* 244 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -64220,19 +64549,19 @@ function _load_classCallCheck() { var _possibleConstructorReturn2; function _load_possibleConstructorReturn() { - return _possibleConstructorReturn2 = _interopRequireDefault(__webpack_require__(12)); + return _possibleConstructorReturn2 = _interopRequireDefault(__webpack_require__(13)); } var _inherits2; function _load_inherits() { - return _inherits2 = _interopRequireDefault(__webpack_require__(11)); + return _inherits2 = _interopRequireDefault(__webpack_require__(12)); } var _hostedGitResolver; function _load_hostedGitResolver() { - return _hostedGitResolver = _interopRequireDefault(__webpack_require__(74)); + return _hostedGitResolver = _interopRequireDefault(__webpack_require__(75)); } function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -64287,7 +64616,7 @@ GitHubResolver.hostname = 'github.com'; exports.default = GitHubResolver; /***/ }), -/* 244 */ +/* 245 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -64313,19 +64642,19 @@ function _load_classCallCheck() { var _possibleConstructorReturn2; function _load_possibleConstructorReturn() { - return _possibleConstructorReturn2 = _interopRequireDefault(__webpack_require__(12)); + return _possibleConstructorReturn2 = _interopRequireDefault(__webpack_require__(13)); } var _inherits2; function _load_inherits() { - return _inherits2 = _interopRequireDefault(__webpack_require__(11)); + return _inherits2 = _interopRequireDefault(__webpack_require__(12)); } var _exoticResolver; function _load_exoticResolver() { - return _exoticResolver = _interopRequireDefault(__webpack_require__(64)); + return _exoticResolver = _interopRequireDefault(__webpack_require__(65)); } var _misc; @@ -64398,7 +64727,7 @@ LinkResolver.protocol = 'link'; exports.default = LinkResolver; /***/ }), -/* 245 */ +/* 246 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -64417,19 +64746,19 @@ function _load_classCallCheck() { var _possibleConstructorReturn2; function _load_possibleConstructorReturn() { - return _possibleConstructorReturn2 = _interopRequireDefault(__webpack_require__(12)); + return _possibleConstructorReturn2 = _interopRequireDefault(__webpack_require__(13)); } var _inherits2; function _load_inherits() { - return _inherits2 = _interopRequireDefault(__webpack_require__(11)); + return _inherits2 = _interopRequireDefault(__webpack_require__(12)); } var _npmResolver; function _load_npmResolver() { - return _npmResolver = _interopRequireDefault(__webpack_require__(156)); + return _npmResolver = _interopRequireDefault(__webpack_require__(158)); } function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -64448,7 +64777,7 @@ var YarnResolver = function (_NpmResolver) { exports.default = YarnResolver; /***/ }), -/* 246 */ +/* 247 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -64471,13 +64800,13 @@ exports.default = function (from, to) { var _semver; function _load_semver() { - return _semver = _interopRequireDefault(__webpack_require__(22)); + return _semver = _interopRequireDefault(__webpack_require__(20)); } var _semver2; function _load_semver2() { - return _semver2 = __webpack_require__(161); + return _semver2 = __webpack_require__(163); } var _constants; @@ -64489,7 +64818,7 @@ function _load_constants() { function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } /***/ }), -/* 247 */ +/* 248 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -64515,7 +64844,7 @@ exports.default = function (from, to, reporter) { }; /***/ }), -/* 248 */ +/* 249 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -64782,7 +65111,7 @@ function filterOverridenGitignores(files) { } /***/ }), -/* 249 */ +/* 250 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -64796,7 +65125,7 @@ exports.spawn = undefined; var _extends2; function _load_extends() { - return _extends2 = _interopRequireDefault(__webpack_require__(25)); + return _extends2 = _interopRequireDefault(__webpack_require__(23)); } var _map; @@ -64848,7 +65177,7 @@ var spawn = exports.spawn = function spawn(args) { }; /***/ }), -/* 250 */ +/* 251 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -64875,7 +65204,7 @@ function isValidPackagePath(input) { } /***/ }), -/* 251 */ +/* 252 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -64893,7 +65222,7 @@ function _load_path() { return _path = __webpack_require__(0); } -var userHome = __webpack_require__(75).default; +var userHome = __webpack_require__(76).default; function getPosixPath(path) { return path.replace(/\\/g, '/'); @@ -64909,7 +65238,7 @@ function resolveWithHome(path) { } /***/ }), -/* 252 */ +/* 253 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -64928,13 +65257,13 @@ function _load_getIterator() { var _assign; function _load_assign() { - return _assign = _interopRequireDefault(__webpack_require__(17)); + return _assign = _interopRequireDefault(__webpack_require__(16)); } var _promise; function _load_promise() { - return _promise = _interopRequireDefault(__webpack_require__(6)); + return _promise = _interopRequireDefault(__webpack_require__(5)); } var _classCallCheck2; @@ -64958,7 +65287,7 @@ function _load_url() { var _dnscache; function _load_dnscache() { - return _dnscache = _interopRequireDefault(__webpack_require__(533)); + return _dnscache = _interopRequireDefault(__webpack_require__(542)); } var _invariant; @@ -64970,13 +65299,13 @@ function _load_invariant() { var _requestCaptureHar; function _load_requestCaptureHar() { - return _requestCaptureHar = _interopRequireDefault(__webpack_require__(683)); + return _requestCaptureHar = _interopRequireDefault(__webpack_require__(692)); } var _errors; function _load_errors() { - return _errors = __webpack_require__(5); + return _errors = __webpack_require__(6); } var _blockingQueue; @@ -64994,7 +65323,7 @@ function _load_constants() { var _network; function _load_network() { - return _network = _interopRequireWildcard(__webpack_require__(206)); + return _network = _interopRequireWildcard(__webpack_require__(208)); } var _map; @@ -65117,7 +65446,7 @@ var RequestManager = function () { RequestManager.prototype._getRequestModule = function _getRequestModule() { if (!this._requestModule) { - var request = __webpack_require__(684); + var request = __webpack_require__(693); if (this.captureHar) { this._requestCaptureHar = new (_requestCaptureHar || _load_requestCaptureHar()).default(request); this._requestModule = this._requestCaptureHar.request.bind(this._requestCaptureHar); @@ -65422,13 +65751,13 @@ var RequestManager = function () { exports.default = RequestManager; /***/ }), -/* 253 */ +/* 254 */ /***/ (function(module, exports, __webpack_require__) { -module.exports = { "default": __webpack_require__(478), __esModule: true }; +module.exports = { "default": __webpack_require__(485), __esModule: true }; /***/ }), -/* 254 */ +/* 255 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -65436,11 +65765,11 @@ module.exports = { "default": __webpack_require__(478), __esModule: true }; exports.__esModule = true; -var _iterator = __webpack_require__(455); +var _iterator = __webpack_require__(460); var _iterator2 = _interopRequireDefault(_iterator); -var _symbol = __webpack_require__(454); +var _symbol = __webpack_require__(459); var _symbol2 = _interopRequireDefault(_symbol); @@ -65455,7 +65784,7 @@ exports.default = typeof _symbol2.default === "function" && _typeof(_iterator2.d }; /***/ }), -/* 255 */ +/* 256 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -66018,12 +66347,50 @@ module.exports = { /***/ }), -/* 256 */ +/* 257 */ +/***/ (function(module, exports, __webpack_require__) { + +var bufferFill = __webpack_require__(467) +var allocUnsafe = __webpack_require__(466) + +module.exports = function alloc (size, fill, encoding) { + if (typeof size !== 'number') { + throw new TypeError('"size" argument must be a number') + } + + if (size < 0) { + throw new RangeError('"size" argument must not be negative') + } + + if (Buffer.alloc) { + return Buffer.alloc(size, fill, encoding) + } + + var buffer = allocUnsafe(size) + + if (size === 0) { + return buffer + } + + if (fill === undefined) { + return bufferFill(buffer, 0) + } + + if (typeof encoding !== 'string') { + encoding = undefined + } + + return bufferFill(buffer, fill, encoding) +} + + +/***/ }), +/* 258 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -const restoreCursor = __webpack_require__(697); +const restoreCursor = __webpack_require__(706); let hidden = false; @@ -66064,7 +66431,7 @@ exports.toggle = (force, stream) => { /***/ }), -/* 257 */ +/* 259 */ /***/ (function(module, exports, __webpack_require__) { // On windows, create a .cmd file. @@ -66080,9 +66447,9 @@ exports.toggle = (force, stream) => { module.exports = cmdShim cmdShim.ifExists = cmdShimIfExists -var fs = __webpack_require__(289) +var fs = __webpack_require__(291) -var mkdir = __webpack_require__(194) +var mkdir = __webpack_require__(196) , path = __webpack_require__(0) , shebangExpr = /^#\!\s*(?:\/usr\/bin\/env)?\s*([^ \t]+)(.*)$/ @@ -66250,7 +66617,7 @@ function times(n, ok, cb) { /***/ }), -/* 258 */ +/* 260 */ /***/ (function(module, exports) { @@ -66493,11 +66860,11 @@ function isObject(val) { /***/ }), -/* 259 */ +/* 261 */ /***/ (function(module, exports, __webpack_require__) { /* MIT license */ -var cssKeywords = __webpack_require__(471); +var cssKeywords = __webpack_require__(478); // NOTE: conversions should only return primitive values (i.e. arrays, or // values that give correct `typeof` results). @@ -67360,12 +67727,12 @@ convert.rgb.gray = function (rgb) { /***/ }), -/* 260 */ +/* 262 */ /***/ (function(module, exports, __webpack_require__) { var util = __webpack_require__(4); var Stream = __webpack_require__(29).Stream; -var DelayedStream = __webpack_require__(530); +var DelayedStream = __webpack_require__(539); module.exports = CombinedStream; function CombinedStream() { @@ -67554,23 +67921,23 @@ CombinedStream.prototype._emitError = function(err) { /***/ }), -/* 261 */ +/* 263 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; var dP = __webpack_require__(45).f , create = __webpack_require__(96) - , redefineAll = __webpack_require__(174) - , ctx = __webpack_require__(55) - , anInstance = __webpack_require__(166) + , redefineAll = __webpack_require__(176) + , ctx = __webpack_require__(56) + , anInstance = __webpack_require__(168) , defined = __webpack_require__(116) , forOf = __webpack_require__(117) - , $iterDefine = __webpack_require__(171) - , step = __webpack_require__(271) - , setSpecies = __webpack_require__(278) + , $iterDefine = __webpack_require__(173) + , step = __webpack_require__(273) + , setSpecies = __webpack_require__(280) , DESCRIPTORS = __webpack_require__(49) - , fastKey = __webpack_require__(172).fastKey + , fastKey = __webpack_require__(174).fastKey , SIZE = DESCRIPTORS ? '_s' : 'size'; var getEntry = function(that, key){ @@ -67702,12 +68069,12 @@ module.exports = { }; /***/ }), -/* 262 */ +/* 264 */ /***/ (function(module, exports, __webpack_require__) { // https://github.com/DavidBruant/Map-Set.prototype.toJSON -var classof = __webpack_require__(167) - , from = __webpack_require__(488); +var classof = __webpack_require__(169) + , from = __webpack_require__(495); module.exports = function(NAME){ return function toJSON(){ if(classof(this) != NAME)throw TypeError(NAME + "#toJSON isn't generic"); @@ -67716,23 +68083,23 @@ module.exports = function(NAME){ }; /***/ }), -/* 263 */ +/* 265 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; var global = __webpack_require__(30) , $export = __webpack_require__(38) - , meta = __webpack_require__(172) - , fails = __webpack_require__(56) - , hide = __webpack_require__(57) - , redefineAll = __webpack_require__(174) + , meta = __webpack_require__(174) + , fails = __webpack_require__(57) + , hide = __webpack_require__(58) + , redefineAll = __webpack_require__(176) , forOf = __webpack_require__(117) - , anInstance = __webpack_require__(166) + , anInstance = __webpack_require__(168) , isObject = __webpack_require__(44) , setToStringTag = __webpack_require__(98) , dP = __webpack_require__(45).f - , each = __webpack_require__(490)(0) + , each = __webpack_require__(497)(0) , DESCRIPTORS = __webpack_require__(49); module.exports = function(NAME, wrapper, methods, common, IS_MAP, IS_WEAK){ @@ -67781,21 +68148,21 @@ module.exports = function(NAME, wrapper, methods, common, IS_MAP, IS_WEAK){ }; /***/ }), -/* 264 */ +/* 266 */ /***/ (function(module, exports, __webpack_require__) { module.exports = __webpack_require__(30).document && document.documentElement; /***/ }), -/* 265 */ +/* 267 */ /***/ (function(module, exports, __webpack_require__) { -module.exports = !__webpack_require__(49) && !__webpack_require__(56)(function(){ - return Object.defineProperty(__webpack_require__(168)('div'), 'a', {get: function(){ return 7; }}).a != 7; +module.exports = !__webpack_require__(49) && !__webpack_require__(57)(function(){ + return Object.defineProperty(__webpack_require__(170)('div'), 'a', {get: function(){ return 7; }}).a != 7; }); /***/ }), -/* 266 */ +/* 268 */ /***/ (function(module, exports) { // fast apply, http://jsperf.lnkit.com/fast-apply/5 @@ -67816,7 +68183,7 @@ module.exports = function(fn, args, that){ }; /***/ }), -/* 267 */ +/* 269 */ /***/ (function(module, exports, __webpack_require__) { // check on default Array iterator @@ -67829,7 +68196,7 @@ module.exports = function(it){ }; /***/ }), -/* 268 */ +/* 270 */ /***/ (function(module, exports, __webpack_require__) { // 7.2.2 IsArray(argument) @@ -67839,7 +68206,7 @@ module.exports = Array.isArray || function isArray(arg){ }; /***/ }), -/* 269 */ +/* 271 */ /***/ (function(module, exports, __webpack_require__) { // call something on iterator step with safe closing on error @@ -67856,7 +68223,7 @@ module.exports = function(iterator, fn, value, entries){ }; /***/ }), -/* 270 */ +/* 272 */ /***/ (function(module, exports, __webpack_require__) { var ITERATOR = __webpack_require__(31)('iterator') @@ -67882,7 +68249,7 @@ module.exports = function(exec, skipClosing){ }; /***/ }), -/* 271 */ +/* 273 */ /***/ (function(module, exports) { module.exports = function(done, value){ @@ -67890,15 +68257,15 @@ module.exports = function(done, value){ }; /***/ }), -/* 272 */ +/* 274 */ /***/ (function(module, exports, __webpack_require__) { var pIE = __webpack_require__(119) , createDesc = __webpack_require__(97) - , toIObject = __webpack_require__(68) - , toPrimitive = __webpack_require__(178) - , has = __webpack_require__(67) - , IE8_DOM_DEFINE = __webpack_require__(265) + , toIObject = __webpack_require__(69) + , toPrimitive = __webpack_require__(180) + , has = __webpack_require__(68) + , IE8_DOM_DEFINE = __webpack_require__(267) , gOPD = Object.getOwnPropertyDescriptor; exports.f = __webpack_require__(49) ? gOPD : function getOwnPropertyDescriptor(O, P){ @@ -67911,25 +68278,25 @@ exports.f = __webpack_require__(49) ? gOPD : function getOwnPropertyDescriptor(O }; /***/ }), -/* 273 */ +/* 275 */ /***/ (function(module, exports, __webpack_require__) { // 19.1.2.7 / 15.2.3.4 Object.getOwnPropertyNames(O) -var $keys = __webpack_require__(275) - , hiddenKeys = __webpack_require__(169).concat('length', 'prototype'); +var $keys = __webpack_require__(277) + , hiddenKeys = __webpack_require__(171).concat('length', 'prototype'); exports.f = Object.getOwnPropertyNames || function getOwnPropertyNames(O){ return $keys(O, hiddenKeys); }; /***/ }), -/* 274 */ +/* 276 */ /***/ (function(module, exports, __webpack_require__) { // 19.1.2.9 / 15.2.3.2 Object.getPrototypeOf(O) -var has = __webpack_require__(67) +var has = __webpack_require__(68) , toObject = __webpack_require__(78) - , IE_PROTO = __webpack_require__(175)('IE_PROTO') + , IE_PROTO = __webpack_require__(177)('IE_PROTO') , ObjectProto = Object.prototype; module.exports = Object.getPrototypeOf || function(O){ @@ -67941,13 +68308,13 @@ module.exports = Object.getPrototypeOf || function(O){ }; /***/ }), -/* 275 */ +/* 277 */ /***/ (function(module, exports, __webpack_require__) { -var has = __webpack_require__(67) - , toIObject = __webpack_require__(68) - , arrayIndexOf = __webpack_require__(489)(false) - , IE_PROTO = __webpack_require__(175)('IE_PROTO'); +var has = __webpack_require__(68) + , toIObject = __webpack_require__(69) + , arrayIndexOf = __webpack_require__(496)(false) + , IE_PROTO = __webpack_require__(177)('IE_PROTO'); module.exports = function(object, names){ var O = toIObject(object) @@ -67963,13 +68330,13 @@ module.exports = function(object, names){ }; /***/ }), -/* 276 */ +/* 278 */ /***/ (function(module, exports, __webpack_require__) { // most Object methods by ES6 should accept primitives var $export = __webpack_require__(38) - , core = __webpack_require__(21) - , fails = __webpack_require__(56); + , core = __webpack_require__(22) + , fails = __webpack_require__(57); module.exports = function(KEY, exec){ var fn = (core.Object || {})[KEY] || Object[KEY] , exp = {}; @@ -67978,19 +68345,19 @@ module.exports = function(KEY, exec){ }; /***/ }), -/* 277 */ +/* 279 */ /***/ (function(module, exports, __webpack_require__) { -module.exports = __webpack_require__(57); +module.exports = __webpack_require__(58); /***/ }), -/* 278 */ +/* 280 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; var global = __webpack_require__(30) - , core = __webpack_require__(21) + , core = __webpack_require__(22) , dP = __webpack_require__(45) , DESCRIPTORS = __webpack_require__(49) , SPECIES = __webpack_require__(31)('species'); @@ -68004,13 +68371,13 @@ module.exports = function(KEY){ }; /***/ }), -/* 279 */ +/* 281 */ /***/ (function(module, exports, __webpack_require__) { -var ctx = __webpack_require__(55) - , invoke = __webpack_require__(266) - , html = __webpack_require__(264) - , cel = __webpack_require__(168) +var ctx = __webpack_require__(56) + , invoke = __webpack_require__(268) + , html = __webpack_require__(266) + , cel = __webpack_require__(170) , global = __webpack_require__(30) , process = global.process , setTask = global.setImmediate @@ -68084,12 +68451,12 @@ module.exports = { }; /***/ }), -/* 280 */ +/* 282 */ /***/ (function(module, exports, __webpack_require__) { // Load modules -var Crypto = __webpack_require__(13); +var Crypto = __webpack_require__(14); var Boom = __webpack_require__(114); @@ -68158,7 +68525,7 @@ exports.fixedTimeComparison = function (a, b) { /***/ }), -/* 281 */ +/* 283 */ /***/ (function(module, exports, __webpack_require__) { @@ -68174,7 +68541,7 @@ exports.coerce = coerce; exports.disable = disable; exports.enable = enable; exports.enabled = enabled; -exports.humanize = __webpack_require__(651); +exports.humanize = __webpack_require__(659); /** * Active `debug` instances. @@ -68389,13 +68756,13 @@ function coerce(val) { /***/ }), -/* 282 */ +/* 284 */ /***/ (function(module, exports, __webpack_require__) { -var stream = __webpack_require__(69) -var eos = __webpack_require__(534) -var inherits = __webpack_require__(58) -var shift = __webpack_require__(722) +var stream = __webpack_require__(70) +var eos = __webpack_require__(543) +var inherits = __webpack_require__(59) +var shift = __webpack_require__(732) var SIGNAL_FLUSH = new Buffer([0]) @@ -68623,13 +68990,13 @@ module.exports = Duplexify /***/ }), -/* 283 */ +/* 285 */ /***/ (function(module, exports, __webpack_require__) { -var crypto = __webpack_require__(13); -var BigInteger = __webpack_require__(61).BigInteger; +var crypto = __webpack_require__(14); +var BigInteger = __webpack_require__(62).BigInteger; var ECPointFp = __webpack_require__(123).ECPointFp; -exports.ECCurves = __webpack_require__(536); +exports.ECCurves = __webpack_require__(545); // zero prepad function unstupid(hex,len) @@ -68686,7 +69053,7 @@ exports.ECKey = function(curve, key, isPublic) /***/ }), -/* 284 */ +/* 286 */ /***/ (function(module, exports, __webpack_require__) { var once = __webpack_require__(135); @@ -68775,7 +69142,7 @@ module.exports = eos; /***/ }), -/* 285 */ +/* 287 */ /***/ (function(module, exports, __webpack_require__) { /* @@ -68947,7 +69314,7 @@ function dumpException(ex) /***/ }), -/* 286 */ +/* 288 */ /***/ (function(module, exports, __webpack_require__) { module.exports = realpath @@ -68963,7 +69330,7 @@ var origRealpathSync = fs.realpathSync var version = process.version var ok = /^v[0-5]\./.test(version) -var old = __webpack_require__(555) +var old = __webpack_require__(564) function newError (er) { return er && er.syscall === 'realpath' && ( @@ -69019,7 +69386,7 @@ function unmonkeypatch () { /***/ }), -/* 287 */ +/* 289 */ /***/ (function(module, exports, __webpack_require__) { exports.alphasort = alphasort @@ -69038,7 +69405,7 @@ function ownProp (obj, field) { var path = __webpack_require__(0) var minimatch = __webpack_require__(134) -var isAbsolute = __webpack_require__(196) +var isAbsolute = __webpack_require__(198) var Minimatch = minimatch.Minimatch function alphasorti (a, b) { @@ -69265,7 +69632,7 @@ function childrenIgnored (self, path) { /***/ }), -/* 288 */ +/* 290 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -69293,12 +69660,12 @@ function clone (obj) { /***/ }), -/* 289 */ +/* 291 */ /***/ (function(module, exports, __webpack_require__) { var fs = __webpack_require__(10) -var polyfills = __webpack_require__(560) -var legacy = __webpack_require__(559) +var polyfills = __webpack_require__(569) +var legacy = __webpack_require__(568) var queue = [] var util = __webpack_require__(4) @@ -69322,7 +69689,7 @@ if (/\bgfs4\b/i.test(process.env.NODE_DEBUG || '')) { }) } -module.exports = patch(__webpack_require__(288)) +module.exports = patch(__webpack_require__(290)) if (process.env.TEST_GRACEFUL_FS_GLOBAL_PATCH) { module.exports = patch(fs) } @@ -69561,15 +69928,15 @@ function retry () { /***/ }), -/* 290 */ +/* 292 */ /***/ (function(module, exports, __webpack_require__) { // Load modules -var Crypto = __webpack_require__(13); +var Crypto = __webpack_require__(14); var Path = __webpack_require__(0); var Util = __webpack_require__(4); -var Escape = __webpack_require__(589); +var Escape = __webpack_require__(598); // Declare internals @@ -70560,13 +70927,13 @@ exports.shallow = function (source) { /***/ }), -/* 291 */ +/* 293 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; var _ = __webpack_require__(32); -var MuteStream = __webpack_require__(297); +var MuteStream = __webpack_require__(299); var readline = __webpack_require__(145); /** @@ -70639,12 +71006,12 @@ function setupReadlineOptions(opt) { /***/ }), -/* 292 */ +/* 294 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var ansiEscapes = __webpack_require__(371); +var ansiEscapes = __webpack_require__(376); /** * Move cursor left by `x` @@ -70697,7 +71064,7 @@ exports.clearLine = function (rl, len) { /***/ }), -/* 293 */ +/* 295 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -70717,7 +71084,7 @@ module.exports = function isPrimitive(value) { /***/ }), -/* 294 */ +/* 296 */ /***/ (function(module, exports) { var toString = {}.toString; @@ -70728,7 +71095,7 @@ module.exports = Array.isArray || function (arr) { /***/ }), -/* 295 */ +/* 297 */ /***/ (function(module, exports, __webpack_require__) { var stream = __webpack_require__(29) @@ -70761,7 +71128,7 @@ module.exports.isDuplex = isDuplex /***/ }), -/* 296 */ +/* 298 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -70779,7 +71146,7 @@ module.exports.isDuplex = isDuplex * @private */ -var db = __webpack_require__(649) +var db = __webpack_require__(657) var extname = __webpack_require__(0).extname /** @@ -70956,7 +71323,7 @@ function populateMaps (extensions, types) { /***/ }), -/* 297 */ +/* 299 */ /***/ (function(module, exports, __webpack_require__) { var Stream = __webpack_require__(29) @@ -71107,7 +71474,7 @@ MuteStream.prototype.close = proxy('close') /***/ }), -/* 298 */ +/* 300 */ /***/ (function(module, exports, __webpack_require__) { var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;(function (root, factory){ @@ -71408,11 +71775,11 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_ /***/ }), -/* 299 */ +/* 301 */ /***/ (function(module, exports, __webpack_require__) { var once = __webpack_require__(135) -var eos = __webpack_require__(284) +var eos = __webpack_require__(286) var fs = __webpack_require__(10) // we only need fs to get the ReadStream and WriteStream prototypes var noop = function () {} @@ -71494,7 +71861,7 @@ module.exports = pump /***/ }), -/* 300 */ +/* 302 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -71519,15 +71886,15 @@ module.exports = { /***/ }), -/* 301 */ +/* 303 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var stringify = __webpack_require__(670); -var parse = __webpack_require__(669); -var formats = __webpack_require__(300); +var stringify = __webpack_require__(679); +var parse = __webpack_require__(678); +var formats = __webpack_require__(302); module.exports = { formats: formats, @@ -71537,7 +71904,7 @@ module.exports = { /***/ }), -/* 302 */ +/* 304 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -71726,7 +72093,7 @@ exports.isBuffer = function (obj) { /***/ }), -/* 303 */ +/* 305 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -71735,11 +72102,11 @@ exports.isBuffer = function (obj) { module.exports = Readable; /**/ -var processNextTick = __webpack_require__(197); +var processNextTick = __webpack_require__(199); /**/ /**/ -var isArray = __webpack_require__(294); +var isArray = __webpack_require__(296); /**/ /**/ @@ -71749,7 +72116,7 @@ var Duplex; Readable.ReadableState = ReadableState; /**/ -var EE = __webpack_require__(71).EventEmitter; +var EE = __webpack_require__(72).EventEmitter; var EElistenerCount = function (emitter, type) { return emitter.listeners(type).length; @@ -71757,17 +72124,17 @@ var EElistenerCount = function (emitter, type) { /**/ /**/ -var Stream = __webpack_require__(306); +var Stream = __webpack_require__(308); /**/ var Buffer = __webpack_require__(105).Buffer; /**/ -var bufferShim = __webpack_require__(164); +var bufferShim = __webpack_require__(166); /**/ /**/ var util = __webpack_require__(100); -util.inherits = __webpack_require__(58); +util.inherits = __webpack_require__(59); /**/ /**/ @@ -71780,7 +72147,7 @@ if (debugUtil && debugUtil.debuglog) { } /**/ -var BufferList = __webpack_require__(677); +var BufferList = __webpack_require__(686); var StringDecoder; util.inherits(Readable, Stream); @@ -71864,7 +72231,7 @@ function ReadableState(options, stream) { this.decoder = null; this.encoding = null; if (options.encoding) { - if (!StringDecoder) StringDecoder = __webpack_require__(307).StringDecoder; + if (!StringDecoder) StringDecoder = __webpack_require__(309).StringDecoder; this.decoder = new StringDecoder(options.encoding); this.encoding = options.encoding; } @@ -71974,7 +72341,7 @@ function needMoreData(state) { // backwards compatibility. Readable.prototype.setEncoding = function (enc) { - if (!StringDecoder) StringDecoder = __webpack_require__(307).StringDecoder; + if (!StringDecoder) StringDecoder = __webpack_require__(309).StringDecoder; this._readableState.decoder = new StringDecoder(enc); this._readableState.encoding = enc; return this; @@ -72667,7 +73034,7 @@ function indexOf(xs, x) { } /***/ }), -/* 304 */ +/* 306 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -72721,7 +73088,7 @@ var Duplex = __webpack_require__(81); /**/ var util = __webpack_require__(100); -util.inherits = __webpack_require__(58); +util.inherits = __webpack_require__(59); /**/ util.inherits(Transform, Duplex); @@ -72855,7 +73222,7 @@ function done(stream, er, data) { } /***/ }), -/* 305 */ +/* 307 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -72868,7 +73235,7 @@ function done(stream, er, data) { module.exports = Writable; /**/ -var processNextTick = __webpack_require__(197); +var processNextTick = __webpack_require__(199); /**/ /**/ @@ -72883,22 +73250,22 @@ Writable.WritableState = WritableState; /**/ var util = __webpack_require__(100); -util.inherits = __webpack_require__(58); +util.inherits = __webpack_require__(59); /**/ /**/ var internalUtil = { - deprecate: __webpack_require__(734) + deprecate: __webpack_require__(744) }; /**/ /**/ -var Stream = __webpack_require__(306); +var Stream = __webpack_require__(308); /**/ var Buffer = __webpack_require__(105).Buffer; /**/ -var bufferShim = __webpack_require__(164); +var bufferShim = __webpack_require__(166); /**/ util.inherits(Writable, Stream); @@ -73405,14 +73772,14 @@ function CorkedRequest(state) { } /***/ }), -/* 306 */ +/* 308 */ /***/ (function(module, exports, __webpack_require__) { module.exports = __webpack_require__(29); /***/ }), -/* 307 */ +/* 309 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -73690,7 +74057,7 @@ function simpleEnd(buf) { } /***/ }), -/* 308 */ +/* 310 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -73715,13 +74082,13 @@ module.exports = function repeat(ele, num) { /***/ }), -/* 309 */ +/* 311 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var tough = __webpack_require__(693) +var tough = __webpack_require__(702) var Cookie = tough.Cookie , CookieJar = tough.CookieJar @@ -73761,7 +74128,7 @@ exports.jar = function(store) { /***/ }), -/* 310 */ +/* 312 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -73829,7 +74196,7 @@ exports.pathMatch = pathMatch; /***/ }), -/* 311 */ +/* 313 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -73864,7 +74231,7 @@ exports.pathMatch = pathMatch; * POSSIBILITY OF SUCH DAMAGE. */ -var pubsuffix = __webpack_require__(312); +var pubsuffix = __webpack_require__(314); // Gives the permutation of all possible domainMatch()es of a given domain. The // array is in shortest-to-longest order. Handy for indexing. @@ -73892,7 +74259,7 @@ exports.permuteDomain = permuteDomain; /***/ }), -/* 312 */ +/* 314 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -73903,7 +74270,7 @@ exports.permuteDomain = permuteDomain; -var punycode = __webpack_require__(202); +var punycode = __webpack_require__(204); module.exports.getPublicSuffix = function getPublicSuffix(domain) { /*! @@ -73997,7 +74364,7 @@ var index = module.exports.index = Object.freeze( /***/ }), -/* 313 */ +/* 315 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -74075,7 +74442,7 @@ Store.prototype.getAllCookies = function(cb) { /***/ }), -/* 314 */ +/* 316 */ /***/ (function(module, exports, __webpack_require__) { /* WEBPACK VAR INJECTION */(function(module) {var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;// Copyright (c) Microsoft, All rights reserved. See License.txt in the project root for license information. @@ -74641,10 +75008,10 @@ Store.prototype.getAllCookies = function(cb) { return Rx; })); -/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(23)(module))) +/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(24)(module))) /***/ }), -/* 315 */ +/* 317 */ /***/ (function(module, exports, __webpack_require__) { /* WEBPACK VAR INJECTION */(function(module) {var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;// Copyright (c) Microsoft, All rights reserved. See License.txt in the project root for license information. @@ -74933,19 +75300,19 @@ Store.prototype.getAllCookies = function(cb) { return Rx; })); -/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(23)(module))) +/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(24)(module))) /***/ }), -/* 316 */ +/* 318 */ /***/ (function(module, exports, __webpack_require__) { // Note: since nyc uses this module to output coverage, any lines // that are in the direct sync flow of nyc's outputCoverage are // ignored, since we can never get coverage for them. var assert = __webpack_require__(36) -var signals = __webpack_require__(711) +var signals = __webpack_require__(720) -var EE = __webpack_require__(71) +var EE = __webpack_require__(72) /* istanbul ignore if */ if (typeof EE !== 'function') { EE = EE.EventEmitter @@ -75099,13 +75466,377 @@ function processEmit (ev, arg) { /***/ }), -/* 317 */ +/* 319 */ /***/ (function(module, exports, __webpack_require__) { -module.exports = __webpack_require__(712); +module.exports = __webpack_require__(721); /***/ }), -/* 318 */ +/* 320 */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +var scan = __webpack_require__(728) +var parse = __webpack_require__(727) + +module.exports = function (source) { + return parse(scan(source)) +} + + +/***/ }), +/* 321 */ +/***/ (function(module, exports) { + +module.exports = [ + "0BSD", + "AAL", + "Abstyles", + "Adobe-2006", + "Adobe-Glyph", + "ADSL", + "AFL-1.1", + "AFL-1.2", + "AFL-2.0", + "AFL-2.1", + "AFL-3.0", + "Afmparse", + "AGPL-1.0", + "AGPL-3.0-only", + "AGPL-3.0-or-later", + "Aladdin", + "AMDPLPA", + "AML", + "AMPAS", + "ANTLR-PD", + "Apache-1.0", + "Apache-1.1", + "Apache-2.0", + "APAFML", + "APL-1.0", + "APSL-1.0", + "APSL-1.1", + "APSL-1.2", + "APSL-2.0", + "Artistic-1.0-cl8", + "Artistic-1.0-Perl", + "Artistic-1.0", + "Artistic-2.0", + "Bahyph", + "Barr", + "Beerware", + "BitTorrent-1.0", + "BitTorrent-1.1", + "Borceux", + "BSD-1-Clause", + "BSD-2-Clause-FreeBSD", + "BSD-2-Clause-NetBSD", + "BSD-2-Clause-Patent", + "BSD-2-Clause", + "BSD-3-Clause-Attribution", + "BSD-3-Clause-Clear", + "BSD-3-Clause-LBNL", + "BSD-3-Clause-No-Nuclear-License-2014", + "BSD-3-Clause-No-Nuclear-License", + "BSD-3-Clause-No-Nuclear-Warranty", + "BSD-3-Clause", + "BSD-4-Clause-UC", + "BSD-4-Clause", + "BSD-Protection", + "BSD-Source-Code", + "BSL-1.0", + "bzip2-1.0.5", + "bzip2-1.0.6", + "Caldera", + "CATOSL-1.1", + "CC-BY-1.0", + "CC-BY-2.0", + "CC-BY-2.5", + "CC-BY-3.0", + "CC-BY-4.0", + "CC-BY-NC-1.0", + "CC-BY-NC-2.0", + "CC-BY-NC-2.5", + "CC-BY-NC-3.0", + "CC-BY-NC-4.0", + "CC-BY-NC-ND-1.0", + "CC-BY-NC-ND-2.0", + "CC-BY-NC-ND-2.5", + "CC-BY-NC-ND-3.0", + "CC-BY-NC-ND-4.0", + "CC-BY-NC-SA-1.0", + "CC-BY-NC-SA-2.0", + "CC-BY-NC-SA-2.5", + "CC-BY-NC-SA-3.0", + "CC-BY-NC-SA-4.0", + "CC-BY-ND-1.0", + "CC-BY-ND-2.0", + "CC-BY-ND-2.5", + "CC-BY-ND-3.0", + "CC-BY-ND-4.0", + "CC-BY-SA-1.0", + "CC-BY-SA-2.0", + "CC-BY-SA-2.5", + "CC-BY-SA-3.0", + "CC-BY-SA-4.0", + "CC0-1.0", + "CDDL-1.0", + "CDDL-1.1", + "CDLA-Permissive-1.0", + "CDLA-Sharing-1.0", + "CECILL-1.0", + "CECILL-1.1", + "CECILL-2.0", + "CECILL-2.1", + "CECILL-B", + "CECILL-C", + "ClArtistic", + "CNRI-Jython", + "CNRI-Python-GPL-Compatible", + "CNRI-Python", + "Condor-1.1", + "CPAL-1.0", + "CPL-1.0", + "CPOL-1.02", + "Crossword", + "CrystalStacker", + "CUA-OPL-1.0", + "Cube", + "curl", + "D-FSL-1.0", + "diffmark", + "DOC", + "Dotseqn", + "DSDP", + "dvipdfm", + "ECL-1.0", + "ECL-2.0", + "EFL-1.0", + "EFL-2.0", + "eGenix", + "Entessa", + "EPL-1.0", + "EPL-2.0", + "ErlPL-1.1", + "EUDatagrid", + "EUPL-1.0", + "EUPL-1.1", + "EUPL-1.2", + "Eurosym", + "Fair", + "Frameworx-1.0", + "FreeImage", + "FSFAP", + "FSFUL", + "FSFULLR", + "FTL", + "GFDL-1.1-only", + "GFDL-1.1-or-later", + "GFDL-1.2-only", + "GFDL-1.2-or-later", + "GFDL-1.3-only", + "GFDL-1.3-or-later", + "Giftware", + "GL2PS", + "Glide", + "Glulxe", + "gnuplot", + "GPL-1.0-only", + "GPL-1.0-or-later", + "GPL-2.0-only", + "GPL-2.0-or-later", + "GPL-3.0-only", + "GPL-3.0-or-later", + "gSOAP-1.3b", + "HaskellReport", + "HPND", + "IBM-pibs", + "ICU", + "IJG", + "ImageMagick", + "iMatix", + "Imlib2", + "Info-ZIP", + "Intel-ACPI", + "Intel", + "Interbase-1.0", + "IPA", + "IPL-1.0", + "ISC", + "JasPer-2.0", + "JSON", + "LAL-1.2", + "LAL-1.3", + "Latex2e", + "Leptonica", + "LGPL-2.0-only", + "LGPL-2.0-or-later", + "LGPL-2.1-only", + "LGPL-2.1-or-later", + "LGPL-3.0-only", + "LGPL-3.0-or-later", + "LGPLLR", + "Libpng", + "libtiff", + "LiLiQ-P-1.1", + "LiLiQ-R-1.1", + "LiLiQ-Rplus-1.1", + "LPL-1.0", + "LPL-1.02", + "LPPL-1.0", + "LPPL-1.1", + "LPPL-1.2", + "LPPL-1.3a", + "LPPL-1.3c", + "MakeIndex", + "MirOS", + "MIT-advertising", + "MIT-CMU", + "MIT-enna", + "MIT-feh", + "MIT", + "MITNFA", + "Motosoto", + "mpich2", + "MPL-1.0", + "MPL-1.1", + "MPL-2.0-no-copyleft-exception", + "MPL-2.0", + "MS-PL", + "MS-RL", + "MTLL", + "Multics", + "Mup", + "NASA-1.3", + "Naumen", + "NBPL-1.0", + "NCSA", + "Net-SNMP", + "NetCDF", + "Newsletr", + "NGPL", + "NLOD-1.0", + "NLPL", + "Nokia", + "NOSL", + "Noweb", + "NPL-1.0", + "NPL-1.1", + "NPOSL-3.0", + "NRL", + "NTP", + "OCCT-PL", + "OCLC-2.0", + "ODbL-1.0", + "OFL-1.0", + "OFL-1.1", + "OGTSL", + "OLDAP-1.1", + "OLDAP-1.2", + "OLDAP-1.3", + "OLDAP-1.4", + "OLDAP-2.0.1", + "OLDAP-2.0", + "OLDAP-2.1", + "OLDAP-2.2.1", + "OLDAP-2.2.2", + "OLDAP-2.2", + "OLDAP-2.3", + "OLDAP-2.4", + "OLDAP-2.5", + "OLDAP-2.6", + "OLDAP-2.7", + "OLDAP-2.8", + "OML", + "OpenSSL", + "OPL-1.0", + "OSET-PL-2.1", + "OSL-1.0", + "OSL-1.1", + "OSL-2.0", + "OSL-2.1", + "OSL-3.0", + "PDDL-1.0", + "PHP-3.0", + "PHP-3.01", + "Plexus", + "PostgreSQL", + "psfrag", + "psutils", + "Python-2.0", + "Qhull", + "QPL-1.0", + "Rdisc", + "RHeCos-1.1", + "RPL-1.1", + "RPL-1.5", + "RPSL-1.0", + "RSA-MD", + "RSCPL", + "Ruby", + "SAX-PD", + "Saxpath", + "SCEA", + "Sendmail", + "SGI-B-1.0", + "SGI-B-1.1", + "SGI-B-2.0", + "SimPL-2.0", + "SISSL-1.2", + "SISSL", + "Sleepycat", + "SMLNJ", + "SMPPL", + "SNIA", + "Spencer-86", + "Spencer-94", + "Spencer-99", + "SPL-1.0", + "SugarCRM-1.1.3", + "SWL", + "TCL", + "TCP-wrappers", + "TMate", + "TORQUE-1.1", + "TOSL", + "Unicode-DFS-2015", + "Unicode-DFS-2016", + "Unicode-TOU", + "Unlicense", + "UPL-1.0", + "Vim", + "VOSTROM", + "VSL-1.0", + "W3C-19980720", + "W3C-20150513", + "W3C", + "Watcom-1.0", + "Wsuipa", + "WTFPL", + "X11", + "Xerox", + "XFree86-1.1", + "xinetd", + "Xnet", + "xpp", + "XSkat", + "YPL-1.0", + "YPL-1.1", + "Zed", + "Zend-2.0", + "Zimbra-1.3", + "Zimbra-1.4", + "zlib-acknowledgement", + "Zlib", + "ZPL-1.1", + "ZPL-2.0", + "ZPL-2.1" +]; + +/***/ }), +/* 322 */ /***/ (function(module, exports, __webpack_require__) { // Copyright 2017 Joyent, Inc. @@ -75116,10 +75847,10 @@ module.exports = { generateED25519: generateED25519 }; -var assert = __webpack_require__(16); -var crypto = __webpack_require__(13); +var assert = __webpack_require__(17); +var crypto = __webpack_require__(14); var algs = __webpack_require__(26); -var utils = __webpack_require__(24); +var utils = __webpack_require__(25); var ed; var nacl; @@ -75154,11 +75885,11 @@ function DiffieHellman(key) { } else if (key.type === 'ecdsa') { if (!CRYPTO_HAVE_ECDH) { if (ecdh === undefined) - ecdh = __webpack_require__(283); + ecdh = __webpack_require__(285); if (ec === undefined) ec = __webpack_require__(123); if (jsbn === undefined) - jsbn = __webpack_require__(61).BigInteger; + jsbn = __webpack_require__(62).BigInteger; this._ecParams = new X9ECParameters(this._curve); @@ -75187,7 +75918,7 @@ function DiffieHellman(key) { } else if (key.type === 'curve25519') { if (ed === undefined) - ed = __webpack_require__(190); + ed = __webpack_require__(192); if (this._isPriv) { this._priv = key.part.r.data; @@ -75481,11 +76212,11 @@ function generateECDSA(curve) { } else { if (ecdh === undefined) - ecdh = __webpack_require__(283); + ecdh = __webpack_require__(285); if (ec === undefined) ec = __webpack_require__(123); if (jsbn === undefined) - jsbn = __webpack_require__(61).BigInteger; + jsbn = __webpack_require__(62).BigInteger; var ecParams = new X9ECParameters(curve); @@ -75521,7 +76252,7 @@ function generateECDSA(curve) { /***/ }), -/* 319 */ +/* 323 */ /***/ (function(module, exports, __webpack_require__) { // Copyright 2015 Joyent, Inc. @@ -75534,7 +76265,7 @@ module.exports = { var nacl; var stream = __webpack_require__(29); var util = __webpack_require__(4); -var assert = __webpack_require__(16); +var assert = __webpack_require__(17); var Signature = __webpack_require__(51); function Verifier(key, hashAlgo) { @@ -75623,7 +76354,7 @@ Signer.prototype.sign = function () { /***/ }), -/* 320 */ +/* 324 */ /***/ (function(module, exports, __webpack_require__) { // Copyright 2015 Joyent, Inc. @@ -75633,14 +76364,14 @@ module.exports = { write: write }; -var assert = __webpack_require__(16); -var utils = __webpack_require__(24); +var assert = __webpack_require__(17); +var utils = __webpack_require__(25); var Key = __webpack_require__(27); var PrivateKey = __webpack_require__(28); -var pem = __webpack_require__(62); -var ssh = __webpack_require__(321); -var rfc4253 = __webpack_require__(70); +var pem = __webpack_require__(63); +var ssh = __webpack_require__(325); +var rfc4253 = __webpack_require__(71); function read(buf, options) { if (typeof (buf) === 'string') { @@ -75702,7 +76433,7 @@ function write(key, options) { /***/ }), -/* 321 */ +/* 325 */ /***/ (function(module, exports, __webpack_require__) { // Copyright 2015 Joyent, Inc. @@ -75712,9 +76443,9 @@ module.exports = { write: write }; -var assert = __webpack_require__(16); -var rfc4253 = __webpack_require__(70); -var utils = __webpack_require__(24); +var assert = __webpack_require__(17); +var rfc4253 = __webpack_require__(71); +var utils = __webpack_require__(25); var Key = __webpack_require__(27); var PrivateKey = __webpack_require__(28); @@ -75822,7 +76553,7 @@ function write(key, options) { /***/ }), -/* 322 */ +/* 326 */ /***/ (function(module, exports, __webpack_require__) { // Copyright 2017 Joyent, Inc. @@ -75835,13 +76566,13 @@ module.exports = { write: write }; -var assert = __webpack_require__(16); +var assert = __webpack_require__(17); var asn1 = __webpack_require__(53); var algs = __webpack_require__(26); -var utils = __webpack_require__(24); +var utils = __webpack_require__(25); var Key = __webpack_require__(27); var PrivateKey = __webpack_require__(28); -var pem = __webpack_require__(62); +var pem = __webpack_require__(63); var Identity = __webpack_require__(104); var Signature = __webpack_require__(51); var Certificate = __webpack_require__(101); @@ -76554,7 +77285,7 @@ function writeBitField(setBits, bitIndex) { /***/ }), -/* 323 */ +/* 327 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -76575,8 +77306,11 @@ module.exports = x => { /***/ }), -/* 324 */ -/***/ (function(module, exports) { +/* 328 */ +/***/ (function(module, exports, __webpack_require__) { + +var toBuffer = __webpack_require__(331) +var alloc = __webpack_require__(257) var ZEROS = '0000000000000000000' var SEVENS = '7777777777777777777' @@ -76586,7 +77320,7 @@ var MASK = parseInt('7777', 8) var clamp = function (index, len, defaultValue) { if (typeof index !== 'number') return defaultValue - index = ~~index // Coerce to integer. + index = ~~index // Coerce to integer. if (index >= len) return len if (index >= 0) return index index += len @@ -76651,12 +77385,6 @@ var toTypeflag = function (flag) { return 0 } -var alloc = function (size) { - var buf = new Buffer(size) - buf.fill(0) - return buf -} - var indexOf = function (block, num, offset, end) { for (; offset < end; offset++) { if (block[offset] === num) return offset @@ -76729,20 +77457,20 @@ var decodeOct = function (val, offset, length) { } } -var decodeStr = function (val, offset, length) { - return val.slice(offset, indexOf(val, 0, offset, offset + length)).toString() +var decodeStr = function (val, offset, length, encoding) { + return val.slice(offset, indexOf(val, 0, offset, offset + length)).toString(encoding) } var addLength = function (str) { var len = Buffer.byteLength(str) var digits = Math.floor(Math.log(len) / Math.log(10)) + 1 - if (len + digits > Math.pow(10, digits)) digits++ + if (len + digits >= Math.pow(10, digits)) digits++ return (len + digits) + str } -exports.decodeLongPath = function (buf) { - return decodeStr(buf, 0, buf.length) +exports.decodeLongPath = function (buf, encoding) { + return decodeStr(buf, 0, buf.length, encoding) } exports.encodePax = function (opts) { // TODO: encode more stuff in pax @@ -76755,7 +77483,7 @@ exports.encodePax = function (opts) { // TODO: encode more stuff in pax result += addLength(' ' + key + '=' + pax[key] + '\n') } } - return new Buffer(result) + return toBuffer(result) } exports.decodePax = function (buf) { @@ -76820,23 +77548,23 @@ exports.encode = function (opts) { return buf } -exports.decode = function (buf) { +exports.decode = function (buf, filenameEncoding) { var typeflag = buf[156] === 0 ? 0 : buf[156] - ZERO_OFFSET - var name = decodeStr(buf, 0, 100) + var name = decodeStr(buf, 0, 100, filenameEncoding) var mode = decodeOct(buf, 100, 8) var uid = decodeOct(buf, 108, 8) var gid = decodeOct(buf, 116, 8) var size = decodeOct(buf, 124, 12) var mtime = decodeOct(buf, 136, 12) var type = toType(typeflag) - var linkname = buf[157] === 0 ? null : decodeStr(buf, 157, 100) + var linkname = buf[157] === 0 ? null : decodeStr(buf, 157, 100, filenameEncoding) var uname = decodeStr(buf, 265, 32) var gname = decodeStr(buf, 297, 32) var devmajor = decodeOct(buf, 329, 8) var devminor = decodeOct(buf, 337, 8) - if (buf[345]) name = decodeStr(buf, 345, 155) + '/' + name + if (buf[345]) name = decodeStr(buf, 345, 155, filenameEncoding) + '/' + name // to support old tar versions that use trailing / to indicate dirs if (typeflag === 0 && name && name[name.length - 1] === '/') typeflag = 5 @@ -76867,20 +77595,20 @@ exports.decode = function (buf) { /***/ }), -/* 325 */ +/* 329 */ /***/ (function(module, exports, __webpack_require__) { -exports.extract = __webpack_require__(729) -exports.pack = __webpack_require__(730) +exports.extract = __webpack_require__(739) +exports.pack = __webpack_require__(740) /***/ }), -/* 326 */ +/* 330 */ /***/ (function(module, exports, __webpack_require__) { -var Transform = __webpack_require__(678) +var Transform = __webpack_require__(687) , inherits = __webpack_require__(4).inherits - , xtend = __webpack_require__(329) + , xtend = __webpack_require__(334) function DestroyableTransform(opts) { Transform.call(this, opts) @@ -76977,7 +77705,27 @@ module.exports.obj = through2(function (options, transform, flush) { /***/ }), -/* 327 */ +/* 331 */ +/***/ (function(module, exports) { + +module.exports = toBuffer + +var makeBuffer = Buffer.from && Buffer.from !== Uint8Array.from ? Buffer.from : bufferFrom + +function bufferFrom (buf, enc) { + return new Buffer(buf, enc) +} + +function toBuffer (buf, enc) { + if (Buffer.isBuffer(buf)) return buf + if (typeof buf === 'string') return makeBuffer(buf, enc) + if (Array.isArray(buf)) return makeBuffer(buf) + throw new Error('Input should be a buffer or a string') +} + + +/***/ }), +/* 332 */ /***/ (function(module, exports) { /** @@ -77006,13 +77754,13 @@ module.exports = bytesToUuid; /***/ }), -/* 328 */ +/* 333 */ /***/ (function(module, exports, __webpack_require__) { // Unique ID creation requires a high quality random # generator. In node.js // this is prett straight-forward - we use the crypto API. -var rb = __webpack_require__(13).randomBytes; +var rb = __webpack_require__(14).randomBytes; function rng() { return rb(16); @@ -77022,7 +77770,7 @@ module.exports = rng; /***/ }), -/* 329 */ +/* 334 */ /***/ (function(module, exports) { module.exports = extend @@ -77047,13 +77795,13 @@ function extend() { /***/ }), -/* 330 */ +/* 335 */ /***/ (function(module, exports) { module.exports = { "name": "yarn", "installationMethod": "unknown", - "version": "1.6.0", + "version": "1.7.0", "license": "BSD-2-Clause", "preferGlobal": true, "description": "📦🐈 Fast, reliable, and secure dependency management.", @@ -77066,7 +77814,7 @@ module.exports = { "commander": "^2.9.0", "death": "^1.0.0", "debug": "^3.0.0", - "deepequal": "^0.0.1", + "deep-equal": "^1.0.1", "detect-indent": "^5.0.0", "dnscache": "^1.0.1", "glob": "^7.1.1", @@ -77083,6 +77831,7 @@ module.exports = { "mkdirp": "^0.5.1", "node-emoji": "^1.6.1", "normalize-url": "^2.0.0", + "npm-logical-tree": "^1.2.1", "object-path": "^0.11.2", "proper-lockfile": "^2.0.0", "puka": "^1.0.0", @@ -77093,11 +77842,11 @@ module.exports = { "semver": "^5.1.0", "strip-ansi": "^4.0.0", "strip-bom": "^3.0.0", - "tar-fs": "^1.15.1", - "tar-stream": "^1.5.2", + "tar-fs": "^1.16.0", + "tar-stream": "^1.6.0", "uuid": "^3.0.1", - "v8-compile-cache": "^1.1.0", - "validate-npm-package-license": "^3.0.1", + "v8-compile-cache": "^2.0.0", + "validate-npm-package-license": "^3.0.3", "yn": "^2.0.0" }, "devDependencies": { @@ -77116,7 +77865,7 @@ module.exports = { "cz-conventional-changelog": "^2.0.0", "eslint": "^4.3.0", "eslint-config-fb-strict": "^22.0.0", - "eslint-plugin-babel": "^4.0.0", + "eslint-plugin-babel": "^5.0.0", "eslint-plugin-flowtype": "^2.35.0", "eslint-plugin-jasmine": "^2.6.2", "eslint-plugin-jest": "^21.0.0", @@ -77128,6 +77877,7 @@ module.exports = { "eslint-plugin-yarn-internal": "file:scripts/eslint-rules", "execa": "^0.10.0", "flow-bin": "^0.66.0", + "git-release-notes": "^3.0.0", "gulp": "^3.9.0", "gulp-babel": "^7.0.0", "gulp-if": "^2.0.1", @@ -77136,7 +77886,7 @@ module.exports = { "gulp-sourcemaps": "^2.2.0", "gulp-util": "^3.0.7", "gulp-watch": "^5.0.0", - "jest": "^22.4.3", + "jest": "^22.4.4", "jsinspect": "^0.12.6", "minimatch": "^3.0.4", "mock-stdin": "^0.3.0", @@ -77160,6 +77910,7 @@ module.exports = { "build-deb": "./scripts/build-deb.sh", "build-dist": "bash ./scripts/build-dist.sh", "build-win-installer": "scripts\\build-windows-installer.bat", + "changelog": "git-release-notes $(git describe --tags --abbrev=0 $(git describe --tags --abbrev=0)^)..$(git describe --tags --abbrev=0) scripts/changelog.md", "dupe-check": "yarn jsinspect ./src", "lint": "eslint . && flow check", "pkg-tests": "yarn --cwd packages/pkg-tests jest yarn.test.js", @@ -77167,6 +77918,7 @@ module.exports = { "release-branch": "./scripts/release-branch.sh", "test": "yarn lint && yarn test-only", "test-only": "node --max_old_space_size=4096 node_modules/jest/bin/jest.js --verbose", + "test-only-debug": "node --inspect-brk --max_old_space_size=4096 node_modules/jest/bin/jest.js --runInBand --verbose", "test-coverage": "node --max_old_space_size=4096 node_modules/jest/bin/jest.js --coverage --verbose", "watch": "gulp watch", "commit": "git-cz" @@ -77195,25 +77947,25 @@ module.exports = { }; /***/ }), -/* 331 */ +/* 336 */ /***/ (function(module, exports) { module.exports = require("constants"); /***/ }), -/* 332 */ +/* 337 */ /***/ (function(module, exports) { module.exports = require("dns"); /***/ }), -/* 333 */ +/* 338 */ /***/ (function(module, exports) { module.exports = require("tls"); /***/ }), -/* 334 */ +/* 339 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -77247,19 +77999,19 @@ function _load_path() { var _commander; function _load_commander() { - return _commander = _interopRequireDefault(__webpack_require__(207)); + return _commander = _interopRequireDefault(__webpack_require__(209)); } var _lockfile; function _load_lockfile() { - return _lockfile = __webpack_require__(20); + return _lockfile = __webpack_require__(21); } var _rc; function _load_rc() { - return _rc = _interopRequireWildcard(__webpack_require__(449)); + return _rc = _interopRequireWildcard(__webpack_require__(454)); } function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } } @@ -77367,7 +78119,7 @@ function getRcArgs(commandName, args) { } /***/ }), -/* 335 */ +/* 340 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -77399,7 +78151,7 @@ function boolifyWithDefault(val, defaultResult) { } /***/ }), -/* 336 */ +/* 341 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -77429,7 +78181,7 @@ function handleSignals() { } /***/ }), -/* 337 */ +/* 342 */ /***/ (function(module, exports) { @@ -77500,14 +78252,14 @@ module.exports = function (arg) { /***/ }), -/* 338 */ +/* 343 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; var util = __webpack_require__(4); -var onExit = __webpack_require__(316); -var currentlyUnhandled = __webpack_require__(524); +var onExit = __webpack_require__(318); +var currentlyUnhandled = __webpack_require__(531); var installed = false; @@ -77543,16 +78295,16 @@ module.exports = function (log) { /***/ }), -/* 339 */ +/* 344 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -const fs = __webpack_require__(289); +const fs = __webpack_require__(291); const path = __webpack_require__(0); -const retry = __webpack_require__(698); -const syncFs = __webpack_require__(666); +const retry = __webpack_require__(707); +const syncFs = __webpack_require__(675); const locks = {}; @@ -77930,33 +78682,33 @@ module.exports.checkSync = checkSync; /***/ }), -/* 340 */ +/* 345 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var compileSchema = __webpack_require__(345) - , resolve = __webpack_require__(211) - , Cache = __webpack_require__(341) - , SchemaObject = __webpack_require__(212) - , stableStringify = __webpack_require__(192) - , formats = __webpack_require__(344) - , rules = __webpack_require__(346) - , v5 = __webpack_require__(370) - , util = __webpack_require__(63) - , async = __webpack_require__(209) - , co = __webpack_require__(258); +var compileSchema = __webpack_require__(350) + , resolve = __webpack_require__(213) + , Cache = __webpack_require__(346) + , SchemaObject = __webpack_require__(214) + , stableStringify = __webpack_require__(194) + , formats = __webpack_require__(349) + , rules = __webpack_require__(351) + , v5 = __webpack_require__(375) + , util = __webpack_require__(64) + , async = __webpack_require__(211) + , co = __webpack_require__(260); module.exports = Ajv; Ajv.prototype.compileAsync = async.compile; -var customKeyword = __webpack_require__(367); +var customKeyword = __webpack_require__(372); Ajv.prototype.addKeyword = customKeyword.add; Ajv.prototype.getKeyword = customKeyword.get; Ajv.prototype.removeKeyword = customKeyword.remove; -Ajv.ValidationError = __webpack_require__(213); +Ajv.ValidationError = __webpack_require__(215); var META_SCHEMA_ID = 'http://json-schema.org/draft-04/schema'; var SCHEMA_URI_FORMAT = /^(?:(?:[a-z][a-z0-9+-.]*:)?\/\/)?[^\s]*$/i; @@ -78318,7 +79070,7 @@ function Ajv(opts) { function addDraft4MetaSchema() { if (self._opts.meta !== false) { - var metaSchema = __webpack_require__(368); + var metaSchema = __webpack_require__(373); addMetaSchema(metaSchema, META_SCHEMA_ID, true); self._refs['http://json-schema.org/schema'] = META_SCHEMA_ID; } @@ -78357,7 +79109,7 @@ function Ajv(opts) { /***/ }), -/* 341 */ +/* 346 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -78390,7 +79142,7 @@ Cache.prototype.clear = function Cache_clear() { /***/ }), -/* 342 */ +/* 347 */ /***/ (function(module, exports) { function webpackEmptyContext(req) { @@ -78399,10 +79151,10 @@ function webpackEmptyContext(req) { webpackEmptyContext.keys = function() { return []; }; webpackEmptyContext.resolve = webpackEmptyContext; module.exports = webpackEmptyContext; -webpackEmptyContext.id = 342; +webpackEmptyContext.id = 347; /***/ }), -/* 343 */ +/* 348 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -78410,40 +79162,40 @@ webpackEmptyContext.id = 342; //all requires must be explicit because browserify won't work with dynamic requires module.exports = { - '$ref': __webpack_require__(363), - allOf: __webpack_require__(349), - anyOf: __webpack_require__(350), - dependencies: __webpack_require__(353), - 'enum': __webpack_require__(354), - format: __webpack_require__(355), - items: __webpack_require__(356), - maximum: __webpack_require__(214), - minimum: __webpack_require__(214), - maxItems: __webpack_require__(215), - minItems: __webpack_require__(215), - maxLength: __webpack_require__(216), - minLength: __webpack_require__(216), - maxProperties: __webpack_require__(217), - minProperties: __webpack_require__(217), - multipleOf: __webpack_require__(357), - not: __webpack_require__(358), - oneOf: __webpack_require__(359), - pattern: __webpack_require__(360), - properties: __webpack_require__(362), - required: __webpack_require__(364), - uniqueItems: __webpack_require__(366), - validate: __webpack_require__(218) + '$ref': __webpack_require__(368), + allOf: __webpack_require__(354), + anyOf: __webpack_require__(355), + dependencies: __webpack_require__(358), + 'enum': __webpack_require__(359), + format: __webpack_require__(360), + items: __webpack_require__(361), + maximum: __webpack_require__(216), + minimum: __webpack_require__(216), + maxItems: __webpack_require__(217), + minItems: __webpack_require__(217), + maxLength: __webpack_require__(218), + minLength: __webpack_require__(218), + maxProperties: __webpack_require__(219), + minProperties: __webpack_require__(219), + multipleOf: __webpack_require__(362), + not: __webpack_require__(363), + oneOf: __webpack_require__(364), + pattern: __webpack_require__(365), + properties: __webpack_require__(367), + required: __webpack_require__(369), + uniqueItems: __webpack_require__(371), + validate: __webpack_require__(220) }; /***/ }), -/* 344 */ +/* 349 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var util = __webpack_require__(63); +var util = __webpack_require__(64); var DATE = /^\d\d\d\d-(\d\d)-(\d\d)$/; var DAYS = [0,31,29,31,30,31,30,31,31,30,31,30,31]; @@ -78608,16 +79360,16 @@ function compareDateTime(dt1, dt2) { /***/ }), -/* 345 */ +/* 350 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var resolve = __webpack_require__(211) - , util = __webpack_require__(63) - , stableStringify = __webpack_require__(192) - , async = __webpack_require__(209); +var resolve = __webpack_require__(213) + , util = __webpack_require__(64) + , stableStringify = __webpack_require__(194) + , async = __webpack_require__(211); var beautify; @@ -78629,18 +79381,18 @@ function loadBeautify(){ } } -var validateGenerator = __webpack_require__(218); +var validateGenerator = __webpack_require__(220); /** * Functions below are used inside compiled validations function */ -var co = __webpack_require__(258); +var co = __webpack_require__(260); var ucs2length = util.ucs2length; -var equal = __webpack_require__(210); +var equal = __webpack_require__(212); // this error is thrown by async schemas to return validation errors via exception -var ValidationError = __webpack_require__(213); +var ValidationError = __webpack_require__(215); module.exports = compile; @@ -79005,14 +79757,14 @@ function vars(arr, statement) { /***/ }), -/* 346 */ +/* 351 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var ruleModules = __webpack_require__(343) - , toHash = __webpack_require__(63).toHash; +var ruleModules = __webpack_require__(348) + , toHash = __webpack_require__(64).toHash; module.exports = function rules() { var RULES = [ @@ -79052,7 +79804,7 @@ module.exports = function rules() { /***/ }), -/* 347 */ +/* 352 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -79079,7 +79831,7 @@ module.exports = function ucs2length(str) { /***/ }), -/* 348 */ +/* 353 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -79262,7 +80014,7 @@ module.exports = function generate__formatLimit(it, $keyword) { /***/ }), -/* 349 */ +/* 354 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -79312,7 +80064,7 @@ module.exports = function generate_allOf(it, $keyword) { /***/ }), -/* 350 */ +/* 355 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -79384,7 +80136,7 @@ module.exports = function generate_anyOf(it, $keyword) { /***/ }), -/* 351 */ +/* 356 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -79443,7 +80195,7 @@ module.exports = function generate_constant(it, $keyword) { /***/ }), -/* 352 */ +/* 357 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -79670,7 +80422,7 @@ module.exports = function generate_custom(it, $keyword) { /***/ }), -/* 353 */ +/* 358 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -79824,7 +80576,7 @@ module.exports = function generate_dependencies(it, $keyword) { /***/ }), -/* 354 */ +/* 359 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -79896,7 +80648,7 @@ module.exports = function generate_enum(it, $keyword) { /***/ }), -/* 355 */ +/* 360 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -80041,7 +80793,7 @@ module.exports = function generate_format(it, $keyword) { /***/ }), -/* 356 */ +/* 361 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -80192,7 +80944,7 @@ module.exports = function generate_items(it, $keyword) { /***/ }), -/* 357 */ +/* 362 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -80275,7 +81027,7 @@ module.exports = function generate_multipleOf(it, $keyword) { /***/ }), -/* 358 */ +/* 363 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -80365,7 +81117,7 @@ module.exports = function generate_not(it, $keyword) { /***/ }), -/* 359 */ +/* 364 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -80448,7 +81200,7 @@ module.exports = function generate_oneOf(it, $keyword) { /***/ }), -/* 360 */ +/* 365 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -80529,7 +81281,7 @@ module.exports = function generate_pattern(it, $keyword) { /***/ }), -/* 361 */ +/* 366 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -80587,7 +81339,7 @@ module.exports = function generate_patternRequired(it, $keyword) { /***/ }), -/* 362 */ +/* 367 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -81039,7 +81791,7 @@ module.exports = function generate_properties(it, $keyword) { /***/ }), -/* 363 */ +/* 368 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -81165,7 +81917,7 @@ module.exports = function generate_ref(it, $keyword) { /***/ }), -/* 364 */ +/* 369 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -81421,7 +82173,7 @@ module.exports = function generate_required(it, $keyword) { /***/ }), -/* 365 */ +/* 370 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -81556,7 +82308,7 @@ module.exports = function generate_switch(it, $keyword) { /***/ }), -/* 366 */ +/* 371 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -81634,14 +82386,14 @@ module.exports = function generate_uniqueItems(it, $keyword) { /***/ }), -/* 367 */ +/* 372 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; var IDENTIFIER = /^[a-z_$][a-z0-9_$\-]*$/i; -var customRuleCode = __webpack_require__(352); +var customRuleCode = __webpack_require__(357); module.exports = { add: addKeyword, @@ -81770,7 +82522,7 @@ function removeKeyword(keyword) { /***/ }), -/* 368 */ +/* 373 */ /***/ (function(module, exports) { module.exports = { @@ -81996,7 +82748,7 @@ module.exports = { }; /***/ }), -/* 369 */ +/* 374 */ /***/ (function(module, exports) { module.exports = { @@ -82496,7 +83248,7 @@ module.exports = { }; /***/ }), -/* 370 */ +/* 375 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -82512,14 +83264,14 @@ module.exports = { function enableV5(ajv) { var inlineFunctions = { - 'switch': __webpack_require__(365), - 'constant': __webpack_require__(351), - '_formatLimit': __webpack_require__(348), - 'patternRequired': __webpack_require__(361) + 'switch': __webpack_require__(370), + 'constant': __webpack_require__(356), + '_formatLimit': __webpack_require__(353), + 'patternRequired': __webpack_require__(366) }; if (ajv._opts.meta !== false) { - var metaSchema = __webpack_require__(369); + var metaSchema = __webpack_require__(374); ajv.addMetaSchema(metaSchema, META_SCHEMA_ID); } _addKeyword('constant'); @@ -82555,7 +83307,7 @@ function containsMacro(schema) { /***/ }), -/* 371 */ +/* 376 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -82668,12 +83420,12 @@ x.iTerm.setCwd = function (cwd) { /***/ }), -/* 372 */ +/* 377 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; /* WEBPACK VAR INJECTION */(function(module) { -const colorConvert = __webpack_require__(469); +const colorConvert = __webpack_require__(476); const wrapAnsi16 = (fn, offset) => function () { const code = fn.apply(colorConvert, arguments); @@ -82825,10 +83577,10 @@ Object.defineProperty(module, 'exports', { get: assembleStyles }); -/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(23)(module))) +/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(24)(module))) /***/ }), -/* 373 */ +/* 378 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -82860,13 +83612,13 @@ module.exports = function (arr, predicate, ctx) { /***/ }), -/* 374 */ +/* 379 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var rawAsap = __webpack_require__(375); +var rawAsap = __webpack_require__(380); var freeTasks = []; /** @@ -82932,7 +83684,7 @@ RawTask.prototype.call = function () { /***/ }), -/* 375 */ +/* 380 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -83016,7 +83768,7 @@ function requestFlush() { if (!domain) { // Lazy execute the domain module. // Only employed if the user elects to use domains. - domain = __webpack_require__(742); + domain = __webpack_require__(752); } domain.active = process.domain = null; } @@ -83040,7 +83792,7 @@ function requestFlush() { /***/ }), -/* 376 */ +/* 381 */ /***/ (function(module, exports, __webpack_require__) { // Copyright 2011 Mark Cavage All rights reserved. @@ -83048,8 +83800,8 @@ function requestFlush() { var errors = __webpack_require__(147); var types = __webpack_require__(148); -var Reader = __webpack_require__(377); -var Writer = __webpack_require__(378); +var Reader = __webpack_require__(382); +var Writer = __webpack_require__(383); ///--- Exports @@ -83073,7 +83825,7 @@ for (var e in errors) { /***/ }), -/* 377 */ +/* 382 */ /***/ (function(module, exports, __webpack_require__) { // Copyright 2011 Mark Cavage All rights reserved. @@ -83340,7 +84092,7 @@ module.exports = Reader; /***/ }), -/* 378 */ +/* 383 */ /***/ (function(module, exports, __webpack_require__) { // Copyright 2011 Mark Cavage All rights reserved. @@ -83662,19 +84414,19 @@ module.exports = Writer; /***/ }), -/* 379 */ +/* 384 */ /***/ (function(module, exports, __webpack_require__) { module.exports = { - parallel : __webpack_require__(381), - serial : __webpack_require__(382), - serialOrdered : __webpack_require__(225) + parallel : __webpack_require__(386), + serial : __webpack_require__(387), + serialOrdered : __webpack_require__(227) }; /***/ }), -/* 380 */ +/* 385 */ /***/ (function(module, exports) { module.exports = defer; @@ -83706,12 +84458,12 @@ function defer(fn) /***/ }), -/* 381 */ +/* 386 */ /***/ (function(module, exports, __webpack_require__) { -var iterate = __webpack_require__(222) - , initState = __webpack_require__(223) - , terminator = __webpack_require__(224) +var iterate = __webpack_require__(224) + , initState = __webpack_require__(225) + , terminator = __webpack_require__(226) ; // Public API @@ -83755,10 +84507,10 @@ function parallel(list, iterator, callback) /***/ }), -/* 382 */ +/* 387 */ /***/ (function(module, exports, __webpack_require__) { -var serialOrdered = __webpack_require__(225); +var serialOrdered = __webpack_require__(227); // Public API module.exports = serial; @@ -83778,7 +84530,7 @@ function serial(list, iterator, callback) /***/ }), -/* 383 */ +/* 388 */ /***/ (function(module, exports, __webpack_require__) { @@ -83802,7 +84554,7 @@ function serial(list, iterator, callback) * Module dependencies. */ -var crypto = __webpack_require__(13) +var crypto = __webpack_require__(14) , parse = __webpack_require__(19).parse ; @@ -83996,14 +84748,14 @@ module.exports.canonicalizeResource = canonicalizeResource /***/ }), -/* 384 */ +/* 389 */ /***/ (function(module, exports, __webpack_require__) { var aws4 = exports, url = __webpack_require__(19), querystring = __webpack_require__(144), - crypto = __webpack_require__(13), - lru = __webpack_require__(385), + crypto = __webpack_require__(14), + lru = __webpack_require__(390), credentialsCache = lru(1000) // http://docs.amazonwebservices.com/general/latest/gr/signature-version-4.html @@ -84334,7 +85086,7 @@ aws4.sign = function(request, credentials) { /***/ }), -/* 385 */ +/* 390 */ /***/ (function(module, exports) { module.exports = function(size) { @@ -84436,7 +85188,7 @@ function DoublyLinkedNode(key, val) { /***/ }), -/* 386 */ +/* 391 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -84462,11 +85214,11 @@ exports.default = function (message) { var _errors; function _load_errors() { - return _errors = __webpack_require__(5); + return _errors = __webpack_require__(6); } /***/ }), -/* 387 */ +/* 392 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -84480,7 +85232,7 @@ exports.examples = exports.hasWrapper = exports.run = undefined; var _promise; function _load_promise() { - return _promise = _interopRequireDefault(__webpack_require__(6)); + return _promise = _interopRequireDefault(__webpack_require__(5)); } exports.setFlags = setFlags; @@ -84519,7 +85271,7 @@ exports.hasWrapper = hasWrapper; exports.examples = examples; /***/ }), -/* 388 */ +/* 393 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -84532,7 +85284,7 @@ Object.defineProperty(exports, "__esModule", { var _promise; function _load_promise() { - return _promise = _interopRequireDefault(__webpack_require__(6)); + return _promise = _interopRequireDefault(__webpack_require__(5)); } exports.hasWrapper = hasWrapper; @@ -84542,11 +85294,13 @@ exports.run = run; var _yarnResolver; function _load_yarnResolver() { - return _yarnResolver = _interopRequireDefault(__webpack_require__(245)); + return _yarnResolver = _interopRequireDefault(__webpack_require__(246)); } function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } +var fs = __webpack_require__(10); + var path = __webpack_require__(0); function hasWrapper(commander) { @@ -84559,12 +85313,22 @@ function setFlags(commander) { function run(config, reporter, flags, args) { var binFolder = path.join(config.cwd, config.registries[(_yarnResolver || _load_yarnResolver()).default.registry].folder, '.bin'); - reporter.log(binFolder, { force: true }); + if (args.length === 0) { + reporter.log(binFolder, { force: true }); + } else { + var binName = args[0]; + var finalPath = path.normalize(`${binFolder}/${binName}`); + if (fs.existsSync(finalPath)) { + reporter.log(finalPath, { force: true }); + } else { + reporter.error(reporter.lang('packageBinaryNotFound', binName)); + } + } return (_promise || _load_promise()).default.resolve(); } /***/ }), -/* 389 */ +/* 394 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -84578,7 +85342,7 @@ exports.examples = exports.run = undefined; var _promise; function _load_promise() { - return _promise = _interopRequireDefault(__webpack_require__(6)); + return _promise = _interopRequireDefault(__webpack_require__(5)); } var _getIterator2; @@ -84801,7 +85565,7 @@ function setFlags(commander) { } /***/ }), -/* 390 */ +/* 395 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -84927,7 +85691,7 @@ exports.run = run; exports.examples = examples; /***/ }), -/* 391 */ +/* 396 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -84976,7 +85740,7 @@ exports.hasWrapper = hasWrapper; var _errors; function _load_errors() { - return _errors = __webpack_require__(5); + return _errors = __webpack_require__(6); } var _child; @@ -85006,7 +85770,7 @@ function hasWrapper(commander, args) { } /***/ }), -/* 392 */ +/* 397 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -85048,7 +85812,7 @@ exports.hasWrapper = hasWrapper; var _errors; function _load_errors() { - return _errors = __webpack_require__(5); + return _errors = __webpack_require__(6); } var _child; @@ -85074,7 +85838,7 @@ function hasWrapper(commander, args) { } /***/ }), -/* 393 */ +/* 398 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -85131,13 +85895,13 @@ exports.setFlags = setFlags; var _errors; function _load_errors() { - return _errors = __webpack_require__(5); + return _errors = __webpack_require__(6); } var _lockfile; function _load_lockfile() { - return _lockfile = __webpack_require__(20); + return _lockfile = __webpack_require__(21); } function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -85156,7 +85920,7 @@ function setFlags(commander) { var examples = exports.examples = ['generate-lock-entry', 'generate-lock-entry --use-manifest ./package.json', 'generate-lock-entry --resolved local-file.tgz#hash']; /***/ }), -/* 394 */ +/* 399 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -85175,13 +85939,13 @@ function _load_getIterator() { var _keys; function _load_keys() { - return _keys = _interopRequireDefault(__webpack_require__(14)); + return _keys = _interopRequireDefault(__webpack_require__(11)); } var _promise; function _load_promise() { - return _promise = _interopRequireDefault(__webpack_require__(6)); + return _promise = _interopRequireDefault(__webpack_require__(5)); } exports.hasWrapper = hasWrapper; @@ -85191,7 +85955,7 @@ exports.run = run; var _index; function _load_index() { - return _index = _interopRequireDefault(__webpack_require__(205)); + return _index = _interopRequireDefault(__webpack_require__(207)); } var _constants; @@ -85209,7 +85973,7 @@ function _load_misc() { var _aliases; function _load_aliases() { - return _aliases = _interopRequireDefault(__webpack_require__(226)); + return _aliases = _interopRequireDefault(__webpack_require__(228)); } function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } } @@ -85288,7 +86052,7 @@ function run(config, reporter, commander, args) { } /***/ }), -/* 395 */ +/* 400 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -85308,7 +86072,7 @@ function _load_getIterator() { var _promise; function _load_promise() { - return _promise = _interopRequireDefault(__webpack_require__(6)); + return _promise = _interopRequireDefault(__webpack_require__(5)); } var _asyncToGenerator2; @@ -85326,23 +86090,23 @@ function _load_classCallCheck() { var _possibleConstructorReturn2; function _load_possibleConstructorReturn() { - return _possibleConstructorReturn2 = _interopRequireDefault(__webpack_require__(12)); + return _possibleConstructorReturn2 = _interopRequireDefault(__webpack_require__(13)); } var _inherits2; function _load_inherits() { - return _inherits2 = _interopRequireDefault(__webpack_require__(11)); + return _inherits2 = _interopRequireDefault(__webpack_require__(12)); } var run = exports.run = function () { - var _ref10 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) { + var _ref15 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) { var imp = new Import(flags, config, reporter, new (_lockfile || _load_lockfile()).default({ cache: {} })); yield imp.init(); }); - return function run(_x6, _x7, _x8, _x9) { - return _ref10.apply(this, arguments); + return function run(_x7, _x8, _x9, _x10) { + return _ref15.apply(this, arguments); }; }(); @@ -85358,13 +86122,13 @@ function _load_install() { var _check; function _load_check() { - return _check = __webpack_require__(228); + return _check = __webpack_require__(230); } var _errors; function _load_errors() { - return _errors = __webpack_require__(5); + return _errors = __webpack_require__(6); } var _index; @@ -85382,25 +86146,25 @@ function _load_baseResolver() { var _hostedGitResolver; function _load_hostedGitResolver() { - return _hostedGitResolver = _interopRequireDefault(__webpack_require__(74)); + return _hostedGitResolver = _interopRequireDefault(__webpack_require__(75)); } var _hostedGitResolver2; function _load_hostedGitResolver2() { - return _hostedGitResolver2 = __webpack_require__(74); + return _hostedGitResolver2 = __webpack_require__(75); } var _gistResolver; function _load_gistResolver() { - return _gistResolver = _interopRequireDefault(__webpack_require__(155)); + return _gistResolver = _interopRequireDefault(__webpack_require__(157)); } var _gistResolver2; function _load_gistResolver2() { - return _gistResolver2 = __webpack_require__(155); + return _gistResolver2 = __webpack_require__(157); } var _gitResolver; @@ -85412,13 +86176,13 @@ function _load_gitResolver() { var _fileResolver; function _load_fileResolver() { - return _fileResolver = _interopRequireDefault(__webpack_require__(154)); + return _fileResolver = _interopRequireDefault(__webpack_require__(156)); } var _packageResolver; function _load_packageResolver() { - return _packageResolver = _interopRequireDefault(__webpack_require__(239)); + return _packageResolver = _interopRequireDefault(__webpack_require__(241)); } var _packageRequest; @@ -85427,34 +86191,46 @@ function _load_packageRequest() { return _packageRequest = _interopRequireDefault(__webpack_require__(87)); } +var _packageReference; + +function _load_packageReference() { + return _packageReference = _interopRequireDefault(__webpack_require__(240)); +} + var _packageFetcher; function _load_packageFetcher() { - return _packageFetcher = _interopRequireWildcard(__webpack_require__(238)); + return _packageFetcher = _interopRequireWildcard(__webpack_require__(151)); } var _packageLinker; function _load_packageLinker() { - return _packageLinker = _interopRequireDefault(__webpack_require__(151)); + return _packageLinker = _interopRequireDefault(__webpack_require__(152)); } var _packageCompatibility; function _load_packageCompatibility() { - return _packageCompatibility = _interopRequireWildcard(__webpack_require__(237)); + return _packageCompatibility = _interopRequireWildcard(__webpack_require__(239)); } var _lockfile; function _load_lockfile() { - return _lockfile = _interopRequireDefault(__webpack_require__(20)); + return _lockfile = _interopRequireDefault(__webpack_require__(21)); } -var _normalizePattern6; +var _normalizePattern10; function _load_normalizePattern() { - return _normalizePattern6 = __webpack_require__(42); + return _normalizePattern10 = __webpack_require__(42); +} + +var _logicalDependencyTree; + +function _load_logicalDependencyTree() { + return _logicalDependencyTree = __webpack_require__(446); } var _fs; @@ -85475,6 +86251,12 @@ function _load_constants() { return _constants = __webpack_require__(8); } +var _semver; + +function _load_semver() { + return _semver = _interopRequireDefault(__webpack_require__(20)); +} + function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } } function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -85484,6 +86266,7 @@ var NPM_REGISTRY = /http[s]:\/\/registry.npmjs.org/g; var invariant = __webpack_require__(9); var path = __webpack_require__(0); var uuid = __webpack_require__(83); +var nodeVersion = process.versions.node.split('-')[0]; var noArguments = exports.noArguments = true; @@ -85505,7 +86288,7 @@ var ImportResolver = function (_BaseResolver) { }; ImportResolver.prototype.resolveHostedGit = function resolveHostedGit(info, Resolver) { - var _normalizePattern = (0, (_normalizePattern6 || _load_normalizePattern()).normalizePattern)(this.pattern), + var _normalizePattern = (0, (_normalizePattern10 || _load_normalizePattern()).normalizePattern)(this.pattern), range = _normalizePattern.range; var exploded = (0, (_hostedGitResolver2 || _load_hostedGitResolver2()).explodeHostedGitFragment)(range, this.reporter); @@ -85524,7 +86307,7 @@ var ImportResolver = function (_BaseResolver) { }; ImportResolver.prototype.resolveGist = function resolveGist(info, Resolver) { - var _normalizePattern2 = (0, (_normalizePattern6 || _load_normalizePattern()).normalizePattern)(this.pattern), + var _normalizePattern2 = (0, (_normalizePattern10 || _load_normalizePattern()).normalizePattern)(this.pattern), range = _normalizePattern2.range; var _explodeGistFragment = (0, (_gistResolver2 || _load_gistResolver2()).explodeGistFragment)(range, this.reporter), @@ -85561,7 +86344,7 @@ var ImportResolver = function (_BaseResolver) { }; ImportResolver.prototype.resolveFile = function resolveFile(info, Resolver) { - var _normalizePattern3 = (0, (_normalizePattern6 || _load_normalizePattern()).normalizePattern)(this.pattern), + var _normalizePattern3 = (0, (_normalizePattern10 || _load_normalizePattern()).normalizePattern)(this.pattern), range = _normalizePattern3.range; var loc = (_misc || _load_misc()).removePrefix(range, 'file:'); @@ -85598,7 +86381,7 @@ var ImportResolver = function (_BaseResolver) { }; ImportResolver.prototype.resolveImport = function resolveImport(info) { - var _normalizePattern4 = (0, (_normalizePattern6 || _load_normalizePattern()).normalizePattern)(this.pattern), + var _normalizePattern4 = (0, (_normalizePattern10 || _load_normalizePattern()).normalizePattern)(this.pattern), range = _normalizePattern4.range; var Resolver = (0, (_index || _load_index()).getExoticResolver)(range); @@ -85630,19 +86413,64 @@ var ImportResolver = function (_BaseResolver) { return resolveLocation; }(); - ImportResolver.prototype.resolve = function () { - var _ref2 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () { + ImportResolver.prototype.resolveFixedVersion = function () { + var _ref2 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (fixedVersionPattern) { + var _normalizePattern5 = (0, (_normalizePattern10 || _load_normalizePattern()).normalizePattern)(fixedVersionPattern), + range = _normalizePattern5.range; + + var exoticResolver = (0, (_index || _load_index()).getExoticResolver)(range); + var manifest = exoticResolver ? yield this.request.findExoticVersionInfo(exoticResolver, range) : yield this.request.findVersionOnRegistry(fixedVersionPattern); + return manifest; + }); + + function resolveFixedVersion(_x2) { + return _ref2.apply(this, arguments); + } + + return resolveFixedVersion; + }(); + + ImportResolver.prototype._resolveFromFixedVersions = function () { + var _ref3 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () { var _this2 = this; - var _normalizePattern5 = (0, (_normalizePattern6 || _load_normalizePattern()).normalizePattern)(this.pattern), - name = _normalizePattern5.name; + invariant(this.request instanceof ImportPackageRequest, 'request must be ImportPackageRequest'); + invariant(this.request.fixedVersionPattern, 'fixedVersionPattern must exist on request'); + var fixedVersionPattern = this.request.fixedVersionPattern; + + var info = yield this.config.getCache(`import-resolver-${fixedVersionPattern}`, function () { + return _this2.resolveFixedVersion(fixedVersionPattern); + }); + if (info) { + return info; + } + + var _normalizePattern6 = (0, (_normalizePattern10 || _load_normalizePattern()).normalizePattern)(this.pattern), + name = _normalizePattern6.name; + + throw new (_errors || _load_errors()).MessageError(this.reporter.lang('importResolveFailed', name, this.getCwd())); + }); + + function _resolveFromFixedVersions() { + return _ref3.apply(this, arguments); + } + + return _resolveFromFixedVersions; + }(); + + ImportResolver.prototype._resolveFromNodeModules = function () { + var _ref4 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () { + var _this3 = this; + + var _normalizePattern7 = (0, (_normalizePattern10 || _load_normalizePattern()).normalizePattern)(this.pattern), + name = _normalizePattern7.name; var cwd = this.getCwd(); var _loop = function* _loop() { var loc = path.join(cwd, 'node_modules', name); - var info = yield _this2.config.getCache(`import-resolver-${loc}`, function () { - return _this2.resolveLocation(loc); + var info = yield _this3.config.getCache(`import-resolver-${loc}`, function () { + return _this3.resolveLocation(loc); }); if (info) { return { @@ -85660,26 +86488,35 @@ var ImportResolver = function (_BaseResolver) { throw new (_errors || _load_errors()).MessageError(this.reporter.lang('importResolveFailed', name, this.getCwd())); }); - function resolve() { - return _ref2.apply(this, arguments); + function _resolveFromNodeModules() { + return _ref4.apply(this, arguments); } - return resolve; + return _resolveFromNodeModules; }(); + ImportResolver.prototype.resolve = function resolve() { + if (this.request instanceof ImportPackageRequest && this.request.fixedVersionPattern) { + return this._resolveFromFixedVersions(); + } else { + return this._resolveFromNodeModules(); + } + }; + return ImportResolver; }((_baseResolver || _load_baseResolver()).default); var ImportPackageRequest = function (_PackageRequest) { (0, (_inherits2 || _load_inherits()).default)(ImportPackageRequest, _PackageRequest); - function ImportPackageRequest(req, resolver) { + function ImportPackageRequest(req, fixedVersionPattern, resolver) { (0, (_classCallCheck2 || _load_classCallCheck()).default)(this, ImportPackageRequest); - var _this3 = (0, (_possibleConstructorReturn2 || _load_possibleConstructorReturn()).default)(this, _PackageRequest.call(this, req, resolver)); + var _this4 = (0, (_possibleConstructorReturn2 || _load_possibleConstructorReturn()).default)(this, _PackageRequest.call(this, req, resolver)); - _this3.import = _this3.parentRequest instanceof ImportPackageRequest ? _this3.parentRequest.import : true; - return _this3; + _this4.import = _this4.parentRequest instanceof ImportPackageRequest ? _this4.parentRequest.import : true; + _this4.fixedVersionPattern = fixedVersionPattern; + return _this4; } ImportPackageRequest.prototype.getRootName = function getRootName() { @@ -85697,8 +86534,34 @@ var ImportPackageRequest = function (_PackageRequest) { this.reporter.warn(this.reporter.lang('importResolvedRangeMatch', resolved.version, resolved.name, info.version, this.getParentHumanName())); }; + ImportPackageRequest.prototype._findResolvedManifest = function _findResolvedManifest(info) { + var _normalizePattern8 = (0, (_normalizePattern10 || _load_normalizePattern()).normalizePattern)(this.pattern), + range = _normalizePattern8.range, + name = _normalizePattern8.name; + + var solvedRange = (_semver || _load_semver()).default.validRange(range) ? info.version : range; + var resolved = this.resolver.getExactVersionMatch(name, solvedRange, info); + if (resolved) { + return resolved; + } + invariant(info._remote, 'expected package remote'); + var ref = new (_packageReference || _load_packageReference()).default(this, info, info._remote); + info._reference = ref; + return info; + }; + + ImportPackageRequest.prototype.resolveToExistingVersion = function resolveToExistingVersion(info) { + var resolved = this._findResolvedManifest(info); + invariant(resolved, 'should have found a resolved reference'); + var ref = resolved._reference; + invariant(ref, 'should have a package reference'); + ref.addRequest(this); + ref.addPattern(this.pattern, resolved); + ref.addOptional(this.optional); + }; + ImportPackageRequest.prototype.findVersionInfo = function findVersionInfo() { - var _this4 = this; + var _this5 = this; if (!this.import) { this.reporter.verbose(this.reporter.lang('skippingImport', this.pattern, this.getParentHumanName())); @@ -85706,9 +86569,9 @@ var ImportPackageRequest = function (_PackageRequest) { } var resolver = new ImportResolver(this, this.pattern); return resolver.resolve().catch(function () { - _this4.import = false; - _this4.reporter.warn(_this4.reporter.lang('importFailed', _this4.pattern, _this4.getParentHumanName())); - return _PackageRequest.prototype.findVersionInfo.call(_this4); + _this5.import = false; + _this5.reporter.warn(_this5.reporter.lang('importFailed', _this5.pattern, _this5.getParentHumanName())); + return _PackageRequest.prototype.findVersionInfo.call(_this5); }); }; @@ -85721,11 +86584,11 @@ var ImportPackageResolver = function (_PackageResolver) { function ImportPackageResolver(config, lockfile) { (0, (_classCallCheck2 || _load_classCallCheck()).default)(this, ImportPackageResolver); - var _this5 = (0, (_possibleConstructorReturn2 || _load_possibleConstructorReturn()).default)(this, _PackageResolver.call(this, config, lockfile)); + var _this6 = (0, (_possibleConstructorReturn2 || _load_possibleConstructorReturn()).default)(this, _PackageResolver.call(this, config, lockfile)); - _this5.next = []; - _this5.rootName = 'root'; - return _this5; + _this6.next = []; + _this6.rootName = 'root'; + return _this6; } ImportPackageResolver.prototype.find = function find(req) { @@ -85734,27 +86597,32 @@ var ImportPackageResolver = function (_PackageResolver) { }; ImportPackageResolver.prototype.findOne = function () { - var _ref3 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (req) { + var _ref5 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (req) { if (this.activity) { this.activity.tick(req.pattern); } - var request = new ImportPackageRequest(req, this); + + var _normalizePattern9 = (0, (_normalizePattern10 || _load_normalizePattern()).normalizePattern)(req.pattern), + name = _normalizePattern9.name; + + var fixedVersionPattern = this.dependencyTree ? this.dependencyTree.getFixedVersionPattern(name, req.parentNames) : null; + var request = new ImportPackageRequest(req, fixedVersionPattern, this); yield request.find({ fresh: false }); }); - function findOne(_x2) { - return _ref3.apply(this, arguments); + function findOne(_x3) { + return _ref5.apply(this, arguments); } return findOne; }(); ImportPackageResolver.prototype.findAll = function () { - var _ref4 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (deps) { - var _this6 = this; + var _ref6 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (deps) { + var _this7 = this; yield (_promise || _load_promise()).default.all(deps.map(function (dep) { - return _this6.findOne(dep); + return _this7.findOne(dep); })); deps = this.next; this.next = []; @@ -85767,8 +86635,8 @@ var ImportPackageResolver = function (_PackageResolver) { yield this.findAll(deps); }); - function findAll(_x3) { - return _ref4.apply(this, arguments); + function findAll(_x4) { + return _ref6.apply(this, arguments); } return findAll; @@ -85780,18 +86648,18 @@ var ImportPackageResolver = function (_PackageResolver) { invariant(ref, 'expected reference'); ref.optional = null; for (var _iterator = ref.requests, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : (0, (_getIterator2 || _load_getIterator()).default)(_iterator);;) { - var _ref5; + var _ref7; if (_isArray) { if (_i >= _iterator.length) break; - _ref5 = _iterator[_i++]; + _ref7 = _iterator[_i++]; } else { _i = _iterator.next(); if (_i.done) break; - _ref5 = _i.value; + _ref7 = _i.value; } - var req = _ref5; + var req = _ref7; ref.addOptional(req.optional); } @@ -85799,11 +86667,11 @@ var ImportPackageResolver = function (_PackageResolver) { }; ImportPackageResolver.prototype.init = function () { - var _ref6 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (deps) { - var _ref7 = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : { isFlat: false, isFrozen: false, workspaceLayout: undefined }, - isFlat = _ref7.isFlat, - isFrozen = _ref7.isFrozen, - workspaceLayout = _ref7.workspaceLayout; + var _ref8 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (deps) { + var _ref9 = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : { isFlat: false, isFrozen: false, workspaceLayout: undefined }, + isFlat = _ref9.isFlat, + isFrozen = _ref9.isFrozen, + workspaceLayout = _ref9.workspaceLayout; this.flat = Boolean(isFlat); var activity = this.activity = this.reporter.activity(); @@ -85813,8 +86681,8 @@ var ImportPackageResolver = function (_PackageResolver) { this.activity = null; }); - function init(_x4) { - return _ref6.apply(this, arguments); + function init(_x5) { + return _ref8.apply(this, arguments); } return init; @@ -85829,24 +86697,68 @@ var Import = exports.Import = function (_Install) { function Import(flags, config, reporter, lockfile) { (0, (_classCallCheck2 || _load_classCallCheck()).default)(this, Import); - var _this7 = (0, (_possibleConstructorReturn2 || _load_possibleConstructorReturn()).default)(this, _Install.call(this, flags, config, reporter, lockfile)); + var _this8 = (0, (_possibleConstructorReturn2 || _load_possibleConstructorReturn()).default)(this, _Install.call(this, flags, config, reporter, lockfile)); - _this7.resolver = new ImportPackageResolver(_this7.config, _this7.lockfile); - _this7.linker = new (_packageLinker || _load_packageLinker()).default(config, _this7.resolver); - return _this7; + _this8.resolver = new ImportPackageResolver(_this8.config, _this8.lockfile); + _this8.linker = new (_packageLinker || _load_packageLinker()).default(config, _this8.resolver); + return _this8; } + Import.prototype.createLogicalDependencyTree = function createLogicalDependencyTree(packageJson, packageLock) { + invariant(packageJson, 'package.json should exist'); + invariant(packageLock, 'package-lock.json should exist'); + invariant(this.resolver instanceof ImportPackageResolver, 'resolver should be an ImportPackageResolver'); + try { + this.resolver.dependencyTree = new (_logicalDependencyTree || _load_logicalDependencyTree()).LogicalDependencyTree(packageJson, packageLock); + } catch (e) { + throw new (_errors || _load_errors()).MessageError(this.reporter.lang('importSourceFilesCorrupted')); + } + }; + + Import.prototype.getExternalLockfileContents = function () { + var _ref10 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () { + try { + var _ref11 = yield (_promise || _load_promise()).default.all([(_fs || _load_fs()).readFile(path.join(this.config.cwd, (_constants || _load_constants()).NODE_PACKAGE_JSON)), (_fs || _load_fs()).readFile(path.join(this.config.cwd, (_constants || _load_constants()).NPM_LOCK_FILENAME))]), + _packageJson = _ref11[0], + _packageLock = _ref11[1]; + + return { packageJson: _packageJson, packageLock: _packageLock }; + } catch (e) { + return { packageJson: null, packageLock: null }; + } + }); + + function getExternalLockfileContents() { + return _ref10.apply(this, arguments); + } + + return getExternalLockfileContents; + }(); + Import.prototype.init = function () { - var _ref8 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () { + var _ref12 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () { if (yield (_fs || _load_fs()).exists(path.join(this.config.cwd, (_constants || _load_constants()).LOCKFILE_FILENAME))) { throw new (_errors || _load_errors()).MessageError(this.reporter.lang('lockfileExists')); } - yield (0, (_check || _load_check()).verifyTreeCheck)(this.config, this.reporter, {}, []); - var _ref9 = yield this.fetchRequestFromCwd(), - requests = _ref9.requests, - patterns = _ref9.patterns, - manifest = _ref9.manifest; + var _ref13 = yield this.getExternalLockfileContents(), + packageJson = _ref13.packageJson, + packageLock = _ref13.packageLock; + + var importSource = packageJson && packageLock && (_semver || _load_semver()).default.satisfies(nodeVersion, '>=5.0.0') ? 'package-lock.json' : 'node_modules'; + if (importSource === 'package-lock.json') { + this.reporter.info(this.reporter.lang('importPackageLock')); + this.createLogicalDependencyTree(packageJson, packageLock); + } + if (importSource === 'node_modules') { + this.reporter.info(this.reporter.lang('importNodeModules')); + yield (0, (_check || _load_check()).verifyTreeCheck)(this.config, this.reporter, {}, []); + } + + var _ref14 = yield this.fetchRequestFromCwd(), + requests = _ref14.requests, + patterns = _ref14.patterns, + manifest = _ref14.manifest; if (manifest.name && this.resolver instanceof ImportPackageResolver) { this.resolver.rootName = manifest.name; @@ -85861,7 +86773,7 @@ var Import = exports.Import = function (_Install) { }); function init() { - return _ref8.apply(this, arguments); + return _ref12.apply(this, arguments); } return init; @@ -85871,7 +86783,7 @@ var Import = exports.Import = function (_Install) { }((_install || _load_install()).Install); function setFlags(commander) { - commander.description('Generates yarn.lock from an existing npm-installed node_modules folder.'); + commander.description('Generates yarn.lock from an npm package-lock.json file or an existing npm-installed node_modules folder.'); } function hasWrapper(commander, args) { @@ -85879,7 +86791,7 @@ function hasWrapper(commander, args) { } /***/ }), -/* 396 */ +/* 401 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -85893,13 +86805,13 @@ exports.run = undefined; var _assign; function _load_assign() { - return _assign = _interopRequireDefault(__webpack_require__(17)); + return _assign = _interopRequireDefault(__webpack_require__(16)); } var _keys; function _load_keys() { - return _keys = _interopRequireDefault(__webpack_require__(14)); + return _keys = _interopRequireDefault(__webpack_require__(11)); } var _asyncToGenerator2; @@ -85928,12 +86840,7 @@ var run = exports.run = function () { name = _parsePackageName.name, version = _parsePackageName.version; - // pass application/json Accept to get full metadata for info command - - - var result = yield config.registries.npm.request(name, { - headers: { Accept: 'application/json' } - }); + var result = yield config.registries.npm.request(name, { unfiltered: true }); if (!result) { reporter.error(reporter.lang('infoFail')); return; @@ -85978,12 +86885,12 @@ function _load_npmRegistry() { var _parsePackageName2; function _load_parsePackageName() { - return _parsePackageName2 = _interopRequireDefault(__webpack_require__(448)); + return _parsePackageName2 = _interopRequireDefault(__webpack_require__(453)); } function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } -var semver = __webpack_require__(22); +var semver = __webpack_require__(20); function clean(object) { if (Array.isArray(object)) { @@ -86024,7 +86931,7 @@ function hasWrapper(commander, args) { } /***/ }), -/* 397 */ +/* 402 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -86038,7 +86945,7 @@ exports.getGitConfigInfo = exports.run = exports.shouldRunInCurrentCwd = undefin var _assign; function _load_assign() { - return _assign = _interopRequireDefault(__webpack_require__(17)); + return _assign = _interopRequireDefault(__webpack_require__(16)); } var _getIterator2; @@ -86288,7 +87195,7 @@ exports.hasWrapper = hasWrapper; var _util; function _load_util() { - return _util = __webpack_require__(159); + return _util = __webpack_require__(161); } var _index; @@ -86300,7 +87207,7 @@ function _load_index() { var _githubResolver; function _load_githubResolver() { - return _githubResolver = _interopRequireDefault(__webpack_require__(243)); + return _githubResolver = _interopRequireDefault(__webpack_require__(244)); } var _child; @@ -86325,9 +87232,9 @@ function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } -var objectPath = __webpack_require__(298); +var objectPath = __webpack_require__(300); var path = __webpack_require__(0); -var yn = __webpack_require__(739); +var yn = __webpack_require__(749); function setFlags(commander) { commander.description('Interactively creates or updates a package.json file.'); @@ -86342,7 +87249,7 @@ function hasWrapper(commander, args) { var shouldRunInCurrentCwd = exports.shouldRunInCurrentCwd = true; /***/ }), -/* 398 */ +/* 403 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -86368,7 +87275,7 @@ function _load_map() { var _extends2; function _load_extends() { - return _extends2 = _interopRequireDefault(__webpack_require__(25)); + return _extends2 = _interopRequireDefault(__webpack_require__(23)); } var _asyncToGenerator2; @@ -86531,7 +87438,7 @@ exports.setFlags = setFlags; var _baseReporter; function _load_baseReporter() { - return _baseReporter = _interopRequireDefault(__webpack_require__(73)); + return _baseReporter = _interopRequireDefault(__webpack_require__(74)); } var _install; @@ -86543,7 +87450,7 @@ function _load_install() { var _lockfile; function _load_lockfile() { - return _lockfile = _interopRequireDefault(__webpack_require__(20)); + return _lockfile = _interopRequireDefault(__webpack_require__(21)); } var _buildSubCommands2; @@ -86703,7 +87610,7 @@ exports.run = run; exports.examples = examples; /***/ }), -/* 399 */ +/* 404 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -86749,7 +87656,7 @@ function hasWrapper(commander, args) { } /***/ }), -/* 400 */ +/* 405 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -86809,7 +87716,7 @@ function hasWrapper(commander, args) { } /***/ }), -/* 401 */ +/* 406 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -86829,7 +87736,7 @@ function _load_set() { var _extends2; function _load_extends() { - return _extends2 = _interopRequireDefault(__webpack_require__(25)); + return _extends2 = _interopRequireDefault(__webpack_require__(23)); } var _asyncToGenerator2; @@ -86906,7 +87813,7 @@ function _load_packageRequest() { var _lockfile; function _load_lockfile() { - return _lockfile = _interopRequireDefault(__webpack_require__(20)); + return _lockfile = _interopRequireDefault(__webpack_require__(21)); } var _install; @@ -86918,13 +87825,13 @@ function _load_install() { var _colorForVersions; function _load_colorForVersions() { - return _colorForVersions = _interopRequireDefault(__webpack_require__(246)); + return _colorForVersions = _interopRequireDefault(__webpack_require__(247)); } var _colorizeDiff; function _load_colorizeDiff() { - return _colorizeDiff = _interopRequireDefault(__webpack_require__(247)); + return _colorizeDiff = _interopRequireDefault(__webpack_require__(248)); } function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -86941,7 +87848,7 @@ function hasWrapper(commander, args) { } /***/ }), -/* 402 */ +/* 407 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -87037,14 +87944,9 @@ var list = function () { if (args.length > 1) { return false; } - var name = yield (0, (_tag || _load_tag()).getName)(args, config); - - reporter.step(1, 3, reporter.lang('loggingIn')); - var revoke = yield (0, (_login || _load_login()).getToken)(config, reporter, name); - - reporter.step(2, 3, reporter.lang('ownerGetting', name)); - var pkg = yield config.registries.npm.request(name); + reporter.step(1, 1, reporter.lang('ownerGetting', name)); + var pkg = yield config.registries.npm.request(name, { unfiltered: true }); if (pkg) { var owners = pkg.maintainers; if (!owners || !owners.length) { @@ -87071,9 +87973,6 @@ var list = function () { reporter.error(reporter.lang('ownerGettingFailed')); } - reporter.step(3, 3, reporter.lang('revokingToken')); - yield revoke(); - if (pkg) { return true; } else { @@ -87091,7 +87990,7 @@ exports.setFlags = setFlags; var _errors; function _load_errors() { - return _errors = __webpack_require__(5); + return _errors = __webpack_require__(6); } var _buildSubCommands2; @@ -87109,7 +88008,7 @@ function _load_validate() { var _tag; function _load_tag() { - return _tag = __webpack_require__(232); + return _tag = __webpack_require__(234); } var _login; @@ -87216,7 +88115,7 @@ exports.hasWrapper = hasWrapper; exports.examples = examples; /***/ }), -/* 403 */ +/* 408 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -87230,13 +88129,13 @@ exports.run = undefined; var _assign; function _load_assign() { - return _assign = _interopRequireDefault(__webpack_require__(17)); + return _assign = _interopRequireDefault(__webpack_require__(16)); } var _promise; function _load_promise() { - return _promise = _interopRequireDefault(__webpack_require__(6)); + return _promise = _interopRequireDefault(__webpack_require__(5)); } var _asyncToGenerator2; @@ -87264,12 +88163,13 @@ var publish = function () { yield config.executeLifecycleScript('prepublish'); yield config.executeLifecycleScript('prepare'); yield config.executeLifecycleScript('prepublishOnly'); + yield config.executeLifecycleScript('prepack'); // get tarball stream var stat = yield (_fs || _load_fs()).lstat(dir); var stream = void 0; if (stat.isDirectory()) { - stream = yield (0, (_pack || _load_pack()).pack)(config, dir); + stream = yield (0, (_pack || _load_pack()).pack)(config); } else if (stat.isFile()) { stream = fs2.createReadStream(dir); } else { @@ -87283,6 +88183,8 @@ var publish = function () { }).on('error', reject); }); + yield config.executeLifecycleScript('postpack'); + // copy normalized package and remove internal keys as they may be sensitive or yarn specific pkg = (0, (_assign || _load_assign()).default)({}, pkg); for (var key in pkg) { @@ -87332,7 +88234,7 @@ var publish = function () { body: root }); } catch (error) { - throw new (_errors || _load_errors()).MessageError(config.reporter.lang('publishFail')); + throw new (_errors || _load_errors()).MessageError(config.reporter.lang('publishFail', error.message)); } yield config.executeLifecycleScript('publish'); @@ -87346,6 +88248,22 @@ var publish = function () { var run = exports.run = function () { var _ref2 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) { + // validate arguments + var dir = args[0] ? (_path || _load_path()).default.resolve(config.cwd, args[0]) : config.cwd; + if (args.length > 1) { + throw new (_errors || _load_errors()).MessageError(reporter.lang('tooManyArguments', 1)); + } + if (!(yield (_fs || _load_fs()).exists(dir))) { + throw new (_errors || _load_errors()).MessageError(reporter.lang('unknownFolderOrTarball')); + } + + var stat = yield (_fs || _load_fs()).lstat(dir); + var publishPath = dir; + if (stat.isDirectory()) { + config.cwd = (_path || _load_path()).default.resolve(dir); + publishPath = config.cwd; + } + // validate package fields that are required for publishing var pkg = yield config.readRootManifest(); if (pkg.private) { @@ -87355,15 +88273,6 @@ var run = exports.run = function () { throw new (_errors || _load_errors()).MessageError(reporter.lang('noName')); } - // validate arguments - var dir = args[0] || config.cwd; - if (args.length > 1) { - throw new (_errors || _load_errors()).MessageError(reporter.lang('tooManyArguments', 1)); - } - if (!(yield (_fs || _load_fs()).exists(dir))) { - throw new (_errors || _load_errors()).MessageError(reporter.lang('unknownFolderOrTarball')); - } - // reporter.step(1, 4, reporter.lang('bumpingVersion')); var commitVersion = yield (0, (_version || _load_version()).setVersion)(config, reporter, flags, args, false); @@ -87374,7 +88283,7 @@ var run = exports.run = function () { // reporter.step(3, 4, reporter.lang('publishing')); - yield publish(config, pkg, flags, dir); + yield publish(config, pkg, flags, publishPath); yield commitVersion(); reporter.success(reporter.lang('published')); @@ -87400,13 +88309,13 @@ function _load_npmRegistry() { var _errors; function _load_errors() { - return _errors = __webpack_require__(5); + return _errors = __webpack_require__(6); } var _version; function _load_version() { - return _version = __webpack_require__(234); + return _version = __webpack_require__(236); } var _fs; @@ -87427,12 +88336,19 @@ function _load_login() { return _login = __webpack_require__(86); } +var _path; + +function _load_path() { + return _path = _interopRequireDefault(__webpack_require__(0)); +} + function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } } function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } var invariant = __webpack_require__(9); -var crypto = __webpack_require__(13); + +var crypto = __webpack_require__(14); var url = __webpack_require__(19); var fs2 = __webpack_require__(10); @@ -87449,7 +88365,7 @@ function hasWrapper(commander, args) { } /***/ }), -/* 404 */ +/* 409 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -87463,7 +88379,7 @@ exports.run = undefined; var _promise; function _load_promise() { - return _promise = _interopRequireDefault(__webpack_require__(6)); + return _promise = _interopRequireDefault(__webpack_require__(5)); } var _stringify; @@ -87481,13 +88397,13 @@ function _load_getIterator() { var _assign; function _load_assign() { - return _assign = _interopRequireDefault(__webpack_require__(17)); + return _assign = _interopRequireDefault(__webpack_require__(16)); } var _keys; function _load_keys() { - return _keys = _interopRequireDefault(__webpack_require__(14)); + return _keys = _interopRequireDefault(__webpack_require__(11)); } var _set; @@ -87549,11 +88465,14 @@ var run = exports.run = function () { // only tack on trailing arguments for default script, ignore for pre and post - #1595 var cmdWithArgs = stage === action ? sh`${unquoted(_cmd)} ${args}` : _cmd; var customShell = config.getOption('script-shell'); - if (customShell) { - yield (0, (_executeLifecycleScript || _load_executeLifecycleScript()).execCommand)(stage, config, cmdWithArgs, config.cwd, String(customShell)); - } else { - yield (0, (_executeLifecycleScript || _load_executeLifecycleScript()).execCommand)(stage, config, cmdWithArgs, config.cwd); - } + yield (0, (_executeLifecycleScript || _load_executeLifecycleScript()).execCommand)({ + stage, + config, + cmd: cmdWithArgs, + cwd: config.cwd, + isInteractive: true, + customShell: customShell ? String(customShell) : undefined + }); } } else if (action === 'env') { reporter.log((0, (_stringify || _load_stringify()).default)((yield (0, (_executeLifecycleScript || _load_executeLifecycleScript()).makeEnv)('env', config.cwd, config)), null, 2), { force: true }); @@ -87655,8 +88574,6 @@ var run = exports.run = function () { } if (args.length === 0) { - reporter.error(reporter.lang('commandNotSpecified')); - if (binCommands.length) { reporter.info(`${reporter.lang('binCommands') + binCommands.join(', ')}`); } else { @@ -87666,11 +88583,13 @@ var run = exports.run = function () { if (pkgCommands.length) { reporter.info(`${reporter.lang('possibleCommands')}`); reporter.list('possibleCommands', pkgCommands, cmdHints); - yield reporter.question(reporter.lang('commandQuestion')).then(function (answer) { - return runCommand(answer.trim().split(' ')); - }, function () { - return reporter.error(reporter.lang('commandNotSpecified')); - }); + if (!flags.nonInteractive) { + yield reporter.question(reporter.lang('commandQuestion')).then(function (answer) { + return runCommand(answer.trim().split(' ')); + }, function () { + return reporter.error(reporter.lang('commandNotSpecified')); + }); + } } else { reporter.error(reporter.lang('noScriptsAvailable')); } @@ -87697,7 +88616,7 @@ function _load_executeLifecycleScript() { var _errors; function _load_errors() { - return _errors = __webpack_require__(5); + return _errors = __webpack_require__(6); } var _index; @@ -87722,11 +88641,11 @@ function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } -var leven = __webpack_require__(638); +var leven = __webpack_require__(646); var path = __webpack_require__(0); -var _require = __webpack_require__(667), +var _require = __webpack_require__(676), quoteForShell = _require.quoteForShell, sh = _require.sh, unquoted = _require.unquoted; @@ -87740,7 +88659,7 @@ function hasWrapper(commander, args) { } /***/ }), -/* 405 */ +/* 410 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -87754,7 +88673,7 @@ exports.examples = exports.hasWrapper = exports.run = undefined; var _extends2; function _load_extends() { - return _extends2 = _interopRequireDefault(__webpack_require__(25)); + return _extends2 = _interopRequireDefault(__webpack_require__(23)); } var _asyncToGenerator2; @@ -87983,7 +88902,7 @@ exports.hasWrapper = hasWrapper; exports.examples = examples; /***/ }), -/* 406 */ +/* 411 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -88078,7 +88997,7 @@ exports.hasWrapper = hasWrapper; var _errors; function _load_errors() { - return _errors = __webpack_require__(5); + return _errors = __webpack_require__(6); } var _fs; @@ -88090,7 +89009,7 @@ function _load_fs() { var _link; function _load_link() { - return _link = __webpack_require__(229); + return _link = __webpack_require__(231); } var _global; @@ -88114,7 +89033,7 @@ function hasWrapper(commander, args) { } /***/ }), -/* 407 */ +/* 412 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -88128,7 +89047,7 @@ exports.run = undefined; var _assign; function _load_assign() { - return _assign = _interopRequireDefault(__webpack_require__(17)); + return _assign = _interopRequireDefault(__webpack_require__(16)); } var _asyncToGenerator2; @@ -88176,7 +89095,7 @@ function hasWrapper(commander, args) { } /***/ }), -/* 408 */ +/* 413 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -88190,7 +89109,7 @@ exports.run = exports.requireLockfile = undefined; var _from; function _load_from() { - return _from = _interopRequireDefault(__webpack_require__(66)); + return _from = _interopRequireDefault(__webpack_require__(55)); } var _getIterator2; @@ -88202,13 +89121,13 @@ function _load_getIterator() { var _keys; function _load_keys() { - return _keys = _interopRequireDefault(__webpack_require__(14)); + return _keys = _interopRequireDefault(__webpack_require__(11)); } var _promise; function _load_promise() { - return _promise = _interopRequireDefault(__webpack_require__(6)); + return _promise = _interopRequireDefault(__webpack_require__(5)); } var _set; @@ -88502,13 +89421,13 @@ function _load_fs() { var _lockfile; function _load_lockfile() { - return _lockfile = _interopRequireDefault(__webpack_require__(20)); + return _lockfile = _interopRequireDefault(__webpack_require__(21)); } var _errors; function _load_errors() { - return _errors = __webpack_require__(5); + return _errors = __webpack_require__(6); } function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } } @@ -88518,8 +89437,8 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de var requireLockfile = exports.requireLockfile = true; var invariant = __webpack_require__(9); -var bytes = __webpack_require__(461); -var emoji = __webpack_require__(195); +var bytes = __webpack_require__(468); +var emoji = __webpack_require__(197); var path = __webpack_require__(0); function sum(array) { @@ -88646,7 +89565,7 @@ function queryWhy(pattern, hoisted) { } /***/ }), -/* 409 */ +/* 414 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -88716,7 +89635,7 @@ exports.hasWrapper = hasWrapper; var _errors; function _load_errors() { - return _errors = __webpack_require__(5); + return _errors = __webpack_require__(6); } var _child; @@ -88744,7 +89663,7 @@ function hasWrapper(commander, args) { } /***/ }), -/* 410 */ +/* 415 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -88758,7 +89677,7 @@ exports.examples = exports.setFlags = exports.run = exports.info = undefined; var _from; function _load_from() { - return _from = _interopRequireDefault(__webpack_require__(66)); + return _from = _interopRequireDefault(__webpack_require__(55)); } var _set; @@ -88776,7 +89695,7 @@ function _load_getIterator() { var _keys; function _load_keys() { - return _keys = _interopRequireDefault(__webpack_require__(14)); + return _keys = _interopRequireDefault(__webpack_require__(11)); } var _stringify; @@ -88890,7 +89809,7 @@ exports.hasWrapper = hasWrapper; var _errors; function _load_errors() { - return _errors = __webpack_require__(5); + return _errors = __webpack_require__(6); } var _buildSubCommands2; @@ -88909,7 +89828,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de var invariant = __webpack_require__(9); var path = __webpack_require__(0); -var semver = __webpack_require__(22); +var semver = __webpack_require__(20); function hasWrapper(commander, args) { return true; @@ -88931,7 +89850,7 @@ exports.setFlags = setFlags; exports.examples = examples; /***/ }), -/* 411 */ +/* 416 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -88945,7 +89864,7 @@ exports.autoRun = undefined; var _assign; function _load_assign() { - return _assign = _interopRequireDefault(__webpack_require__(17)); + return _assign = _interopRequireDefault(__webpack_require__(16)); } var _asyncToGenerator2; @@ -88969,7 +89888,7 @@ function _load_stringify() { var _promise; function _load_promise() { - return _promise = _interopRequireDefault(__webpack_require__(6)); + return _promise = _interopRequireDefault(__webpack_require__(5)); } var _set; @@ -89044,7 +89963,7 @@ function _load_path() { var _commander; function _load_commander() { - return _commander = _interopRequireDefault(__webpack_require__(207)); + return _commander = _interopRequireDefault(__webpack_require__(209)); } var _fs; @@ -89062,25 +89981,25 @@ function _load_invariant() { var _properLockfile; function _load_properLockfile() { - return _properLockfile = _interopRequireDefault(__webpack_require__(339)); + return _properLockfile = _interopRequireDefault(__webpack_require__(344)); } var _loudRejection; function _load_loudRejection() { - return _loudRejection = _interopRequireDefault(__webpack_require__(338)); + return _loudRejection = _interopRequireDefault(__webpack_require__(343)); } var _death; function _load_death() { - return _death = _interopRequireDefault(__webpack_require__(337)); + return _death = _interopRequireDefault(__webpack_require__(342)); } var _semver; function _load_semver() { - return _semver = _interopRequireDefault(__webpack_require__(22)); + return _semver = _interopRequireDefault(__webpack_require__(20)); } var _index; @@ -89098,7 +90017,7 @@ function _load_index2() { var _index3; function _load_index3() { - return _index3 = _interopRequireDefault(__webpack_require__(205)); + return _index3 = _interopRequireDefault(__webpack_require__(207)); } var _constants; @@ -89110,13 +90029,13 @@ function _load_constants() { var _network; function _load_network() { - return _network = _interopRequireWildcard(__webpack_require__(206)); + return _network = _interopRequireWildcard(__webpack_require__(208)); } var _errors; function _load_errors() { - return _errors = __webpack_require__(5); + return _errors = __webpack_require__(6); } var _config; @@ -89128,7 +90047,7 @@ function _load_config() { var _rc; function _load_rc() { - return _rc = __webpack_require__(334); + return _rc = __webpack_require__(339); } var _child; @@ -89146,13 +90065,13 @@ function _load_yarnVersion() { var _signalHandler; function _load_signalHandler() { - return _signalHandler = _interopRequireDefault(__webpack_require__(336)); + return _signalHandler = _interopRequireDefault(__webpack_require__(341)); } var _conversion; function _load_conversion() { - return _conversion = __webpack_require__(335); + return _conversion = __webpack_require__(340); } function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } } @@ -89716,10 +90635,10 @@ if (__webpack_require__.c[__webpack_require__.s] === module) { } exports.default = start; -/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(23)(module))) +/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(24)(module))) /***/ }), -/* 412 */ +/* 417 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -89744,13 +90663,13 @@ function _load_classCallCheck() { var _possibleConstructorReturn2; function _load_possibleConstructorReturn() { - return _possibleConstructorReturn2 = _interopRequireDefault(__webpack_require__(12)); + return _possibleConstructorReturn2 = _interopRequireDefault(__webpack_require__(13)); } var _inherits2; function _load_inherits() { - return _inherits2 = _interopRequireDefault(__webpack_require__(11)); + return _inherits2 = _interopRequireDefault(__webpack_require__(12)); } var _baseFetcher; @@ -89799,7 +90718,7 @@ var CopyFetcher = function (_BaseFetcher) { exports.default = CopyFetcher; /***/ }), -/* 413 */ +/* 418 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -89812,7 +90731,7 @@ Object.defineProperty(exports, "__esModule", { var _promise; function _load_promise() { - return _promise = _interopRequireDefault(__webpack_require__(6)); + return _promise = _interopRequireDefault(__webpack_require__(5)); } var _asyncToGenerator2; @@ -89830,19 +90749,19 @@ function _load_classCallCheck() { var _possibleConstructorReturn2; function _load_possibleConstructorReturn() { - return _possibleConstructorReturn2 = _interopRequireDefault(__webpack_require__(12)); + return _possibleConstructorReturn2 = _interopRequireDefault(__webpack_require__(13)); } var _inherits2; function _load_inherits() { - return _inherits2 = _interopRequireDefault(__webpack_require__(11)); + return _inherits2 = _interopRequireDefault(__webpack_require__(12)); } var _errors; function _load_errors() { - return _errors = __webpack_require__(5); + return _errors = __webpack_require__(6); } var _baseFetcher; @@ -89854,7 +90773,7 @@ function _load_baseFetcher() { var _git; function _load_git() { - return _git = _interopRequireDefault(__webpack_require__(157)); + return _git = _interopRequireDefault(__webpack_require__(159)); } var _fs; @@ -89884,7 +90803,7 @@ function _load_install() { var _lockfile; function _load_lockfile() { - return _lockfile = _interopRequireDefault(__webpack_require__(20)); + return _lockfile = _interopRequireDefault(__webpack_require__(21)); } var _config; @@ -90229,7 +91148,7 @@ var GitFetcher = function (_BaseFetcher) { exports.default = GitFetcher; /***/ }), -/* 414 */ +/* 419 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -90249,25 +91168,25 @@ function _load_baseFetcher() { var _copyFetcher; function _load_copyFetcher() { - return _copyFetcher = _interopRequireDefault(__webpack_require__(412)); + return _copyFetcher = _interopRequireDefault(__webpack_require__(417)); } var _gitFetcher; function _load_gitFetcher() { - return _gitFetcher = _interopRequireDefault(__webpack_require__(413)); + return _gitFetcher = _interopRequireDefault(__webpack_require__(418)); } var _tarballFetcher; function _load_tarballFetcher() { - return _tarballFetcher = _interopRequireDefault(__webpack_require__(235)); + return _tarballFetcher = _interopRequireDefault(__webpack_require__(237)); } var _workspaceFetcher; function _load_workspaceFetcher() { - return _workspaceFetcher = _interopRequireDefault(__webpack_require__(415)); + return _workspaceFetcher = _interopRequireDefault(__webpack_require__(420)); } function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -90279,7 +91198,7 @@ exports.tarball = (_tarballFetcher || _load_tarballFetcher()).default; exports.workspace = (_workspaceFetcher || _load_workspaceFetcher()).default; /***/ }), -/* 415 */ +/* 420 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -90292,7 +91211,7 @@ Object.defineProperty(exports, "__esModule", { var _extends2; function _load_extends() { - return _extends2 = _interopRequireDefault(__webpack_require__(25)); + return _extends2 = _interopRequireDefault(__webpack_require__(23)); } var _asyncToGenerator2; @@ -90304,7 +91223,7 @@ function _load_asyncToGenerator() { var _promise; function _load_promise() { - return _promise = _interopRequireDefault(__webpack_require__(6)); + return _promise = _interopRequireDefault(__webpack_require__(5)); } var _classCallCheck2; @@ -90313,6 +91232,12 @@ function _load_classCallCheck() { return _classCallCheck2 = _interopRequireDefault(__webpack_require__(2)); } +var _packageFetcher; + +function _load_packageFetcher() { + return _packageFetcher = __webpack_require__(151); +} + function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } var WorkspaceFetcher = function () { @@ -90323,6 +91248,7 @@ var WorkspaceFetcher = function () { this.dest = dest; this.registry = remote.registry; this.workspaceDir = remote.reference; + this.registryRemote = remote.registryRemote; } WorkspaceFetcher.prototype.setupMirrorFromCache = function setupMirrorFromCache() { @@ -90333,6 +91259,10 @@ var WorkspaceFetcher = function () { var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () { var pkg = yield this.config.readManifest(this.workspaceDir, this.registry); + if (this.registryRemote) { + yield this.fetchRemoteWorkspace(this.registryRemote, pkg); + } + return { resolved: null, hash: '', @@ -90351,13 +91281,17 @@ var WorkspaceFetcher = function () { return fetch; }(); + WorkspaceFetcher.prototype.fetchRemoteWorkspace = function fetchRemoteWorkspace(remote, manifest) { + return (0, (_packageFetcher || _load_packageFetcher()).fetchOneRemote)(remote, manifest.name, manifest.version, this.dest, this.config); + }; + return WorkspaceFetcher; }(); exports.default = WorkspaceFetcher; /***/ }), -/* 416 */ +/* 421 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -90370,7 +91304,7 @@ Object.defineProperty(exports, "__esModule", { var _keys; function _load_keys() { - return _keys = _interopRequireDefault(__webpack_require__(14)); + return _keys = _interopRequireDefault(__webpack_require__(11)); } var _stringify2; @@ -90396,7 +91330,7 @@ function _load_constants() { var _package; function _load_package() { - return _package = __webpack_require__(330); + return _package = __webpack_require__(335); } function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -90507,7 +91441,7 @@ function stringify(obj, noHeader, enableVersions) { } /***/ }), -/* 417 */ +/* 422 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -90520,7 +91454,7 @@ Object.defineProperty(exports, "__esModule", { var _promise; function _load_promise() { - return _promise = _interopRequireDefault(__webpack_require__(6)); + return _promise = _interopRequireDefault(__webpack_require__(5)); } var _classCallCheck2; @@ -90531,7 +91465,7 @@ function _load_classCallCheck() { function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } -var semver = __webpack_require__(22); +var semver = __webpack_require__(20); // This isn't really a "proper" constraint resolver. We just return the highest semver // version in the versions passed that satisfies the input range. This vastly reduces @@ -90560,7 +91494,7 @@ var PackageConstraintResolver = function () { exports.default = PackageConstraintResolver; /***/ }), -/* 418 */ +/* 423 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -90571,10 +91505,22 @@ Object.defineProperty(exports, "__esModule", { }); exports.NohoistResolver = exports.HoistManifest = undefined; +var _extends2; + +function _load_extends() { + return _extends2 = _interopRequireDefault(__webpack_require__(23)); +} + +var _from; + +function _load_from() { + return _from = _interopRequireDefault(__webpack_require__(55)); +} + var _keys; function _load_keys() { - return _keys = _interopRequireDefault(__webpack_require__(14)); + return _keys = _interopRequireDefault(__webpack_require__(11)); } var _getIterator2; @@ -90619,9 +91565,16 @@ function _load_micromatch() { return _micromatch = _interopRequireDefault(__webpack_require__(80)); } +var _workspaceLayout2; + +function _load_workspaceLayout() { + return _workspaceLayout2 = _interopRequireDefault(__webpack_require__(67)); +} + function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } var invariant = __webpack_require__(9); + var path = __webpack_require__(0); var historyCounter = 0; @@ -90648,8 +91601,14 @@ var HoistManifest = exports.HoistManifest = function () { this.isNohoist = false; this.originalParentPath = ''; + + this.shallowPaths = []; + this.isShallow = false; } + //focus + + // nohoist info @@ -90663,7 +91622,8 @@ var HoistManifest = exports.HoistManifest = function () { var PackageHoister = function () { function PackageHoister(config, resolver) { var _ref = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {}, - ignoreOptional = _ref.ignoreOptional; + ignoreOptional = _ref.ignoreOptional, + workspaceLayout = _ref.workspaceLayout; (0, (_classCallCheck2 || _load_classCallCheck()).default)(this, PackageHoister); @@ -90676,6 +91636,8 @@ var PackageHoister = function () { this.levelQueue = []; this.tree = new (_map || _load_map()).default(); + this.workspaceLayout = workspaceLayout; + this.nohoistResolver = new NohoistResolver(config, resolver); } @@ -90846,7 +91808,7 @@ var PackageHoister = function () { } // - var loc = this.config.generateHardModulePath(ref); + var loc = this.config.generateModuleCachePath(ref); var parts = parentParts.concat(pkg.name); var key = this.implodeKey(parts); var info = new HoistManifest(key, parts, pkg, loc, isDirectRequire, isRequired, isIncompatible); @@ -91379,78 +92341,273 @@ var PackageHoister = function () { } }; + PackageHoister.prototype.markShallowWorkspaceEntries = function markShallowWorkspaceEntries() { + var _this4 = this; + + var targetWorkspace = path.basename(this.config.cwd); + var targetHoistManifest = this.tree.get(targetWorkspace); + invariant(targetHoistManifest, 'targetHoistManifest missing'); + + //dedupe with a set + var dependentWorkspaces = (0, (_from || _load_from()).default)(new (_set || _load_set()).default(this._getDependentWorkspaces(targetHoistManifest))); + + var entries = (0, (_from || _load_from()).default)(this.tree); + entries.forEach(function (_ref16) { + var key = _ref16[0], + info = _ref16[1]; + + var splitPath = key.split('#'); + + //mark the workspace and any un-hoisted dependencies it has for shallow installation + var isShallowDependency = dependentWorkspaces.some(function (w) { + if (splitPath[0] !== w) { + //entry is not related to the workspace + return false; + } + if (!splitPath[1]) { + //entry is the workspace + return true; + } + //don't bother marking dev dependencies or nohoist packages for shallow installation + var treeEntry = _this4.tree.get(w); + invariant(treeEntry, 'treeEntry is not defined for ' + w); + var pkg = treeEntry.pkg; + return !info.isNohoist && (!pkg.devDependencies || !(splitPath[1] in pkg.devDependencies)); + }); + + if (isShallowDependency) { + info.shallowPaths = [null]; + return; + } + + //if package foo is at TARGET_WORKSPACE/node_modules/foo, the hoisted version of foo + //should be installed under each shallow workspace that uses it + //(unless that workspace has its own version of foo, in which case that should be installed) + if (splitPath.length !== 2 || splitPath[0] !== targetWorkspace) { + return; + } + var unhoistedDependency = splitPath[1]; + var unhoistedInfo = _this4.tree.get(unhoistedDependency); + if (!unhoistedInfo) { + return; + } + dependentWorkspaces.forEach(function (w) { + if (_this4._packageDependsOnHoistedPackage(w, unhoistedDependency, false)) { + unhoistedInfo.shallowPaths.push(w); + } + }); + }); + }; + + PackageHoister.prototype._getDependentWorkspaces = function _getDependentWorkspaces(parent) { + var _this5 = this; + + var allowDevDeps = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true; + var alreadySeen = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : new (_set || _load_set()).default(); + + var parentName = parent.pkg.name; + if (alreadySeen.has(parentName)) { + return []; + } + + alreadySeen.add(parentName); + invariant(this.workspaceLayout, 'missing workspaceLayout'); + var _workspaceLayout = this.workspaceLayout, + virtualManifestName = _workspaceLayout.virtualManifestName, + workspaces = _workspaceLayout.workspaces; + + + var directDependencies = []; + var ignored = []; + (0, (_keys || _load_keys()).default)(workspaces).forEach(function (workspace) { + if (alreadySeen.has(workspace) || workspace === virtualManifestName) { + return; + } + + //skip a workspace if a different version of it is already being installed under the parent workspace + var info = _this5.tree.get(`${parentName}#${workspace}`); + if (info) { + var workspaceVersion = workspaces[workspace].manifest.version; + if (info.isNohoist && info.originalParentPath.startsWith(`/${WS_ROOT_ALIAS}/${parentName}`) && info.pkg.version === workspaceVersion) { + //nohoist installations are exceptions + directDependencies.push(info.key); + } else { + ignored.push(workspace); + } + return; + } + + var searchPath = `/${WS_ROOT_ALIAS}/${parentName}`; + info = _this5.tree.get(workspace); + invariant(info, 'missing workspace tree entry ' + workspace); + if (!info.previousPaths.some(function (p) { + return p.startsWith(searchPath); + })) { + return; + } + if (allowDevDeps || !parent.pkg.devDependencies || !(workspace in parent.pkg.devDependencies)) { + directDependencies.push(workspace); + } + }); + + var nested = directDependencies.map(function (d) { + var dependencyEntry = _this5.tree.get(d); + invariant(dependencyEntry, 'missing dependencyEntry ' + d); + return _this5._getDependentWorkspaces(dependencyEntry, false, alreadySeen); + }); + nested = [].concat.apply([], nested); //flatten + + var directDependencyNames = directDependencies.map(function (d) { + return d.split('#').slice(-1)[0]; + }); + + return directDependencyNames.concat(nested).filter(function (w) { + return ignored.indexOf(w) === -1; + }); + }; + + PackageHoister.prototype._packageDependsOnHoistedPackage = function _packageDependsOnHoistedPackage(p, hoisted) { + var _this6 = this; + + var checkDevDeps = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true; + var checked = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : new (_set || _load_set()).default(); + + //don't check the same package more than once, and ignore any package that has its own version of hoisted + if (checked.has(p) || this.tree.has(`${p}#${hoisted}`)) { + return false; + } + checked.add(p); + var info = this.tree.get(p); + if (!info) { + return false; + } + + var pkg = info.pkg; + if (!pkg) { + return false; + } + + var deps = []; + if (pkg.dependencies) { + deps = deps.concat((0, (_keys || _load_keys()).default)(pkg.dependencies)); + } + if (checkDevDeps && pkg.devDependencies) { + deps = deps.concat((0, (_keys || _load_keys()).default)(pkg.devDependencies)); + } + + if (deps.indexOf(hoisted) !== -1) { + return true; + } + return deps.some(function (dep) { + return _this6._packageDependsOnHoistedPackage(dep, hoisted, false, checked); + }); + }; + /** * Produce a flattened list of module locations and manifests. */ PackageHoister.prototype.init = function init() { + var _this7 = this; + var flatTree = []; // - for (var _iterator11 = this.tree.entries(), _isArray11 = Array.isArray(_iterator11), _i11 = 0, _iterator11 = _isArray11 ? _iterator11 : (0, (_getIterator2 || _load_getIterator()).default)(_iterator11);;) { - var _ref17; - - if (_isArray11) { - if (_i11 >= _iterator11.length) break; - _ref17 = _iterator11[_i11++]; - } else { - _i11 = _iterator11.next(); - if (_i11.done) break; - _ref17 = _i11.value; - } - - var _ref16 = _ref17; - var key = _ref16[0]; - var info = _ref16[1]; + var _loop2 = function _loop2(key, info) { // decompress the location and push it to the flat tree. this path could be made - var _parts2 = []; + var parts = []; var keyParts = key.split('#'); for (var i = 0; i < keyParts.length; i++) { var _key = keyParts.slice(0, i + 1).join('#'); - var hoisted = this.tree.get(_key); + var hoisted = _this7.tree.get(_key); invariant(hoisted, 'expected hoisted manifest'); - _parts2.push(this.config.getFolder(hoisted.pkg)); - _parts2.push(keyParts[i]); + parts.push(_this7.config.getFolder(hoisted.pkg)); + parts.push(keyParts[i]); } - if (this.config.modulesFolder) { + var shallowLocs = []; + if (_this7.config.modulesFolder) { // remove the first part which will be the folder name and replace it with a // hardcoded modules folder - _parts2.splice(0, 1, this.config.modulesFolder); + parts.splice(0, 1, _this7.config.modulesFolder); } else { // first part will be the registry-specific module folder - _parts2.splice(0, 0, this.config.lockfileFolder); + parts.splice(0, 0, _this7.config.lockfileFolder); } - var loc = path.join.apply(path, _parts2); + info.shallowPaths.forEach(function (shallowPath) { + var shallowCopyParts = parts.slice(); + shallowCopyParts[0] = _this7.config.cwd; + if (_this7.config.modulesFolder) { + //add back the module folder name for the shallow installation + var treeEntry = _this7.tree.get(keyParts[0]); + invariant(treeEntry, 'expected treeEntry for ' + keyParts[0]); + var moduleFolderName = _this7.config.getFolder(treeEntry.pkg); + shallowCopyParts.splice(1, 0, moduleFolderName); + } + + if (shallowPath) { + var targetWorkspace = path.basename(_this7.config.cwd); + var _treeEntry = _this7.tree.get(`${targetWorkspace}#${shallowPath}`) || _this7.tree.get(shallowPath); + invariant(_treeEntry, 'expected treeEntry for ' + shallowPath); + var _moduleFolderName = _this7.config.getFolder(_treeEntry.pkg); + shallowCopyParts.splice(1, 0, _moduleFolderName, shallowPath); + } + shallowLocs.push(path.join.apply(path, shallowCopyParts)); + }); + + var loc = path.join.apply(path, parts); flatTree.push([loc, info]); + shallowLocs.forEach(function (shallowLoc) { + var newManifest = (0, (_extends2 || _load_extends()).default)({}, info, { isShallow: true }); + flatTree.push([shallowLoc, newManifest]); + }); + }; + + for (var _iterator11 = this.tree.entries(), _isArray11 = Array.isArray(_iterator11), _i11 = 0, _iterator11 = _isArray11 ? _iterator11 : (0, (_getIterator2 || _load_getIterator()).default)(_iterator11);;) { + var _ref18; + + if (_isArray11) { + if (_i11 >= _iterator11.length) break; + _ref18 = _iterator11[_i11++]; + } else { + _i11 = _iterator11.next(); + if (_i11.done) break; + _ref18 = _i11.value; + } + + var _ref17 = _ref18; + var key = _ref17[0]; + var info = _ref17[1]; + + _loop2(key, info); } // remove ignored modules from the tree var visibleFlatTree = []; for (var _iterator12 = flatTree, _isArray12 = Array.isArray(_iterator12), _i12 = 0, _iterator12 = _isArray12 ? _iterator12 : (0, (_getIterator2 || _load_getIterator()).default)(_iterator12);;) { - var _ref19; + var _ref20; if (_isArray12) { if (_i12 >= _iterator12.length) break; - _ref19 = _iterator12[_i12++]; + _ref20 = _iterator12[_i12++]; } else { _i12 = _iterator12.next(); if (_i12.done) break; - _ref19 = _i12.value; + _ref20 = _i12.value; } - var _ref18 = _ref19; - var loc = _ref18[0]; - var _info = _ref18[1]; + var _ref19 = _ref20; + var loc = _ref19[0]; + var info = _ref19[1]; - var ref = _info.pkg._reference; + var ref = info.pkg._reference; invariant(ref, 'expected reference'); - if (!_info.isRequired) { - _info.addHistory('Deleted as this module was ignored'); + if (!info.isRequired) { + info.addHistory('Deleted as this module was ignored'); } else { - visibleFlatTree.push([loc, _info]); + visibleFlatTree.push([loc, info]); } } return visibleFlatTree; @@ -91466,7 +92623,7 @@ var WS_ROOT_ALIAS = '_project_'; var NohoistResolver = exports.NohoistResolver = function () { function NohoistResolver(config, resolver) { - var _this4 = this; + var _this8 = this; (0, (_classCallCheck2 || _load_classCallCheck()).default)(this, NohoistResolver); @@ -91476,22 +92633,22 @@ var NohoistResolver = exports.NohoistResolver = function () { if (parent) { parentNohoistList = parent.nohoistList; - originalParentPath = _this4._originalPath(parent); + originalParentPath = _this8._originalPath(parent); } else { - invariant(_this4._isTopPackage(info), `${info.key} doesn't have parent nor a top package`); - if (info.pkg.name !== _this4._wsRootPackageName) { - parentNohoistList = _this4._wsRootNohoistList; - originalParentPath = _this4._wsRootPackageName || ''; + invariant(_this8._isTopPackage(info), `${info.key} doesn't have parent nor a top package`); + if (info.pkg.name !== _this8._wsRootPackageName) { + parentNohoistList = _this8._wsRootNohoistList; + originalParentPath = _this8._wsRootPackageName || ''; } } info.originalParentPath = originalParentPath; - var nohoistList = _this4._extractNohoistList(info.pkg, _this4._originalPath(info)) || []; + var nohoistList = _this8._extractNohoistList(info.pkg, _this8._originalPath(info)) || []; if (parentNohoistList) { nohoistList = nohoistList.concat(parentNohoistList); } info.nohoistList = nohoistList.length > 0 ? nohoistList : null; - info.isNohoist = _this4._isNohoist(info); + info.isNohoist = _this8._isNohoist(info); }; this.highestHoistingPoint = function (info) { @@ -91502,23 +92659,23 @@ var NohoistResolver = exports.NohoistResolver = function () { if (!info.nohoistList || info.nohoistList.length <= 0) { return false; } - var path = _this4._originalPath(info); + var path = _this8._originalPath(info); // top package can not be marked 'nohoist' because it is already at the top (hoisted). - return !_this4._isTopPackage(info) && (_micromatch || _load_micromatch()).default.any(path, info.nohoistList); + return !_this8._isTopPackage(info) && (_micromatch || _load_micromatch()).default.any(path, info.nohoistList); }; this._isRootPackage = function (pkg) { - return pkg.name === _this4._wsRootPackageName; + return pkg.name === _this8._wsRootPackageName; }; this._originalPath = function (info) { - return _this4._makePath(info.originalParentPath, info.pkg.name); + return _this8._makePath(info.originalParentPath, info.pkg.name); }; this._isTopPackage = function (info) { var parentParts = info.parts.slice(0, -1); - var result = !parentParts || parentParts.length <= 0 || parentParts.length === 1 && parentParts[0] === _this4._wsRootPackageName; + var result = !parentParts || parentParts.length <= 0 || parentParts.length === 1 && parentParts[0] === _this8._wsRootPackageName; return result; }; @@ -91528,11 +92685,11 @@ var NohoistResolver = exports.NohoistResolver = function () { this._extractNohoistList = function (pkg, pathPrefix) { var nohoistList = void 0; - var ws = _this4._config.getWorkspaces(pkg); + var ws = _this8._config.getWorkspaces(pkg); if (ws && ws.nohoist) { nohoistList = ws.nohoist.map(function (p) { - return _this4._makePath(pathPrefix, p); + return _this8._makePath(pathPrefix, p); }); } return nohoistList; @@ -91567,14 +92724,14 @@ var NohoistResolver = exports.NohoistResolver = function () { NohoistResolver.prototype._makePath = function _makePath() { - var _this5 = this; + var _this9 = this; for (var _len = arguments.length, args = Array(_len), _key2 = 0; _key2 < _len; _key2++) { args[_key2] = arguments[_key2]; } var parts = args.map(function (s) { - return s === _this5._wsRootPackageName ? WS_ROOT_ALIAS : s; + return s === _this9._wsRootPackageName ? WS_ROOT_ALIAS : s; }); return parts.join('/'); }; @@ -91587,7 +92744,7 @@ var NohoistResolver = exports.NohoistResolver = function () { }(); /***/ }), -/* 419 */ +/* 424 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -91600,7 +92757,7 @@ Object.defineProperty(exports, "__esModule", { var _promise; function _load_promise() { - return _promise = _interopRequireDefault(__webpack_require__(6)); + return _promise = _interopRequireDefault(__webpack_require__(5)); } var _map; @@ -91660,7 +92817,7 @@ function _load_fs() { var _packageNameUtils; function _load_packageNameUtils() { - return _packageNameUtils = __webpack_require__(160); + return _packageNameUtils = __webpack_require__(162); } var _pack; @@ -91810,11 +92967,53 @@ var PackageInstallScripts = function () { PackageInstallScripts.prototype.install = function () { var _ref7 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (cmds, pkg, spinner) { + var _this = this; + var ref = pkg._reference; invariant(ref, 'expected reference'); - var loc = this.config.generateHardModulePath(ref); + var locs = ref.locations; + + var updateProgress = void 0; + + if (cmds.length > 0) { + updateProgress = function updateProgress(data) { + var dataStr = data.toString() // turn buffer into string + .trim(); // trim whitespace + + invariant(spinner && spinner.tick, 'We should have spinner and its ticker here'); + if (dataStr) { + spinner.tick(dataStr + // Only get the last line + .substr(dataStr.lastIndexOf('\n') + 1) + // change tabs to spaces as they can interfere with the console + .replace(/\t/g, ' ')); + } + }; + } try { + var _loop = function* _loop(stage, cmd) { + yield (_promise || _load_promise()).default.all(locs.map(function () { + var _ref10 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (loc) { + var _ref11 = yield (0, (_executeLifecycleScript || _load_executeLifecycleScript()).default)({ + stage, + config: _this.config, + cwd: loc, + cmd, + isInteractive: false, + updateProgress + }), + stdout = _ref11.stdout; + + _this.reporter.verbose(stdout); + }); + + return function (_x9) { + return _ref10.apply(this, arguments); + }; + }())); + }; + for (var _iterator4 = cmds, _isArray4 = Array.isArray(_iterator4), _i4 = 0, _iterator4 = _isArray4 ? _iterator4 : (0, (_getIterator2 || _load_getIterator()).default)(_iterator4);;) { var _ref9; @@ -91830,14 +93029,10 @@ var PackageInstallScripts = function () { var _ref8 = _ref9; var stage = _ref8[0]; var cmd = _ref8[1]; - - var _ref10 = yield (0, (_executeLifecycleScript || _load_executeLifecycleScript()).default)(stage, this.config, loc, cmd, spinner), - stdout = _ref10.stdout; - - this.reporter.verbose(stdout); + yield* _loop(stage, cmd); } } catch (err) { - err.message = `${loc}: ${err.message}`; + err.message = `${locs.join(', ')}: ${err.message}`; invariant(ref, 'expected reference'); @@ -91849,7 +93044,15 @@ var PackageInstallScripts = function () { // Cleanup node_modules try { - yield (_fs || _load_fs()).unlink(loc); + yield (_promise || _load_promise()).default.all(locs.map(function () { + var _ref12 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (loc) { + yield (_fs || _load_fs()).unlink(loc); + }); + + return function (_x10) { + return _ref12.apply(this, arguments); + }; + }())); } catch (e) { this.reporter.error(this.reporter.lang('optionalModuleCleanupFail', e.message)); } @@ -91886,7 +93089,7 @@ var PackageInstallScripts = function () { } // Don't run lifecycle scripts for hoisted packages - if (!ref.location) { + if (!ref.locations.length) { return false; } @@ -91898,14 +93101,14 @@ var PackageInstallScripts = function () { }; PackageInstallScripts.prototype.runCommand = function () { - var _ref11 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (spinner, pkg) { + var _ref13 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (spinner, pkg) { var cmds = this.getInstallCommands(pkg); spinner.setPrefix(++this.installed, pkg.name); yield this.install(cmds, pkg, spinner); }); - function runCommand(_x9, _x10) { - return _ref11.apply(this, arguments); + function runCommand(_x11, _x12) { + return _ref13.apply(this, arguments); } return runCommand; @@ -91920,18 +93123,18 @@ var PackageInstallScripts = function () { var deps = ref.dependencies; for (var _iterator5 = deps, _isArray5 = Array.isArray(_iterator5), _i5 = 0, _iterator5 = _isArray5 ? _iterator5 : (0, (_getIterator2 || _load_getIterator()).default)(_iterator5);;) { - var _ref12; + var _ref14; if (_isArray5) { if (_i5 >= _iterator5.length) break; - _ref12 = _iterator5[_i5++]; + _ref14 = _iterator5[_i5++]; } else { _i5 = _iterator5.next(); if (_i5.done) break; - _ref12 = _i5.value; + _ref14 = _i5.value; } - var dep = _ref12; + var dep = _ref14; var pkgDep = this.resolver.getStrictResolvedPattern(dep); if (seenManifests.has(pkgDep)) { @@ -91955,18 +93158,18 @@ var PackageInstallScripts = function () { PackageInstallScripts.prototype.findInstallablePackage = function findInstallablePackage(workQueue, installed) { for (var _iterator6 = workQueue, _isArray6 = Array.isArray(_iterator6), _i6 = 0, _iterator6 = _isArray6 ? _iterator6 : (0, (_getIterator2 || _load_getIterator()).default)(_iterator6);;) { - var _ref13; + var _ref15; if (_isArray6) { if (_i6 >= _iterator6.length) break; - _ref13 = _iterator6[_i6++]; + _ref15 = _iterator6[_i6++]; } else { _i6 = _iterator6.next(); if (_i6.done) break; - _ref13 = _i6.value; + _ref15 = _i6.value; } - var pkg = _ref13; + var pkg = _ref15; var ref = pkg._reference; invariant(ref, 'expected reference'); @@ -91974,18 +93177,18 @@ var PackageInstallScripts = function () { var dependenciesFulfilled = true; for (var _iterator7 = deps, _isArray7 = Array.isArray(_iterator7), _i7 = 0, _iterator7 = _isArray7 ? _iterator7 : (0, (_getIterator2 || _load_getIterator()).default)(_iterator7);;) { - var _ref14; + var _ref16; if (_isArray7) { if (_i7 >= _iterator7.length) break; - _ref14 = _iterator7[_i7++]; + _ref16 = _iterator7[_i7++]; } else { _i7 = _iterator7.next(); if (_i7.done) break; - _ref14 = _i7.value; + _ref16 = _i7.value; } - var dep = _ref14; + var dep = _ref16; var pkgDep = this.resolver.getStrictResolvedPattern(dep); if (!installed.has(pkgDep)) { @@ -92008,13 +93211,8 @@ var PackageInstallScripts = function () { }; PackageInstallScripts.prototype.worker = function () { - var _ref15 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (spinner, workQueue, installed, waitQueue) { - while (true) { - // No more work to be done - if (workQueue.size == 0) { - break; - } - + var _ref17 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (spinner, workQueue, installed, waitQueue) { + while (workQueue.size > 0) { // find a installable package var pkg = this.findInstallablePackage(workQueue, installed); @@ -92034,18 +93232,18 @@ var PackageInstallScripts = function () { } installed.add(pkg); for (var _iterator8 = waitQueue, _isArray8 = Array.isArray(_iterator8), _i8 = 0, _iterator8 = _isArray8 ? _iterator8 : (0, (_getIterator2 || _load_getIterator()).default)(_iterator8);;) { - var _ref16; + var _ref18; if (_isArray8) { if (_i8 >= _iterator8.length) break; - _ref16 = _iterator8[_i8++]; + _ref18 = _iterator8[_i8++]; } else { _i8 = _iterator8.next(); if (_i8.done) break; - _ref16 = _i8.value; + _ref18 = _i8.value; } - var workerResolve = _ref16; + var workerResolve = _ref18; workerResolve(); } @@ -92053,16 +93251,16 @@ var PackageInstallScripts = function () { } }); - function worker(_x11, _x12, _x13, _x14) { - return _ref15.apply(this, arguments); + function worker(_x13, _x14, _x15, _x16) { + return _ref17.apply(this, arguments); } return worker; }(); PackageInstallScripts.prototype.init = function () { - var _ref17 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (seedPatterns) { - var _this = this; + var _ref19 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (seedPatterns) { + var _this2 = this; var workQueue = new (_set || _load_set()).default(); var installed = new (_set || _load_set()).default(); @@ -92071,129 +93269,138 @@ var PackageInstallScripts = function () { // A map to keep track of what files exist before installation var beforeFilesMap = new (_map || _load_map()).default(); for (var _iterator9 = pkgs, _isArray9 = Array.isArray(_iterator9), _i9 = 0, _iterator9 = _isArray9 ? _iterator9 : (0, (_getIterator2 || _load_getIterator()).default)(_iterator9);;) { - var _ref18; + var _ref20; if (_isArray9) { if (_i9 >= _iterator9.length) break; - _ref18 = _iterator9[_i9++]; + _ref20 = _iterator9[_i9++]; } else { _i9 = _iterator9.next(); if (_i9.done) break; - _ref18 = _i9.value; + _ref20 = _i9.value; } - var pkg = _ref18; + var pkg = _ref20; if (this.packageCanBeInstalled(pkg)) { - var _ref22 = pkg._reference; - invariant(_ref22, 'expected reference'); - var _loc = this.config.generateHardModulePath(_ref22); - beforeFilesMap.set(_loc, (yield this.walk(_loc))); - installablePkgs += 1; + var ref = pkg._reference; + invariant(ref, 'expected reference'); + yield (_promise || _load_promise()).default.all(ref.locations.map(function () { + var _ref25 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (loc) { + beforeFilesMap.set(loc, (yield _this2.walk(loc))); + installablePkgs += 1; + }); + + return function (_x21) { + return _ref25.apply(this, arguments); + }; + }())); } workQueue.add(pkg); } + var set = this.reporter.activitySet(installablePkgs, Math.min(installablePkgs, this.config.childConcurrency)); + // waitQueue acts like a semaphore to allow workers to register to be notified // when there are more work added to the work queue var waitQueue = new (_set || _load_set()).default(); - var workers = []; - - var set = this.reporter.activitySet(installablePkgs, Math.min(this.config.childConcurrency, workQueue.size)); - - for (var _iterator10 = set.spinners, _isArray10 = Array.isArray(_iterator10), _i10 = 0, _iterator10 = _isArray10 ? _iterator10 : (0, (_getIterator2 || _load_getIterator()).default)(_iterator10);;) { - var _ref19; - - if (_isArray10) { - if (_i10 >= _iterator10.length) break; - _ref19 = _iterator10[_i10++]; - } else { - _i10 = _iterator10.next(); - if (_i10.done) break; - _ref19 = _i10.value; - } - - var spinner = _ref19; - - workers.push(this.worker(spinner, workQueue, installed, waitQueue)); - } - - yield (_promise || _load_promise()).default.all(workers); - + yield (_promise || _load_promise()).default.all(set.spinners.map(function (spinner) { + return _this2.worker(spinner, workQueue, installed, waitQueue); + })); // generate built package as prebuilt one for offline mirror var offlineMirrorPath = this.config.getOfflineMirrorPath(); if (this.config.packBuiltPackages && offlineMirrorPath) { + var _loop2 = function* _loop2(_pkg) { + if (_this2.packageCanBeInstalled(_pkg)) { + var prebuiltPath = path.join(offlineMirrorPath, 'prebuilt'); + yield (_fs || _load_fs()).mkdirp(prebuiltPath); + var prebuiltFilename = (0, (_packageNameUtils || _load_packageNameUtils()).getPlatformSpecificPackageFilename)(_pkg); + prebuiltPath = path.join(prebuiltPath, prebuiltFilename + '.tgz'); + var ref = _pkg._reference; + invariant(ref, 'expected reference'); + var builtPackagePaths = ref.locations; + + yield (_promise || _load_promise()).default.all(builtPackagePaths.map(function () { + var _ref22 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (builtPackagePath) { + // don't use pack command, we want to avoid the file filters logic + var stream = yield (0, (_pack || _load_pack()).packWithIgnoreAndHeaders)(builtPackagePath); + + var hash = yield new (_promise || _load_promise()).default(function (resolve, reject) { + var validateStream = new (_crypto || _load_crypto()).HashStream(); + stream.pipe(validateStream).pipe(fs.createWriteStream(prebuiltPath)).on('error', reject).on('close', function () { + return resolve(validateStream.getHash()); + }); + }); + _pkg.prebuiltVariants = _pkg.prebuiltVariants || {}; + _pkg.prebuiltVariants[prebuiltFilename] = hash; + }); + + return function (_x18) { + return _ref22.apply(this, arguments); + }; + }())); + } + }; + + for (var _iterator10 = pkgs, _isArray10 = Array.isArray(_iterator10), _i10 = 0, _iterator10 = _isArray10 ? _iterator10 : (0, (_getIterator2 || _load_getIterator()).default)(_iterator10);;) { + var _ref21; + + if (_isArray10) { + if (_i10 >= _iterator10.length) break; + _ref21 = _iterator10[_i10++]; + } else { + _i10 = _iterator10.next(); + if (_i10.done) break; + _ref21 = _i10.value; + } + + var _pkg = _ref21; + yield* _loop2(_pkg); + } + } else { + var _loop3 = function* _loop3(_pkg2) { + if (_this2.packageCanBeInstalled(_pkg2)) { + var ref = _pkg2._reference; + invariant(ref, 'expected reference'); + var beforeFiles = ref.locations.map(function (loc) { + return beforeFilesMap.get(loc); + }); + yield (_promise || _load_promise()).default.all(beforeFiles.map(function () { + var _ref24 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (b, index) { + invariant(b, 'files before installation should always be recorded'); + yield _this2.saveBuildArtifacts(ref.locations[index], _pkg2, b, set.spinners[0]); + }); + + return function (_x19, _x20) { + return _ref24.apply(this, arguments); + }; + }())); + } + }; + + // cache all build artifacts for (var _iterator11 = pkgs, _isArray11 = Array.isArray(_iterator11), _i11 = 0, _iterator11 = _isArray11 ? _iterator11 : (0, (_getIterator2 || _load_getIterator()).default)(_iterator11);;) { - var _ref20; + var _ref23; if (_isArray11) { if (_i11 >= _iterator11.length) break; - _ref20 = _iterator11[_i11++]; + _ref23 = _iterator11[_i11++]; } else { _i11 = _iterator11.next(); if (_i11.done) break; - _ref20 = _i11.value; + _ref23 = _i11.value; } - var _pkg = _ref20; - - if (this.packageCanBeInstalled(_pkg)) { - yield* function* () { - var prebuiltPath = path.join(offlineMirrorPath, 'prebuilt'); - yield (_fs || _load_fs()).mkdirp(prebuiltPath); - var prebuiltFilename = (0, (_packageNameUtils || _load_packageNameUtils()).getPlatformSpecificPackageFilename)(_pkg); - prebuiltPath = path.join(prebuiltPath, prebuiltFilename + '.tgz'); - var ref = _pkg._reference; - invariant(ref, 'expected reference'); - var builtPackagePath = _this.config.generateHardModulePath(ref); - var pkgConfig = yield (_config || _load_config()).default.create({ - cwd: builtPackagePath - }, _this.reporter); - var stream = yield (0, (_pack || _load_pack()).pack)(pkgConfig, builtPackagePath); - - var hash = yield new (_promise || _load_promise()).default(function (resolve, reject) { - var validateStream = new (_crypto || _load_crypto()).HashStream(); - stream.pipe(validateStream).pipe(fs.createWriteStream(prebuiltPath)).on('error', reject).on('close', function () { - return resolve(validateStream.getHash()); - }); - }); - _pkg.prebuiltVariants = _pkg.prebuiltVariants || {}; - _pkg.prebuiltVariants[prebuiltFilename] = hash; - }(); - } - } - } else { - // cache all build artifacts - for (var _iterator12 = pkgs, _isArray12 = Array.isArray(_iterator12), _i12 = 0, _iterator12 = _isArray12 ? _iterator12 : (0, (_getIterator2 || _load_getIterator()).default)(_iterator12);;) { - var _ref21; - - if (_isArray12) { - if (_i12 >= _iterator12.length) break; - _ref21 = _iterator12[_i12++]; - } else { - _i12 = _iterator12.next(); - if (_i12.done) break; - _ref21 = _i12.value; - } - - var _pkg2 = _ref21; - - if (this.packageCanBeInstalled(_pkg2)) { - var ref = _pkg2._reference; - invariant(ref, 'expected reference'); - var loc = this.config.generateHardModulePath(ref); - var beforeFiles = beforeFilesMap.get(loc); - invariant(beforeFiles, 'files before installation should always be recorded'); - yield this.saveBuildArtifacts(loc, _pkg2, beforeFiles, set.spinners[0]); - } + var _pkg2 = _ref23; + yield* _loop3(_pkg2); } } set.end(); }); - function init(_x15) { - return _ref17.apply(this, arguments); + function init(_x17) { + return _ref19.apply(this, arguments); } return init; @@ -92205,162 +93412,7 @@ var PackageInstallScripts = function () { exports.default = PackageInstallScripts; /***/ }), -/* 420 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -Object.defineProperty(exports, "__esModule", { - value: true -}); - -var _getIterator2; - -function _load_getIterator() { - return _getIterator2 = _interopRequireDefault(__webpack_require__(3)); -} - -var _classCallCheck2; - -function _load_classCallCheck() { - return _classCallCheck2 = _interopRequireDefault(__webpack_require__(2)); -} - -var _misc; - -function _load_misc() { - return _misc = __webpack_require__(18); -} - -function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } - -var PackageReference = function () { - function PackageReference(request, info, remote) { - (0, (_classCallCheck2 || _load_classCallCheck()).default)(this, PackageReference); - - this.resolver = request.resolver; - this.lockfile = request.lockfile; - this.requests = []; - this.config = request.config; - this.hint = request.hint; - - this.registry = remote.registry; - this.version = info.version; - this.name = info.name; - this.uid = info._uid; - - this.remote = remote; - - this.dependencies = []; - - this.permissions = {}; - this.patterns = []; - this.optional = null; - this.level = Infinity; - this.ignore = false; - this.incompatible = false; - this.fresh = false; - this.location = null; - this.addRequest(request); - } - - PackageReference.prototype.setFresh = function setFresh(fresh) { - this.fresh = fresh; - }; - - PackageReference.prototype.setLocation = function setLocation(loc) { - return this.location = loc; - }; - - PackageReference.prototype.addRequest = function addRequest(request) { - this.requests.push(request); - - this.level = Math.min(this.level, request.parentNames.length); - }; - - PackageReference.prototype.prune = function prune() { - for (var _iterator = this.patterns, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : (0, (_getIterator2 || _load_getIterator()).default)(_iterator);;) { - var _ref; - - if (_isArray) { - if (_i >= _iterator.length) break; - _ref = _iterator[_i++]; - } else { - _i = _iterator.next(); - if (_i.done) break; - _ref = _i.value; - } - - var selfPattern = _ref; - - // remove ourselves from the resolver - this.resolver.removePattern(selfPattern); - } - }; - - PackageReference.prototype.addDependencies = function addDependencies(deps) { - this.dependencies = this.dependencies.concat(deps); - }; - - PackageReference.prototype.setPermission = function setPermission(key, val) { - this.permissions[key] = val; - }; - - PackageReference.prototype.hasPermission = function hasPermission(key) { - if (key in this.permissions) { - return this.permissions[key]; - } else { - return false; - } - }; - - PackageReference.prototype.addPattern = function addPattern(pattern, manifest) { - this.resolver.addPattern(pattern, manifest); - - this.patterns.push(pattern); - - var shrunk = this.lockfile.getLocked(pattern); - if (shrunk && shrunk.permissions) { - for (var _iterator2 = (0, (_misc || _load_misc()).entries)(shrunk.permissions), _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : (0, (_getIterator2 || _load_getIterator()).default)(_iterator2);;) { - var _ref3; - - if (_isArray2) { - if (_i2 >= _iterator2.length) break; - _ref3 = _iterator2[_i2++]; - } else { - _i2 = _iterator2.next(); - if (_i2.done) break; - _ref3 = _i2.value; - } - - var _ref2 = _ref3; - var _key = _ref2[0]; - var perm = _ref2[1]; - - this.setPermission(_key, perm); - } - } - }; - - PackageReference.prototype.addOptional = function addOptional(optional) { - if (this.optional == null) { - // optional is uninitialised - this.optional = optional; - } else if (!optional) { - // otherwise, ignore all subsequent optional assignments and only accept ones making - // this not optional - this.optional = false; - } - }; - - return PackageReference; -}(); - -exports.default = PackageReference; - -/***/ }), -/* 421 */ +/* 425 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -92385,19 +93437,19 @@ function _load_asyncToGenerator() { var _extends2; function _load_extends() { - return _extends2 = _interopRequireDefault(__webpack_require__(25)); + return _extends2 = _interopRequireDefault(__webpack_require__(23)); } var _promise; function _load_promise() { - return _promise = _interopRequireDefault(__webpack_require__(6)); + return _promise = _interopRequireDefault(__webpack_require__(5)); } var _keys; function _load_keys() { - return _keys = _interopRequireDefault(__webpack_require__(14)); + return _keys = _interopRequireDefault(__webpack_require__(11)); } var _classCallCheck2; @@ -92414,7 +93466,7 @@ function _load_misc() { function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } -var objectPath = __webpack_require__(298); +var objectPath = __webpack_require__(300); var path = __webpack_require__(0); @@ -92582,7 +93634,7 @@ var BaseRegistry = function () { exports.default = BaseRegistry; /***/ }), -/* 422 */ +/* 426 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -92602,7 +93654,7 @@ function _load_getIterator() { var _assign; function _load_assign() { - return _assign = _interopRequireDefault(__webpack_require__(17)); + return _assign = _interopRequireDefault(__webpack_require__(16)); } var _asyncToGenerator2; @@ -92620,13 +93672,13 @@ function _load_classCallCheck() { var _possibleConstructorReturn2; function _load_possibleConstructorReturn() { - return _possibleConstructorReturn2 = _interopRequireDefault(__webpack_require__(12)); + return _possibleConstructorReturn2 = _interopRequireDefault(__webpack_require__(13)); } var _inherits2; function _load_inherits() { - return _inherits2 = _interopRequireDefault(__webpack_require__(11)); + return _inherits2 = _interopRequireDefault(__webpack_require__(12)); } var _constants; @@ -92644,7 +93696,7 @@ function _load_npmRegistry() { var _lockfile; function _load_lockfile() { - return _lockfile = __webpack_require__(20); + return _lockfile = __webpack_require__(21); } var _fs; @@ -92663,12 +93715,13 @@ function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } -var userHome = __webpack_require__(75).default; +var userHome = __webpack_require__(76).default; var path = __webpack_require__(0); var DEFAULTS = exports.DEFAULTS = { 'version-tag-prefix': 'v', 'version-git-tag': true, + 'version-commit-hooks': true, 'version-git-sign': false, 'version-git-message': 'v%s', @@ -92676,6 +93729,7 @@ var DEFAULTS = exports.DEFAULTS = { 'init-license': 'MIT', 'save-prefix': '^', + 'bin-links': true, 'ignore-scripts': false, 'ignore-optional': false, registry: (_constants || _load_constants()).YARN_REGISTRY, @@ -92687,6 +93741,7 @@ var npmMap = { 'version-git-sign': 'sign-git-tag', 'version-tag-prefix': 'tag-version-prefix', 'version-git-tag': 'git-tag-version', + 'version-commit-hooks': 'commit-hooks', 'version-git-message': 'message' }; @@ -92815,7 +93870,7 @@ YarnRegistry.filename = 'yarn.json'; exports.default = YarnRegistry; /***/ }), -/* 423 */ +/* 427 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -92840,19 +93895,19 @@ function _load_classCallCheck() { var _possibleConstructorReturn2; function _load_possibleConstructorReturn() { - return _possibleConstructorReturn2 = _interopRequireDefault(__webpack_require__(12)); + return _possibleConstructorReturn2 = _interopRequireDefault(__webpack_require__(13)); } var _inherits2; function _load_inherits() { - return _inherits2 = _interopRequireDefault(__webpack_require__(11)); + return _inherits2 = _interopRequireDefault(__webpack_require__(12)); } var _jsonReporter; function _load_jsonReporter() { - return _jsonReporter = _interopRequireDefault(__webpack_require__(153)); + return _jsonReporter = _interopRequireDefault(__webpack_require__(154)); } function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -92898,7 +93953,7 @@ var BufferReporter = function (_JSONReporter) { exports.default = BufferReporter; /***/ }), -/* 424 */ +/* 428 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -92917,7 +93972,7 @@ function _load_asyncToGenerator() { var _promise; function _load_promise() { - return _promise = _interopRequireDefault(__webpack_require__(6)); + return _promise = _interopRequireDefault(__webpack_require__(5)); } var _getIterator2; @@ -92941,37 +93996,37 @@ function _load_classCallCheck() { var _possibleConstructorReturn2; function _load_possibleConstructorReturn() { - return _possibleConstructorReturn2 = _interopRequireDefault(__webpack_require__(12)); + return _possibleConstructorReturn2 = _interopRequireDefault(__webpack_require__(13)); } var _inherits2; function _load_inherits() { - return _inherits2 = _interopRequireDefault(__webpack_require__(11)); + return _inherits2 = _interopRequireDefault(__webpack_require__(12)); } var _baseReporter; function _load_baseReporter() { - return _baseReporter = _interopRequireDefault(__webpack_require__(73)); + return _baseReporter = _interopRequireDefault(__webpack_require__(74)); } var _progressBar; function _load_progressBar() { - return _progressBar = _interopRequireDefault(__webpack_require__(426)); + return _progressBar = _interopRequireDefault(__webpack_require__(430)); } var _spinnerProgress; function _load_spinnerProgress() { - return _spinnerProgress = _interopRequireDefault(__webpack_require__(427)); + return _spinnerProgress = _interopRequireDefault(__webpack_require__(431)); } var _util; function _load_util() { - return _util = __webpack_require__(152); + return _util = __webpack_require__(153); } var _misc; @@ -92983,13 +94038,13 @@ function _load_misc() { var _treeHelper; function _load_treeHelper() { - return _treeHelper = __webpack_require__(425); + return _treeHelper = __webpack_require__(429); } var _inquirer; function _load_inquirer() { - return _inquirer = _interopRequireDefault(__webpack_require__(187)); + return _inquirer = _interopRequireDefault(__webpack_require__(189)); } function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -92999,8 +94054,8 @@ var _require = __webpack_require__(4), var readline = __webpack_require__(145); var chalk = __webpack_require__(115); -var stripAnsi = __webpack_require__(726); -var read = __webpack_require__(674); +var stripAnsi = __webpack_require__(736); +var read = __webpack_require__(683); var tty = __webpack_require__(106); // fixes bold on windows @@ -93270,6 +94325,9 @@ var ConsoleReporter = function (_BaseReporter) { this.stopProgress(); // + if (this.isSilent) { + return; + } var output = function output(_ref6, titlePrefix, childrenPrefix) { var name = _ref6.name, children = _ref6.children, @@ -93555,7 +94613,7 @@ var ConsoleReporter = function (_BaseReporter) { exports.default = ConsoleReporter; /***/ }), -/* 425 */ +/* 429 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -93611,7 +94669,7 @@ function formatColor(color, strToFormat, formatter) { } /***/ }), -/* 426 */ +/* 430 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -93630,7 +94688,7 @@ function _load_classCallCheck() { var _util; function _load_util() { - return _util = __webpack_require__(152); + return _util = __webpack_require__(153); } function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -93715,7 +94773,7 @@ ProgressBar.bars = [['#', '-']]; exports.default = ProgressBar; /***/ }), -/* 427 */ +/* 431 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -93734,7 +94792,7 @@ function _load_classCallCheck() { var _util; function _load_util() { - return _util = __webpack_require__(152); + return _util = __webpack_require__(153); } function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -93800,7 +94858,7 @@ Spinner.spinners = ['|/-\\', '⠂-–—–-', '◐◓◑◒', '◴◷◶◵', ' exports.default = Spinner; /***/ }), -/* 428 */ +/* 432 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -93813,7 +94871,7 @@ Object.defineProperty(exports, "__esModule", { var _assign; function _load_assign() { - return _assign = _interopRequireDefault(__webpack_require__(17)); + return _assign = _interopRequireDefault(__webpack_require__(16)); } var _classCallCheck2; @@ -93825,24 +94883,24 @@ function _load_classCallCheck() { var _possibleConstructorReturn2; function _load_possibleConstructorReturn() { - return _possibleConstructorReturn2 = _interopRequireDefault(__webpack_require__(12)); + return _possibleConstructorReturn2 = _interopRequireDefault(__webpack_require__(13)); } var _inherits2; function _load_inherits() { - return _inherits2 = _interopRequireDefault(__webpack_require__(11)); + return _inherits2 = _interopRequireDefault(__webpack_require__(12)); } var _jsonReporter; function _load_jsonReporter() { - return _jsonReporter = _interopRequireDefault(__webpack_require__(153)); + return _jsonReporter = _interopRequireDefault(__webpack_require__(154)); } function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } -var _require = __webpack_require__(71), +var _require = __webpack_require__(72), EventEmitter = _require.EventEmitter; var EventReporter = function (_JSONReporter) { @@ -93871,7 +94929,7 @@ exports.default = EventReporter; (0, (_assign || _load_assign()).default)(EventReporter.prototype, EventEmitter.prototype); /***/ }), -/* 429 */ +/* 433 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -94047,7 +95105,9 @@ var messages = { createInvalidBin: 'Invalid bin entry found in package $0.', createMissingPackage: 'Package not found - this is probably an internal error, and should be reported at https://github.com/yarnpkg/yarn/issues.', - workspacesAddRootCheck: 'Running this command will add the dependency to the workspace root rather than workspace itself, which might not be what you want - if you really meant it, make it explicit by running this command again with the -W flag (or --ignore-workspace-root-check).', + workspacesAddRootCheck: 'Running this command will add the dependency to the workspace root rather than the workspace itself, which might not be what you want - if you really meant it, make it explicit by running this command again with the -W flag (or --ignore-workspace-root-check).', + workspacesRemoveRootCheck: 'Running this command will remove the dependency from the workspace root rather than the workspace itself, which might not be what you want - if you really meant it, make it explicit by running this command again with the -W flag (or --ignore-workspace-root-check).', + workspacesFocusRootCheck: 'This command can only be run inside an individual workspace.', workspacesRequirePrivateProjects: 'Workspaces can only be enabled in private projects.', workspacesSettingMustBeArray: 'The workspaces field in package.json must be an array.', workspacesDisabled: 'Your project root defines workspaces but the feature is disabled in your Yarn config. Please check "workspaces-experimental" in your .yarnrc file.', @@ -94105,8 +95165,6 @@ var messages = { foundWarnings: 'Found $0 warnings.', foundErrors: 'Found $0 errors.', - notSavedLockfileNoDependencies: 'Lockfile not saved, no dependencies.', - savedLockfile: 'Saved lockfile.', noRequiredLockfile: 'No lockfile in this directory. Run `yarn install` to generate one.', noLockfileFound: 'No lockfile found.', @@ -94176,7 +95234,7 @@ var messages = { incorrectCredentials: 'Incorrect username or password.', clearedCredentials: 'Cleared login credentials.', - publishFail: "Couldn't publish package.", + publishFail: "Couldn't publish package: $0", publishPrivate: 'Package marked as private, not publishing.', published: 'Published.', publishing: 'Publishing', @@ -94202,13 +95260,13 @@ var messages = { unknownFetcherFor: 'Unknown fetcher for $0', - refusingDownloadGitWithoutCommit: 'Refusing to download the git repo $0 over plain git without a commit hash', - refusingDownloadHTTPWithoutCommit: 'Refusing to download the git repo $0 over HTTP without a commit hash', - refusingDownloadHTTPSWithoutCommit: 'Refusing to download the git repo $0 over HTTPS without a commit hash - possible certificate error?', + downloadGitWithoutCommit: 'Downloading the git repo $0 over plain git without a commit hash', + downloadHTTPWithoutCommit: 'Downloading the git repo $0 over HTTP without a commit hash', packageInstalledWithBinaries: 'Installed $0 with binaries:', packageHasBinaries: '$0 has binaries:', packageHasNoBinaries: '$0 has no binaries', + packageBinaryNotFound: "Couldn't find a binary named $0", couldBeDeduped: '$0 could be deduped from $1 to $2', lockfileNotContainPattern: 'Lockfile does not contain pattern: $0', @@ -94232,6 +95290,9 @@ var messages = { importFailed: 'Import of $0 for $1 failed, resolving normally.', importResolveFailed: 'Import of $0 failed starting in $1', importResolvedRangeMatch: 'Using version $0 of $1 instead of $2 for $3', + importSourceFilesCorrupted: 'Failed to import from package-lock.json, source file(s) corrupted', + importPackageLock: 'found npm package-lock.json, converting to yarn.lock', + importNodeModules: 'creating yarn.lock from local node_modules folder', packageContainsYarnAsGlobal: 'Installing Yarn via Yarn will result in you having two separate versions of Yarn installed at the same time, which is not recommended. To update Yarn please follow https://yarnpkg.com/en/docs/install .', scopeNotValid: 'The specified scope is not valid.', @@ -94252,7 +95313,7 @@ var messages = { exports.default = messages; /***/ }), -/* 430 */ +/* 434 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -94271,7 +95332,7 @@ function _load_asyncToGenerator() { var _promise; function _load_promise() { - return _promise = _interopRequireDefault(__webpack_require__(6)); + return _promise = _interopRequireDefault(__webpack_require__(5)); } var _classCallCheck2; @@ -94283,37 +95344,37 @@ function _load_classCallCheck() { var _possibleConstructorReturn2; function _load_possibleConstructorReturn() { - return _possibleConstructorReturn2 = _interopRequireDefault(__webpack_require__(12)); + return _possibleConstructorReturn2 = _interopRequireDefault(__webpack_require__(13)); } var _inherits2; function _load_inherits() { - return _inherits2 = _interopRequireDefault(__webpack_require__(11)); + return _inherits2 = _interopRequireDefault(__webpack_require__(12)); } var _format; function _load_format() { - return _format = __webpack_require__(240); + return _format = __webpack_require__(242); } var _index; function _load_index() { - return _index = _interopRequireWildcard(__webpack_require__(241)); + return _index = _interopRequireWildcard(__webpack_require__(243)); } var _isCi; function _load_isCi() { - return _isCi = _interopRequireDefault(__webpack_require__(189)); + return _isCi = _interopRequireDefault(__webpack_require__(191)); } var _baseReporter; function _load_baseReporter() { - return _baseReporter = _interopRequireDefault(__webpack_require__(73)); + return _baseReporter = _interopRequireDefault(__webpack_require__(74)); } function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } } @@ -94435,7 +95496,7 @@ var NoopReporter = function (_BaseReporter) { exports.default = NoopReporter; /***/ }), -/* 431 */ +/* 435 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -94445,10 +95506,28 @@ Object.defineProperty(exports, "__esModule", { value: true }); +var _extends2; + +function _load_extends() { + return _extends2 = _interopRequireDefault(__webpack_require__(23)); +} + +var _assign; + +function _load_assign() { + return _assign = _interopRequireDefault(__webpack_require__(16)); +} + +var _keys; + +function _load_keys() { + return _keys = _interopRequireDefault(__webpack_require__(11)); +} + var _promise; function _load_promise() { - return _promise = _interopRequireDefault(__webpack_require__(6)); + return _promise = _interopRequireDefault(__webpack_require__(5)); } var _classCallCheck2; @@ -94460,13 +95539,13 @@ function _load_classCallCheck() { var _possibleConstructorReturn2; function _load_possibleConstructorReturn() { - return _possibleConstructorReturn2 = _interopRequireDefault(__webpack_require__(12)); + return _possibleConstructorReturn2 = _interopRequireDefault(__webpack_require__(13)); } var _inherits2; function _load_inherits() { - return _inherits2 = _interopRequireDefault(__webpack_require__(11)); + return _inherits2 = _interopRequireDefault(__webpack_require__(12)); } var _packageRequest; @@ -94484,7 +95563,7 @@ function _load_baseResolver() { var _workspaceLayout; function _load_workspaceLayout() { - return _workspaceLayout = _interopRequireDefault(__webpack_require__(76)); + return _workspaceLayout = _interopRequireDefault(__webpack_require__(67)); } function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -94507,21 +95586,44 @@ var WorkspaceResolver = function (_BaseResolver) { return _this; } - WorkspaceResolver.prototype.resolve = function resolve() { + WorkspaceResolver.prototype.resolve = function resolve(downloadedManifest) { var workspace = this.workspaceLayout.getManifestByPattern(this.request.pattern); invariant(workspace, 'expected workspace'); var manifest = workspace.manifest, loc = workspace.loc; + if (manifest._remote && manifest._remote.registryRemote) { + return (_promise || _load_promise()).default.resolve(manifest); //already downloaded + } var registry = manifest._registry; invariant(registry, 'expected reference'); + var hash = ''; + var registryRemote = void 0; + if (downloadedManifest && manifest.version === downloadedManifest.version) { + registryRemote = downloadedManifest._remote; + invariant(registryRemote, 'missing remote info'); + hash = registryRemote.hash; + //override any local changes to manifest + (0, (_keys || _load_keys()).default)(manifest).forEach(function (k) { + return k.startsWith('_') || delete manifest[k]; + }); + (0, (_assign || _load_assign()).default)(manifest, downloadedManifest); + } else if (manifest._remote && manifest._remote.hash) { + invariant(workspace.manifest._remote, 'missing remote info'); + registryRemote = workspace.manifest._remote.registryRemote; + hash = manifest._remote.hash; + } + if (registryRemote) { + registryRemote = (0, (_extends2 || _load_extends()).default)({}, registryRemote); + } - manifest._remote = { + manifest._remote = (0, (_assign || _load_assign()).default)(manifest._remote || {}, { type: 'workspace', + registryRemote, registry, - hash: '', + hash, reference: loc - }; + }); manifest._uid = manifest.version; @@ -94534,7 +95636,7 @@ var WorkspaceResolver = function (_BaseResolver) { exports.default = WorkspaceResolver; /***/ }), -/* 432 */ +/* 436 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -94559,19 +95661,19 @@ function _load_classCallCheck() { var _possibleConstructorReturn2; function _load_possibleConstructorReturn() { - return _possibleConstructorReturn2 = _interopRequireDefault(__webpack_require__(12)); + return _possibleConstructorReturn2 = _interopRequireDefault(__webpack_require__(13)); } var _inherits2; function _load_inherits() { - return _inherits2 = _interopRequireDefault(__webpack_require__(11)); + return _inherits2 = _interopRequireDefault(__webpack_require__(12)); } var _hostedGitResolver; function _load_hostedGitResolver() { - return _hostedGitResolver = _interopRequireDefault(__webpack_require__(74)); + return _hostedGitResolver = _interopRequireDefault(__webpack_require__(75)); } function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -94634,7 +95736,7 @@ BitbucketResolver.protocol = 'bitbucket'; exports.default = BitbucketResolver; /***/ }), -/* 433 */ +/* 437 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -94653,19 +95755,19 @@ function _load_classCallCheck() { var _possibleConstructorReturn2; function _load_possibleConstructorReturn() { - return _possibleConstructorReturn2 = _interopRequireDefault(__webpack_require__(12)); + return _possibleConstructorReturn2 = _interopRequireDefault(__webpack_require__(13)); } var _inherits2; function _load_inherits() { - return _inherits2 = _interopRequireDefault(__webpack_require__(11)); + return _inherits2 = _interopRequireDefault(__webpack_require__(12)); } var _hostedGitResolver; function _load_hostedGitResolver() { - return _hostedGitResolver = _interopRequireDefault(__webpack_require__(74)); + return _hostedGitResolver = _interopRequireDefault(__webpack_require__(75)); } function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -94706,7 +95808,7 @@ GitLabResolver.protocol = 'gitlab'; exports.default = GitLabResolver; /***/ }), -/* 434 */ +/* 438 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -94725,25 +95827,25 @@ function _load_classCallCheck() { var _possibleConstructorReturn2; function _load_possibleConstructorReturn() { - return _possibleConstructorReturn2 = _interopRequireDefault(__webpack_require__(12)); + return _possibleConstructorReturn2 = _interopRequireDefault(__webpack_require__(13)); } var _inherits2; function _load_inherits() { - return _inherits2 = _interopRequireDefault(__webpack_require__(11)); + return _inherits2 = _interopRequireDefault(__webpack_require__(12)); } var _errors; function _load_errors() { - return _errors = __webpack_require__(5); + return _errors = __webpack_require__(6); } var _exoticResolver; function _load_exoticResolver() { - return _exoticResolver = _interopRequireDefault(__webpack_require__(64)); + return _exoticResolver = _interopRequireDefault(__webpack_require__(65)); } function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -94779,7 +95881,7 @@ var RegistryResolver = function (_ExoticResolver) { exports.default = RegistryResolver; /***/ }), -/* 435 */ +/* 439 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -94804,25 +95906,25 @@ function _load_classCallCheck() { var _possibleConstructorReturn2; function _load_possibleConstructorReturn() { - return _possibleConstructorReturn2 = _interopRequireDefault(__webpack_require__(12)); + return _possibleConstructorReturn2 = _interopRequireDefault(__webpack_require__(13)); } var _inherits2; function _load_inherits() { - return _inherits2 = _interopRequireDefault(__webpack_require__(11)); + return _inherits2 = _interopRequireDefault(__webpack_require__(12)); } var _tarballFetcher; function _load_tarballFetcher() { - return _tarballFetcher = _interopRequireDefault(__webpack_require__(235)); + return _tarballFetcher = _interopRequireDefault(__webpack_require__(237)); } var _exoticResolver; function _load_exoticResolver() { - return _exoticResolver = _interopRequireDefault(__webpack_require__(64)); + return _exoticResolver = _interopRequireDefault(__webpack_require__(65)); } var _gitResolver; @@ -94840,7 +95942,7 @@ function _load_guessName() { var _version; function _load_version() { - return _version = _interopRequireWildcard(__webpack_require__(162)); + return _version = _interopRequireWildcard(__webpack_require__(164)); } var _crypto; @@ -94976,7 +96078,7 @@ var TarballResolver = function (_ExoticResolver) { exports.default = TarballResolver; /***/ }), -/* 436 */ +/* 440 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -94995,13 +96097,13 @@ function _load_classCallCheck() { var _possibleConstructorReturn2; function _load_possibleConstructorReturn() { - return _possibleConstructorReturn2 = _interopRequireDefault(__webpack_require__(12)); + return _possibleConstructorReturn2 = _interopRequireDefault(__webpack_require__(13)); } var _inherits2; function _load_inherits() { - return _inherits2 = _interopRequireDefault(__webpack_require__(11)); + return _inherits2 = _interopRequireDefault(__webpack_require__(12)); } var _baseResolver; @@ -95033,7 +96135,7 @@ var RegistryResolver = function (_BaseResolver) { exports.default = RegistryResolver; /***/ }), -/* 437 */ +/* 441 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -95064,7 +96166,7 @@ function envReplace(value) { } /***/ }), -/* 438 */ +/* 442 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -95105,7 +96207,7 @@ function fixCmdWinSlashes(cmd) { } /***/ }), -/* 439 */ +/* 443 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -95119,7 +96221,7 @@ exports.fileDatesEqual = exports.copyFile = exports.unlink = undefined; var _promise; function _load_promise() { - return _promise = _interopRequireDefault(__webpack_require__(6)); + return _promise = _interopRequireDefault(__webpack_require__(5)); } var _asyncToGenerator2; @@ -95197,7 +96299,7 @@ function _load_fs() { var _promise2; function _load_promise2() { - return _promise2 = __webpack_require__(65); + return _promise2 = __webpack_require__(66); } function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -95214,7 +96316,7 @@ var futimes = (0, (_promise2 || _load_promise2()).promisify)((_fs || _load_fs()) var write = (0, (_promise2 || _load_promise2()).promisify)((_fs || _load_fs()).default.write); -var unlink = exports.unlink = (0, (_promise2 || _load_promise2()).promisify)(__webpack_require__(701)); +var unlink = exports.unlink = (0, (_promise2 || _load_promise2()).promisify)(__webpack_require__(710)); /** * Unlinks the destination to force a recreation. This is needed on case-insensitive file systems @@ -95307,7 +96409,7 @@ var copyWithBuffer = function () { }; /***/ }), -/* 440 */ +/* 444 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -95339,7 +96441,7 @@ function _load_getIterator() { var _promise; function _load_promise() { - return _promise = _interopRequireDefault(__webpack_require__(6)); + return _promise = _interopRequireDefault(__webpack_require__(5)); } var _misc; @@ -95350,8 +96452,9 @@ function _load_misc() { function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } -var semver = __webpack_require__(22); +var semver = __webpack_require__(20); +var REF_PREFIX = 'refs/'; var REF_TAG_PREFIX = 'refs/tags/'; var REF_BRANCH_PREFIX = 'refs/heads/'; var REF_PR_PREFIX = 'refs/pull/'; @@ -95441,29 +96544,35 @@ var tryVersionAsBranchName = function tryVersionAsBranchName(_ref10) { return tryRef(refs, `${REF_BRANCH_PREFIX}${version}`); }; -var computeSemverNames = function computeSemverNames(_ref11) { - var config = _ref11.config, +var tryVersionAsDirectRef = function tryVersionAsDirectRef(_ref11) { + var version = _ref11.version, refs = _ref11.refs; + return tryRef(refs, `${REF_PREFIX}${version}`); +}; + +var computeSemverNames = function computeSemverNames(_ref12) { + var config = _ref12.config, + refs = _ref12.refs; var names = { tags: [], heads: [] }; for (var _iterator2 = refs.keys(), _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : (0, (_getIterator2 || _load_getIterator()).default)(_iterator2);;) { - var _ref13; + var _ref14; if (_isArray2) { if (_i2 >= _iterator2.length) break; - _ref13 = _iterator2[_i2++]; + _ref14 = _iterator2[_i2++]; } else { _i2 = _iterator2.next(); if (_i2.done) break; - _ref13 = _i2.value; + _ref14 = _i2.value; } - var _ref12 = _ref13; + var _ref13 = _ref14; - var match = REF_NAME_REGEXP.exec(_ref12); + var match = REF_NAME_REGEXP.exec(_ref13); if (!match) { continue; } @@ -95482,47 +96591,47 @@ var findSemver = function findSemver(version, config, namesList) { }; var tryVersionAsTagSemver = function () { - var _ref14 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (_ref15, names) { - var version = _ref15.version, - config = _ref15.config, - refs = _ref15.refs; + var _ref15 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (_ref16, names) { + var version = _ref16.version, + config = _ref16.config, + refs = _ref16.refs; var result = yield findSemver(version.replace(/^semver:/, ''), config, names.tags); return result ? tryRef(refs, `${REF_TAG_PREFIX}${result}`) : null; }); return function tryVersionAsTagSemver(_x, _x2) { - return _ref14.apply(this, arguments); + return _ref15.apply(this, arguments); }; }(); var tryVersionAsBranchSemver = function () { - var _ref16 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (_ref17, names) { - var version = _ref17.version, - config = _ref17.config, - refs = _ref17.refs; + var _ref17 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (_ref18, names) { + var version = _ref18.version, + config = _ref18.config, + refs = _ref18.refs; var result = yield findSemver(version.replace(/^semver:/, ''), config, names.heads); return result ? tryRef(refs, `${REF_BRANCH_PREFIX}${result}`) : null; }); return function tryVersionAsBranchSemver(_x3, _x4) { - return _ref16.apply(this, arguments); + return _ref17.apply(this, arguments); }; }(); var tryVersionAsSemverRange = function () { - var _ref18 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (options) { + var _ref19 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (options) { var names = computeSemverNames(options); return (yield tryVersionAsTagSemver(options, names)) || tryVersionAsBranchSemver(options, names); }); return function tryVersionAsSemverRange(_x5) { - return _ref18.apply(this, arguments); + return _ref19.apply(this, arguments); }; }(); -var VERSION_RESOLUTION_STEPS = [tryEmptyVersionAsDefaultBranch, tryVersionAsGitCommit, tryVersionAsFullRef, tryVersionAsTagName, tryVersionAsPullRequestNo, tryVersionAsBranchName, tryVersionAsSemverRange, tryWildcardVersionAsDefaultBranch]; +var VERSION_RESOLUTION_STEPS = [tryEmptyVersionAsDefaultBranch, tryVersionAsGitCommit, tryVersionAsFullRef, tryVersionAsTagName, tryVersionAsPullRequestNo, tryVersionAsBranchName, tryVersionAsSemverRange, tryWildcardVersionAsDefaultBranch, tryVersionAsDirectRef]; /** * Resolve a git-url hash (version) to a git commit sha and branch/tag ref @@ -95530,20 +96639,20 @@ var VERSION_RESOLUTION_STEPS = [tryEmptyVersionAsDefaultBranch, tryVersionAsGitC */ var resolveVersion = exports.resolveVersion = function () { - var _ref19 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (options) { + var _ref20 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (options) { for (var _iterator3 = VERSION_RESOLUTION_STEPS, _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : (0, (_getIterator2 || _load_getIterator()).default)(_iterator3);;) { - var _ref20; + var _ref21; if (_isArray3) { if (_i3 >= _iterator3.length) break; - _ref20 = _iterator3[_i3++]; + _ref21 = _iterator3[_i3++]; } else { _i3 = _iterator3.next(); if (_i3.done) break; - _ref20 = _i3.value; + _ref21 = _i3.value; } - var testFunction = _ref20; + var testFunction = _ref21; var result = yield testFunction(options); if (result !== null) { @@ -95554,7 +96663,7 @@ var resolveVersion = exports.resolveVersion = function () { }); return function resolveVersion(_x6) { - return _ref19.apply(this, arguments); + return _ref20.apply(this, arguments); }; }(); @@ -95570,18 +96679,18 @@ var parseRefs = exports.parseRefs = function parseRefs(stdout) { var refLines = stdout.split('\n'); for (var _iterator4 = refLines, _isArray4 = Array.isArray(_iterator4), _i4 = 0, _iterator4 = _isArray4 ? _iterator4 : (0, (_getIterator2 || _load_getIterator()).default)(_iterator4);;) { - var _ref21; + var _ref22; if (_isArray4) { if (_i4 >= _iterator4.length) break; - _ref21 = _iterator4[_i4++]; + _ref22 = _iterator4[_i4++]; } else { _i4 = _iterator4.next(); if (_i4.done) break; - _ref21 = _i4.value; + _ref22 = _i4.value; } - var line = _ref21; + var line = _ref22; var match = GIT_REF_LINE_REGEXP.exec(line); @@ -95606,7 +96715,7 @@ var parseRefs = exports.parseRefs = function parseRefs(stdout) { }; /***/ }), -/* 441 */ +/* 445 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -95639,7 +96748,58 @@ function callThroughHook(type, fn) { } /***/ }), -/* 442 */ +/* 446 */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +Object.defineProperty(exports, "__esModule", { + value: true +}); +exports.LogicalDependencyTree = undefined; + +var _classCallCheck2; + +function _load_classCallCheck() { + return _classCallCheck2 = _interopRequireDefault(__webpack_require__(2)); +} + +var _npmLogicalTree; + +function _load_npmLogicalTree() { + return _npmLogicalTree = _interopRequireDefault(__webpack_require__(664)); +} + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + +var LogicalDependencyTree = exports.LogicalDependencyTree = function () { + function LogicalDependencyTree(packageJson, packageLock) { + (0, (_classCallCheck2 || _load_classCallCheck()).default)(this, LogicalDependencyTree); + + this.tree = (0, (_npmLogicalTree || _load_npmLogicalTree()).default)(JSON.parse(packageJson), JSON.parse(packageLock)); + } + + LogicalDependencyTree.prototype._findNode = function _findNode(name, parentNames) { + var parentTree = parentNames ? parentNames.reduce(function (node, ancestor) { + var ancestorNode = node.dependencies.get(ancestor); + return ancestorNode; + }, this.tree) : this.tree; + var node = parentTree.dependencies.get(name); + return node; + }; + + LogicalDependencyTree.prototype.getFixedVersionPattern = function getFixedVersionPattern(name, parentNames) { + var node = this._findNode(name, parentNames); + var version = node.version; + return `${node.name}@${version}`; + }; + + return LogicalDependencyTree; +}(); + +/***/ }), +/* 447 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -95652,7 +96812,7 @@ Object.defineProperty(exports, "__esModule", { var _promise; function _load_promise() { - return _promise = _interopRequireDefault(__webpack_require__(6)); + return _promise = _interopRequireDefault(__webpack_require__(5)); } var _map; @@ -95688,7 +96848,7 @@ exports.default = function (key) { }; /***/ }), -/* 443 */ +/* 448 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -95701,7 +96861,7 @@ Object.defineProperty(exports, "__esModule", { var _keys; function _load_keys() { - return _keys = _interopRequireDefault(__webpack_require__(14)); + return _keys = _interopRequireDefault(__webpack_require__(11)); } var _getIterator2; @@ -95725,7 +96885,7 @@ function _load_constants() { var _util; function _load_util() { - return _util = __webpack_require__(159); + return _util = __webpack_require__(161); } var _index; @@ -95737,7 +96897,7 @@ function _load_index() { var _inferLicense; function _load_inferLicense() { - return _inferLicense = _interopRequireDefault(__webpack_require__(444)); + return _inferLicense = _interopRequireDefault(__webpack_require__(449)); } var _fs; @@ -95750,7 +96910,7 @@ function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } -var semver = __webpack_require__(22); +var semver = __webpack_require__(20); var path = __webpack_require__(0); var url = __webpack_require__(19); @@ -96149,7 +97309,7 @@ exports.default = function () { }(); /***/ }), -/* 444 */ +/* 449 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -96170,7 +97330,7 @@ exports.default = inferLicense; var _licenses; function _load_licenses() { - return _licenses = _interopRequireDefault(__webpack_require__(445)); + return _licenses = _interopRequireDefault(__webpack_require__(450)); } function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -96224,7 +97384,7 @@ function inferLicense(license) { } /***/ }), -/* 445 */ +/* 450 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -96251,7 +97411,7 @@ exports.default = { }; /***/ }), -/* 446 */ +/* 451 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -96264,7 +97424,7 @@ Object.defineProperty(exports, "__esModule", { var _keys; function _load_keys() { - return _keys = _interopRequireDefault(__webpack_require__(14)); + return _keys = _interopRequireDefault(__webpack_require__(11)); } var _getIterator2; @@ -96358,13 +97518,13 @@ function _load_constants() { var _fileResolver; function _load_fileResolver() { - return _fileResolver = __webpack_require__(154); + return _fileResolver = __webpack_require__(156); } var _linkResolver; function _load_linkResolver() { - return _linkResolver = __webpack_require__(244); + return _linkResolver = __webpack_require__(245); } var _invariant; @@ -96378,7 +97538,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de var path = __webpack_require__(0); /***/ }), -/* 447 */ +/* 452 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -96410,7 +97570,7 @@ exports.default = { }; /***/ }), -/* 448 */ +/* 453 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -96433,7 +97593,7 @@ function parsePackageName(input) { } /***/ }), -/* 449 */ +/* 454 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -96446,7 +97606,7 @@ Object.defineProperty(exports, "__esModule", { var _assign; function _load_assign() { - return _assign = _interopRequireDefault(__webpack_require__(17)); + return _assign = _interopRequireDefault(__webpack_require__(16)); } exports.findRc = findRc; @@ -96536,7 +97696,7 @@ function findRc(name, cwd, parser) { } /***/ }), -/* 450 */ +/* 455 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -96564,7 +97724,7 @@ function isRootUser(uid) { } /***/ }), -/* 451 */ +/* 456 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -96577,7 +97737,7 @@ exports.getDataDir = getDataDir; exports.getCacheDir = getCacheDir; exports.getConfigDir = getConfigDir; var path = __webpack_require__(0); -var userHome = __webpack_require__(75).default; +var userHome = __webpack_require__(76).default; var FALLBACK_CONFIG_DIR = path.join(userHome, '.config', 'yarn'); var FALLBACK_CACHE_DIR = path.join(userHome, '.cache', 'yarn'); @@ -96630,31 +97790,31 @@ function getLocalAppDataDir() { } /***/ }), -/* 452 */ -/***/ (function(module, exports, __webpack_require__) { - -module.exports = { "default": __webpack_require__(479), __esModule: true }; - -/***/ }), -/* 453 */ -/***/ (function(module, exports, __webpack_require__) { - -module.exports = { "default": __webpack_require__(483), __esModule: true }; - -/***/ }), -/* 454 */ -/***/ (function(module, exports, __webpack_require__) { - -module.exports = { "default": __webpack_require__(485), __esModule: true }; - -/***/ }), -/* 455 */ +/* 457 */ /***/ (function(module, exports, __webpack_require__) { module.exports = { "default": __webpack_require__(486), __esModule: true }; /***/ }), -/* 456 */ +/* 458 */ +/***/ (function(module, exports, __webpack_require__) { + +module.exports = { "default": __webpack_require__(490), __esModule: true }; + +/***/ }), +/* 459 */ +/***/ (function(module, exports, __webpack_require__) { + +module.exports = { "default": __webpack_require__(492), __esModule: true }; + +/***/ }), +/* 460 */ +/***/ (function(module, exports, __webpack_require__) { + +module.exports = { "default": __webpack_require__(493), __esModule: true }; + +/***/ }), +/* 461 */ /***/ (function(module, exports) { module.exports = balanced; @@ -96718,10 +97878,10 @@ function range(a, b, str) { /***/ }), -/* 457 */ +/* 462 */ /***/ (function(module, exports, __webpack_require__) { -var DuplexStream = __webpack_require__(675) +var DuplexStream = __webpack_require__(684) , util = __webpack_require__(4) @@ -97004,7 +98164,7 @@ module.exports = BufferList /***/ }), -/* 458 */ +/* 463 */ /***/ (function(module, exports) { // Declare internals @@ -97142,15 +98302,15 @@ internals.safeCharCodes = (function () { /***/ }), -/* 459 */ +/* 464 */ /***/ (function(module, exports, __webpack_require__) { // Load modules -var Crypto = __webpack_require__(13); +var Crypto = __webpack_require__(14); var Path = __webpack_require__(0); var Util = __webpack_require__(4); -var Escape = __webpack_require__(458); +var Escape = __webpack_require__(463); // Declare internals @@ -98141,11 +99301,11 @@ exports.shallow = function (source) { /***/ }), -/* 460 */ +/* 465 */ /***/ (function(module, exports, __webpack_require__) { -var concatMap = __webpack_require__(472); -var balanced = __webpack_require__(456); +var concatMap = __webpack_require__(479); +var balanced = __webpack_require__(461); module.exports = expandTop; @@ -98348,7 +99508,149 @@ function expand(str, isTop) { /***/ }), -/* 461 */ +/* 466 */ +/***/ (function(module, exports) { + +function allocUnsafe (size) { + if (typeof size !== 'number') { + throw new TypeError('"size" argument must be a number') + } + + if (size < 0) { + throw new RangeError('"size" argument must not be negative') + } + + if (Buffer.allocUnsafe) { + return Buffer.allocUnsafe(size) + } else { + return new Buffer(size) + } +} + +module.exports = allocUnsafe + + +/***/ }), +/* 467 */ +/***/ (function(module, exports) { + +/* Node.js 6.4.0 and up has full support */ +var hasFullSupport = (function () { + try { + if (!Buffer.isEncoding('latin1')) { + return false + } + + var buf = Buffer.alloc ? Buffer.alloc(4) : new Buffer(4) + + buf.fill('ab', 'ucs2') + + return (buf.toString('hex') === '61006200') + } catch (_) { + return false + } +}()) + +function isSingleByte (val) { + return (val.length === 1 && val.charCodeAt(0) < 256) +} + +function fillWithNumber (buffer, val, start, end) { + if (start < 0 || end > buffer.length) { + throw new RangeError('Out of range index') + } + + start = start >>> 0 + end = end === undefined ? buffer.length : end >>> 0 + + if (end > start) { + buffer.fill(val, start, end) + } + + return buffer +} + +function fillWithBuffer (buffer, val, start, end) { + if (start < 0 || end > buffer.length) { + throw new RangeError('Out of range index') + } + + if (end <= start) { + return buffer + } + + start = start >>> 0 + end = end === undefined ? buffer.length : end >>> 0 + + var pos = start + var len = val.length + while (pos <= (end - len)) { + val.copy(buffer, pos) + pos += len + } + + if (pos !== end) { + val.copy(buffer, pos, 0, end - pos) + } + + return buffer +} + +function fill (buffer, val, start, end, encoding) { + if (hasFullSupport) { + return buffer.fill(val, start, end, encoding) + } + + if (typeof val === 'number') { + return fillWithNumber(buffer, val, start, end) + } + + if (typeof val === 'string') { + if (typeof start === 'string') { + encoding = start + start = 0 + end = buffer.length + } else if (typeof end === 'string') { + encoding = end + end = buffer.length + } + + if (encoding !== undefined && typeof encoding !== 'string') { + throw new TypeError('encoding must be a string') + } + + if (encoding === 'latin1') { + encoding = 'binary' + } + + if (typeof encoding === 'string' && !Buffer.isEncoding(encoding)) { + throw new TypeError('Unknown encoding: ' + encoding) + } + + if (val === '') { + return fillWithNumber(buffer, 0, start, end) + } + + if (isSingleByte(val)) { + return fillWithNumber(buffer, val.charCodeAt(0), start, end) + } + + val = new Buffer(val, encoding) + } + + if (Buffer.isBuffer(val)) { + return fillWithBuffer(buffer, val, start, end) + } + + // Other values (e.g. undefined, boolean, object) results in zero-fill + return fillWithNumber(buffer, 0, start, end) +} + +module.exports = fill + + +/***/ }), +/* 468 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -98514,7 +99816,7 @@ function parse(val) { /***/ }), -/* 462 */ +/* 469 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -98585,7 +99887,7 @@ module.exports = function (str) { /***/ }), -/* 463 */ +/* 470 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -98602,13 +99904,13 @@ module.exports = function (flag, argv) { /***/ }), -/* 464 */ +/* 471 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -const os = __webpack_require__(72); -const hasFlag = __webpack_require__(463); +const os = __webpack_require__(73); +const hasFlag = __webpack_require__(470); const env = process.env; @@ -98724,7 +100026,7 @@ module.exports = process && support(supportLevel); /***/ }), -/* 465 */ +/* 472 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -98859,7 +100161,7 @@ module.exports = (chalk, tmp) => { /***/ }), -/* 466 */ +/* 473 */ /***/ (function(module, exports, __webpack_require__) { module.exports = chownr @@ -98917,7 +100219,7 @@ function chownrSync (p, uid, gid) { /***/ }), -/* 467 */ +/* 474 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -98971,7 +100273,7 @@ exports.isCI = !!( /***/ }), -/* 468 */ +/* 475 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -99027,11 +100329,11 @@ function cliWidth(options) { /***/ }), -/* 469 */ +/* 476 */ /***/ (function(module, exports, __webpack_require__) { -var conversions = __webpack_require__(259); -var route = __webpack_require__(470); +var conversions = __webpack_require__(261); +var route = __webpack_require__(477); var convert = {}; @@ -99111,10 +100413,10 @@ module.exports = convert; /***/ }), -/* 470 */ +/* 477 */ /***/ (function(module, exports, __webpack_require__) { -var conversions = __webpack_require__(259); +var conversions = __webpack_require__(261); /* this function routes a model to all other models. @@ -99215,7 +100517,7 @@ module.exports = function (fromModel) { /***/ }), -/* 471 */ +/* 478 */ /***/ (function(module, exports) { module.exports = { @@ -99370,7 +100672,7 @@ module.exports = { }; /***/ }), -/* 472 */ +/* 479 */ /***/ (function(module, exports) { module.exports = function (xs, fn) { @@ -99389,134 +100691,134 @@ var isArray = Array.isArray || function (xs) { /***/ }), -/* 473 */ +/* 480 */ /***/ (function(module, exports, __webpack_require__) { __webpack_require__(79); -__webpack_require__(507); -module.exports = __webpack_require__(21).Array.from; +__webpack_require__(514); +module.exports = __webpack_require__(22).Array.from; /***/ }), -/* 474 */ +/* 481 */ /***/ (function(module, exports, __webpack_require__) { __webpack_require__(99); __webpack_require__(79); -module.exports = __webpack_require__(506); +module.exports = __webpack_require__(513); /***/ }), -/* 475 */ +/* 482 */ /***/ (function(module, exports, __webpack_require__) { -var core = __webpack_require__(21) +var core = __webpack_require__(22) , $JSON = core.JSON || (core.JSON = {stringify: JSON.stringify}); module.exports = function stringify(it){ // eslint-disable-line no-unused-vars return $JSON.stringify.apply($JSON, arguments); }; -/***/ }), -/* 476 */ -/***/ (function(module, exports, __webpack_require__) { - -__webpack_require__(122); -__webpack_require__(79); -__webpack_require__(99); -__webpack_require__(509); -__webpack_require__(519); -module.exports = __webpack_require__(21).Map; - -/***/ }), -/* 477 */ -/***/ (function(module, exports, __webpack_require__) { - -__webpack_require__(510); -module.exports = __webpack_require__(21).Object.assign; - -/***/ }), -/* 478 */ -/***/ (function(module, exports, __webpack_require__) { - -__webpack_require__(511); -var $Object = __webpack_require__(21).Object; -module.exports = function create(P, D){ - return $Object.create(P, D); -}; - -/***/ }), -/* 479 */ -/***/ (function(module, exports, __webpack_require__) { - -__webpack_require__(512); -module.exports = __webpack_require__(21).Object.getPrototypeOf; - -/***/ }), -/* 480 */ -/***/ (function(module, exports, __webpack_require__) { - -__webpack_require__(513); -module.exports = __webpack_require__(21).Object.keys; - -/***/ }), -/* 481 */ -/***/ (function(module, exports, __webpack_require__) { - -__webpack_require__(514); -module.exports = __webpack_require__(21).Object.setPrototypeOf; - -/***/ }), -/* 482 */ -/***/ (function(module, exports, __webpack_require__) { - -__webpack_require__(122); -__webpack_require__(79); -__webpack_require__(99); -__webpack_require__(515); -module.exports = __webpack_require__(21).Promise; - /***/ }), /* 483 */ /***/ (function(module, exports, __webpack_require__) { +__webpack_require__(122); +__webpack_require__(79); +__webpack_require__(99); __webpack_require__(516); -module.exports = __webpack_require__(21).Reflect.construct; +__webpack_require__(526); +module.exports = __webpack_require__(22).Map; /***/ }), /* 484 */ /***/ (function(module, exports, __webpack_require__) { -__webpack_require__(122); -__webpack_require__(79); -__webpack_require__(99); __webpack_require__(517); -__webpack_require__(520); -module.exports = __webpack_require__(21).Set; +module.exports = __webpack_require__(22).Object.assign; /***/ }), /* 485 */ /***/ (function(module, exports, __webpack_require__) { __webpack_require__(518); -__webpack_require__(122); -__webpack_require__(521); -__webpack_require__(522); -module.exports = __webpack_require__(21).Symbol; +var $Object = __webpack_require__(22).Object; +module.exports = function create(P, D){ + return $Object.create(P, D); +}; /***/ }), /* 486 */ /***/ (function(module, exports, __webpack_require__) { -__webpack_require__(79); -__webpack_require__(99); -module.exports = __webpack_require__(180).f('iterator'); +__webpack_require__(519); +module.exports = __webpack_require__(22).Object.getPrototypeOf; /***/ }), /* 487 */ +/***/ (function(module, exports, __webpack_require__) { + +__webpack_require__(520); +module.exports = __webpack_require__(22).Object.keys; + +/***/ }), +/* 488 */ +/***/ (function(module, exports, __webpack_require__) { + +__webpack_require__(521); +module.exports = __webpack_require__(22).Object.setPrototypeOf; + +/***/ }), +/* 489 */ +/***/ (function(module, exports, __webpack_require__) { + +__webpack_require__(122); +__webpack_require__(79); +__webpack_require__(99); +__webpack_require__(522); +module.exports = __webpack_require__(22).Promise; + +/***/ }), +/* 490 */ +/***/ (function(module, exports, __webpack_require__) { + +__webpack_require__(523); +module.exports = __webpack_require__(22).Reflect.construct; + +/***/ }), +/* 491 */ +/***/ (function(module, exports, __webpack_require__) { + +__webpack_require__(122); +__webpack_require__(79); +__webpack_require__(99); +__webpack_require__(524); +__webpack_require__(527); +module.exports = __webpack_require__(22).Set; + +/***/ }), +/* 492 */ +/***/ (function(module, exports, __webpack_require__) { + +__webpack_require__(525); +__webpack_require__(122); +__webpack_require__(528); +__webpack_require__(529); +module.exports = __webpack_require__(22).Symbol; + +/***/ }), +/* 493 */ +/***/ (function(module, exports, __webpack_require__) { + +__webpack_require__(79); +__webpack_require__(99); +module.exports = __webpack_require__(182).f('iterator'); + +/***/ }), +/* 494 */ /***/ (function(module, exports) { module.exports = function(){ /* empty */ }; /***/ }), -/* 488 */ +/* 495 */ /***/ (function(module, exports, __webpack_require__) { var forOf = __webpack_require__(117); @@ -99529,14 +100831,14 @@ module.exports = function(iter, ITERATOR){ /***/ }), -/* 489 */ +/* 496 */ /***/ (function(module, exports, __webpack_require__) { // false -> Array#indexOf // true -> Array#includes -var toIObject = __webpack_require__(68) +var toIObject = __webpack_require__(69) , toLength = __webpack_require__(120) - , toIndex = __webpack_require__(505); + , toIndex = __webpack_require__(512); module.exports = function(IS_INCLUDES){ return function($this, el, fromIndex){ var O = toIObject($this) @@ -99555,7 +100857,7 @@ module.exports = function(IS_INCLUDES){ }; /***/ }), -/* 490 */ +/* 497 */ /***/ (function(module, exports, __webpack_require__) { // 0 -> Array#forEach @@ -99565,11 +100867,11 @@ module.exports = function(IS_INCLUDES){ // 4 -> Array#every // 5 -> Array#find // 6 -> Array#findIndex -var ctx = __webpack_require__(55) - , IObject = __webpack_require__(170) +var ctx = __webpack_require__(56) + , IObject = __webpack_require__(172) , toObject = __webpack_require__(78) , toLength = __webpack_require__(120) - , asc = __webpack_require__(492); + , asc = __webpack_require__(499); module.exports = function(TYPE, $create){ var IS_MAP = TYPE == 1 , IS_FILTER = TYPE == 2 @@ -99604,11 +100906,11 @@ module.exports = function(TYPE, $create){ }; /***/ }), -/* 491 */ +/* 498 */ /***/ (function(module, exports, __webpack_require__) { var isObject = __webpack_require__(44) - , isArray = __webpack_require__(268) + , isArray = __webpack_require__(270) , SPECIES = __webpack_require__(31)('species'); module.exports = function(original){ @@ -99625,25 +100927,25 @@ module.exports = function(original){ }; /***/ }), -/* 492 */ +/* 499 */ /***/ (function(module, exports, __webpack_require__) { // 9.4.2.3 ArraySpeciesCreate(originalArray, length) -var speciesConstructor = __webpack_require__(491); +var speciesConstructor = __webpack_require__(498); module.exports = function(original, length){ return new (speciesConstructor(original))(length); }; /***/ }), -/* 493 */ +/* 500 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; var aFunction = __webpack_require__(93) , isObject = __webpack_require__(44) - , invoke = __webpack_require__(266) + , invoke = __webpack_require__(268) , arraySlice = [].slice , factories = {}; @@ -99666,7 +100968,7 @@ module.exports = Function.bind || function bind(that /*, args... */){ }; /***/ }), -/* 494 */ +/* 501 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -99680,12 +100982,12 @@ module.exports = function(object, index, value){ }; /***/ }), -/* 495 */ +/* 502 */ /***/ (function(module, exports, __webpack_require__) { // all enumerable object keys, includes symbols var getKeys = __webpack_require__(77) - , gOPS = __webpack_require__(173) + , gOPS = __webpack_require__(175) , pIE = __webpack_require__(119); module.exports = function(it){ var result = getKeys(it) @@ -99700,7 +101002,7 @@ module.exports = function(it){ }; /***/ }), -/* 496 */ +/* 503 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -99711,7 +101013,7 @@ var create = __webpack_require__(96) , IteratorPrototype = {}; // 25.1.2.1.1 %IteratorPrototype%[@@iterator]() -__webpack_require__(57)(IteratorPrototype, __webpack_require__(31)('iterator'), function(){ return this; }); +__webpack_require__(58)(IteratorPrototype, __webpack_require__(31)('iterator'), function(){ return this; }); module.exports = function(Constructor, NAME, next){ Constructor.prototype = create(IteratorPrototype, {next: descriptor(1, next)}); @@ -99719,11 +101021,11 @@ module.exports = function(Constructor, NAME, next){ }; /***/ }), -/* 497 */ +/* 504 */ /***/ (function(module, exports, __webpack_require__) { var getKeys = __webpack_require__(77) - , toIObject = __webpack_require__(68); + , toIObject = __webpack_require__(69); module.exports = function(object, el){ var O = toIObject(object) , keys = getKeys(O) @@ -99734,11 +101036,11 @@ module.exports = function(object, el){ }; /***/ }), -/* 498 */ +/* 505 */ /***/ (function(module, exports, __webpack_require__) { var global = __webpack_require__(30) - , macrotask = __webpack_require__(279).set + , macrotask = __webpack_require__(281).set , Observer = global.MutationObserver || global.WebKitMutationObserver , process = global.process , Promise = global.Promise @@ -99807,21 +101109,21 @@ module.exports = function(){ }; /***/ }), -/* 499 */ +/* 506 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; // 19.1.2.1 Object.assign(target, source, ...) var getKeys = __webpack_require__(77) - , gOPS = __webpack_require__(173) + , gOPS = __webpack_require__(175) , pIE = __webpack_require__(119) , toObject = __webpack_require__(78) - , IObject = __webpack_require__(170) + , IObject = __webpack_require__(172) , $assign = Object.assign; // should work with symbols and should have deterministic property order (V8 bug) -module.exports = !$assign || __webpack_require__(56)(function(){ +module.exports = !$assign || __webpack_require__(57)(function(){ var A = {} , B = {} , S = Symbol() @@ -99846,7 +101148,7 @@ module.exports = !$assign || __webpack_require__(56)(function(){ } : $assign; /***/ }), -/* 500 */ +/* 507 */ /***/ (function(module, exports, __webpack_require__) { var dP = __webpack_require__(45) @@ -99864,12 +101166,12 @@ module.exports = __webpack_require__(49) ? Object.defineProperties : function de }; /***/ }), -/* 501 */ +/* 508 */ /***/ (function(module, exports, __webpack_require__) { // fallback for IE11 buggy Object.getOwnPropertyNames with iframe and window -var toIObject = __webpack_require__(68) - , gOPN = __webpack_require__(273).f +var toIObject = __webpack_require__(69) + , gOPN = __webpack_require__(275).f , toString = {}.toString; var windowNames = typeof window == 'object' && window && Object.getOwnPropertyNames @@ -99889,7 +101191,7 @@ module.exports.f = function getOwnPropertyNames(it){ /***/ }), -/* 502 */ +/* 509 */ /***/ (function(module, exports, __webpack_require__) { // Works with __proto__ only. Old v8 can't work with null proto objects. @@ -99904,7 +101206,7 @@ module.exports = { set: Object.setPrototypeOf || ('__proto__' in {} ? // eslint-disable-line function(test, buggy, set){ try { - set = __webpack_require__(55)(Function.call, __webpack_require__(272).f(Object.prototype, '__proto__').set, 2); + set = __webpack_require__(56)(Function.call, __webpack_require__(274).f(Object.prototype, '__proto__').set, 2); set(test, []); buggy = !(test instanceof Array); } catch(e){ buggy = true; } @@ -99919,7 +101221,7 @@ module.exports = { }; /***/ }), -/* 503 */ +/* 510 */ /***/ (function(module, exports, __webpack_require__) { // 7.3.20 SpeciesConstructor(O, defaultConstructor) @@ -99932,10 +101234,10 @@ module.exports = function(O, D){ }; /***/ }), -/* 504 */ +/* 511 */ /***/ (function(module, exports, __webpack_require__) { -var toInteger = __webpack_require__(177) +var toInteger = __webpack_require__(179) , defined = __webpack_require__(116); // true -> String#at // false -> String#codePointAt @@ -99954,10 +101256,10 @@ module.exports = function(TO_STRING){ }; /***/ }), -/* 505 */ +/* 512 */ /***/ (function(module, exports, __webpack_require__) { -var toInteger = __webpack_require__(177) +var toInteger = __webpack_require__(179) , max = Math.max , min = Math.min; module.exports = function(index, length){ @@ -99966,33 +101268,33 @@ module.exports = function(index, length){ }; /***/ }), -/* 506 */ +/* 513 */ /***/ (function(module, exports, __webpack_require__) { var anObject = __webpack_require__(43) - , get = __webpack_require__(181); -module.exports = __webpack_require__(21).getIterator = function(it){ + , get = __webpack_require__(183); +module.exports = __webpack_require__(22).getIterator = function(it){ var iterFn = get(it); if(typeof iterFn != 'function')throw TypeError(it + ' is not iterable!'); return anObject(iterFn.call(it)); }; /***/ }), -/* 507 */ +/* 514 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var ctx = __webpack_require__(55) +var ctx = __webpack_require__(56) , $export = __webpack_require__(38) , toObject = __webpack_require__(78) - , call = __webpack_require__(269) - , isArrayIter = __webpack_require__(267) + , call = __webpack_require__(271) + , isArrayIter = __webpack_require__(269) , toLength = __webpack_require__(120) - , createProperty = __webpack_require__(494) - , getIterFn = __webpack_require__(181); + , createProperty = __webpack_require__(501) + , getIterFn = __webpack_require__(183); -$export($export.S + $export.F * !__webpack_require__(270)(function(iter){ Array.from(iter); }), 'Array', { +$export($export.S + $export.F * !__webpack_require__(272)(function(iter){ Array.from(iter); }), 'Array', { // 22.1.2.1 Array.from(arrayLike, mapfn = undefined, thisArg = undefined) from: function from(arrayLike/*, mapfn = undefined, thisArg = undefined*/){ var O = toObject(arrayLike) @@ -100022,21 +101324,21 @@ $export($export.S + $export.F * !__webpack_require__(270)(function(iter){ Array. /***/ }), -/* 508 */ +/* 515 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var addToUnscopables = __webpack_require__(487) - , step = __webpack_require__(271) +var addToUnscopables = __webpack_require__(494) + , step = __webpack_require__(273) , Iterators = __webpack_require__(95) - , toIObject = __webpack_require__(68); + , toIObject = __webpack_require__(69); // 22.1.3.4 Array.prototype.entries() // 22.1.3.13 Array.prototype.keys() // 22.1.3.29 Array.prototype.values() // 22.1.3.30 Array.prototype[@@iterator]() -module.exports = __webpack_require__(171)(Array, 'Array', function(iterated, kind){ +module.exports = __webpack_require__(173)(Array, 'Array', function(iterated, kind){ this._t = toIObject(iterated); // target this._i = 0; // next index this._k = kind; // kind @@ -100062,15 +101364,15 @@ addToUnscopables('values'); addToUnscopables('entries'); /***/ }), -/* 509 */ +/* 516 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var strong = __webpack_require__(261); +var strong = __webpack_require__(263); // 23.1 Map Objects -module.exports = __webpack_require__(263)('Map', function(get){ +module.exports = __webpack_require__(265)('Map', function(get){ return function Map(){ return get(this, arguments.length > 0 ? arguments[0] : undefined); }; }, { // 23.1.3.6 Map.prototype.get(key) @@ -100085,16 +101387,16 @@ module.exports = __webpack_require__(263)('Map', function(get){ }, strong, true); /***/ }), -/* 510 */ +/* 517 */ /***/ (function(module, exports, __webpack_require__) { // 19.1.3.1 Object.assign(target, source) var $export = __webpack_require__(38); -$export($export.S + $export.F, 'Object', {assign: __webpack_require__(499)}); +$export($export.S + $export.F, 'Object', {assign: __webpack_require__(506)}); /***/ }), -/* 511 */ +/* 518 */ /***/ (function(module, exports, __webpack_require__) { var $export = __webpack_require__(38) @@ -100102,59 +101404,59 @@ var $export = __webpack_require__(38) $export($export.S, 'Object', {create: __webpack_require__(96)}); /***/ }), -/* 512 */ +/* 519 */ /***/ (function(module, exports, __webpack_require__) { // 19.1.2.9 Object.getPrototypeOf(O) var toObject = __webpack_require__(78) - , $getPrototypeOf = __webpack_require__(274); + , $getPrototypeOf = __webpack_require__(276); -__webpack_require__(276)('getPrototypeOf', function(){ +__webpack_require__(278)('getPrototypeOf', function(){ return function getPrototypeOf(it){ return $getPrototypeOf(toObject(it)); }; }); /***/ }), -/* 513 */ +/* 520 */ /***/ (function(module, exports, __webpack_require__) { // 19.1.2.14 Object.keys(O) var toObject = __webpack_require__(78) , $keys = __webpack_require__(77); -__webpack_require__(276)('keys', function(){ +__webpack_require__(278)('keys', function(){ return function keys(it){ return $keys(toObject(it)); }; }); /***/ }), -/* 514 */ +/* 521 */ /***/ (function(module, exports, __webpack_require__) { // 19.1.3.19 Object.setPrototypeOf(O, proto) var $export = __webpack_require__(38); -$export($export.S, 'Object', {setPrototypeOf: __webpack_require__(502).set}); +$export($export.S, 'Object', {setPrototypeOf: __webpack_require__(509).set}); /***/ }), -/* 515 */ +/* 522 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; var LIBRARY = __webpack_require__(118) , global = __webpack_require__(30) - , ctx = __webpack_require__(55) - , classof = __webpack_require__(167) + , ctx = __webpack_require__(56) + , classof = __webpack_require__(169) , $export = __webpack_require__(38) , isObject = __webpack_require__(44) , aFunction = __webpack_require__(93) - , anInstance = __webpack_require__(166) + , anInstance = __webpack_require__(168) , forOf = __webpack_require__(117) - , speciesConstructor = __webpack_require__(503) - , task = __webpack_require__(279).set - , microtask = __webpack_require__(498)() + , speciesConstructor = __webpack_require__(510) + , task = __webpack_require__(281).set + , microtask = __webpack_require__(505)() , PROMISE = 'Promise' , TypeError = global.TypeError , process = global.process @@ -100346,7 +101648,7 @@ if(!USE_NATIVE){ this._h = 0; // <- rejection state, 0 - default, 1 - handled, 2 - unhandled this._n = false; // <- notify }; - Internal.prototype = __webpack_require__(174)($Promise.prototype, { + Internal.prototype = __webpack_require__(176)($Promise.prototype, { // 25.4.5.3 Promise.prototype.then(onFulfilled, onRejected) then: function then(onFulfilled, onRejected){ var reaction = newPromiseCapability(speciesConstructor(this, $Promise)); @@ -100373,8 +101675,8 @@ if(!USE_NATIVE){ $export($export.G + $export.W + $export.F * !USE_NATIVE, {Promise: $Promise}); __webpack_require__(98)($Promise, PROMISE); -__webpack_require__(278)(PROMISE); -Wrapper = __webpack_require__(21)[PROMISE]; +__webpack_require__(280)(PROMISE); +Wrapper = __webpack_require__(22)[PROMISE]; // statics $export($export.S + $export.F * !USE_NATIVE, PROMISE, { @@ -100397,7 +101699,7 @@ $export($export.S + $export.F * (LIBRARY || !USE_NATIVE), PROMISE, { return capability.promise; } }); -$export($export.S + $export.F * !(USE_NATIVE && __webpack_require__(270)(function(iter){ +$export($export.S + $export.F * !(USE_NATIVE && __webpack_require__(272)(function(iter){ $Promise.all(iter)['catch'](empty); })), PROMISE, { // 25.4.4.1 Promise.all(iterable) @@ -100443,7 +101745,7 @@ $export($export.S + $export.F * !(USE_NATIVE && __webpack_require__(270)(functio }); /***/ }), -/* 516 */ +/* 523 */ /***/ (function(module, exports, __webpack_require__) { // 26.1.2 Reflect.construct(target, argumentsList [, newTarget]) @@ -100452,8 +101754,8 @@ var $export = __webpack_require__(38) , aFunction = __webpack_require__(93) , anObject = __webpack_require__(43) , isObject = __webpack_require__(44) - , fails = __webpack_require__(56) - , bind = __webpack_require__(493) + , fails = __webpack_require__(57) + , bind = __webpack_require__(500) , rConstruct = (__webpack_require__(30).Reflect || {}).construct; // MS Edge supports only 2 arguments and argumentsList argument is optional @@ -100495,15 +101797,15 @@ $export($export.S + $export.F * (NEW_TARGET_BUG || ARGS_BUG), 'Reflect', { }); /***/ }), -/* 517 */ +/* 524 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var strong = __webpack_require__(261); +var strong = __webpack_require__(263); // 23.2 Set Objects -module.exports = __webpack_require__(263)('Set', function(get){ +module.exports = __webpack_require__(265)('Set', function(get){ return function Set(){ return get(this, arguments.length > 0 ? arguments[0] : undefined); }; }, { // 23.2.3.1 Set.prototype.add(value) @@ -100513,35 +101815,35 @@ module.exports = __webpack_require__(263)('Set', function(get){ }, strong); /***/ }), -/* 518 */ +/* 525 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; // ECMAScript 6 symbols shim var global = __webpack_require__(30) - , has = __webpack_require__(67) + , has = __webpack_require__(68) , DESCRIPTORS = __webpack_require__(49) , $export = __webpack_require__(38) - , redefine = __webpack_require__(277) - , META = __webpack_require__(172).KEY - , $fails = __webpack_require__(56) - , shared = __webpack_require__(176) + , redefine = __webpack_require__(279) + , META = __webpack_require__(174).KEY + , $fails = __webpack_require__(57) + , shared = __webpack_require__(178) , setToStringTag = __webpack_require__(98) , uid = __webpack_require__(121) , wks = __webpack_require__(31) - , wksExt = __webpack_require__(180) - , wksDefine = __webpack_require__(179) - , keyOf = __webpack_require__(497) - , enumKeys = __webpack_require__(495) - , isArray = __webpack_require__(268) + , wksExt = __webpack_require__(182) + , wksDefine = __webpack_require__(181) + , keyOf = __webpack_require__(504) + , enumKeys = __webpack_require__(502) + , isArray = __webpack_require__(270) , anObject = __webpack_require__(43) - , toIObject = __webpack_require__(68) - , toPrimitive = __webpack_require__(178) + , toIObject = __webpack_require__(69) + , toPrimitive = __webpack_require__(180) , createDesc = __webpack_require__(97) , _create = __webpack_require__(96) - , gOPNExt = __webpack_require__(501) - , $GOPD = __webpack_require__(272) + , gOPNExt = __webpack_require__(508) + , $GOPD = __webpack_require__(274) , $DP = __webpack_require__(45) , $keys = __webpack_require__(77) , gOPD = $GOPD.f @@ -100666,9 +101968,9 @@ if(!USE_NATIVE){ $GOPD.f = $getOwnPropertyDescriptor; $DP.f = $defineProperty; - __webpack_require__(273).f = gOPNExt.f = $getOwnPropertyNames; + __webpack_require__(275).f = gOPNExt.f = $getOwnPropertyNames; __webpack_require__(119).f = $propertyIsEnumerable; - __webpack_require__(173).f = $getOwnPropertySymbols; + __webpack_require__(175).f = $getOwnPropertySymbols; if(DESCRIPTORS && !__webpack_require__(118)){ redefine(ObjectProto, 'propertyIsEnumerable', $propertyIsEnumerable, true); @@ -100745,7 +102047,7 @@ $JSON && $export($export.S + $export.F * (!USE_NATIVE || $fails(function(){ }); // 19.4.3.4 Symbol.prototype[@@toPrimitive](hint) -$Symbol[PROTOTYPE][TO_PRIMITIVE] || __webpack_require__(57)($Symbol[PROTOTYPE], TO_PRIMITIVE, $Symbol[PROTOTYPE].valueOf); +$Symbol[PROTOTYPE][TO_PRIMITIVE] || __webpack_require__(58)($Symbol[PROTOTYPE], TO_PRIMITIVE, $Symbol[PROTOTYPE].valueOf); // 19.4.3.5 Symbol.prototype[@@toStringTag] setToStringTag($Symbol, 'Symbol'); // 20.2.1.9 Math[@@toStringTag] @@ -100754,42 +102056,42 @@ setToStringTag(Math, 'Math', true); setToStringTag(global.JSON, 'JSON', true); /***/ }), -/* 519 */ +/* 526 */ /***/ (function(module, exports, __webpack_require__) { // https://github.com/DavidBruant/Map-Set.prototype.toJSON var $export = __webpack_require__(38); -$export($export.P + $export.R, 'Map', {toJSON: __webpack_require__(262)('Map')}); +$export($export.P + $export.R, 'Map', {toJSON: __webpack_require__(264)('Map')}); /***/ }), -/* 520 */ +/* 527 */ /***/ (function(module, exports, __webpack_require__) { // https://github.com/DavidBruant/Map-Set.prototype.toJSON var $export = __webpack_require__(38); -$export($export.P + $export.R, 'Set', {toJSON: __webpack_require__(262)('Set')}); +$export($export.P + $export.R, 'Set', {toJSON: __webpack_require__(264)('Set')}); /***/ }), -/* 521 */ +/* 528 */ /***/ (function(module, exports, __webpack_require__) { -__webpack_require__(179)('asyncIterator'); +__webpack_require__(181)('asyncIterator'); /***/ }), -/* 522 */ +/* 529 */ /***/ (function(module, exports, __webpack_require__) { -__webpack_require__(179)('observable'); +__webpack_require__(181)('observable'); /***/ }), -/* 523 */ +/* 530 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var arrayFindIndex = __webpack_require__(373); +var arrayFindIndex = __webpack_require__(378); module.exports = function () { var unhandledRejections = []; @@ -100824,12 +102126,12 @@ module.exports = function () { /***/ }), -/* 524 */ +/* 531 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var core = __webpack_require__(523); +var core = __webpack_require__(530); module.exports = function (p) { p = p || process; @@ -100843,7 +102145,7 @@ module.exports = function (p) { /***/ }), -/* 525 */ +/* 532 */ /***/ (function(module, exports, __webpack_require__) { /** @@ -100852,7 +102154,7 @@ module.exports = function (p) { * Expose `debug()` as the module. */ -exports = module.exports = __webpack_require__(281); +exports = module.exports = __webpack_require__(283); exports.log = log; exports.formatArgs = formatArgs; exports.save = save; @@ -101044,7 +102346,7 @@ function localstorage() { /***/ }), -/* 526 */ +/* 533 */ /***/ (function(module, exports, __webpack_require__) { /** @@ -101053,14 +102355,14 @@ function localstorage() { */ if (typeof process === 'undefined' || process.type === 'renderer') { - module.exports = __webpack_require__(525); + module.exports = __webpack_require__(532); } else { - module.exports = __webpack_require__(527); + module.exports = __webpack_require__(534); } /***/ }), -/* 527 */ +/* 534 */ /***/ (function(module, exports, __webpack_require__) { /** @@ -101076,7 +102378,7 @@ var util = __webpack_require__(4); * Expose `debug()` as the module. */ -exports = module.exports = __webpack_require__(281); +exports = module.exports = __webpack_require__(283); exports.init = init; exports.log = log; exports.formatArgs = formatArgs; @@ -101091,7 +102393,7 @@ exports.useColors = useColors; exports.colors = [ 6, 2, 3, 4, 5, 1 ]; try { - var supportsColor = __webpack_require__(728); + var supportsColor = __webpack_require__(738); if (supportsColor && supportsColor.level >= 2) { exports.colors = [ 20, 21, 26, 27, 32, 33, 38, 39, 40, 41, 42, 43, 44, 45, 56, 57, 62, 63, 68, @@ -101252,7 +102554,7 @@ exports.enable(load()); /***/ }), -/* 528 */ +/* 535 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -101353,98 +102655,148 @@ module.exports = function (encodedURI) { /***/ }), -/* 529 */ +/* 536 */ /***/ (function(module, exports, __webpack_require__) { -var fastApply = __webpack_require__(548) - , isArgs = __webpack_require__(615) - , isBuffer = typeof Buffer === 'function' ? Buffer.isBuffer : null -; +var pSlice = Array.prototype.slice; +var objectKeys = __webpack_require__(538); +var isArguments = __webpack_require__(537); -module.exports = deepEqual; - -function deepEqual(actual, expected, strict) { - if (actual === expected) return true; - - // isNaN test - if (actual !== actual && expected !== expected) return true; - - var actualType = typeof actual - , expectedType = typeof expected - , i - ; - - if (actualType !== 'object' && expectedType !== 'object') return strict ? actual === expected : actual == expected; - - // null is an object, but cannot have properties; stop here - if (actual === null || expected === null) return false; - - if (actualType !== expectedType) return false; - - if (actual.prototype !== expected.prototype) return false; - - if (actual instanceof Date) return actual.getTime() === expected.getTime(); - - if (actual instanceof RegExp) { - return actual.source === expected.source - && actual.lastIndex === expected.lastIndex - && actual.global === expected.global - && actual.multiline === expected.multiline - && actual.ignoreCase === expected.ignoreCase - ; - } - - if (isBuffer && isBuffer(actual)) { - if (actual.length !== expected.length) return false; - - i = actual.length; - - while (--i >= 0) { - if (actual[i] !== expected[i]) return false; - } - - return true; - } - - var actualArg = isArgs(actual) - , expectedArg = isArgs(expected) - ; - - if (actualArg || expectedArg) { - if (!actualArg || !expectedArg) return false; - actual = fastApply(Array, null, actual); - expected = fastApply(Array, null, expected); - } - - var actualKeys = Object.keys(actual) - , expectedKeys = Object.keys(expected) - , key - ; - - if (actualKeys.length !== expectedKeys.length) return false; - - actualKeys.sort(); - expectedKeys.sort(); - - i = actualKeys.length; - - while (--i >= 0) { - if (actualKeys[i] !== expectedKeys[i]) return false; - } - - i = actualKeys.length; - - while (--i >= 0) { - key = actualKeys[i]; - if (!deepEqual(actual[key], expected[key], strict)) return false; - } - +var deepEqual = module.exports = function (actual, expected, opts) { + if (!opts) opts = {}; + // 7.1. All identical values are equivalent, as determined by ===. + if (actual === expected) { return true; - + + } else if (actual instanceof Date && expected instanceof Date) { + return actual.getTime() === expected.getTime(); + + // 7.3. Other pairs that do not both pass typeof value == 'object', + // equivalence is determined by ==. + } else if (!actual || !expected || typeof actual != 'object' && typeof expected != 'object') { + return opts.strict ? actual === expected : actual == expected; + + // 7.4. For all other Object pairs, including Array objects, equivalence is + // determined by having the same number of owned properties (as verified + // with Object.prototype.hasOwnProperty.call), the same set of keys + // (although not necessarily the same order), equivalent values for every + // corresponding key, and an identical 'prototype' property. Note: this + // accounts for both named and indexed properties on Arrays. + } else { + return objEquiv(actual, expected, opts); + } } +function isUndefinedOrNull(value) { + return value === null || value === undefined; +} + +function isBuffer (x) { + if (!x || typeof x !== 'object' || typeof x.length !== 'number') return false; + if (typeof x.copy !== 'function' || typeof x.slice !== 'function') { + return false; + } + if (x.length > 0 && typeof x[0] !== 'number') return false; + return true; +} + +function objEquiv(a, b, opts) { + var i, key; + if (isUndefinedOrNull(a) || isUndefinedOrNull(b)) + return false; + // an identical 'prototype' property. + if (a.prototype !== b.prototype) return false; + //~~~I've managed to break Object.keys through screwy arguments passing. + // Converting to array solves the problem. + if (isArguments(a)) { + if (!isArguments(b)) { + return false; + } + a = pSlice.call(a); + b = pSlice.call(b); + return deepEqual(a, b, opts); + } + if (isBuffer(a)) { + if (!isBuffer(b)) { + return false; + } + if (a.length !== b.length) return false; + for (i = 0; i < a.length; i++) { + if (a[i] !== b[i]) return false; + } + return true; + } + try { + var ka = objectKeys(a), + kb = objectKeys(b); + } catch (e) {//happens when one is a string literal and the other isn't + return false; + } + // having the same number of owned properties (keys incorporates + // hasOwnProperty) + if (ka.length != kb.length) + return false; + //the same set of keys (although not necessarily the same order), + ka.sort(); + kb.sort(); + //~~~cheap key test + for (i = ka.length - 1; i >= 0; i--) { + if (ka[i] != kb[i]) + return false; + } + //equivalent values for every corresponding key, and + //~~~possibly expensive deep test + for (i = ka.length - 1; i >= 0; i--) { + key = ka[i]; + if (!deepEqual(a[key], b[key], opts)) return false; + } + return typeof a === typeof b; +} + + /***/ }), -/* 530 */ +/* 537 */ +/***/ (function(module, exports) { + +var supportsArgumentsClass = (function(){ + return Object.prototype.toString.call(arguments) +})() == '[object Arguments]'; + +exports = module.exports = supportsArgumentsClass ? supported : unsupported; + +exports.supported = supported; +function supported(object) { + return Object.prototype.toString.call(object) == '[object Arguments]'; +}; + +exports.unsupported = unsupported; +function unsupported(object){ + return object && + typeof object == 'object' && + typeof object.length == 'number' && + Object.prototype.hasOwnProperty.call(object, 'callee') && + !Object.prototype.propertyIsEnumerable.call(object, 'callee') || + false; +}; + + +/***/ }), +/* 538 */ +/***/ (function(module, exports) { + +exports = module.exports = typeof Object.keys === 'function' + ? Object.keys : shim; + +exports.shim = shim; +function shim (obj) { + var keys = []; + for (var key in obj) keys.push(key); + return keys; +} + + +/***/ }), +/* 539 */ /***/ (function(module, exports, __webpack_require__) { var Stream = __webpack_require__(29).Stream; @@ -101557,7 +102909,7 @@ DelayedStream.prototype._checkIfMaxDataSizeExceeded = function() { /***/ }), -/* 531 */ +/* 540 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -101686,7 +103038,7 @@ module.exports = str => { /***/ }), -/* 532 */ +/* 541 */ /***/ (function(module, exports, __webpack_require__) { /* @@ -101705,7 +103057,7 @@ var CacheObject = function (conf) { this.count = 0; this.data = {}; - var next = __webpack_require__(374); + var next = __webpack_require__(379); this.set = function (key, value, callback) { var self = this; @@ -101813,7 +103165,7 @@ module.exports = CacheObject; /***/ }), -/* 533 */ +/* 542 */ /***/ (function(module, exports, __webpack_require__) { /* @@ -101822,9 +103174,9 @@ module.exports = CacheObject; * See the accompanying LICENSE file for terms. */ -var CacheObject = __webpack_require__(532), - deepCopy = __webpack_require__(640), - dns = __webpack_require__(332); +var CacheObject = __webpack_require__(541), + deepCopy = __webpack_require__(648), + dns = __webpack_require__(337); // original function storage @@ -102140,10 +103492,10 @@ module.exports = function(conf) { /***/ }), -/* 534 */ +/* 543 */ /***/ (function(module, exports, __webpack_require__) { -var once = __webpack_require__(535); +var once = __webpack_require__(544); var noop = function() {}; @@ -102217,10 +103569,10 @@ var eos = function(stream, opts, callback) { module.exports = eos; /***/ }), -/* 535 */ +/* 544 */ /***/ (function(module, exports, __webpack_require__) { -var wrappy = __webpack_require__(201) +var wrappy = __webpack_require__(203) module.exports = wrappy(once) once.proto = once(function () { @@ -102244,13 +103596,13 @@ function once (fn) { /***/ }), -/* 536 */ +/* 545 */ /***/ (function(module, exports, __webpack_require__) { // Named EC curves // Requires ec.js, jsbn.js, and jsbn2.js -var BigInteger = __webpack_require__(61).BigInteger +var BigInteger = __webpack_require__(62).BigInteger var ECCurveFp = __webpack_require__(123).ECCurveFp @@ -102420,7 +103772,7 @@ module.exports = { /***/ }), -/* 537 */ +/* 546 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -102433,7 +103785,7 @@ module.exports = { -var isPosixBracket = __webpack_require__(626); +var isPosixBracket = __webpack_require__(634); /** * POSIX character classes @@ -102590,7 +103942,7 @@ brackets.match = function(arr, pattern) { /***/ }), -/* 538 */ +/* 547 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -102603,7 +103955,7 @@ brackets.match = function(arr, pattern) { -var fill = __webpack_require__(539); +var fill = __webpack_require__(548); module.exports = function expandRange(str, options, fn) { if (typeof str !== 'string') { @@ -102640,7 +103992,7 @@ module.exports = function expandRange(str, options, fn) { /***/ }), -/* 539 */ +/* 548 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -102653,11 +104005,11 @@ module.exports = function expandRange(str, options, fn) { -var isObject = __webpack_require__(541); -var isNumber = __webpack_require__(540); -var randomize = __webpack_require__(672); -var repeatStr = __webpack_require__(681); -var repeat = __webpack_require__(308); +var isObject = __webpack_require__(550); +var isNumber = __webpack_require__(549); +var randomize = __webpack_require__(681); +var repeatStr = __webpack_require__(690); +var repeat = __webpack_require__(310); /** * Expose `fillRange` @@ -103055,7 +104407,7 @@ function length(val) { /***/ }), -/* 540 */ +/* 549 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -103081,7 +104433,7 @@ module.exports = function isNumber(num) { /***/ }), -/* 541 */ +/* 550 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -103094,7 +104446,7 @@ module.exports = function isNumber(num) { -var isArray = __webpack_require__(294); +var isArray = __webpack_require__(296); module.exports = function isObject(val) { return val != null && typeof val === 'object' && isArray(val) === false; @@ -103102,7 +104454,7 @@ module.exports = function isObject(val) { /***/ }), -/* 542 */ +/* 551 */ /***/ (function(module, exports) { // Generated by CoffeeScript 1.12.0 @@ -103137,7 +104489,7 @@ module.exports = function isObject(val) { /***/ }), -/* 543 */ +/* 552 */ /***/ (function(module, exports) { // Generated by CoffeeScript 1.12.0 @@ -103172,7 +104524,7 @@ module.exports = function isObject(val) { /***/ }), -/* 544 */ +/* 553 */ /***/ (function(module, exports) { // Generated by CoffeeScript 1.12.0 @@ -103207,7 +104559,7 @@ module.exports = function isObject(val) { /***/ }), -/* 545 */ +/* 554 */ /***/ (function(module, exports) { // Generated by CoffeeScript 1.12.0 @@ -103242,7 +104594,7 @@ module.exports = function isObject(val) { /***/ }), -/* 546 */ +/* 555 */ /***/ (function(module, exports, __webpack_require__) { // Generated by CoffeeScript 1.12.0 @@ -103259,19 +104611,19 @@ module.exports = function isObject(val) { FS = __webpack_require__(10); - Temp = __webpack_require__(732); + Temp = __webpack_require__(742); SpawnSync = __webpack_require__(142).spawnSync; Spawn = __webpack_require__(142).spawn; - CreateFileError = __webpack_require__(542); + CreateFileError = __webpack_require__(551); - ReadFileError = __webpack_require__(544); + ReadFileError = __webpack_require__(553); - RemoveFileError = __webpack_require__(545); + RemoveFileError = __webpack_require__(554); - LaunchEditorError = __webpack_require__(543); + LaunchEditorError = __webpack_require__(552); ExternalEditor = (function() { ExternalEditor.edit = function(text) { @@ -103456,7 +104808,7 @@ module.exports = function isObject(val) { /***/ }), -/* 547 */ +/* 556 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -103641,34 +104993,7 @@ function toRegex(pattern, contains, isNegated) { /***/ }), -/* 548 */ -/***/ (function(module, exports) { - -module.exports = fastApply; - -function fastApply(fn, context, args) { - - switch (args ? args.length : 0) { - case 0: - return context ? fn.call(context) : fn(); - case 1: - return context ? fn.call(context, args[0]) : fn(args[0]); - case 2: - return context ? fn.call(context, args[0], args[1]) : fn(args[0], args[1]); - case 3: - return context ? fn.call(context, args[0], args[1], args[2]) : fn(args[0], args[1], args[2]); - case 4: - return context ? fn.call(context, args[0], args[1], args[2], args[3]) : fn(args[0], args[1], args[2], args[3]); - case 5: - return context ? fn.call(context, args[0], args[1], args[2], args[3], args[4]) : fn(args[0], args[1], args[2], args[3], args[4]); - default: - return fn.apply(context, args); - } - -} - -/***/ }), -/* 549 */ +/* 557 */ /***/ (function(module, exports) { /*! @@ -103684,7 +105009,7 @@ module.exports = function filenameRegex() { /***/ }), -/* 550 */ +/* 558 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -103707,7 +105032,7 @@ module.exports = function forIn(obj, fn, thisArg) { /***/ }), -/* 551 */ +/* 559 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -103720,7 +105045,7 @@ module.exports = function forIn(obj, fn, thisArg) { -var forIn = __webpack_require__(550); +var forIn = __webpack_require__(558); var hasOwn = Object.prototype.hasOwnProperty; module.exports = function forOwn(obj, fn, thisArg) { @@ -103733,7 +105058,7 @@ module.exports = function forOwn(obj, fn, thisArg) { /***/ }), -/* 552 */ +/* 560 */ /***/ (function(module, exports, __webpack_require__) { module.exports = ForeverAgent @@ -103742,7 +105067,7 @@ ForeverAgent.SSL = ForeverAgentSSL var util = __webpack_require__(4) , Agent = __webpack_require__(52).Agent , net = __webpack_require__(108) - , tls = __webpack_require__(333) + , tls = __webpack_require__(338) , AgentSSL = __webpack_require__(143).Agent function getConnectionName(host, port) { @@ -103877,19 +105202,19 @@ function createConnectionSSL (port, host, options) { /***/ }), -/* 553 */ +/* 561 */ /***/ (function(module, exports, __webpack_require__) { -var CombinedStream = __webpack_require__(260); +var CombinedStream = __webpack_require__(262); var util = __webpack_require__(4); var path = __webpack_require__(0); var http = __webpack_require__(52); var https = __webpack_require__(143); var parseUrl = __webpack_require__(19).parse; var fs = __webpack_require__(10); -var mime = __webpack_require__(296); -var asynckit = __webpack_require__(379); -var populate = __webpack_require__(554); +var mime = __webpack_require__(298); +var asynckit = __webpack_require__(384); +var populate = __webpack_require__(562); // Public API module.exports = FormData; @@ -104327,7 +105652,7 @@ FormData.prototype.toString = function () { /***/ }), -/* 554 */ +/* 562 */ /***/ (function(module, exports) { // populates missing values @@ -104343,7 +105668,14 @@ module.exports = function(dst, src) { /***/ }), -/* 555 */ +/* 563 */ +/***/ (function(module, exports, __webpack_require__) { + +module.exports = __webpack_require__(10).constants || __webpack_require__(336) + + +/***/ }), +/* 564 */ /***/ (function(module, exports, __webpack_require__) { // Copyright Joyent, Inc. and other Node contributors. @@ -104652,7 +105984,7 @@ exports.realpath = function realpath(p, cache, cb) { /***/ }), -/* 556 */ +/* 565 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -104666,7 +105998,7 @@ exports.realpath = function realpath(p, cache, cb) { var path = __webpack_require__(0); -var parent = __webpack_require__(557); +var parent = __webpack_require__(566); var isGlob = __webpack_require__(130); module.exports = function globBase(pattern) { @@ -104710,7 +106042,7 @@ function dirname(glob) { /***/ }), -/* 557 */ +/* 566 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -104727,22 +106059,22 @@ module.exports = function globParent(str) { /***/ }), -/* 558 */ +/* 567 */ /***/ (function(module, exports, __webpack_require__) { module.exports = globSync globSync.GlobSync = GlobSync var fs = __webpack_require__(10) -var rp = __webpack_require__(286) +var rp = __webpack_require__(288) var minimatch = __webpack_require__(134) var Minimatch = minimatch.Minimatch -var Glob = __webpack_require__(185).Glob +var Glob = __webpack_require__(187).Glob var util = __webpack_require__(4) var path = __webpack_require__(0) var assert = __webpack_require__(36) -var isAbsolute = __webpack_require__(196) -var common = __webpack_require__(287) +var isAbsolute = __webpack_require__(198) +var common = __webpack_require__(289) var alphasort = common.alphasort var alphasorti = common.alphasorti var setopts = common.setopts @@ -105219,7 +106551,7 @@ GlobSync.prototype._makeAbs = function (f) { /***/ }), -/* 559 */ +/* 568 */ /***/ (function(module, exports, __webpack_require__) { var Stream = __webpack_require__(29).Stream @@ -105343,11 +106675,11 @@ function legacy (fs) { /***/ }), -/* 560 */ +/* 569 */ /***/ (function(module, exports, __webpack_require__) { -var fs = __webpack_require__(288) -var constants = __webpack_require__(331) +var fs = __webpack_require__(290) +var constants = __webpack_require__(336) var origCwd = process.cwd var cwd = null @@ -105679,7 +107011,7 @@ function chownErOk (er) { /***/ }), -/* 561 */ +/* 570 */ /***/ (function(module, exports, __webpack_require__) { var fs = __webpack_require__(10) @@ -105697,15 +107029,15 @@ exports.readlinkSync = function (p) { /***/ }), -/* 562 */ +/* 571 */ /***/ (function(module, exports, __webpack_require__) { -var zlib = __webpack_require__(204) -var peek = __webpack_require__(662) -var through = __webpack_require__(326) -var pumpify = __webpack_require__(668) -var isGzip = __webpack_require__(624) -var isDeflate = __webpack_require__(619) +var zlib = __webpack_require__(206) +var peek = __webpack_require__(671) +var through = __webpack_require__(330) +var pumpify = __webpack_require__(677) +var isGzip = __webpack_require__(632) +var isDeflate = __webpack_require__(627) var isCompressed = function (data) { if (isGzip(data)) return 1 @@ -105732,7 +107064,7 @@ module.exports = gunzip /***/ }), -/* 563 */ +/* 572 */ /***/ (function(module, exports) { module.exports = { @@ -105766,7 +107098,7 @@ module.exports = { }; /***/ }), -/* 564 */ +/* 573 */ /***/ (function(module, exports) { module.exports = { @@ -105800,7 +107132,7 @@ module.exports = { }; /***/ }), -/* 565 */ +/* 574 */ /***/ (function(module, exports) { module.exports = { @@ -105824,7 +107156,7 @@ module.exports = { }; /***/ }), -/* 566 */ +/* 575 */ /***/ (function(module, exports) { module.exports = { @@ -105857,7 +107189,7 @@ module.exports = { }; /***/ }), -/* 567 */ +/* 576 */ /***/ (function(module, exports) { module.exports = { @@ -105890,7 +107222,7 @@ module.exports = { }; /***/ }), -/* 568 */ +/* 577 */ /***/ (function(module, exports) { module.exports = { @@ -105933,7 +107265,7 @@ module.exports = { }; /***/ }), -/* 569 */ +/* 578 */ /***/ (function(module, exports) { module.exports = { @@ -105957,7 +107289,7 @@ module.exports = { }; /***/ }), -/* 570 */ +/* 579 */ /***/ (function(module, exports) { module.exports = { @@ -106018,7 +107350,7 @@ module.exports = { }; /***/ }), -/* 571 */ +/* 580 */ /***/ (function(module, exports) { module.exports = { @@ -106035,7 +107367,7 @@ module.exports = { }; /***/ }), -/* 572 */ +/* 581 */ /***/ (function(module, exports) { module.exports = { @@ -106059,36 +107391,36 @@ module.exports = { }; /***/ }), -/* 573 */ +/* 582 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; module.exports = { - afterRequest: __webpack_require__(563), - beforeRequest: __webpack_require__(564), - browser: __webpack_require__(565), - cache: __webpack_require__(566), - content: __webpack_require__(567), - cookie: __webpack_require__(568), - creator: __webpack_require__(569), - entry: __webpack_require__(570), - har: __webpack_require__(571), - header: __webpack_require__(572), - log: __webpack_require__(574), - page: __webpack_require__(575), - pageTimings: __webpack_require__(576), - postData: __webpack_require__(577), - query: __webpack_require__(578), - request: __webpack_require__(579), - response: __webpack_require__(580), - timings: __webpack_require__(581) + afterRequest: __webpack_require__(572), + beforeRequest: __webpack_require__(573), + browser: __webpack_require__(574), + cache: __webpack_require__(575), + content: __webpack_require__(576), + cookie: __webpack_require__(577), + creator: __webpack_require__(578), + entry: __webpack_require__(579), + har: __webpack_require__(580), + header: __webpack_require__(581), + log: __webpack_require__(583), + page: __webpack_require__(584), + pageTimings: __webpack_require__(585), + postData: __webpack_require__(586), + query: __webpack_require__(587), + request: __webpack_require__(588), + response: __webpack_require__(589), + timings: __webpack_require__(590) } /***/ }), -/* 574 */ +/* 583 */ /***/ (function(module, exports) { module.exports = { @@ -106128,7 +107460,7 @@ module.exports = { }; /***/ }), -/* 575 */ +/* 584 */ /***/ (function(module, exports) { module.exports = { @@ -106164,7 +107496,7 @@ module.exports = { }; /***/ }), -/* 576 */ +/* 585 */ /***/ (function(module, exports) { module.exports = { @@ -106186,7 +107518,7 @@ module.exports = { }; /***/ }), -/* 577 */ +/* 586 */ /***/ (function(module, exports) { module.exports = { @@ -106233,7 +107565,7 @@ module.exports = { }; /***/ }), -/* 578 */ +/* 587 */ /***/ (function(module, exports) { module.exports = { @@ -106257,7 +107589,7 @@ module.exports = { }; /***/ }), -/* 579 */ +/* 588 */ /***/ (function(module, exports) { module.exports = { @@ -106318,7 +107650,7 @@ module.exports = { }; /***/ }), -/* 580 */ +/* 589 */ /***/ (function(module, exports) { module.exports = { @@ -106376,7 +107708,7 @@ module.exports = { }; /***/ }), -/* 581 */ +/* 590 */ /***/ (function(module, exports) { module.exports = { @@ -106422,7 +107754,7 @@ module.exports = { }; /***/ }), -/* 582 */ +/* 591 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -106450,7 +107782,7 @@ HARError.prototype = Error.prototype; module.exports = exports['default']; /***/ }), -/* 583 */ +/* 592 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -106479,15 +107811,15 @@ exports.request = request; exports.response = response; exports.timings = timings; -var _harSchema = __webpack_require__(573); +var _harSchema = __webpack_require__(582); var schemas = _interopRequireWildcard(_harSchema); -var _ajv = __webpack_require__(340); +var _ajv = __webpack_require__(345); var _ajv2 = _interopRequireDefault(_ajv); -var _error = __webpack_require__(582); +var _error = __webpack_require__(591); var _error2 = _interopRequireDefault(_error); @@ -106588,18 +107920,18 @@ function timings(data) { } /***/ }), -/* 584 */ +/* 593 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var ansiRegex = __webpack_require__(219); +var ansiRegex = __webpack_require__(221); var re = new RegExp(ansiRegex().source); // remove the `g` flag module.exports = re.test.bind(re); /***/ }), -/* 585 */ +/* 594 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -106616,15 +107948,15 @@ module.exports = function (flag, argv) { /***/ }), -/* 586 */ +/* 595 */ /***/ (function(module, exports, __webpack_require__) { // Load modules var Url = __webpack_require__(19); -var Hoek = __webpack_require__(290); -var Cryptiles = __webpack_require__(280); -var Crypto = __webpack_require__(186); +var Hoek = __webpack_require__(292); +var Cryptiles = __webpack_require__(282); +var Crypto = __webpack_require__(188); var Utils = __webpack_require__(124); @@ -106991,17 +108323,17 @@ exports.message = function (host, port, message, options) { /***/ }), -/* 587 */ +/* 596 */ /***/ (function(module, exports, __webpack_require__) { // Export sub-modules exports.error = exports.Error = __webpack_require__(114); -exports.sntp = __webpack_require__(317); +exports.sntp = __webpack_require__(319); -exports.server = __webpack_require__(588); -exports.client = __webpack_require__(586); -exports.crypto = __webpack_require__(186); +exports.server = __webpack_require__(597); +exports.client = __webpack_require__(595); +exports.crypto = __webpack_require__(188); exports.utils = __webpack_require__(124); exports.uri = { @@ -107012,15 +108344,15 @@ exports.uri = { /***/ }), -/* 588 */ +/* 597 */ /***/ (function(module, exports, __webpack_require__) { // Load modules var Boom = __webpack_require__(114); -var Hoek = __webpack_require__(290); -var Cryptiles = __webpack_require__(280); -var Crypto = __webpack_require__(186); +var Hoek = __webpack_require__(292); +var Cryptiles = __webpack_require__(282); +var Crypto = __webpack_require__(188); var Utils = __webpack_require__(124); @@ -107566,7 +108898,7 @@ internals.nonceFunc = function (key, nonce, ts, nonceCallback) { /***/ }), -/* 589 */ +/* 598 */ /***/ (function(module, exports) { // Declare internals @@ -107704,7 +109036,7 @@ internals.safeCharCodes = (function () { /***/ }), -/* 590 */ +/* 599 */ /***/ (function(module, exports) { module.exports = { @@ -107743,14 +109075,14 @@ module.exports = { }; /***/ }), -/* 591 */ +/* 600 */ /***/ (function(module, exports, __webpack_require__) { // Copyright 2015 Joyent, Inc. -var parser = __webpack_require__(592); -var signer = __webpack_require__(593); -var verify = __webpack_require__(594); +var parser = __webpack_require__(601); +var signer = __webpack_require__(602); +var verify = __webpack_require__(603); var utils = __webpack_require__(125); @@ -107778,7 +109110,7 @@ module.exports = { /***/ }), -/* 592 */ +/* 601 */ /***/ (function(module, exports, __webpack_require__) { // Copyright 2012 Joyent, Inc. All rights reserved. @@ -108102,17 +109434,17 @@ module.exports = { /***/ }), -/* 593 */ +/* 602 */ /***/ (function(module, exports, __webpack_require__) { // Copyright 2012 Joyent, Inc. All rights reserved. var assert = __webpack_require__(126); -var crypto = __webpack_require__(13); +var crypto = __webpack_require__(14); var http = __webpack_require__(52); var util = __webpack_require__(4); -var sshpk = __webpack_require__(200); -var jsprim = __webpack_require__(637); +var sshpk = __webpack_require__(202); +var jsprim = __webpack_require__(645); var utils = __webpack_require__(125); var sprintf = __webpack_require__(4).format; @@ -108507,14 +109839,14 @@ module.exports = { /***/ }), -/* 594 */ +/* 603 */ /***/ (function(module, exports, __webpack_require__) { // Copyright 2015 Joyent, Inc. var assert = __webpack_require__(126); -var crypto = __webpack_require__(13); -var sshpk = __webpack_require__(200); +var crypto = __webpack_require__(14); +var sshpk = __webpack_require__(202); var utils = __webpack_require__(125); var HASH_ALGOS = utils.HASH_ALGOS; @@ -108601,10 +109933,10 @@ module.exports = { /***/ }), -/* 595 */ +/* 604 */ /***/ (function(module, exports, __webpack_require__) { -var wrappy = __webpack_require__(201) +var wrappy = __webpack_require__(203) var reqs = Object.create(null) var once = __webpack_require__(135) @@ -108661,7 +109993,7 @@ function slice (args) { /***/ }), -/* 596 */ +/* 605 */ /***/ (function(module, exports) { if (typeof Object.create === 'function') { @@ -108690,7 +110022,7 @@ if (typeof Object.create === 'function') { /***/ }), -/* 597 */ +/* 606 */ /***/ (function(module, exports) { @@ -108886,7 +110218,7 @@ function unsafe (val, doUnesc) { /***/ }), -/* 598 */ +/* 607 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -108928,7 +110260,7 @@ var Choice = module.exports = function (val, answers) { /***/ }), -/* 599 */ +/* 608 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -108936,7 +110268,7 @@ var Choice = module.exports = function (val, answers) { var assert = __webpack_require__(36); var _ = __webpack_require__(32); var Separator = __webpack_require__(127); -var Choice = __webpack_require__(598); +var Choice = __webpack_require__(607); /** * Choices collection @@ -109047,7 +110379,7 @@ Choices.prototype.push = function () { /***/ }), -/* 600 */ +/* 609 */ /***/ (function(module, exports, __webpack_require__) { /** @@ -109057,10 +110389,10 @@ Choices.prototype.push = function () { var _ = __webpack_require__(32); var util = __webpack_require__(4); var chalk = __webpack_require__(39); -var cliCursor = __webpack_require__(256); -var figures = __webpack_require__(184); -var Base = __webpack_require__(59); -var observe = __webpack_require__(60); +var cliCursor = __webpack_require__(258); +var figures = __webpack_require__(186); +var Base = __webpack_require__(60); +var observe = __webpack_require__(61); var Paginator = __webpack_require__(128); /** @@ -109289,7 +110621,7 @@ function getCheckbox(checked) { /***/ }), -/* 601 */ +/* 610 */ /***/ (function(module, exports, __webpack_require__) { /** @@ -109299,8 +110631,8 @@ function getCheckbox(checked) { var _ = __webpack_require__(32); var util = __webpack_require__(4); var chalk = __webpack_require__(39); -var Base = __webpack_require__(59); -var observe = __webpack_require__(60); +var Base = __webpack_require__(60); +var observe = __webpack_require__(61); /** * Module exports @@ -109401,7 +110733,7 @@ Prompt.prototype.onKeypress = function () { /***/ }), -/* 602 */ +/* 611 */ /***/ (function(module, exports, __webpack_require__) { /** @@ -109410,9 +110742,9 @@ Prompt.prototype.onKeypress = function () { var util = __webpack_require__(4); var chalk = __webpack_require__(39); -var ExternalEditor = __webpack_require__(546); -var Base = __webpack_require__(59); -var observe = __webpack_require__(60); +var ExternalEditor = __webpack_require__(555); +var Base = __webpack_require__(60); +var observe = __webpack_require__(61); var rx = __webpack_require__(137); /** @@ -109518,7 +110850,7 @@ Prompt.prototype.onError = function (state) { /***/ }), -/* 603 */ +/* 612 */ /***/ (function(module, exports, __webpack_require__) { /** @@ -109528,9 +110860,9 @@ Prompt.prototype.onError = function (state) { var _ = __webpack_require__(32); var util = __webpack_require__(4); var chalk = __webpack_require__(39); -var Base = __webpack_require__(59); +var Base = __webpack_require__(60); var Separator = __webpack_require__(127); -var observe = __webpack_require__(60); +var observe = __webpack_require__(61); var Paginator = __webpack_require__(128); /** @@ -109784,7 +111116,7 @@ function renderChoices(choices, pointer) { /***/ }), -/* 604 */ +/* 613 */ /***/ (function(module, exports, __webpack_require__) { /** @@ -109793,8 +111125,8 @@ function renderChoices(choices, pointer) { var util = __webpack_require__(4); var chalk = __webpack_require__(39); -var Base = __webpack_require__(59); -var observe = __webpack_require__(60); +var Base = __webpack_require__(60); +var observe = __webpack_require__(61); /** * Module exports @@ -109894,7 +111226,7 @@ Prompt.prototype.onKeypress = function () { /***/ }), -/* 605 */ +/* 614 */ /***/ (function(module, exports, __webpack_require__) { /** @@ -109904,11 +111236,11 @@ Prompt.prototype.onKeypress = function () { var _ = __webpack_require__(32); var util = __webpack_require__(4); var chalk = __webpack_require__(39); -var figures = __webpack_require__(184); -var cliCursor = __webpack_require__(256); +var figures = __webpack_require__(186); +var cliCursor = __webpack_require__(258); var runAsync = __webpack_require__(136); -var Base = __webpack_require__(59); -var observe = __webpack_require__(60); +var Base = __webpack_require__(60); +var observe = __webpack_require__(61); var Paginator = __webpack_require__(128); /** @@ -110087,7 +111419,7 @@ function listRender(choices, pointer) { /***/ }), -/* 606 */ +/* 615 */ /***/ (function(module, exports, __webpack_require__) { /** @@ -110096,8 +111428,8 @@ function listRender(choices, pointer) { var util = __webpack_require__(4); var chalk = __webpack_require__(39); -var Base = __webpack_require__(59); -var observe = __webpack_require__(60); +var Base = __webpack_require__(60); +var observe = __webpack_require__(61); function mask(input) { input = String(input); @@ -110208,7 +111540,7 @@ Prompt.prototype.onKeypress = function () { /***/ }), -/* 607 */ +/* 616 */ /***/ (function(module, exports, __webpack_require__) { /** @@ -110218,9 +111550,9 @@ Prompt.prototype.onKeypress = function () { var _ = __webpack_require__(32); var util = __webpack_require__(4); var chalk = __webpack_require__(39); -var Base = __webpack_require__(59); +var Base = __webpack_require__(60); var Separator = __webpack_require__(127); -var observe = __webpack_require__(60); +var observe = __webpack_require__(61); var Paginator = __webpack_require__(128); /** @@ -110393,7 +111725,7 @@ function renderChoices(choices, pointer) { /***/ }), -/* 608 */ +/* 617 */ /***/ (function(module, exports, __webpack_require__) { /** @@ -110401,9 +111733,9 @@ function renderChoices(choices, pointer) { */ var util = __webpack_require__(4); -var through = __webpack_require__(731); -var Base = __webpack_require__(291); -var rlUtils = __webpack_require__(292); +var through = __webpack_require__(741); +var Base = __webpack_require__(293); +var rlUtils = __webpack_require__(294); var _ = __webpack_require__(32); /** @@ -110504,7 +111836,7 @@ Prompt.prototype.write = function (message) { /***/ }), -/* 609 */ +/* 618 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -110513,8 +111845,8 @@ var _ = __webpack_require__(32); var rx = __webpack_require__(137); var util = __webpack_require__(4); var runAsync = __webpack_require__(136); -var utils = __webpack_require__(611); -var Base = __webpack_require__(291); +var utils = __webpack_require__(620); +var Base = __webpack_require__(293); /** * Base interface class other can inherits from @@ -110626,16 +111958,16 @@ PromptUI.prototype.filterIfRunnable = function (question) { /***/ }), -/* 610 */ +/* 619 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; var _ = __webpack_require__(32); -var util = __webpack_require__(292); -var cliWidth = __webpack_require__(468); -var stripAnsi = __webpack_require__(188); -var stringWidth = __webpack_require__(613); +var util = __webpack_require__(294); +var cliWidth = __webpack_require__(475); +var stripAnsi = __webpack_require__(190); +var stringWidth = __webpack_require__(622); function height(content) { return content.split('\n').length; @@ -110768,7 +112100,7 @@ function forceLineReturn(content, width) { /***/ }), -/* 611 */ +/* 620 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -110801,7 +112133,7 @@ exports.fetchAsyncQuestionProperty = function (question, prop, answers) { /***/ }), -/* 612 */ +/* 621 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -110871,16 +112203,16 @@ Object.defineProperty(module, 'exports', { get: assembleStyles }); -/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(23)(module))) +/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(24)(module))) /***/ }), -/* 613 */ +/* 622 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -const stripAnsi = __webpack_require__(188); -const isFullwidthCodePoint = __webpack_require__(623); +const stripAnsi = __webpack_require__(190); +const isFullwidthCodePoint = __webpack_require__(631); module.exports = str => { if (typeof str !== 'string' || str.length === 0) { @@ -110916,7 +112248,7 @@ module.exports = str => { /***/ }), -/* 614 */ +/* 623 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -110973,18 +112305,7 @@ module.exports = (function () { /***/ }), -/* 615 */ -/***/ (function(module, exports) { - -module.exports = function (val) { - return !!val - && typeof val.length === 'number' - && typeof val.callee === 'function' - ; -}; - -/***/ }), -/* 616 */ +/* 624 */ /***/ (function(module, exports) { /*! @@ -111011,12 +112332,12 @@ function isSlowBuffer (obj) { /***/ }), -/* 617 */ +/* 625 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -const builtinModules = __webpack_require__(618); +const builtinModules = __webpack_require__(626); const moduleSet = new Set(builtinModules); @@ -111030,7 +112351,7 @@ module.exports = moduleName => { /***/ }), -/* 618 */ +/* 626 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -111047,7 +112368,7 @@ module.exports = Object.keys(process.binding('natives')) /***/ }), -/* 619 */ +/* 627 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -111060,7 +112381,7 @@ module.exports = function (buf) { /***/ }), -/* 620 */ +/* 628 */ /***/ (function(module, exports) { /*! @@ -111081,7 +112402,7 @@ module.exports = function(str) { /***/ }), -/* 621 */ +/* 629 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -111094,7 +112415,7 @@ module.exports = function(str) { -var isPrimitive = __webpack_require__(293); +var isPrimitive = __webpack_require__(295); module.exports = function isEqual(a, b) { if (!a && !b) { return true; } @@ -111115,7 +112436,7 @@ module.exports = function isEqual(a, b) { /***/ }), -/* 622 */ +/* 630 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -111135,7 +112456,7 @@ module.exports = function isExtendable(val) { /***/ }), -/* 623 */ +/* 631 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -111188,7 +112509,7 @@ module.exports = x => { /***/ }), -/* 624 */ +/* 632 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -111211,7 +112532,7 @@ module.exports = function (buf) { /***/ }), -/* 625 */ +/* 633 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -111225,7 +112546,7 @@ module.exports = function (x) { /***/ }), -/* 626 */ +/* 634 */ /***/ (function(module, exports) { /*! @@ -111241,7 +112562,7 @@ module.exports = function isPosixBracket(str) { /***/ }), -/* 627 */ +/* 635 */ /***/ (function(module, exports) { module.exports = isPromise; @@ -111252,7 +112573,7 @@ function isPromise(obj) { /***/ }), -/* 628 */ +/* 636 */ /***/ (function(module, exports) { module.exports = isTypedArray @@ -111299,7 +112620,7 @@ function isLooseTypedArray(arr) { /***/ }), -/* 629 */ +/* 637 */ /***/ (function(module, exports, __webpack_require__) { // @flow @@ -111312,7 +112633,7 @@ module.exports = typeof __webpack_require__ !== "undefined"; /***/ }), -/* 630 */ +/* 638 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -111333,7 +112654,7 @@ module.exports = typeof __webpack_require__ !== "undefined"; var core = __webpack_require__(131); var utils = __webpack_require__(132); -var curve255 = __webpack_require__(191); +var curve255 = __webpack_require__(193); /** @@ -111430,7 +112751,7 @@ module.exports = ns; /***/ }), -/* 631 */ +/* 639 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -111451,10 +112772,10 @@ module.exports = ns; */ var core = __webpack_require__(131); -var curve255 = __webpack_require__(191); +var curve255 = __webpack_require__(193); var utils = __webpack_require__(132); -var BigInteger = __webpack_require__(61).BigInteger; -var crypto = __webpack_require__(13); +var BigInteger = __webpack_require__(62).BigInteger; +var crypto = __webpack_require__(14); /** * @exports jodid25519/eddsa @@ -112010,7 +113331,7 @@ module.exports = ns; /***/ }), -/* 632 */ +/* 640 */ /***/ (function(module, exports, __webpack_require__) { var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;/** @@ -112290,7 +113611,7 @@ return exports; /***/ }), -/* 633 */ +/* 641 */ /***/ (function(module, exports) { exports = module.exports = stringify @@ -112323,15 +113644,15 @@ function serializer(replacer, cycleReplacer) { /***/ }), -/* 634 */ +/* 642 */ /***/ (function(module, exports, __webpack_require__) { -exports.parse = __webpack_require__(635); -exports.stringify = __webpack_require__(636); +exports.parse = __webpack_require__(643); +exports.stringify = __webpack_require__(644); /***/ }), -/* 635 */ +/* 643 */ /***/ (function(module, exports) { var at, // The index of the current character @@ -112610,7 +113931,7 @@ module.exports = function (source, reviver) { /***/ }), -/* 636 */ +/* 644 */ /***/ (function(module, exports) { var cx = /[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g, @@ -112770,19 +114091,19 @@ module.exports = function (value, replacer, space) { /***/ }), -/* 637 */ +/* 645 */ /***/ (function(module, exports, __webpack_require__) { /* * lib/jsprim.js: utilities for primitive JavaScript types */ -var mod_assert = __webpack_require__(16); +var mod_assert = __webpack_require__(17); var mod_util = __webpack_require__(4); -var mod_extsprintf = __webpack_require__(285); -var mod_verror = __webpack_require__(738); -var mod_jsonschema = __webpack_require__(632); +var mod_extsprintf = __webpack_require__(287); +var mod_verror = __webpack_require__(748); +var mod_jsonschema = __webpack_require__(640); /* * Public interface @@ -113511,7 +114832,7 @@ function mergeObjects(provided, overrides, defaults) /***/ }), -/* 638 */ +/* 646 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -113603,7 +114924,7 @@ module.exports = function (a, b) { /***/ }), -/* 639 */ +/* 647 */ /***/ (function(module, exports, __webpack_require__) { /* WEBPACK VAR INJECTION */(function(module) {/** @@ -115392,10 +116713,10 @@ function constant(value) { module.exports = baseClone; -/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(23)(module))) +/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(24)(module))) /***/ }), -/* 640 */ +/* 648 */ /***/ (function(module, exports, __webpack_require__) { /** @@ -115406,7 +116727,7 @@ module.exports = baseClone; * Copyright 2009-2016 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors * Available under MIT license */ -var baseClone = __webpack_require__(639); +var baseClone = __webpack_require__(647); /** * Creates a shallow clone of `value`. @@ -115440,7 +116761,7 @@ module.exports = clone; /***/ }), -/* 641 */ +/* 649 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -115514,7 +116835,7 @@ module.exports = chars; /***/ }), -/* 642 */ +/* 650 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -115527,8 +116848,8 @@ module.exports = chars; -var utils = __webpack_require__(193); -var Glob = __webpack_require__(643); +var utils = __webpack_require__(195); +var Glob = __webpack_require__(651); /** * Expose `expand` @@ -115825,14 +117146,14 @@ function globstar(dotfile) { /***/ }), -/* 643 */ +/* 651 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var chars = __webpack_require__(641); -var utils = __webpack_require__(193); +var chars = __webpack_require__(649); +var utils = __webpack_require__(195); /** * Expose `Glob` @@ -116025,7 +117346,7 @@ function unesc(str) { /***/ }), -/* 644 */ +/* 652 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -116038,7 +117359,7 @@ function unesc(str) { -var flatten = __webpack_require__(645); +var flatten = __webpack_require__(653); var slice = [].slice; /** @@ -116090,7 +117411,7 @@ module.exports = diff; /***/ }), -/* 645 */ +/* 653 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -116124,7 +117445,7 @@ function flat(arr, acc) { /***/ }), -/* 646 */ +/* 654 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -116159,7 +117480,7 @@ module.exports = function unique(arr) { /***/ }), -/* 647 */ +/* 655 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -116176,9 +117497,9 @@ module.exports = function unique(arr) { * Module dependencies */ -var expand = __webpack_require__(538); -var repeat = __webpack_require__(308); -var tokens = __webpack_require__(665); +var expand = __webpack_require__(547); +var repeat = __webpack_require__(310); +var tokens = __webpack_require__(674); /** * Expose `braces` @@ -116565,7 +117886,7 @@ function filter(arr, cb) { /***/ }), -/* 648 */ +/* 656 */ /***/ (function(module, exports) { module.exports = { @@ -125266,7 +126587,7 @@ module.exports = { }; /***/ }), -/* 649 */ +/* 657 */ /***/ (function(module, exports, __webpack_require__) { /*! @@ -125279,11 +126600,11 @@ module.exports = { * Module exports. */ -module.exports = __webpack_require__(648) +module.exports = __webpack_require__(656) /***/ }), -/* 650 */ +/* 658 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -125297,7 +126618,7 @@ module.exports = (to, from) => { /***/ }), -/* 651 */ +/* 659 */ /***/ (function(module, exports) { /** @@ -125455,11 +126776,11 @@ function plural(ms, n, name) { /***/ }), -/* 652 */ +/* 660 */ /***/ (function(module, exports, __webpack_require__) { /*jslint node: true*/ -__webpack_require__(724); +__webpack_require__(734); "use strict"; @@ -125492,7 +126813,7 @@ var trim = function(str) { * Emoji namespace */ var Emoji = module.exports = { - emoji: __webpack_require__(653) + emoji: __webpack_require__(661) }; /** @@ -125589,7 +126910,7 @@ Emoji.search = function search(str) { /***/ }), -/* 653 */ +/* 661 */ /***/ (function(module, exports) { module.exports = { @@ -126937,7 +128258,7 @@ module.exports = { }; /***/ }), -/* 654 */ +/* 662 */ /***/ (function(module, exports, __webpack_require__) { /*! @@ -126947,7 +128268,7 @@ module.exports = { * Released under the MIT License. */ -var removeTrailingSeparator = __webpack_require__(680); +var removeTrailingSeparator = __webpack_require__(689); module.exports = function normalizePath(str, stripTrailing) { if (typeof str !== 'string') { @@ -126962,16 +128283,16 @@ module.exports = function normalizePath(str, stripTrailing) { /***/ }), -/* 655 */ +/* 663 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; const url = __webpack_require__(19); -const punycode = __webpack_require__(202); -const queryString = __webpack_require__(671); -const prependHttp = __webpack_require__(664); -const sortKeys = __webpack_require__(715); +const punycode = __webpack_require__(204); +const queryString = __webpack_require__(680); +const prependHttp = __webpack_require__(673); +const sortKeys = __webpack_require__(724); const DEFAULT_PORTS = { 'http:': 80, @@ -127132,10 +128453,209 @@ module.exports = (str, opts) => { /***/ }), -/* 656 */ +/* 664 */ /***/ (function(module, exports, __webpack_require__) { -var crypto = __webpack_require__(13) +"use strict"; + + +let path + +class LogicalTree { + constructor (name, address, opts) { + this.name = name + this.version = opts.version + this.address = address || '' + this.optional = !!opts.optional + this.dev = !!opts.dev + this.bundled = !!opts.bundled + this.resolved = opts.resolved + this.integrity = opts.integrity + this.dependencies = new Map() + this.requiredBy = new Set() + } + + get isRoot () { return !this.requiredBy.size } + + addDep (dep) { + this.dependencies.set(dep.name, dep) + dep.requiredBy.add(this) + return this + } + + delDep (dep) { + this.dependencies.delete(dep.name) + dep.requiredBy.delete(this) + return this + } + + getDep (name) { + return this.dependencies.get(name) + } + + path (prefix) { + if (this.isRoot) { + // The address of the root is the prefix itself. + return prefix || '' + } else { + if (!path) { path = __webpack_require__(0) } + return path.join( + prefix || '', + 'node_modules', + this.address.replace(/:/g, '/node_modules/') + ) + } + } + + // This finds cycles _from_ a given node: if some deeper dep has + // its own cycle, but that cycle does not refer to this node, + // it will return false. + hasCycle (_seen, _from) { + if (!_seen) { _seen = new Set() } + if (!_from) { _from = this } + for (let dep of this.dependencies.values()) { + if (_seen.has(dep)) { continue } + _seen.add(dep) + if (dep === _from || dep.hasCycle(_seen, _from)) { + return true + } + } + return false + } + + forEachAsync (fn, opts, _pending) { + if (!opts) { opts = _pending || {} } + if (!_pending) { _pending = new Map() } + const P = opts.Promise || Promise + if (_pending.has(this)) { + return P.resolve(this.hasCycle() || _pending.get(this)) + } + const pending = P.resolve().then(() => { + return fn(this, () => { + return promiseMap( + this.dependencies.values(), + dep => dep.forEachAsync(fn, opts, _pending), + opts + ) + }) + }) + _pending.set(this, pending) + return pending + } + + forEach (fn, _seen) { + if (!_seen) { _seen = new Set() } + if (_seen.has(this)) { return } + _seen.add(this) + fn(this, () => { + for (let dep of this.dependencies.values()) { + dep.forEach(fn, _seen) + } + }) + } +} + +module.exports = lockTree +function lockTree (pkg, pkgLock, opts) { + const tree = makeNode(pkg.name, null, pkg) + const allDeps = new Map() + Array.from( + new Set(Object.keys(pkg.devDependencies || {}) + .concat(Object.keys(pkg.optionalDependencies || {})) + .concat(Object.keys(pkg.dependencies || {}))) + ).forEach(name => { + let dep = allDeps.get(name) + if (!dep) { + const depNode = (pkgLock.dependencies || {})[name] + dep = makeNode(name, name, depNode) + } + addChild(dep, tree, allDeps, pkgLock) + }) + return tree +} + +module.exports.node = makeNode +function makeNode (name, address, opts) { + return new LogicalTree(name, address, opts || {}) +} + +function addChild (dep, tree, allDeps, pkgLock) { + tree.addDep(dep) + allDeps.set(dep.address, dep) + const addr = dep.address + const lockNode = atAddr(pkgLock, addr) + Object.keys(lockNode.requires || {}).forEach(name => { + const tdepAddr = reqAddr(pkgLock, name, addr) + let tdep = allDeps.get(tdepAddr) + if (!tdep) { + tdep = makeNode(name, tdepAddr, atAddr(pkgLock, tdepAddr)) + addChild(tdep, dep, allDeps, pkgLock) + } else { + dep.addDep(tdep) + } + }) +} + +module.exports._reqAddr = reqAddr +function reqAddr (pkgLock, name, fromAddr) { + const lockNode = atAddr(pkgLock, fromAddr) + const child = (lockNode.dependencies || {})[name] + if (child) { + return `${fromAddr}:${name}` + } else { + const parts = fromAddr.split(':') + while (parts.length) { + parts.pop() + const joined = parts.join(':') + const parent = atAddr(pkgLock, joined) + if (parent) { + const child = (parent.dependencies || {})[name] + if (child) { + return `${joined}${parts.length ? ':' : ''}${name}` + } + } + } + const err = new Error(`${name} not accessible from ${fromAddr}`) + err.pkgLock = pkgLock + err.target = name + err.from = fromAddr + throw err + } +} + +module.exports._atAddr = atAddr +function atAddr (pkgLock, addr) { + if (!addr.length) { return pkgLock } + const parts = addr.split(':') + return parts.reduce((acc, next) => { + return acc && (acc.dependencies || {})[next] + }, pkgLock) +} + +function promiseMap (arr, fn, opts, _index) { + _index = _index || 0 + const P = (opts && opts.Promise) || Promise + if (P.map) { + return P.map(arr, fn, opts) + } else { + if (!(arr instanceof Array)) { + arr = Array.from(arr) + } + if (_index >= arr.length) { + return P.resolve() + } else { + return P.resolve(fn(arr[_index], _index, arr)) + .then(() => promiseMap(arr, fn, opts, _index + 1)) + } + } +} + + +/***/ }), +/* 665 */ +/***/ (function(module, exports, __webpack_require__) { + +var crypto = __webpack_require__(14) , qs = __webpack_require__(144) ; @@ -127274,7 +128794,7 @@ exports.generateBase = generateBase /***/ }), -/* 657 */ +/* 666 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -127371,7 +128891,7 @@ module.exports = shouldUseNative() ? Object.assign : function (target, source) { /***/ }), -/* 658 */ +/* 667 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -127384,8 +128904,8 @@ module.exports = shouldUseNative() ? Object.assign : function (target, source) { -var isObject = __webpack_require__(622); -var forOwn = __webpack_require__(551); +var isObject = __webpack_require__(630); +var forOwn = __webpack_require__(559); module.exports = function omit(obj, keys) { if (!isObject(obj)) return {}; @@ -127418,12 +128938,12 @@ module.exports = function omit(obj, keys) { /***/ }), -/* 659 */ +/* 668 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -const mimicFn = __webpack_require__(650); +const mimicFn = __webpack_require__(658); module.exports = (fn, opts) => { // TODO: Remove this in v3 @@ -127464,7 +128984,7 @@ module.exports = (fn, opts) => { /***/ }), -/* 660 */ +/* 669 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -127496,7 +129016,7 @@ module.exports = function () { /***/ }), -/* 661 */ +/* 670 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -127510,9 +129030,9 @@ module.exports = function () { var isGlob = __webpack_require__(130); -var findBase = __webpack_require__(556); +var findBase = __webpack_require__(565); var extglob = __webpack_require__(129); -var dotfile = __webpack_require__(620); +var dotfile = __webpack_require__(628); /** * Expose `cache` @@ -127659,11 +129179,11 @@ function unescape(str) { /***/ }), -/* 662 */ +/* 671 */ /***/ (function(module, exports, __webpack_require__) { -var duplexify = __webpack_require__(282) -var through = __webpack_require__(326) +var duplexify = __webpack_require__(284) +var through = __webpack_require__(330) var noop = function() {} @@ -127740,7 +129260,7 @@ var peek = function(opts, onpeek) { module.exports = peek /***/ }), -/* 663 */ +/* 672 */ /***/ (function(module, exports) { // Generated by CoffeeScript 1.7.1 @@ -127778,7 +129298,7 @@ module.exports = peek /***/ }), -/* 664 */ +/* 673 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -127800,7 +129320,7 @@ module.exports = (url, opts) => { /***/ }), -/* 665 */ +/* 674 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -127860,7 +129380,7 @@ function randomize() { var cache = {}; /***/ }), -/* 666 */ +/* 675 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -127907,7 +129427,7 @@ module.exports = syncFs; /***/ }), -/* 667 */ +/* 676 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -128652,12 +130172,12 @@ exports.unquoted = unquoted; /***/ }), -/* 668 */ +/* 677 */ /***/ (function(module, exports, __webpack_require__) { -var pump = __webpack_require__(299) -var inherits = __webpack_require__(58) -var Duplexify = __webpack_require__(282) +var pump = __webpack_require__(301) +var inherits = __webpack_require__(59) +var Duplexify = __webpack_require__(284) var toArray = function(args) { if (!args.length) return [] @@ -128713,13 +130233,13 @@ module.exports.obj = define({destroy:false, objectMode:true, highWaterMark:16}) /***/ }), -/* 669 */ +/* 678 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var utils = __webpack_require__(302); +var utils = __webpack_require__(304); var has = Object.prototype.hasOwnProperty; @@ -128887,14 +130407,14 @@ module.exports = function (str, opts) { /***/ }), -/* 670 */ +/* 679 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var utils = __webpack_require__(302); -var formats = __webpack_require__(300); +var utils = __webpack_require__(304); +var formats = __webpack_require__(302); var arrayPrefixGenerators = { brackets: function brackets(prefix) { // eslint-disable-line func-name-matching @@ -129101,14 +130621,14 @@ module.exports = function (object, opts) { /***/ }), -/* 671 */ +/* 680 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var strictUriEncode = __webpack_require__(723); -var objectAssign = __webpack_require__(657); -var decodeComponent = __webpack_require__(528); +var strictUriEncode = __webpack_require__(733); +var objectAssign = __webpack_require__(666); +var decodeComponent = __webpack_require__(535); function encoderForArrayFormat(opts) { switch (opts.arrayFormat) { @@ -129329,7 +130849,7 @@ exports.parseUrl = function (str, opts) { /***/ }), -/* 672 */ +/* 681 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -129343,7 +130863,7 @@ exports.parseUrl = function (str, opts) { -var isNumber = __webpack_require__(673); +var isNumber = __webpack_require__(682); var typeOf = __webpack_require__(133); /** @@ -129419,7 +130939,7 @@ function randomatic(pattern, length, options) { /***/ }), -/* 673 */ +/* 682 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -129445,14 +130965,14 @@ module.exports = function isNumber(num) { /***/ }), -/* 674 */ +/* 683 */ /***/ (function(module, exports, __webpack_require__) { module.exports = read var readline = __webpack_require__(145) -var Mute = __webpack_require__(297) +var Mute = __webpack_require__(299) function read (opts, cb) { if (opts.num) { @@ -129564,14 +131084,14 @@ function read (opts, cb) { /***/ }), -/* 675 */ +/* 684 */ /***/ (function(module, exports, __webpack_require__) { -module.exports = __webpack_require__(69).Duplex +module.exports = __webpack_require__(70).Duplex /***/ }), -/* 676 */ +/* 685 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -129583,11 +131103,11 @@ module.exports = __webpack_require__(69).Duplex module.exports = PassThrough; -var Transform = __webpack_require__(304); +var Transform = __webpack_require__(306); /**/ var util = __webpack_require__(100); -util.inherits = __webpack_require__(58); +util.inherits = __webpack_require__(59); /**/ util.inherits(PassThrough, Transform); @@ -129603,7 +131123,7 @@ PassThrough.prototype._transform = function (chunk, encoding, cb) { }; /***/ }), -/* 677 */ +/* 686 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -129611,7 +131131,7 @@ PassThrough.prototype._transform = function (chunk, encoding, cb) { var Buffer = __webpack_require__(105).Buffer; /**/ -var bufferShim = __webpack_require__(164); +var bufferShim = __webpack_require__(166); /**/ module.exports = BufferList; @@ -129673,14 +131193,14 @@ BufferList.prototype.concat = function (n) { }; /***/ }), -/* 678 */ +/* 687 */ /***/ (function(module, exports, __webpack_require__) { -module.exports = __webpack_require__(69).Transform +module.exports = __webpack_require__(70).Transform /***/ }), -/* 679 */ +/* 688 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -129693,8 +131213,8 @@ module.exports = __webpack_require__(69).Transform -var isPrimitive = __webpack_require__(293); -var equal = __webpack_require__(621); +var isPrimitive = __webpack_require__(295); +var equal = __webpack_require__(629); var basic = {}; var cache = {}; @@ -129756,7 +131276,7 @@ module.exports.basic = basic; /***/ }), -/* 680 */ +/* 689 */ /***/ (function(module, exports) { const isWin = process.platform === 'win32'; @@ -129775,7 +131295,7 @@ function endsInSeparator(str) { /***/ }), -/* 681 */ +/* 690 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -129852,7 +131372,7 @@ function repeat(str, num) { /***/ }), -/* 682 */ +/* 691 */ /***/ (function(module, exports) { module.exports = { @@ -129888,11 +131408,11 @@ module.exports = { }; /***/ }), -/* 683 */ +/* 692 */ /***/ (function(module, exports, __webpack_require__) { var fs = __webpack_require__(10); -var pkg = __webpack_require__(682); +var pkg = __webpack_require__(691); function buildHarHeaders (headers) { return headers ? Object.keys(headers).map(function (key) { @@ -130036,7 +131556,7 @@ module.exports = HarWrapper; /***/ }), -/* 684 */ +/* 693 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -130056,9 +131576,9 @@ module.exports = HarWrapper; -var extend = __webpack_require__(183) - , cookies = __webpack_require__(309) - , helpers = __webpack_require__(198) +var extend = __webpack_require__(185) + , cookies = __webpack_require__(311) + , helpers = __webpack_require__(200) var paramsHaveRequestBody = helpers.paramsHaveRequestBody @@ -130183,7 +131703,7 @@ request.forever = function (agentOptions, optionsArg) { // Exports module.exports = request -request.Request = __webpack_require__(696) +request.Request = __webpack_require__(705) request.initParams = initParams // Backwards compatibility for request.debug @@ -130199,15 +131719,15 @@ Object.defineProperty(request, 'debug', { /***/ }), -/* 685 */ +/* 694 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var caseless = __webpack_require__(165) +var caseless = __webpack_require__(167) , uuid = __webpack_require__(83) - , helpers = __webpack_require__(198) + , helpers = __webpack_require__(200) var md5 = helpers.md5 , toBase64 = helpers.toBase64 @@ -130374,7 +131894,7 @@ exports.Auth = Auth /***/ }), -/* 686 */ +/* 695 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -130460,7 +131980,7 @@ module.exports = getProxyFromURI /***/ }), -/* 687 */ +/* 696 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -130468,8 +131988,8 @@ module.exports = getProxyFromURI var fs = __webpack_require__(10) var qs = __webpack_require__(144) -var validate = __webpack_require__(583) -var extend = __webpack_require__(183) +var validate = __webpack_require__(592) +var extend = __webpack_require__(185) function Har (request) { this.request = request @@ -130682,15 +132202,15 @@ exports.Har = Har /***/ }), -/* 688 */ +/* 697 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; var uuid = __webpack_require__(83) - , CombinedStream = __webpack_require__(260) - , isstream = __webpack_require__(295) + , CombinedStream = __webpack_require__(262) + , isstream = __webpack_require__(297) , Buffer = __webpack_require__(82).Buffer @@ -130802,18 +132322,18 @@ exports.Multipart = Multipart /***/ }), -/* 689 */ +/* 698 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; var url = __webpack_require__(19) - , qs = __webpack_require__(301) - , caseless = __webpack_require__(165) + , qs = __webpack_require__(303) + , caseless = __webpack_require__(167) , uuid = __webpack_require__(83) - , oauth = __webpack_require__(656) - , crypto = __webpack_require__(13) + , oauth = __webpack_require__(665) + , crypto = __webpack_require__(14) , Buffer = __webpack_require__(82).Buffer @@ -130957,13 +132477,13 @@ exports.OAuth = OAuth /***/ }), -/* 690 */ +/* 699 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var qs = __webpack_require__(301) +var qs = __webpack_require__(303) , querystring = __webpack_require__(144) @@ -131015,7 +132535,7 @@ exports.Querystring = Querystring /***/ }), -/* 691 */ +/* 700 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -131179,14 +132699,14 @@ exports.Redirect = Redirect /***/ }), -/* 692 */ +/* 701 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; var url = __webpack_require__(19) - , tunnel = __webpack_require__(733) + , tunnel = __webpack_require__(743) var defaultProxyHeaderWhiteList = [ 'accept', @@ -131362,7 +132882,7 @@ exports.Tunnel = Tunnel /***/ }), -/* 693 */ +/* 702 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -131399,15 +132919,15 @@ exports.Tunnel = Tunnel var net = __webpack_require__(108); var urlParse = __webpack_require__(19).parse; -var pubsuffix = __webpack_require__(312); -var Store = __webpack_require__(313).Store; -var MemoryCookieStore = __webpack_require__(694).MemoryCookieStore; -var pathMatch = __webpack_require__(310).pathMatch; -var VERSION = __webpack_require__(695).version; +var pubsuffix = __webpack_require__(314); +var Store = __webpack_require__(315).Store; +var MemoryCookieStore = __webpack_require__(703).MemoryCookieStore; +var pathMatch = __webpack_require__(312).pathMatch; +var VERSION = __webpack_require__(704).version; var punycode; try { - punycode = __webpack_require__(202); + punycode = __webpack_require__(204); } catch(e) { console.warn("cookie: can't load punycode; won't use punycode for domain normalization"); } @@ -132698,14 +134218,14 @@ module.exports = { pathMatch: pathMatch, getPublicSuffix: pubsuffix.getPublicSuffix, cookieCompare: cookieCompare, - permuteDomain: __webpack_require__(311).permuteDomain, + permuteDomain: __webpack_require__(313).permuteDomain, permutePath: permutePath, canonicalDomain: canonicalDomain }; /***/ }), -/* 694 */ +/* 703 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -132740,9 +134260,9 @@ module.exports = { * POSSIBILITY OF SUCH DAMAGE. */ -var Store = __webpack_require__(313).Store; -var permuteDomain = __webpack_require__(311).permuteDomain; -var pathMatch = __webpack_require__(310).pathMatch; +var Store = __webpack_require__(315).Store; +var permuteDomain = __webpack_require__(313).permuteDomain; +var pathMatch = __webpack_require__(312).pathMatch; var util = __webpack_require__(4); function MemoryCookieStore() { @@ -132882,7 +134402,7 @@ MemoryCookieStore.prototype.getAllCookies = function(cb) { /***/ }), -/* 695 */ +/* 704 */ /***/ (function(module, exports) { module.exports = { @@ -132961,7 +134481,7 @@ module.exports = { }; /***/ }), -/* 696 */ +/* 705 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -132972,30 +134492,30 @@ var http = __webpack_require__(52) , url = __webpack_require__(19) , util = __webpack_require__(4) , stream = __webpack_require__(29) - , zlib = __webpack_require__(204) - , hawk = __webpack_require__(587) - , aws2 = __webpack_require__(383) - , aws4 = __webpack_require__(384) - , httpSignature = __webpack_require__(591) - , mime = __webpack_require__(296) - , stringstream = __webpack_require__(725) - , caseless = __webpack_require__(165) - , ForeverAgent = __webpack_require__(552) - , FormData = __webpack_require__(553) - , extend = __webpack_require__(183) - , isstream = __webpack_require__(295) - , isTypedArray = __webpack_require__(628).strict - , helpers = __webpack_require__(198) - , cookies = __webpack_require__(309) - , getProxyFromURI = __webpack_require__(686) - , Querystring = __webpack_require__(690).Querystring - , Har = __webpack_require__(687).Har - , Auth = __webpack_require__(685).Auth - , OAuth = __webpack_require__(689).OAuth - , Multipart = __webpack_require__(688).Multipart - , Redirect = __webpack_require__(691).Redirect - , Tunnel = __webpack_require__(692).Tunnel - , now = __webpack_require__(663) + , zlib = __webpack_require__(206) + , hawk = __webpack_require__(596) + , aws2 = __webpack_require__(388) + , aws4 = __webpack_require__(389) + , httpSignature = __webpack_require__(600) + , mime = __webpack_require__(298) + , stringstream = __webpack_require__(735) + , caseless = __webpack_require__(167) + , ForeverAgent = __webpack_require__(560) + , FormData = __webpack_require__(561) + , extend = __webpack_require__(185) + , isstream = __webpack_require__(297) + , isTypedArray = __webpack_require__(636).strict + , helpers = __webpack_require__(200) + , cookies = __webpack_require__(311) + , getProxyFromURI = __webpack_require__(695) + , Querystring = __webpack_require__(699).Querystring + , Har = __webpack_require__(696).Har + , Auth = __webpack_require__(694).Auth + , OAuth = __webpack_require__(698).OAuth + , Multipart = __webpack_require__(697).Multipart + , Redirect = __webpack_require__(700).Redirect + , Tunnel = __webpack_require__(701).Tunnel + , now = __webpack_require__(672) , Buffer = __webpack_require__(82).Buffer var safeStringify = helpers.safeStringify @@ -134533,13 +136053,13 @@ module.exports = Request /***/ }), -/* 697 */ +/* 706 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -const onetime = __webpack_require__(659); -const signalExit = __webpack_require__(316); +const onetime = __webpack_require__(668); +const signalExit = __webpack_require__(318); module.exports = onetime(() => { signalExit(() => { @@ -134549,16 +136069,16 @@ module.exports = onetime(() => { /***/ }), -/* 698 */ +/* 707 */ /***/ (function(module, exports, __webpack_require__) { -module.exports = __webpack_require__(699); +module.exports = __webpack_require__(708); /***/ }), -/* 699 */ +/* 708 */ /***/ (function(module, exports, __webpack_require__) { -var RetryOperation = __webpack_require__(700); +var RetryOperation = __webpack_require__(709); exports.operation = function(options) { var timeouts = exports.timeouts(options); @@ -134660,7 +136180,7 @@ exports.wrap = function(obj, options, methods) { /***/ }), -/* 700 */ +/* 709 */ /***/ (function(module, exports) { function RetryOperation(timeouts, options) { @@ -134809,7 +136329,7 @@ RetryOperation.prototype.mainError = function() { /***/ }), -/* 701 */ +/* 710 */ /***/ (function(module, exports, __webpack_require__) { module.exports = rimraf @@ -134818,7 +136338,8 @@ rimraf.sync = rimrafSync var assert = __webpack_require__(36) var path = __webpack_require__(0) var fs = __webpack_require__(10) -var glob = __webpack_require__(185) +var glob = __webpack_require__(187) +var _0666 = parseInt('666', 8) var defaultGlobOpts = { nosort: true, @@ -134979,7 +136500,7 @@ function fixWinEPERM (p, options, er, cb) { if (er) assert(er instanceof Error) - options.chmod(p, 666, function (er2) { + options.chmod(p, _0666, function (er2) { if (er2) cb(er2.code === "ENOENT" ? null : er) else @@ -135001,7 +136522,7 @@ function fixWinEPERMSync (p, options, er) { assert(er instanceof Error) try { - options.chmodSync(p, 666) + options.chmodSync(p, _0666) } catch (er2) { if (er2.code === "ENOENT") return @@ -135178,7 +136699,7 @@ function rmkidsSync (p, options) { /***/ }), -/* 702 */ +/* 711 */ /***/ (function(module, exports, __webpack_require__) { /* WEBPACK VAR INJECTION */(function(module) {var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;// Copyright (c) Microsoft, All rights reserved. See License.txt in the project root for license information. @@ -136548,10 +138069,10 @@ function rmkidsSync (p, options) { return Rx; })); -/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(23)(module))) +/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(24)(module))) /***/ }), -/* 703 */ +/* 712 */ /***/ (function(module, exports, __webpack_require__) { /* WEBPACK VAR INJECTION */(function(module) {var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;// Copyright (c) Microsoft, All rights reserved. See License.txt in the project root for license information. @@ -136577,7 +138098,7 @@ function rmkidsSync (p, options) { // Because of build optimizers if (true) { - !(__WEBPACK_AMD_DEFINE_ARRAY__ = [__webpack_require__(314), exports], __WEBPACK_AMD_DEFINE_RESULT__ = function (Rx, exports) { + !(__WEBPACK_AMD_DEFINE_ARRAY__ = [__webpack_require__(316), exports], __WEBPACK_AMD_DEFINE_RESULT__ = function (Rx, exports) { root.Rx = factory(root, exports, Rx); return root.Rx; }.apply(exports, __WEBPACK_AMD_DEFINE_ARRAY__), @@ -137088,10 +138609,10 @@ Observable.fromNodeCallback = function (fn, ctx, selector) { return Rx; })); -/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(23)(module))) +/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(24)(module))) /***/ }), -/* 704 */ +/* 713 */ /***/ (function(module, exports, __webpack_require__) { /* WEBPACK VAR INJECTION */(function(module) {var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;// Copyright (c) Microsoft, All rights reserved. See License.txt in the project root for license information. @@ -137712,10 +139233,10 @@ Observable.fromNodeCallback = function (fn, ctx, selector) { return Rx; })); -/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(23)(module))) +/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(24)(module))) /***/ }), -/* 705 */ +/* 714 */ /***/ (function(module, exports, __webpack_require__) { /* WEBPACK VAR INJECTION */(function(module) {var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;// Copyright (c) Microsoft, All rights reserved. See License.txt in the project root for license information. @@ -138343,10 +139864,10 @@ Observable.fromNodeCallback = function (fn, ctx, selector) { return Rx; })); -/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(23)(module))) +/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(24)(module))) /***/ }), -/* 706 */ +/* 715 */ /***/ (function(module, exports, __webpack_require__) { /* WEBPACK VAR INJECTION */(function(module) {var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;// Copyright (c) Microsoft, All rights reserved. See License.txt in the project root for license information. @@ -138941,10 +140462,10 @@ observableProto.flatMapWithMaxConcurrent = observableProto.flatMapMaxConcurrent return Rx; })); -/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(23)(module))) +/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(24)(module))) /***/ }), -/* 707 */ +/* 716 */ /***/ (function(module, exports, __webpack_require__) { /* WEBPACK VAR INJECTION */(function(module) {var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;// Copyright (c) Microsoft, All rights reserved. See License.txt in the project root for license information. @@ -139292,10 +140813,10 @@ observableProto.flatMapWithMaxConcurrent = observableProto.flatMapMaxConcurrent return Rx; })); -/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(23)(module))) +/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(24)(module))) /***/ }), -/* 708 */ +/* 717 */ /***/ (function(module, exports, __webpack_require__) { /* WEBPACK VAR INJECTION */(function(module) {var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;// Copyright (c) Microsoft, All rights reserved. See License.txt in the project root for license information. @@ -139371,10 +140892,10 @@ observableProto.flatMapWithMaxConcurrent = observableProto.flatMapMaxConcurrent return Rx; })); -/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(23)(module))) +/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(24)(module))) /***/ }), -/* 709 */ +/* 718 */ /***/ (function(module, exports, __webpack_require__) { /* WEBPACK VAR INJECTION */(function(module) {var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;// Copyright (c) Microsoft, All rights reserved. See License.txt in the project root for license information. @@ -139400,7 +140921,7 @@ observableProto.flatMapWithMaxConcurrent = observableProto.flatMapMaxConcurrent // Because of build optimizers if (true) { - !(__WEBPACK_AMD_DEFINE_ARRAY__ = [__webpack_require__(315), exports], __WEBPACK_AMD_DEFINE_RESULT__ = function (Rx, exports) { + !(__WEBPACK_AMD_DEFINE_ARRAY__ = [__webpack_require__(317), exports], __WEBPACK_AMD_DEFINE_RESULT__ = function (Rx, exports) { root.Rx = factory(root, exports, Rx); return root.Rx; }.apply(exports, __WEBPACK_AMD_DEFINE_ARRAY__), @@ -139888,10 +141409,10 @@ var ReactiveTest = Rx.ReactiveTest = { return Rx; })); -/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(23)(module))) +/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(24)(module))) /***/ }), -/* 710 */ +/* 719 */ /***/ (function(module, exports, __webpack_require__) { /* WEBPACK VAR INJECTION */(function(module) {var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;// Copyright (c) Microsoft, All rights reserved. See License.txt in the project root for license information. @@ -141368,10 +142889,10 @@ var ReactiveTest = Rx.ReactiveTest = { return Rx; })); -/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(23)(module))) +/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(24)(module))) /***/ }), -/* 711 */ +/* 720 */ /***/ (function(module, exports) { // This is not the set of all possible signals. @@ -141430,14 +142951,14 @@ if (process.platform === 'linux') { /***/ }), -/* 712 */ +/* 721 */ /***/ (function(module, exports, __webpack_require__) { // Load modules -var Dgram = __webpack_require__(741); -var Dns = __webpack_require__(332); -var Hoek = __webpack_require__(714); +var Dgram = __webpack_require__(751); +var Dns = __webpack_require__(337); +var Hoek = __webpack_require__(723); // Declare internals @@ -141848,7 +143369,7 @@ internals.ignore = function () { /***/ }), -/* 713 */ +/* 722 */ /***/ (function(module, exports) { // Declare internals @@ -141986,15 +143507,15 @@ internals.safeCharCodes = (function () { /***/ }), -/* 714 */ +/* 723 */ /***/ (function(module, exports, __webpack_require__) { // Load modules -var Crypto = __webpack_require__(13); +var Crypto = __webpack_require__(14); var Path = __webpack_require__(0); var Util = __webpack_require__(4); -var Escape = __webpack_require__(713); +var Escape = __webpack_require__(722); // Declare internals @@ -142985,12 +144506,12 @@ exports.shallow = function (source) { /***/ }), -/* 715 */ +/* 724 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -const isPlainObj = __webpack_require__(625); +const isPlainObj = __webpack_require__(633); module.exports = (obj, opts) => { if (!isPlainObj(obj)) { @@ -143047,13 +144568,34 @@ module.exports = (obj, opts) => { /***/ }), -/* 716 */ +/* 725 */ /***/ (function(module, exports, __webpack_require__) { -var licenseIDs = __webpack_require__(719); +/* +Copyright 2015 Kyle E. Mitchell -function valid(string) { - return licenseIDs.indexOf(string) > -1; +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ +var parse = __webpack_require__(320) +var spdxLicenseIds = __webpack_require__(321) + +function valid (string) { + try { + parse(string) + return true + } catch (error) { + return false + } } // Common transpositions of license identifier acronyms @@ -143082,112 +144624,155 @@ var transpositions = [ ['Mozilla Public License', 'MPL'], ['WTH', 'WTF'], ['-License', ''] -]; +] -var TRANSPOSED = 0; -var CORRECT = 1; +var TRANSPOSED = 0 +var CORRECT = 1 // Simple corrections to nearly valid identifiers. var transforms = [ // e.g. 'mit' - function(argument) { - return argument.toUpperCase(); + function (argument) { + return argument.toUpperCase() }, // e.g. 'MIT ' - function(argument) { - return argument.trim(); + function (argument) { + return argument.trim() }, // e.g. 'M.I.T.' - function(argument) { - return argument.replace(/\./g, ''); + function (argument) { + return argument.replace(/\./g, '') }, // e.g. 'Apache- 2.0' - function(argument) { - return argument.replace(/\s+/g, ''); + function (argument) { + return argument.replace(/\s+/g, '') }, // e.g. 'CC BY 4.0'' - function(argument) { - return argument.replace(/\s+/g, '-'); + function (argument) { + return argument.replace(/\s+/g, '-') }, // e.g. 'LGPLv2.1' - function(argument) { - return argument.replace('v', '-'); + function (argument) { + return argument.replace('v', '-') }, // e.g. 'Apache 2.0' - function(argument) { - return argument.replace(/,?\s*(\d)/, '-$1'); + function (argument) { + return argument.replace(/,?\s*(\d)/, '-$1') }, // e.g. 'GPL 2' - function(argument) { - return argument.replace(/,?\s*(\d)/, '-$1.0'); + function (argument) { + return argument.replace(/,?\s*(\d)/, '-$1.0') }, // e.g. 'Apache Version 2.0' - function(argument) { - return argument.replace(/,?\s*(V\.|v\.|V|v|Version|version)\s*(\d)/, '-$2'); + function (argument) { + return argument + .replace(/,?\s*(V\.|v\.|V|v|Version|version)\s*(\d)/, '-$2') }, // e.g. 'Apache Version 2' - function(argument) { - return argument.replace(/,?\s*(V\.|v\.|V|v|Version|version)\s*(\d)/, '-$2.0'); + function (argument) { + return argument + .replace(/,?\s*(V\.|v\.|V|v|Version|version)\s*(\d)/, '-$2.0') }, // e.g. 'ZLIB' - function(argument) { - return argument[0].toUpperCase() + argument.slice(1); + function (argument) { + return argument[0].toUpperCase() + argument.slice(1) }, // e.g. 'MPL/2.0' - function(argument) { - return argument.replace('/', '-'); + function (argument) { + return argument.replace('/', '-') }, // e.g. 'Apache 2' - function(argument) { + function (argument) { return argument .replace(/\s*V\s*(\d)/, '-$1') - .replace(/(\d)$/, '$1.0'); + .replace(/(\d)$/, '$1.0') + }, + // e.g. 'GPL-2.0', 'GPL-3.0' + function (argument) { + if (argument.indexOf('3.0') !== -1) { + return argument + '-or-later' + } else { + return argument + '-only' + } }, // e.g. 'GPL-2.0-' - function(argument) { - return argument.slice(0, argument.length - 1); + function (argument) { + return argument + 'only' }, // e.g. 'GPL2' - function(argument) { - return argument.replace(/(\d)$/, '-$1.0'); + function (argument) { + return argument.replace(/(\d)$/, '-$1.0') }, // e.g. 'BSD 3' - function(argument) { - return argument.replace(/(-| )?(\d)$/, '-$2-Clause'); + function (argument) { + return argument.replace(/(-| )?(\d)$/, '-$2-Clause') }, // e.g. 'BSD clause 3' - function(argument) { - return argument.replace(/(-| )clause(-| )(\d)/, '-$3-Clause'); + function (argument) { + return argument.replace(/(-| )clause(-| )(\d)/, '-$3-Clause') }, // e.g. 'BY-NC-4.0' - function(argument) { - return 'CC-' + argument; + function (argument) { + return 'CC-' + argument }, // e.g. 'BY-NC' - function(argument) { - return 'CC-' + argument + '-4.0'; + function (argument) { + return 'CC-' + argument + '-4.0' }, // e.g. 'Attribution-NonCommercial' - function(argument) { + function (argument) { return argument .replace('Attribution', 'BY') .replace('NonCommercial', 'NC') .replace('NoDerivatives', 'ND') .replace(/ (\d)/, '-$1') - .replace(/ ?International/, ''); + .replace(/ ?International/, '') }, // e.g. 'Attribution-NonCommercial' - function(argument) { + function (argument) { return 'CC-' + argument - .replace('Attribution', 'BY') - .replace('NonCommercial', 'NC') - .replace('NoDerivatives', 'ND') - .replace(/ (\d)/, '-$1') - .replace(/ ?International/, '') + - '-4.0'; + .replace('Attribution', 'BY') + .replace('NonCommercial', 'NC') + .replace('NoDerivatives', 'ND') + .replace(/ (\d)/, '-$1') + .replace(/ ?International/, '') + + '-4.0' } -]; +] + +var licensesWithVersions = spdxLicenseIds + .map(function (id) { + var match = /^(.*)-\d+\.\d+$/.exec(id) + return match + ? [match[0], match[1]] + : [id, null] + }) + .reduce(function (objectMap, item) { + var key = item[1] + objectMap[key] = objectMap[key] || [] + objectMap[key].push(item[0]) + return objectMap + }, {}) + +var licensesWithOneVersion = Object.keys(licensesWithVersions) + .map(function makeEntries (key) { + return [key, licensesWithVersions[key]] + }) + .filter(function identifySoleVersions (item) { + return ( + // Licenses has just one valid version suffix. + item[1].length === 1 && + item[0] !== null && + // APL will be considered Apache, rather than APL-1.0 + item[0] !== 'APL' + ) + }) + .map(function createLastResorts (item) { + return [item[0], item[1][0]] + }) + +licensesWithVersions = undefined // If all else fails, guess that strings containing certain substrings // meant to identify certain licenses. @@ -143198,1813 +144783,469 @@ var lastResorts = [ ['2-CLAUSE', 'BSD-2-Clause'], ['3 CLAUSE', 'BSD-3-Clause'], ['3-CLAUSE', 'BSD-3-Clause'], - ['AFFERO', 'AGPL-3.0'], - ['AGPL', 'AGPL-3.0'], + ['AFFERO', 'AGPL-3.0-or-later'], + ['AGPL', 'AGPL-3.0-or-later'], ['APACHE', 'Apache-2.0'], ['ARTISTIC', 'Artistic-2.0'], - ['Affero', 'AGPL-3.0'], + ['Affero', 'AGPL-3.0-or-later'], ['BEER', 'Beerware'], ['BOOST', 'BSL-1.0'], ['BSD', 'BSD-2-Clause'], + ['CDDL', 'CDDL-1.1'], ['ECLIPSE', 'EPL-1.0'], ['FUCK', 'WTFPL'], - ['GNU', 'GPL-3.0'], - ['LGPL', 'LGPL-3.0'], - ['GPL', 'GPL-3.0'], + ['GNU', 'GPL-3.0-or-later'], + ['LGPL', 'LGPL-3.0-or-later'], + ['GPLV1', 'GPL-1.0-only'], + ['GPLV2', 'GPL-2.0-only'], + ['GPL', 'GPL-3.0-or-later'], + ['MIT +NO-FALSE-ATTRIBS', 'MITNFA'], ['MIT', 'MIT'], ['MPL', 'MPL-2.0'], ['X11', 'X11'], ['ZLIB', 'Zlib'] -]; +].concat(licensesWithOneVersion) -var SUBSTRING = 0; -var IDENTIFIER = 1; +var SUBSTRING = 0 +var IDENTIFIER = 1 -var validTransformation = function(identifier) { +var validTransformation = function (identifier) { for (var i = 0; i < transforms.length; i++) { - var transformed = transforms[i](identifier); + var transformed = transforms[i](identifier).trim() if (transformed !== identifier && valid(transformed)) { - return transformed; + return transformed } } - return null; -}; + return null +} -var validLastResort = function(identifier) { - var upperCased = identifier.toUpperCase(); +var validLastResort = function (identifier) { + var upperCased = identifier.toUpperCase() for (var i = 0; i < lastResorts.length; i++) { - var lastResort = lastResorts[i]; + var lastResort = lastResorts[i] if (upperCased.indexOf(lastResort[SUBSTRING]) > -1) { - return lastResort[IDENTIFIER]; + return lastResort[IDENTIFIER] } } - return null; -}; + return null +} -var anyCorrection = function(identifier, check) { +var anyCorrection = function (identifier, check) { for (var i = 0; i < transpositions.length; i++) { - var transposition = transpositions[i]; - var transposed = transposition[TRANSPOSED]; + var transposition = transpositions[i] + var transposed = transposition[TRANSPOSED] if (identifier.indexOf(transposed) > -1) { var corrected = identifier.replace( transposed, transposition[CORRECT] - ); - var checked = check(corrected); + ) + var checked = check(corrected) if (checked !== null) { - return checked; + return checked } } } - return null; -}; + return null +} -module.exports = function(identifier) { - identifier = identifier.replace(/\+$/, ''); +module.exports = function (identifier) { + var validArugment = ( + typeof identifier === 'string' && + identifier.trim().length !== 0 + ) + if (!validArugment) { + throw Error('Invalid argument. Expected non-empty string.') + } + identifier = identifier.replace(/\+$/, '').trim() if (valid(identifier)) { - return identifier; + return upgradeGPLs(identifier) } - var transformed = validTransformation(identifier); + var transformed = validTransformation(identifier) if (transformed !== null) { - return transformed; + return upgradeGPLs(transformed) } - transformed = anyCorrection(identifier, function(argument) { + transformed = anyCorrection(identifier, function (argument) { if (valid(argument)) { - return argument; + return argument } - return validTransformation(argument); - }); + return validTransformation(argument) + }) if (transformed !== null) { - return transformed; + return upgradeGPLs(transformed) } - transformed = validLastResort(identifier); + transformed = validLastResort(identifier) if (transformed !== null) { - return transformed; + return upgradeGPLs(transformed) } - transformed = anyCorrection(identifier, validLastResort); + transformed = anyCorrection(identifier, validLastResort) if (transformed !== null) { - return transformed; + return upgradeGPLs(transformed) } - return null; -}; + return null +} - -/***/ }), -/* 717 */ -/***/ (function(module, exports, __webpack_require__) { - -var parser = __webpack_require__(718).parser - -module.exports = function (argument) { - return parser.parse(argument) +function upgradeGPLs (value) { + if ([ + 'GPL-1.0', 'LGPL-1.0', 'AGPL-1.0', + 'GPL-2.0', 'LGPL-2.0', 'AGPL-2.0', + 'LGPL-2.1' + ].indexOf(value) !== -1) { + return value + '-only' + } else if (['GPL-3.0', 'LGPL-3.0', 'AGPL-3.0'].indexOf(value) !== -1) { + return value + '-or-later' + } else { + return value + } } /***/ }), -/* 718 */ -/***/ (function(module, exports, __webpack_require__) { - -/* WEBPACK VAR INJECTION */(function(module) {/* parser generated by jison 0.4.17 */ -/* - Returns a Parser object of the following structure: - - Parser: { - yy: {} - } - - Parser.prototype: { - yy: {}, - trace: function(), - symbols_: {associative list: name ==> number}, - terminals_: {associative list: number ==> name}, - productions_: [...], - performAction: function anonymous(yytext, yyleng, yylineno, yy, yystate, $$, _$), - table: [...], - defaultActions: {...}, - parseError: function(str, hash), - parse: function(input), - - lexer: { - EOF: 1, - parseError: function(str, hash), - setInput: function(input), - input: function(), - unput: function(str), - more: function(), - less: function(n), - pastInput: function(), - upcomingInput: function(), - showPosition: function(), - test_match: function(regex_match_array, rule_index), - next: function(), - lex: function(), - begin: function(condition), - popState: function(), - _currentRules: function(), - topState: function(), - pushState: function(condition), - - options: { - ranges: boolean (optional: true ==> token location info will include a .range[] member) - flex: boolean (optional: true ==> flex-like lexing behaviour where the rules are tested exhaustively to find the longest match) - backtrack_lexer: boolean (optional: true ==> lexer regexes are tested in order and for each matching regex the action code is invoked; the lexer terminates the scan when a token is returned by the action code) - }, - - performAction: function(yy, yy_, $avoiding_name_collisions, YY_START), - rules: [...], - conditions: {associative list: name ==> set}, - } - } - - - token location info (@$, _$, etc.): { - first_line: n, - last_line: n, - first_column: n, - last_column: n, - range: [start_number, end_number] (where the numbers are indexes into the input string, regular zero-based) - } - - - the parseError function receives a 'hash' object with these members for lexer and parser errors: { - text: (matched text) - token: (the produced terminal token, if any) - line: (yylineno) - } - while parser (grammar) errors will also provide these members, i.e. parser errors deliver a superset of attributes: { - loc: (yylloc) - expected: (string describing the set of expected tokens) - recoverable: (boolean: TRUE when the parser has a error recovery rule available for this particular error) - } -*/ -var spdxparse = (function(){ -var o=function(k,v,o,l){for(o=o||{},l=k.length;l--;o[k[l]]=v);return o},$V0=[1,5],$V1=[1,6],$V2=[1,7],$V3=[1,4],$V4=[1,9],$V5=[1,10],$V6=[5,14,15,17],$V7=[5,12,14,15,17]; -var parser = {trace: function trace() { }, -yy: {}, -symbols_: {"error":2,"start":3,"expression":4,"EOS":5,"simpleExpression":6,"LICENSE":7,"PLUS":8,"LICENSEREF":9,"DOCUMENTREF":10,"COLON":11,"WITH":12,"EXCEPTION":13,"AND":14,"OR":15,"OPEN":16,"CLOSE":17,"$accept":0,"$end":1}, -terminals_: {2:"error",5:"EOS",7:"LICENSE",8:"PLUS",9:"LICENSEREF",10:"DOCUMENTREF",11:"COLON",12:"WITH",13:"EXCEPTION",14:"AND",15:"OR",16:"OPEN",17:"CLOSE"}, -productions_: [0,[3,2],[6,1],[6,2],[6,1],[6,3],[4,1],[4,3],[4,3],[4,3],[4,3]], -performAction: function anonymous(yytext, yyleng, yylineno, yy, yystate /* action[1] */, $$ /* vstack */, _$ /* lstack */) { -/* this == yyval */ - -var $0 = $$.length - 1; -switch (yystate) { -case 1: -return this.$ = $$[$0-1] -break; -case 2: case 4: case 5: -this.$ = {license: yytext} -break; -case 3: -this.$ = {license: $$[$0-1], plus: true} -break; -case 6: -this.$ = $$[$0] -break; -case 7: -this.$ = {exception: $$[$0]} -this.$.license = $$[$0-2].license -if ($$[$0-2].hasOwnProperty('plus')) { - this.$.plus = $$[$0-2].plus -} -break; -case 8: -this.$ = {conjunction: 'and', left: $$[$0-2], right: $$[$0]} -break; -case 9: -this.$ = {conjunction: 'or', left: $$[$0-2], right: $$[$0]} -break; -case 10: -this.$ = $$[$0-1] -break; -} -}, -table: [{3:1,4:2,6:3,7:$V0,9:$V1,10:$V2,16:$V3},{1:[3]},{5:[1,8],14:$V4,15:$V5},o($V6,[2,6],{12:[1,11]}),{4:12,6:3,7:$V0,9:$V1,10:$V2,16:$V3},o($V7,[2,2],{8:[1,13]}),o($V7,[2,4]),{11:[1,14]},{1:[2,1]},{4:15,6:3,7:$V0,9:$V1,10:$V2,16:$V3},{4:16,6:3,7:$V0,9:$V1,10:$V2,16:$V3},{13:[1,17]},{14:$V4,15:$V5,17:[1,18]},o($V7,[2,3]),{9:[1,19]},o($V6,[2,8]),o([5,15,17],[2,9],{14:$V4}),o($V6,[2,7]),o($V6,[2,10]),o($V7,[2,5])], -defaultActions: {8:[2,1]}, -parseError: function parseError(str, hash) { - if (hash.recoverable) { - this.trace(str); - } else { - function _parseError (msg, hash) { - this.message = msg; - this.hash = hash; - } - _parseError.prototype = Error; - - throw new _parseError(str, hash); - } -}, -parse: function parse(input) { - var self = this, stack = [0], tstack = [], vstack = [null], lstack = [], table = this.table, yytext = '', yylineno = 0, yyleng = 0, recovering = 0, TERROR = 2, EOF = 1; - var args = lstack.slice.call(arguments, 1); - var lexer = Object.create(this.lexer); - var sharedState = { yy: {} }; - for (var k in this.yy) { - if (Object.prototype.hasOwnProperty.call(this.yy, k)) { - sharedState.yy[k] = this.yy[k]; - } - } - lexer.setInput(input, sharedState.yy); - sharedState.yy.lexer = lexer; - sharedState.yy.parser = this; - if (typeof lexer.yylloc == 'undefined') { - lexer.yylloc = {}; - } - var yyloc = lexer.yylloc; - lstack.push(yyloc); - var ranges = lexer.options && lexer.options.ranges; - if (typeof sharedState.yy.parseError === 'function') { - this.parseError = sharedState.yy.parseError; - } else { - this.parseError = Object.getPrototypeOf(this).parseError; - } - function popStack(n) { - stack.length = stack.length - 2 * n; - vstack.length = vstack.length - n; - lstack.length = lstack.length - n; - } - _token_stack: - var lex = function () { - var token; - token = lexer.lex() || EOF; - if (typeof token !== 'number') { - token = self.symbols_[token] || token; - } - return token; - }; - var symbol, preErrorSymbol, state, action, a, r, yyval = {}, p, len, newState, expected; - while (true) { - state = stack[stack.length - 1]; - if (this.defaultActions[state]) { - action = this.defaultActions[state]; - } else { - if (symbol === null || typeof symbol == 'undefined') { - symbol = lex(); - } - action = table[state] && table[state][symbol]; - } - if (typeof action === 'undefined' || !action.length || !action[0]) { - var errStr = ''; - expected = []; - for (p in table[state]) { - if (this.terminals_[p] && p > TERROR) { - expected.push('\'' + this.terminals_[p] + '\''); - } - } - if (lexer.showPosition) { - errStr = 'Parse error on line ' + (yylineno + 1) + ':\n' + lexer.showPosition() + '\nExpecting ' + expected.join(', ') + ', got \'' + (this.terminals_[symbol] || symbol) + '\''; - } else { - errStr = 'Parse error on line ' + (yylineno + 1) + ': Unexpected ' + (symbol == EOF ? 'end of input' : '\'' + (this.terminals_[symbol] || symbol) + '\''); - } - this.parseError(errStr, { - text: lexer.match, - token: this.terminals_[symbol] || symbol, - line: lexer.yylineno, - loc: yyloc, - expected: expected - }); - } - if (action[0] instanceof Array && action.length > 1) { - throw new Error('Parse Error: multiple actions possible at state: ' + state + ', token: ' + symbol); - } - switch (action[0]) { - case 1: - stack.push(symbol); - vstack.push(lexer.yytext); - lstack.push(lexer.yylloc); - stack.push(action[1]); - symbol = null; - if (!preErrorSymbol) { - yyleng = lexer.yyleng; - yytext = lexer.yytext; - yylineno = lexer.yylineno; - yyloc = lexer.yylloc; - if (recovering > 0) { - recovering--; - } - } else { - symbol = preErrorSymbol; - preErrorSymbol = null; - } - break; - case 2: - len = this.productions_[action[1]][1]; - yyval.$ = vstack[vstack.length - len]; - yyval._$ = { - first_line: lstack[lstack.length - (len || 1)].first_line, - last_line: lstack[lstack.length - 1].last_line, - first_column: lstack[lstack.length - (len || 1)].first_column, - last_column: lstack[lstack.length - 1].last_column - }; - if (ranges) { - yyval._$.range = [ - lstack[lstack.length - (len || 1)].range[0], - lstack[lstack.length - 1].range[1] - ]; - } - r = this.performAction.apply(yyval, [ - yytext, - yyleng, - yylineno, - sharedState.yy, - action[1], - vstack, - lstack - ].concat(args)); - if (typeof r !== 'undefined') { - return r; - } - if (len) { - stack = stack.slice(0, -1 * len * 2); - vstack = vstack.slice(0, -1 * len); - lstack = lstack.slice(0, -1 * len); - } - stack.push(this.productions_[action[1]][0]); - vstack.push(yyval.$); - lstack.push(yyval._$); - newState = table[stack[stack.length - 2]][stack[stack.length - 1]]; - stack.push(newState); - break; - case 3: - return true; - } - } - return true; -}}; -/* generated by jison-lex 0.3.4 */ -var lexer = (function(){ -var lexer = ({ - -EOF:1, - -parseError:function parseError(str, hash) { - if (this.yy.parser) { - this.yy.parser.parseError(str, hash); - } else { - throw new Error(str); - } - }, - -// resets the lexer, sets new input -setInput:function (input, yy) { - this.yy = yy || this.yy || {}; - this._input = input; - this._more = this._backtrack = this.done = false; - this.yylineno = this.yyleng = 0; - this.yytext = this.matched = this.match = ''; - this.conditionStack = ['INITIAL']; - this.yylloc = { - first_line: 1, - first_column: 0, - last_line: 1, - last_column: 0 - }; - if (this.options.ranges) { - this.yylloc.range = [0,0]; - } - this.offset = 0; - return this; - }, - -// consumes and returns one char from the input -input:function () { - var ch = this._input[0]; - this.yytext += ch; - this.yyleng++; - this.offset++; - this.match += ch; - this.matched += ch; - var lines = ch.match(/(?:\r\n?|\n).*/g); - if (lines) { - this.yylineno++; - this.yylloc.last_line++; - } else { - this.yylloc.last_column++; - } - if (this.options.ranges) { - this.yylloc.range[1]++; - } - - this._input = this._input.slice(1); - return ch; - }, - -// unshifts one char (or a string) into the input -unput:function (ch) { - var len = ch.length; - var lines = ch.split(/(?:\r\n?|\n)/g); - - this._input = ch + this._input; - this.yytext = this.yytext.substr(0, this.yytext.length - len); - //this.yyleng -= len; - this.offset -= len; - var oldLines = this.match.split(/(?:\r\n?|\n)/g); - this.match = this.match.substr(0, this.match.length - 1); - this.matched = this.matched.substr(0, this.matched.length - 1); - - if (lines.length - 1) { - this.yylineno -= lines.length - 1; - } - var r = this.yylloc.range; - - this.yylloc = { - first_line: this.yylloc.first_line, - last_line: this.yylineno + 1, - first_column: this.yylloc.first_column, - last_column: lines ? - (lines.length === oldLines.length ? this.yylloc.first_column : 0) - + oldLines[oldLines.length - lines.length].length - lines[0].length : - this.yylloc.first_column - len - }; - - if (this.options.ranges) { - this.yylloc.range = [r[0], r[0] + this.yyleng - len]; - } - this.yyleng = this.yytext.length; - return this; - }, - -// When called from action, caches matched text and appends it on next action -more:function () { - this._more = true; - return this; - }, - -// When called from action, signals the lexer that this rule fails to match the input, so the next matching rule (regex) should be tested instead. -reject:function () { - if (this.options.backtrack_lexer) { - this._backtrack = true; - } else { - return this.parseError('Lexical error on line ' + (this.yylineno + 1) + '. You can only invoke reject() in the lexer when the lexer is of the backtracking persuasion (options.backtrack_lexer = true).\n' + this.showPosition(), { - text: "", - token: null, - line: this.yylineno - }); - - } - return this; - }, - -// retain first n characters of the match -less:function (n) { - this.unput(this.match.slice(n)); - }, - -// displays already matched input, i.e. for error messages -pastInput:function () { - var past = this.matched.substr(0, this.matched.length - this.match.length); - return (past.length > 20 ? '...':'') + past.substr(-20).replace(/\n/g, ""); - }, - -// displays upcoming input, i.e. for error messages -upcomingInput:function () { - var next = this.match; - if (next.length < 20) { - next += this._input.substr(0, 20-next.length); - } - return (next.substr(0,20) + (next.length > 20 ? '...' : '')).replace(/\n/g, ""); - }, - -// displays the character position where the lexing error occurred, i.e. for error messages -showPosition:function () { - var pre = this.pastInput(); - var c = new Array(pre.length + 1).join("-"); - return pre + this.upcomingInput() + "\n" + c + "^"; - }, - -// test the lexed token: return FALSE when not a match, otherwise return token -test_match:function (match, indexed_rule) { - var token, - lines, - backup; - - if (this.options.backtrack_lexer) { - // save context - backup = { - yylineno: this.yylineno, - yylloc: { - first_line: this.yylloc.first_line, - last_line: this.last_line, - first_column: this.yylloc.first_column, - last_column: this.yylloc.last_column - }, - yytext: this.yytext, - match: this.match, - matches: this.matches, - matched: this.matched, - yyleng: this.yyleng, - offset: this.offset, - _more: this._more, - _input: this._input, - yy: this.yy, - conditionStack: this.conditionStack.slice(0), - done: this.done - }; - if (this.options.ranges) { - backup.yylloc.range = this.yylloc.range.slice(0); - } - } - - lines = match[0].match(/(?:\r\n?|\n).*/g); - if (lines) { - this.yylineno += lines.length; - } - this.yylloc = { - first_line: this.yylloc.last_line, - last_line: this.yylineno + 1, - first_column: this.yylloc.last_column, - last_column: lines ? - lines[lines.length - 1].length - lines[lines.length - 1].match(/\r?\n?/)[0].length : - this.yylloc.last_column + match[0].length - }; - this.yytext += match[0]; - this.match += match[0]; - this.matches = match; - this.yyleng = this.yytext.length; - if (this.options.ranges) { - this.yylloc.range = [this.offset, this.offset += this.yyleng]; - } - this._more = false; - this._backtrack = false; - this._input = this._input.slice(match[0].length); - this.matched += match[0]; - token = this.performAction.call(this, this.yy, this, indexed_rule, this.conditionStack[this.conditionStack.length - 1]); - if (this.done && this._input) { - this.done = false; - } - if (token) { - return token; - } else if (this._backtrack) { - // recover context - for (var k in backup) { - this[k] = backup[k]; - } - return false; // rule action called reject() implying the next rule should be tested instead. - } - return false; - }, - -// return next match in input -next:function () { - if (this.done) { - return this.EOF; - } - if (!this._input) { - this.done = true; - } - - var token, - match, - tempMatch, - index; - if (!this._more) { - this.yytext = ''; - this.match = ''; - } - var rules = this._currentRules(); - for (var i = 0; i < rules.length; i++) { - tempMatch = this._input.match(this.rules[rules[i]]); - if (tempMatch && (!match || tempMatch[0].length > match[0].length)) { - match = tempMatch; - index = i; - if (this.options.backtrack_lexer) { - token = this.test_match(tempMatch, rules[i]); - if (token !== false) { - return token; - } else if (this._backtrack) { - match = false; - continue; // rule action called reject() implying a rule MISmatch. - } else { - // else: this is a lexer rule which consumes input without producing a token (e.g. whitespace) - return false; - } - } else if (!this.options.flex) { - break; - } - } - } - if (match) { - token = this.test_match(match, rules[index]); - if (token !== false) { - return token; - } - // else: this is a lexer rule which consumes input without producing a token (e.g. whitespace) - return false; - } - if (this._input === "") { - return this.EOF; - } else { - return this.parseError('Lexical error on line ' + (this.yylineno + 1) + '. Unrecognized text.\n' + this.showPosition(), { - text: "", - token: null, - line: this.yylineno - }); - } - }, - -// return next match that has a token -lex:function lex() { - var r = this.next(); - if (r) { - return r; - } else { - return this.lex(); - } - }, - -// activates a new lexer condition state (pushes the new lexer condition state onto the condition stack) -begin:function begin(condition) { - this.conditionStack.push(condition); - }, - -// pop the previously active lexer condition state off the condition stack -popState:function popState() { - var n = this.conditionStack.length - 1; - if (n > 0) { - return this.conditionStack.pop(); - } else { - return this.conditionStack[0]; - } - }, - -// produce the lexer rule set which is active for the currently active lexer condition state -_currentRules:function _currentRules() { - if (this.conditionStack.length && this.conditionStack[this.conditionStack.length - 1]) { - return this.conditions[this.conditionStack[this.conditionStack.length - 1]].rules; - } else { - return this.conditions["INITIAL"].rules; - } - }, - -// return the currently active lexer condition state; when an index argument is provided it produces the N-th previous condition state, if available -topState:function topState(n) { - n = this.conditionStack.length - 1 - Math.abs(n || 0); - if (n >= 0) { - return this.conditionStack[n]; - } else { - return "INITIAL"; - } - }, - -// alias for begin(condition) -pushState:function pushState(condition) { - this.begin(condition); - }, - -// return the number of states currently on the stack -stateStackSize:function stateStackSize() { - return this.conditionStack.length; - }, -options: {}, -performAction: function anonymous(yy,yy_,$avoiding_name_collisions,YY_START) { -var YYSTATE=YY_START; -switch($avoiding_name_collisions) { -case 0:return 5 -break; -case 1:/* skip whitespace */ -break; -case 2:return 8 -break; -case 3:return 16 -break; -case 4:return 17 -break; -case 5:return 11 -break; -case 6:return 10 -break; -case 7:return 9 -break; -case 8:return 14 -break; -case 9:return 15 -break; -case 10:return 12 -break; -case 11:return 7 -break; -case 12:return 7 -break; -case 13:return 7 -break; -case 14:return 7 -break; -case 15:return 7 -break; -case 16:return 7 -break; -case 17:return 7 -break; -case 18:return 7 -break; -case 19:return 7 -break; -case 20:return 7 -break; -case 21:return 7 -break; -case 22:return 7 -break; -case 23:return 7 -break; -case 24:return 13 -break; -case 25:return 13 -break; -case 26:return 13 -break; -case 27:return 13 -break; -case 28:return 13 -break; -case 29:return 13 -break; -case 30:return 13 -break; -case 31:return 13 -break; -case 32:return 7 -break; -case 33:return 13 -break; -case 34:return 7 -break; -case 35:return 13 -break; -case 36:return 7 -break; -case 37:return 13 -break; -case 38:return 13 -break; -case 39:return 7 -break; -case 40:return 13 -break; -case 41:return 13 -break; -case 42:return 13 -break; -case 43:return 13 -break; -case 44:return 13 -break; -case 45:return 7 -break; -case 46:return 13 -break; -case 47:return 7 -break; -case 48:return 7 -break; -case 49:return 7 -break; -case 50:return 7 -break; -case 51:return 7 -break; -case 52:return 7 -break; -case 53:return 7 -break; -case 54:return 7 -break; -case 55:return 7 -break; -case 56:return 7 -break; -case 57:return 7 -break; -case 58:return 7 -break; -case 59:return 7 -break; -case 60:return 7 -break; -case 61:return 7 -break; -case 62:return 7 -break; -case 63:return 13 -break; -case 64:return 7 -break; -case 65:return 7 -break; -case 66:return 13 -break; -case 67:return 7 -break; -case 68:return 7 -break; -case 69:return 7 -break; -case 70:return 7 -break; -case 71:return 7 -break; -case 72:return 7 -break; -case 73:return 13 -break; -case 74:return 7 -break; -case 75:return 13 -break; -case 76:return 7 -break; -case 77:return 7 -break; -case 78:return 7 -break; -case 79:return 7 -break; -case 80:return 7 -break; -case 81:return 7 -break; -case 82:return 7 -break; -case 83:return 7 -break; -case 84:return 7 -break; -case 85:return 7 -break; -case 86:return 7 -break; -case 87:return 7 -break; -case 88:return 7 -break; -case 89:return 7 -break; -case 90:return 7 -break; -case 91:return 7 -break; -case 92:return 7 -break; -case 93:return 7 -break; -case 94:return 7 -break; -case 95:return 7 -break; -case 96:return 7 -break; -case 97:return 7 -break; -case 98:return 7 -break; -case 99:return 7 -break; -case 100:return 7 -break; -case 101:return 7 -break; -case 102:return 7 -break; -case 103:return 7 -break; -case 104:return 7 -break; -case 105:return 7 -break; -case 106:return 7 -break; -case 107:return 7 -break; -case 108:return 7 -break; -case 109:return 7 -break; -case 110:return 7 -break; -case 111:return 7 -break; -case 112:return 7 -break; -case 113:return 7 -break; -case 114:return 7 -break; -case 115:return 7 -break; -case 116:return 7 -break; -case 117:return 7 -break; -case 118:return 7 -break; -case 119:return 7 -break; -case 120:return 7 -break; -case 121:return 7 -break; -case 122:return 7 -break; -case 123:return 7 -break; -case 124:return 7 -break; -case 125:return 7 -break; -case 126:return 7 -break; -case 127:return 7 -break; -case 128:return 7 -break; -case 129:return 7 -break; -case 130:return 7 -break; -case 131:return 7 -break; -case 132:return 7 -break; -case 133:return 7 -break; -case 134:return 7 -break; -case 135:return 7 -break; -case 136:return 7 -break; -case 137:return 7 -break; -case 138:return 7 -break; -case 139:return 7 -break; -case 140:return 7 -break; -case 141:return 7 -break; -case 142:return 7 -break; -case 143:return 7 -break; -case 144:return 7 -break; -case 145:return 7 -break; -case 146:return 7 -break; -case 147:return 7 -break; -case 148:return 7 -break; -case 149:return 7 -break; -case 150:return 7 -break; -case 151:return 7 -break; -case 152:return 7 -break; -case 153:return 7 -break; -case 154:return 7 -break; -case 155:return 7 -break; -case 156:return 7 -break; -case 157:return 7 -break; -case 158:return 7 -break; -case 159:return 7 -break; -case 160:return 7 -break; -case 161:return 7 -break; -case 162:return 7 -break; -case 163:return 7 -break; -case 164:return 7 -break; -case 165:return 7 -break; -case 166:return 7 -break; -case 167:return 7 -break; -case 168:return 7 -break; -case 169:return 7 -break; -case 170:return 7 -break; -case 171:return 7 -break; -case 172:return 7 -break; -case 173:return 7 -break; -case 174:return 7 -break; -case 175:return 7 -break; -case 176:return 7 -break; -case 177:return 7 -break; -case 178:return 7 -break; -case 179:return 7 -break; -case 180:return 7 -break; -case 181:return 7 -break; -case 182:return 7 -break; -case 183:return 7 -break; -case 184:return 7 -break; -case 185:return 7 -break; -case 186:return 7 -break; -case 187:return 7 -break; -case 188:return 7 -break; -case 189:return 7 -break; -case 190:return 7 -break; -case 191:return 7 -break; -case 192:return 7 -break; -case 193:return 7 -break; -case 194:return 7 -break; -case 195:return 7 -break; -case 196:return 7 -break; -case 197:return 7 -break; -case 198:return 7 -break; -case 199:return 7 -break; -case 200:return 7 -break; -case 201:return 7 -break; -case 202:return 7 -break; -case 203:return 7 -break; -case 204:return 7 -break; -case 205:return 7 -break; -case 206:return 7 -break; -case 207:return 7 -break; -case 208:return 7 -break; -case 209:return 7 -break; -case 210:return 7 -break; -case 211:return 7 -break; -case 212:return 7 -break; -case 213:return 7 -break; -case 214:return 7 -break; -case 215:return 7 -break; -case 216:return 7 -break; -case 217:return 7 -break; -case 218:return 7 -break; -case 219:return 7 -break; -case 220:return 7 -break; -case 221:return 7 -break; -case 222:return 7 -break; -case 223:return 7 -break; -case 224:return 7 -break; -case 225:return 7 -break; -case 226:return 7 -break; -case 227:return 7 -break; -case 228:return 7 -break; -case 229:return 7 -break; -case 230:return 7 -break; -case 231:return 7 -break; -case 232:return 7 -break; -case 233:return 7 -break; -case 234:return 7 -break; -case 235:return 7 -break; -case 236:return 7 -break; -case 237:return 7 -break; -case 238:return 7 -break; -case 239:return 7 -break; -case 240:return 7 -break; -case 241:return 7 -break; -case 242:return 7 -break; -case 243:return 7 -break; -case 244:return 7 -break; -case 245:return 7 -break; -case 246:return 7 -break; -case 247:return 7 -break; -case 248:return 7 -break; -case 249:return 7 -break; -case 250:return 7 -break; -case 251:return 7 -break; -case 252:return 7 -break; -case 253:return 7 -break; -case 254:return 7 -break; -case 255:return 7 -break; -case 256:return 7 -break; -case 257:return 7 -break; -case 258:return 7 -break; -case 259:return 7 -break; -case 260:return 7 -break; -case 261:return 7 -break; -case 262:return 7 -break; -case 263:return 7 -break; -case 264:return 7 -break; -case 265:return 7 -break; -case 266:return 7 -break; -case 267:return 7 -break; -case 268:return 7 -break; -case 269:return 7 -break; -case 270:return 7 -break; -case 271:return 7 -break; -case 272:return 7 -break; -case 273:return 7 -break; -case 274:return 7 -break; -case 275:return 7 -break; -case 276:return 7 -break; -case 277:return 7 -break; -case 278:return 7 -break; -case 279:return 7 -break; -case 280:return 7 -break; -case 281:return 7 -break; -case 282:return 7 -break; -case 283:return 7 -break; -case 284:return 7 -break; -case 285:return 7 -break; -case 286:return 7 -break; -case 287:return 7 -break; -case 288:return 7 -break; -case 289:return 7 -break; -case 290:return 7 -break; -case 291:return 7 -break; -case 292:return 7 -break; -case 293:return 7 -break; -case 294:return 7 -break; -case 295:return 7 -break; -case 296:return 7 -break; -case 297:return 7 -break; -case 298:return 7 -break; -case 299:return 7 -break; -case 300:return 7 -break; -case 301:return 7 -break; -case 302:return 7 -break; -case 303:return 7 -break; -case 304:return 7 -break; -case 305:return 7 -break; -case 306:return 7 -break; -case 307:return 7 -break; -case 308:return 7 -break; -case 309:return 7 -break; -case 310:return 7 -break; -case 311:return 7 -break; -case 312:return 7 -break; -case 313:return 7 -break; -case 314:return 7 -break; -case 315:return 7 -break; -case 316:return 7 -break; -case 317:return 7 -break; -case 318:return 7 -break; -case 319:return 7 -break; -case 320:return 7 -break; -case 321:return 7 -break; -case 322:return 7 -break; -case 323:return 7 -break; -case 324:return 7 -break; -case 325:return 7 -break; -case 326:return 7 -break; -case 327:return 7 -break; -case 328:return 7 -break; -case 329:return 7 -break; -case 330:return 7 -break; -case 331:return 7 -break; -case 332:return 7 -break; -case 333:return 7 -break; -case 334:return 7 -break; -case 335:return 7 -break; -case 336:return 7 -break; -case 337:return 7 -break; -case 338:return 7 -break; -case 339:return 7 -break; -case 340:return 7 -break; -case 341:return 7 -break; -case 342:return 7 -break; -case 343:return 7 -break; -case 344:return 7 -break; -case 345:return 7 -break; -case 346:return 7 -break; -case 347:return 7 -break; -case 348:return 7 -break; -case 349:return 7 -break; -case 350:return 7 -break; -case 351:return 7 -break; -case 352:return 7 -break; -case 353:return 7 -break; -case 354:return 7 -break; -case 355:return 7 -break; -case 356:return 7 -break; -case 357:return 7 -break; -case 358:return 7 -break; -case 359:return 7 -break; -case 360:return 7 -break; -case 361:return 7 -break; -case 362:return 7 -break; -case 363:return 7 -break; -case 364:return 7 -break; -} -}, -rules: [/^(?:$)/,/^(?:\s+)/,/^(?:\+)/,/^(?:\()/,/^(?:\))/,/^(?::)/,/^(?:DocumentRef-([0-9A-Za-z-+.]+))/,/^(?:LicenseRef-([0-9A-Za-z-+.]+))/,/^(?:AND)/,/^(?:OR)/,/^(?:WITH)/,/^(?:BSD-3-Clause-No-Nuclear-License-2014)/,/^(?:BSD-3-Clause-No-Nuclear-Warranty)/,/^(?:GPL-2\.0-with-classpath-exception)/,/^(?:GPL-3\.0-with-autoconf-exception)/,/^(?:GPL-2\.0-with-autoconf-exception)/,/^(?:BSD-3-Clause-No-Nuclear-License)/,/^(?:MPL-2\.0-no-copyleft-exception)/,/^(?:GPL-2\.0-with-bison-exception)/,/^(?:GPL-2\.0-with-font-exception)/,/^(?:GPL-2\.0-with-GCC-exception)/,/^(?:CNRI-Python-GPL-Compatible)/,/^(?:GPL-3\.0-with-GCC-exception)/,/^(?:BSD-3-Clause-Attribution)/,/^(?:Classpath-exception-2\.0)/,/^(?:WxWindows-exception-3\.1)/,/^(?:freertos-exception-2\.0)/,/^(?:Autoconf-exception-3\.0)/,/^(?:i2p-gpl-java-exception)/,/^(?:gnu-javamail-exception)/,/^(?:Nokia-Qt-exception-1\.1)/,/^(?:Autoconf-exception-2\.0)/,/^(?:BSD-2-Clause-FreeBSD)/,/^(?:u-boot-exception-2\.0)/,/^(?:zlib-acknowledgement)/,/^(?:Bison-exception-2\.2)/,/^(?:BSD-2-Clause-NetBSD)/,/^(?:CLISP-exception-2\.0)/,/^(?:eCos-exception-2\.0)/,/^(?:BSD-3-Clause-Clear)/,/^(?:Font-exception-2\.0)/,/^(?:FLTK-exception-2\.0)/,/^(?:GCC-exception-2\.0)/,/^(?:Qwt-exception-1\.0)/,/^(?:Libtool-exception)/,/^(?:BSD-3-Clause-LBNL)/,/^(?:GCC-exception-3\.1)/,/^(?:Artistic-1\.0-Perl)/,/^(?:Artistic-1\.0-cl8)/,/^(?:CC-BY-NC-SA-2\.5)/,/^(?:MIT-advertising)/,/^(?:BSD-Source-Code)/,/^(?:CC-BY-NC-SA-4\.0)/,/^(?:LiLiQ-Rplus-1\.1)/,/^(?:CC-BY-NC-SA-3\.0)/,/^(?:BSD-4-Clause-UC)/,/^(?:CC-BY-NC-SA-2\.0)/,/^(?:CC-BY-NC-SA-1\.0)/,/^(?:CC-BY-NC-ND-4\.0)/,/^(?:CC-BY-NC-ND-3\.0)/,/^(?:CC-BY-NC-ND-2\.5)/,/^(?:CC-BY-NC-ND-2\.0)/,/^(?:CC-BY-NC-ND-1\.0)/,/^(?:LZMA-exception)/,/^(?:BitTorrent-1\.1)/,/^(?:CrystalStacker)/,/^(?:FLTK-exception)/,/^(?:SugarCRM-1\.1\.3)/,/^(?:BSD-Protection)/,/^(?:BitTorrent-1\.0)/,/^(?:HaskellReport)/,/^(?:Interbase-1\.0)/,/^(?:StandardML-NJ)/,/^(?:mif-exception)/,/^(?:Frameworx-1\.0)/,/^(?:389-exception)/,/^(?:CC-BY-NC-2\.0)/,/^(?:CC-BY-NC-2\.5)/,/^(?:CC-BY-NC-3\.0)/,/^(?:CC-BY-NC-4\.0)/,/^(?:W3C-19980720)/,/^(?:CC-BY-SA-1\.0)/,/^(?:CC-BY-SA-2\.0)/,/^(?:CC-BY-SA-2\.5)/,/^(?:CC-BY-ND-2\.0)/,/^(?:CC-BY-SA-4\.0)/,/^(?:CC-BY-SA-3\.0)/,/^(?:Artistic-1\.0)/,/^(?:Artistic-2\.0)/,/^(?:CC-BY-ND-2\.5)/,/^(?:CC-BY-ND-3\.0)/,/^(?:CC-BY-ND-4\.0)/,/^(?:CC-BY-ND-1\.0)/,/^(?:BSD-4-Clause)/,/^(?:BSD-3-Clause)/,/^(?:BSD-2-Clause)/,/^(?:CC-BY-NC-1\.0)/,/^(?:bzip2-1\.0\.6)/,/^(?:Unicode-TOU)/,/^(?:CNRI-Jython)/,/^(?:ImageMagick)/,/^(?:Adobe-Glyph)/,/^(?:CUA-OPL-1\.0)/,/^(?:OLDAP-2\.2\.2)/,/^(?:LiLiQ-R-1\.1)/,/^(?:bzip2-1\.0\.5)/,/^(?:LiLiQ-P-1\.1)/,/^(?:OLDAP-2\.0\.1)/,/^(?:OLDAP-2\.2\.1)/,/^(?:CNRI-Python)/,/^(?:XFree86-1\.1)/,/^(?:OSET-PL-2\.1)/,/^(?:Apache-2\.0)/,/^(?:Watcom-1\.0)/,/^(?:PostgreSQL)/,/^(?:Python-2\.0)/,/^(?:RHeCos-1\.1)/,/^(?:EUDatagrid)/,/^(?:Spencer-99)/,/^(?:Intel-ACPI)/,/^(?:CECILL-1\.0)/,/^(?:CECILL-1\.1)/,/^(?:JasPer-2\.0)/,/^(?:CECILL-2\.0)/,/^(?:CECILL-2\.1)/,/^(?:gSOAP-1\.3b)/,/^(?:Spencer-94)/,/^(?:Apache-1\.1)/,/^(?:Spencer-86)/,/^(?:Apache-1\.0)/,/^(?:ClArtistic)/,/^(?:TORQUE-1\.1)/,/^(?:CATOSL-1\.1)/,/^(?:Adobe-2006)/,/^(?:Zimbra-1\.4)/,/^(?:Zimbra-1\.3)/,/^(?:Condor-1\.1)/,/^(?:CC-BY-3\.0)/,/^(?:CC-BY-2\.5)/,/^(?:OLDAP-2\.4)/,/^(?:SGI-B-1\.1)/,/^(?:SISSL-1\.2)/,/^(?:SGI-B-1\.0)/,/^(?:OLDAP-2\.3)/,/^(?:CC-BY-4\.0)/,/^(?:Crossword)/,/^(?:SimPL-2\.0)/,/^(?:OLDAP-2\.2)/,/^(?:OLDAP-2\.1)/,/^(?:ErlPL-1\.1)/,/^(?:LPPL-1\.3a)/,/^(?:LPPL-1\.3c)/,/^(?:OLDAP-2\.0)/,/^(?:Leptonica)/,/^(?:CPOL-1\.02)/,/^(?:OLDAP-1\.4)/,/^(?:OLDAP-1\.3)/,/^(?:CC-BY-2\.0)/,/^(?:Unlicense)/,/^(?:OLDAP-2\.8)/,/^(?:OLDAP-1\.2)/,/^(?:MakeIndex)/,/^(?:OLDAP-2\.7)/,/^(?:OLDAP-1\.1)/,/^(?:Sleepycat)/,/^(?:D-FSL-1\.0)/,/^(?:CC-BY-1\.0)/,/^(?:OLDAP-2\.6)/,/^(?:WXwindows)/,/^(?:NPOSL-3\.0)/,/^(?:FreeImage)/,/^(?:SGI-B-2\.0)/,/^(?:OLDAP-2\.5)/,/^(?:Beerware)/,/^(?:Newsletr)/,/^(?:NBPL-1\.0)/,/^(?:NASA-1\.3)/,/^(?:NLOD-1\.0)/,/^(?:AGPL-1\.0)/,/^(?:OCLC-2\.0)/,/^(?:ODbL-1\.0)/,/^(?:PDDL-1\.0)/,/^(?:Motosoto)/,/^(?:Afmparse)/,/^(?:ANTLR-PD)/,/^(?:LPL-1\.02)/,/^(?:Abstyles)/,/^(?:eCos-2\.0)/,/^(?:APSL-1\.0)/,/^(?:LPPL-1\.2)/,/^(?:LPPL-1\.1)/,/^(?:LPPL-1\.0)/,/^(?:APSL-1\.1)/,/^(?:APSL-2\.0)/,/^(?:Info-ZIP)/,/^(?:Zend-2\.0)/,/^(?:IBM-pibs)/,/^(?:LGPL-2\.0)/,/^(?:LGPL-3\.0)/,/^(?:LGPL-2\.1)/,/^(?:GFDL-1\.3)/,/^(?:PHP-3\.01)/,/^(?:GFDL-1\.2)/,/^(?:GFDL-1\.1)/,/^(?:AGPL-3\.0)/,/^(?:Giftware)/,/^(?:EUPL-1\.1)/,/^(?:RPSL-1\.0)/,/^(?:EUPL-1\.0)/,/^(?:MIT-enna)/,/^(?:CECILL-B)/,/^(?:diffmark)/,/^(?:CECILL-C)/,/^(?:CDDL-1\.0)/,/^(?:Sendmail)/,/^(?:CDDL-1\.1)/,/^(?:CPAL-1\.0)/,/^(?:APSL-1\.2)/,/^(?:NPL-1\.1)/,/^(?:AFL-1\.2)/,/^(?:Caldera)/,/^(?:AFL-2\.0)/,/^(?:FSFULLR)/,/^(?:AFL-2\.1)/,/^(?:VSL-1\.0)/,/^(?:VOSTROM)/,/^(?:UPL-1\.0)/,/^(?:Dotseqn)/,/^(?:CPL-1\.0)/,/^(?:dvipdfm)/,/^(?:EPL-1\.0)/,/^(?:OCCT-PL)/,/^(?:ECL-1\.0)/,/^(?:Latex2e)/,/^(?:ECL-2\.0)/,/^(?:GPL-1\.0)/,/^(?:GPL-2\.0)/,/^(?:GPL-3\.0)/,/^(?:AFL-3\.0)/,/^(?:LAL-1\.2)/,/^(?:LAL-1\.3)/,/^(?:EFL-1\.0)/,/^(?:EFL-2\.0)/,/^(?:gnuplot)/,/^(?:Aladdin)/,/^(?:LPL-1\.0)/,/^(?:libtiff)/,/^(?:Entessa)/,/^(?:AMDPLPA)/,/^(?:IPL-1\.0)/,/^(?:OPL-1\.0)/,/^(?:OSL-1\.0)/,/^(?:OSL-1\.1)/,/^(?:OSL-2\.0)/,/^(?:OSL-2\.1)/,/^(?:OSL-3\.0)/,/^(?:OpenSSL)/,/^(?:ZPL-2\.1)/,/^(?:PHP-3\.0)/,/^(?:ZPL-2\.0)/,/^(?:ZPL-1\.1)/,/^(?:CC0-1\.0)/,/^(?:SPL-1\.0)/,/^(?:psutils)/,/^(?:MPL-1\.0)/,/^(?:QPL-1\.0)/,/^(?:MPL-1\.1)/,/^(?:MPL-2\.0)/,/^(?:APL-1\.0)/,/^(?:RPL-1\.1)/,/^(?:RPL-1\.5)/,/^(?:MIT-CMU)/,/^(?:Multics)/,/^(?:Eurosym)/,/^(?:BSL-1\.0)/,/^(?:MIT-feh)/,/^(?:Saxpath)/,/^(?:Borceux)/,/^(?:OFL-1\.1)/,/^(?:OFL-1\.0)/,/^(?:AFL-1\.1)/,/^(?:YPL-1\.1)/,/^(?:YPL-1\.0)/,/^(?:NPL-1\.0)/,/^(?:iMatix)/,/^(?:mpich2)/,/^(?:APAFML)/,/^(?:Bahyph)/,/^(?:RSA-MD)/,/^(?:psfrag)/,/^(?:Plexus)/,/^(?:eGenix)/,/^(?:Glulxe)/,/^(?:SAX-PD)/,/^(?:Imlib2)/,/^(?:Wsuipa)/,/^(?:LGPLLR)/,/^(?:Libpng)/,/^(?:xinetd)/,/^(?:MITNFA)/,/^(?:NetCDF)/,/^(?:Naumen)/,/^(?:SMPPL)/,/^(?:Nunit)/,/^(?:FSFUL)/,/^(?:GL2PS)/,/^(?:SMLNJ)/,/^(?:Rdisc)/,/^(?:Noweb)/,/^(?:Nokia)/,/^(?:SISSL)/,/^(?:Qhull)/,/^(?:Intel)/,/^(?:Glide)/,/^(?:Xerox)/,/^(?:AMPAS)/,/^(?:WTFPL)/,/^(?:MS-PL)/,/^(?:XSkat)/,/^(?:MS-RL)/,/^(?:MirOS)/,/^(?:RSCPL)/,/^(?:TMate)/,/^(?:OGTSL)/,/^(?:FSFAP)/,/^(?:NCSA)/,/^(?:Zlib)/,/^(?:SCEA)/,/^(?:SNIA)/,/^(?:NGPL)/,/^(?:NOSL)/,/^(?:ADSL)/,/^(?:MTLL)/,/^(?:NLPL)/,/^(?:Ruby)/,/^(?:JSON)/,/^(?:Barr)/,/^(?:0BSD)/,/^(?:Xnet)/,/^(?:Cube)/,/^(?:curl)/,/^(?:DSDP)/,/^(?:Fair)/,/^(?:HPND)/,/^(?:TOSL)/,/^(?:IJG)/,/^(?:SWL)/,/^(?:Vim)/,/^(?:FTL)/,/^(?:ICU)/,/^(?:OML)/,/^(?:NRL)/,/^(?:DOC)/,/^(?:TCL)/,/^(?:W3C)/,/^(?:NTP)/,/^(?:IPA)/,/^(?:ISC)/,/^(?:X11)/,/^(?:AAL)/,/^(?:AML)/,/^(?:xpp)/,/^(?:Zed)/,/^(?:MIT)/,/^(?:Mup)/], -conditions: {"INITIAL":{"rules":[0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,292,293,294,295,296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,316,317,318,319,320,321,322,323,324,325,326,327,328,329,330,331,332,333,334,335,336,337,338,339,340,341,342,343,344,345,346,347,348,349,350,351,352,353,354,355,356,357,358,359,360,361,362,363,364],"inclusive":true}} -}); -return lexer; -})(); -parser.lexer = lexer; -function Parser () { - this.yy = {}; -} -Parser.prototype = parser;parser.Parser = Parser; -return new Parser; -})(); - - -if (true) { -exports.parser = spdxparse; -exports.Parser = spdxparse.Parser; -exports.parse = function () { return spdxparse.parse.apply(spdxparse, arguments); }; -exports.main = function commonjsMain(args) { - if (!args[1]) { - console.log('Usage: '+args[0]+' FILE'); - process.exit(1); - } - var source = __webpack_require__(10).readFileSync(__webpack_require__(0).normalize(args[1]), "utf8"); - return exports.parser.parse(source); -}; -if (typeof module !== 'undefined' && __webpack_require__.c[__webpack_require__.s] === module) { - exports.main(process.argv.slice(1)); -} -} - -/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(23)(module))) - -/***/ }), -/* 719 */ +/* 726 */ +/***/ (function(module, exports) { + +module.exports = [ + "389-exception", + "Autoconf-exception-2.0", + "Autoconf-exception-3.0", + "Bison-exception-2.2", + "Bootloader-exception", + "CLISP-exception-2.0", + "Classpath-exception-2.0", + "DigiRule-FOSS-exception", + "FLTK-exception", + "Fawkes-Runtime-exception", + "Font-exception-2.0", + "GCC-exception-2.0", + "GCC-exception-3.1", + "LZMA-exception", + "Libtool-exception", + "Linux-syscall-note", + "Nokia-Qt-exception-1.1", + "OCCT-exception-1.0", + "Qwt-exception-1.0", + "WxWindows-exception-3.1", + "eCos-exception-2.0", + "freertos-exception-2.0", + "gnu-javamail-exception", + "i2p-gpl-java-exception", + "mif-exception", + "openvpn-openssl-exception", + "u-boot-exception-2.0" +]; + +/***/ }), +/* 727 */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +// The ABNF grammar in the spec is totally ambiguous. +// +// This parser follows the operator precedence defined in the +// `Order of Precedence and Parentheses` section. + +module.exports = function (tokens) { + var index = 0 + + function hasMore () { + return index < tokens.length + } + + function token () { + return hasMore() ? tokens[index] : null + } + + function next () { + if (!hasMore()) { + throw new Error() + } + index++ + } + + function parseOperator (operator) { + var t = token() + if (t && t.type === 'OPERATOR' && operator === t.string) { + next() + return t.string + } + } + + function parseWith () { + if (parseOperator('WITH')) { + var t = token() + if (t && t.type === 'EXCEPTION') { + next() + return t.string + } + throw new Error('Expected exception after `WITH`') + } + } + + function parseLicenseRef () { + // TODO: Actually, everything is concatenated into one string + // for backward-compatibility but it could be better to return + // a nice structure. + var begin = index + var string = '' + var t = token() + if (t.type === 'DOCUMENTREF') { + next() + string += 'DocumentRef-' + t.string + ':' + if (!parseOperator(':')) { + throw new Error('Expected `:` after `DocumentRef-...`') + } + } + t = token() + if (t.type === 'LICENSEREF') { + next() + string += 'LicenseRef-' + t.string + return {license: string} + } + index = begin + } + + function parseLicense () { + var t = token() + if (t && t.type === 'LICENSE') { + next() + var node = {license: t.string} + if (parseOperator('+')) { + node.plus = true + } + var exception = parseWith() + if (exception) { + node.exception = exception + } + return node + } + } + + function parseParenthesizedExpression () { + var left = parseOperator('(') + if (!left) { + return + } + + var expr = parseExpression() + + if (!parseOperator(')')) { + throw new Error('Expected `)`') + } + + return expr + } + + function parseAtom () { + return ( + parseParenthesizedExpression() || + parseLicenseRef() || + parseLicense() + ) + } + + function makeBinaryOpParser (operator, nextParser) { + return function parseBinaryOp () { + var left = nextParser() + if (!left) { + return + } + + if (!parseOperator(operator)) { + return left + } + + var right = parseBinaryOp() + if (!right) { + throw new Error('Expected expression') + } + return { + left: left, + conjunction: operator.toLowerCase(), + right: right + } + } + } + + var parseAnd = makeBinaryOpParser('AND', parseAtom) + var parseExpression = makeBinaryOpParser('OR', parseAnd) + + var node = parseExpression() + if (!node || hasMore()) { + throw new Error('Syntax error') + } + return node +} + + +/***/ }), +/* 728 */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +var licenses = [] + .concat(__webpack_require__(321)) + .concat(__webpack_require__(729)) +var exceptions = __webpack_require__(726) + +module.exports = function (source) { + var index = 0 + + function hasMore () { + return index < source.length + } + + // `value` can be a regexp or a string. + // If it is recognized, the matching source string is returned and + // the index is incremented. Otherwise `undefined` is returned. + function read (value) { + if (value instanceof RegExp) { + var chars = source.slice(index) + var match = chars.match(value) + if (match) { + index += match[0].length + return match[0] + } + } else { + if (source.indexOf(value, index) === index) { + index += value.length + return value + } + } + } + + function skipWhitespace () { + read(/[ ]*/) + } + + function operator () { + var string + var possibilities = ['WITH', 'AND', 'OR', '(', ')', ':', '+'] + for (var i = 0; i < possibilities.length; i++) { + string = read(possibilities[i]) + if (string) { + break + } + } + + if (string === '+' && index > 1 && source[index - 2] === ' ') { + throw new Error('Space before `+`') + } + + return string && { + type: 'OPERATOR', + string: string + } + } + + function idstring () { + return read(/[A-Za-z0-9-.]+/) + } + + function expectIdstring () { + var string = idstring() + if (!string) { + throw new Error('Expected idstring at offset ' + index) + } + return string + } + + function documentRef () { + if (read('DocumentRef-')) { + var string = expectIdstring() + return {type: 'DOCUMENTREF', string: string} + } + } + + function licenseRef () { + if (read('LicenseRef-')) { + var string = expectIdstring() + return {type: 'LICENSEREF', string: string} + } + } + + function identifier () { + var begin = index + var string = idstring() + + if (licenses.indexOf(string) !== -1) { + return { + type: 'LICENSE', + string: string + } + } else if (exceptions.indexOf(string) !== -1) { + return { + type: 'EXCEPTION', + string: string + } + } + + index = begin + } + + // Tries to read the next token. Returns `undefined` if no token is + // recognized. + function parseToken () { + // Ordering matters + return ( + operator() || + documentRef() || + licenseRef() || + identifier() + ) + } + + var tokens = [] + while (hasMore()) { + skipWhitespace() + if (!hasMore()) { + break + } + + var token = parseToken() + if (!token) { + throw new Error('Unexpected `' + source[index] + + '` at offset ' + index) + } + + tokens.push(token) + } + return tokens +} + + +/***/ }), +/* 729 */ /***/ (function(module, exports) { module.exports = [ - "Glide", - "Abstyles", - "AFL-1.1", - "AFL-1.2", - "AFL-2.0", - "AFL-2.1", - "AFL-3.0", - "AMPAS", - "APL-1.0", - "Adobe-Glyph", - "APAFML", - "Adobe-2006", - "AGPL-1.0", - "Afmparse", - "Aladdin", - "ADSL", - "AMDPLPA", - "ANTLR-PD", - "Apache-1.0", - "Apache-1.1", - "Apache-2.0", - "AML", - "APSL-1.0", - "APSL-1.1", - "APSL-1.2", - "APSL-2.0", - "Artistic-1.0", - "Artistic-1.0-Perl", - "Artistic-1.0-cl8", - "Artistic-2.0", - "AAL", - "Bahyph", - "Barr", - "Beerware", - "BitTorrent-1.0", - "BitTorrent-1.1", - "BSL-1.0", - "Borceux", - "BSD-2-Clause", - "BSD-2-Clause-FreeBSD", - "BSD-2-Clause-NetBSD", - "BSD-3-Clause", - "BSD-3-Clause-Clear", - "BSD-4-Clause", - "BSD-Protection", - "BSD-Source-Code", - "BSD-3-Clause-Attribution", - "0BSD", - "BSD-4-Clause-UC", - "bzip2-1.0.5", - "bzip2-1.0.6", - "Caldera", - "CECILL-1.0", - "CECILL-1.1", - "CECILL-2.0", - "CECILL-2.1", - "CECILL-B", - "CECILL-C", - "ClArtistic", - "MIT-CMU", - "CNRI-Jython", - "CNRI-Python", - "CNRI-Python-GPL-Compatible", - "CPOL-1.02", - "CDDL-1.0", - "CDDL-1.1", - "CPAL-1.0", - "CPL-1.0", - "CATOSL-1.1", - "Condor-1.1", - "CC-BY-1.0", - "CC-BY-2.0", - "CC-BY-2.5", - "CC-BY-3.0", - "CC-BY-4.0", - "CC-BY-ND-1.0", - "CC-BY-ND-2.0", - "CC-BY-ND-2.5", - "CC-BY-ND-3.0", - "CC-BY-ND-4.0", - "CC-BY-NC-1.0", - "CC-BY-NC-2.0", - "CC-BY-NC-2.5", - "CC-BY-NC-3.0", - "CC-BY-NC-4.0", - "CC-BY-NC-ND-1.0", - "CC-BY-NC-ND-2.0", - "CC-BY-NC-ND-2.5", - "CC-BY-NC-ND-3.0", - "CC-BY-NC-ND-4.0", - "CC-BY-NC-SA-1.0", - "CC-BY-NC-SA-2.0", - "CC-BY-NC-SA-2.5", - "CC-BY-NC-SA-3.0", - "CC-BY-NC-SA-4.0", - "CC-BY-SA-1.0", - "CC-BY-SA-2.0", - "CC-BY-SA-2.5", - "CC-BY-SA-3.0", - "CC-BY-SA-4.0", - "CC0-1.0", - "Crossword", - "CrystalStacker", - "CUA-OPL-1.0", - "Cube", - "curl", - "D-FSL-1.0", - "diffmark", - "WTFPL", - "DOC", - "Dotseqn", - "DSDP", - "dvipdfm", - "EPL-1.0", - "ECL-1.0", - "ECL-2.0", - "eGenix", - "EFL-1.0", - "EFL-2.0", - "MIT-advertising", - "MIT-enna", - "Entessa", - "ErlPL-1.1", - "EUDatagrid", - "EUPL-1.0", - "EUPL-1.1", - "Eurosym", - "Fair", - "MIT-feh", - "Frameworx-1.0", - "FreeImage", - "FTL", - "FSFAP", - "FSFUL", - "FSFULLR", - "Giftware", - "GL2PS", - "Glulxe", "AGPL-3.0", + "eCos-2.0", "GFDL-1.1", "GFDL-1.2", "GFDL-1.3", "GPL-1.0", - "GPL-2.0", - "GPL-3.0", - "LGPL-2.1", - "LGPL-3.0", - "LGPL-2.0", - "gnuplot", - "gSOAP-1.3b", - "HaskellReport", - "HPND", - "IBM-pibs", - "IPL-1.0", - "ICU", - "ImageMagick", - "iMatix", - "Imlib2", - "IJG", - "Info-ZIP", - "Intel-ACPI", - "Intel", - "Interbase-1.0", - "IPA", - "ISC", - "JasPer-2.0", - "JSON", - "LPPL-1.0", - "LPPL-1.1", - "LPPL-1.2", - "LPPL-1.3a", - "LPPL-1.3c", - "Latex2e", - "BSD-3-Clause-LBNL", - "Leptonica", - "LGPLLR", - "Libpng", - "libtiff", - "LAL-1.2", - "LAL-1.3", - "LiLiQ-P-1.1", - "LiLiQ-Rplus-1.1", - "LiLiQ-R-1.1", - "LPL-1.02", - "LPL-1.0", - "MakeIndex", - "MTLL", - "MS-PL", - "MS-RL", - "MirOS", - "MITNFA", - "MIT", - "Motosoto", - "MPL-1.0", - "MPL-1.1", - "MPL-2.0", - "MPL-2.0-no-copyleft-exception", - "mpich2", - "Multics", - "Mup", - "NASA-1.3", - "Naumen", - "NBPL-1.0", - "NetCDF", - "NGPL", - "NOSL", - "NPL-1.0", - "NPL-1.1", - "Newsletr", - "NLPL", - "Nokia", - "NPOSL-3.0", - "NLOD-1.0", - "Noweb", - "NRL", - "NTP", - "Nunit", - "OCLC-2.0", - "ODbL-1.0", - "PDDL-1.0", - "OCCT-PL", - "OGTSL", - "OLDAP-2.2.2", - "OLDAP-1.1", - "OLDAP-1.2", - "OLDAP-1.3", - "OLDAP-1.4", - "OLDAP-2.0", - "OLDAP-2.0.1", - "OLDAP-2.1", - "OLDAP-2.2", - "OLDAP-2.2.1", - "OLDAP-2.3", - "OLDAP-2.4", - "OLDAP-2.5", - "OLDAP-2.6", - "OLDAP-2.7", - "OLDAP-2.8", - "OML", - "OPL-1.0", - "OSL-1.0", - "OSL-1.1", - "OSL-2.0", - "OSL-2.1", - "OSL-3.0", - "OpenSSL", - "OSET-PL-2.1", - "PHP-3.0", - "PHP-3.01", - "Plexus", - "PostgreSQL", - "psfrag", - "psutils", - "Python-2.0", - "QPL-1.0", - "Qhull", - "Rdisc", - "RPSL-1.0", - "RPL-1.1", - "RPL-1.5", - "RHeCos-1.1", - "RSCPL", - "RSA-MD", - "Ruby", - "SAX-PD", - "Saxpath", - "SCEA", - "SWL", - "SMPPL", - "Sendmail", - "SGI-B-1.0", - "SGI-B-1.1", - "SGI-B-2.0", - "OFL-1.0", - "OFL-1.1", - "SimPL-2.0", - "Sleepycat", - "SNIA", - "Spencer-86", - "Spencer-94", - "Spencer-99", - "SMLNJ", - "SugarCRM-1.1.3", - "SISSL", - "SISSL-1.2", - "SPL-1.0", - "Watcom-1.0", - "TCL", - "Unlicense", - "TMate", - "TORQUE-1.1", - "TOSL", - "Unicode-TOU", - "UPL-1.0", - "NCSA", - "Vim", - "VOSTROM", - "VSL-1.0", - "W3C-19980720", - "W3C", - "Wsuipa", - "Xnet", - "X11", - "Xerox", - "XFree86-1.1", - "xinetd", - "xpp", - "XSkat", - "YPL-1.0", - "YPL-1.1", - "Zed", - "Zend-2.0", - "Zimbra-1.3", - "Zimbra-1.4", - "Zlib", - "zlib-acknowledgement", - "ZPL-1.1", - "ZPL-2.0", - "ZPL-2.1", - "BSD-3-Clause-No-Nuclear-License", - "BSD-3-Clause-No-Nuclear-Warranty", - "BSD-3-Clause-No-Nuclear-License-2014", - "eCos-2.0", "GPL-2.0-with-autoconf-exception", "GPL-2.0-with-bison-exception", "GPL-2.0-with-classpath-exception", "GPL-2.0-with-font-exception", "GPL-2.0-with-GCC-exception", + "GPL-2.0", "GPL-3.0-with-autoconf-exception", "GPL-3.0-with-GCC-exception", + "GPL-3.0", + "LGPL-2.0", + "LGPL-2.1", + "LGPL-3.0", + "Nunit", "StandardML-NJ", - "WXwindows" + "wxWindows" ]; /***/ }), -/* 720 */ +/* 730 */ /***/ (function(module, exports, __webpack_require__) { // Copyright 2017 Joyent, Inc. @@ -145021,16 +145262,16 @@ module.exports = { toBuffer: toBuffer }; -var assert = __webpack_require__(16); +var assert = __webpack_require__(17); var SSHBuffer = __webpack_require__(139); -var crypto = __webpack_require__(13); +var crypto = __webpack_require__(14); var algs = __webpack_require__(26); var Key = __webpack_require__(27); var PrivateKey = __webpack_require__(28); var Identity = __webpack_require__(104); -var rfc4253 = __webpack_require__(70); +var rfc4253 = __webpack_require__(71); var Signature = __webpack_require__(51); -var utils = __webpack_require__(24); +var utils = __webpack_require__(25); var Certificate = __webpack_require__(101); function verify(cert, key) { @@ -145332,12 +145573,12 @@ function getCertType(key) { /***/ }), -/* 721 */ +/* 731 */ /***/ (function(module, exports, __webpack_require__) { // Copyright 2016 Joyent, Inc. -var x509 = __webpack_require__(322); +var x509 = __webpack_require__(326); module.exports = { read: read, @@ -145346,13 +145587,13 @@ module.exports = { write: write }; -var assert = __webpack_require__(16); +var assert = __webpack_require__(17); var asn1 = __webpack_require__(53); var algs = __webpack_require__(26); -var utils = __webpack_require__(24); +var utils = __webpack_require__(25); var Key = __webpack_require__(27); var PrivateKey = __webpack_require__(28); -var pem = __webpack_require__(62); +var pem = __webpack_require__(63); var Identity = __webpack_require__(104); var Signature = __webpack_require__(51); var Certificate = __webpack_require__(101); @@ -145415,7 +145656,7 @@ function write(cert, options) { /***/ }), -/* 722 */ +/* 732 */ /***/ (function(module, exports) { module.exports = shift @@ -145441,7 +145682,7 @@ function getStateLength (state) { /***/ }), -/* 723 */ +/* 733 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -145454,7 +145695,7 @@ module.exports = function (str) { /***/ }), -/* 724 */ +/* 734 */ /***/ (function(module, exports) { /*! http://mths.be/codepointat v0.2.0 by @mathias */ @@ -145514,12 +145755,12 @@ if (!String.prototype.codePointAt) { /***/ }), -/* 725 */ +/* 735 */ /***/ (function(module, exports, __webpack_require__) { var util = __webpack_require__(4) var Stream = __webpack_require__(29) -var StringDecoder = __webpack_require__(203).StringDecoder +var StringDecoder = __webpack_require__(205).StringDecoder module.exports = StringStream module.exports.AlignedStringDecoder = AlignedStringDecoder @@ -145622,18 +145863,18 @@ function alignedWrite(buffer) { /***/ }), -/* 726 */ +/* 736 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -const ansiRegex = __webpack_require__(727); +const ansiRegex = __webpack_require__(737); module.exports = input => typeof input === 'string' ? input.replace(ansiRegex(), '') : input; /***/ }), -/* 727 */ +/* 737 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -145650,12 +145891,12 @@ module.exports = () => { /***/ }), -/* 728 */ +/* 738 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var hasFlag = __webpack_require__(585); +var hasFlag = __webpack_require__(594); var support = function (level) { if (level === 0) { @@ -145741,16 +145982,16 @@ module.exports = process && support(supportLevel); /***/ }), -/* 729 */ +/* 739 */ /***/ (function(module, exports, __webpack_require__) { var util = __webpack_require__(4) -var bl = __webpack_require__(457) -var xtend = __webpack_require__(329) -var headers = __webpack_require__(324) +var bl = __webpack_require__(462) +var xtend = __webpack_require__(334) +var headers = __webpack_require__(328) -var Writable = __webpack_require__(69).Writable -var PassThrough = __webpack_require__(69).PassThrough +var Writable = __webpack_require__(70).Writable +var PassThrough = __webpack_require__(70).PassThrough var noop = function () {} @@ -145768,6 +146009,7 @@ var emptyStream = function (self, offset) { var mixinPax = function (header, pax) { if (pax.path) header.name = pax.path if (pax.linkpath) header.linkname = pax.linkpath + if (pax.size) header.size = parseInt(pax.size, 10) header.pax = pax return header } @@ -145788,9 +146030,12 @@ var Extract = function (opts) { if (!(this instanceof Extract)) return new Extract(opts) Writable.call(this, opts) + opts = opts || {} + this._offset = 0 this._buffer = bl() this._missing = 0 + this._partial = false this._onparse = noop this._header = null this._stream = null @@ -145847,14 +146092,14 @@ var Extract = function (opts) { var ongnulongpath = function () { var size = self._header.size - this._gnuLongPath = headers.decodeLongPath(b.slice(0, size)) + this._gnuLongPath = headers.decodeLongPath(b.slice(0, size), opts.filenameEncoding) b.consume(size) onstreamend() } var ongnulonglinkpath = function () { var size = self._header.size - this._gnuLongLinkPath = headers.decodeLongPath(b.slice(0, size)) + this._gnuLongLinkPath = headers.decodeLongPath(b.slice(0, size), opts.filenameEncoding) b.consume(size) onstreamend() } @@ -145863,7 +146108,7 @@ var Extract = function (opts) { var offset = self._offset var header try { - header = self._header = headers.decode(b.slice(0, 512)) + header = self._header = headers.decode(b.slice(0, 512), opts.filenameEncoding) } catch (err) { self.emit('error', err) } @@ -145925,6 +146170,7 @@ var Extract = function (opts) { oncontinue() } + this._onheader = onheader this._parse(512, onheader) } @@ -145943,6 +146189,7 @@ Extract.prototype._parse = function (size, onparse) { if (this._destroyed) return this._offset += size this._missing = size + if (onparse === this._onheader) this._partial = false this._onparse = onparse } @@ -145960,6 +146207,7 @@ Extract.prototype._write = function (data, enc, cb) { var s = this._stream var b = this._buffer var missing = this._missing + if (data.length) this._partial = true // we do not reach end-of-chunk now. just forward it @@ -145989,28 +146237,34 @@ Extract.prototype._write = function (data, enc, cb) { this._onparse() } +Extract.prototype._final = function (cb) { + if (this._partial) return this.destroy(new Error('Unexpected end of data')) + cb() +} + module.exports = Extract /***/ }), -/* 730 */ +/* 740 */ /***/ (function(module, exports, __webpack_require__) { -var constants = __webpack_require__(331) -var eos = __webpack_require__(284) +var constants = __webpack_require__(563) +var eos = __webpack_require__(286) var util = __webpack_require__(4) +var alloc = __webpack_require__(257) +var toBuffer = __webpack_require__(331) -var Readable = __webpack_require__(69).Readable -var Writable = __webpack_require__(69).Writable -var StringDecoder = __webpack_require__(203).StringDecoder +var Readable = __webpack_require__(70).Readable +var Writable = __webpack_require__(70).Writable +var StringDecoder = __webpack_require__(205).StringDecoder -var headers = __webpack_require__(324) +var headers = __webpack_require__(328) var DMODE = parseInt('755', 8) var FMODE = parseInt('644', 8) -var END_OF_TAR = new Buffer(1024) -END_OF_TAR.fill(0) +var END_OF_TAR = alloc(1024) var noop = function () {} @@ -146122,7 +146376,7 @@ Pack.prototype.entry = function (header, buffer, callback) { if (!header.gid) header.gid = 0 if (!header.mtime) header.mtime = new Date() - if (typeof buffer === 'string') buffer = new Buffer(buffer) + if (typeof buffer === 'string') buffer = toBuffer(buffer) if (Buffer.isBuffer(buffer)) { header.size = buffer.length this._encode(header) @@ -146253,7 +146507,7 @@ module.exports = Pack /***/ }), -/* 731 */ +/* 741 */ /***/ (function(module, exports, __webpack_require__) { var Stream = __webpack_require__(29) @@ -146367,7 +146621,7 @@ function through (write, end, opts) { /***/ }), -/* 732 */ +/* 742 */ /***/ (function(module, exports, __webpack_require__) { /*! @@ -146384,8 +146638,8 @@ function through (write, end, opts) { var fs = __webpack_require__(10), path = __webpack_require__(0), - crypto = __webpack_require__(13), - tmpDir = __webpack_require__(660), + crypto = __webpack_require__(14), + tmpDir = __webpack_require__(669), _c = process.binding('constants'); @@ -146862,17 +147116,17 @@ module.exports.setGracefulCleanup = _setGracefulCleanup; /***/ }), -/* 733 */ +/* 743 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; var net = __webpack_require__(108) - , tls = __webpack_require__(333) + , tls = __webpack_require__(338) , http = __webpack_require__(52) , https = __webpack_require__(143) - , events = __webpack_require__(71) + , events = __webpack_require__(72) , assert = __webpack_require__(36) , util = __webpack_require__(4) , Buffer = __webpack_require__(82).Buffer @@ -147113,7 +147367,7 @@ exports.debug = debug // for test /***/ }), -/* 734 */ +/* 744 */ /***/ (function(module, exports, __webpack_require__) { @@ -147125,14 +147379,14 @@ module.exports = __webpack_require__(4).deprecate; /***/ }), -/* 735 */ +/* 745 */ /***/ (function(module, exports, __webpack_require__) { // Unique ID creation requires a high quality random # generator. We feature // detect to determine the best RNG source, normalizing to a function that // returns 128-bits of randomness, since that's what's usually required -var rng = __webpack_require__(328); -var bytesToUuid = __webpack_require__(327); +var rng = __webpack_require__(333); +var bytesToUuid = __webpack_require__(332); // **`v1()` - Generate time-based UUID** // @@ -147234,11 +147488,11 @@ module.exports = v1; /***/ }), -/* 736 */ +/* 746 */ /***/ (function(module, exports, __webpack_require__) { -var rng = __webpack_require__(328); -var bytesToUuid = __webpack_require__(327); +var rng = __webpack_require__(333); +var bytesToUuid = __webpack_require__(332); function v4(options, buf, offset) { var i = buf && offset || 0; @@ -147269,11 +147523,11 @@ module.exports = v4; /***/ }), -/* 737 */ +/* 747 */ /***/ (function(module, exports, __webpack_require__) { -var parse = __webpack_require__(717); -var correct = __webpack_require__(716); +var parse = __webpack_require__(320); +var correct = __webpack_require__(725); var genericWarning = ( 'license should be ' + @@ -147359,7 +147613,7 @@ module.exports = function(argument) { /***/ }), -/* 738 */ +/* 748 */ /***/ (function(module, exports, __webpack_require__) { /* @@ -147369,7 +147623,7 @@ module.exports = function(argument) { var mod_assert = __webpack_require__(36); var mod_util = __webpack_require__(4); -var mod_extsprintf = __webpack_require__(285); +var mod_extsprintf = __webpack_require__(287); /* * Public interface @@ -147522,12 +147776,12 @@ WError.prototype.cause = function we_cause(c) /***/ }), -/* 739 */ +/* 749 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -const lenient = __webpack_require__(740); +const lenient = __webpack_require__(750); module.exports = (val, opts) => { val = String(val).trim(); @@ -147557,7 +147811,7 @@ module.exports = (val, opts) => { /***/ }), -/* 740 */ +/* 750 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -147672,13 +147926,13 @@ module.exports = (val, opts) => { /***/ }), -/* 741 */ +/* 751 */ /***/ (function(module, exports) { module.exports = require("dgram"); /***/ }), -/* 742 */ +/* 752 */ /***/ (function(module, exports) { module.exports = require("domain");