You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by zr...@apache.org on 2020/02/18 15:18:18 UTC
[camel-website] branch master updated: chore: upgrade to Yarn 1.22.0
This is an automated email from the ASF dual-hosted git repository.
zregvart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-website.git
The following commit(s) were added to refs/heads/master by this push:
new b4f7133 chore: upgrade to Yarn 1.22.0
b4f7133 is described below
commit b4f713373fc8c197432a1ac9ceed2680053657cb
Author: Zoran Regvart <zr...@apache.org>
AuthorDate: Tue Feb 18 16:18:07 2020 +0100
chore: upgrade to Yarn 1.22.0
---
.yarn/releases/{yarn-1.19.1.js => yarn-1.22.0.js} | 444 ++++++++++++++-------
.yarnrc | 4 +-
.../releases/{yarn-1.19.1.js => yarn-1.22.0.js} | 444 ++++++++++++++-------
antora-ui-camel/.yarnrc | 4 +-
4 files changed, 602 insertions(+), 294 deletions(-)
diff --git a/.yarn/releases/yarn-1.19.1.js b/.yarn/releases/yarn-1.22.0.js
similarity index 99%
rename from .yarn/releases/yarn-1.19.1.js
rename to .yarn/releases/yarn-1.22.0.js
index 3907b87..32f00a3 100755
--- a/.yarn/releases/yarn-1.19.1.js
+++ b/.yarn/releases/yarn-1.22.0.js
@@ -1405,7 +1405,7 @@ function _load_glob() {
var _os;
function _load_os() {
- return _os = _interopRequireDefault(__webpack_require__(49));
+ return _os = _interopRequireDefault(__webpack_require__(46));
}
var _path;
@@ -1832,7 +1832,7 @@ Object.defineProperty(exports, "__esModule", {
value: true
});
exports.getPathKey = getPathKey;
-const os = __webpack_require__(49);
+const os = __webpack_require__(46);
const path = __webpack_require__(0);
const userHome = __webpack_require__(67).default;
@@ -4388,7 +4388,7 @@ module.exports = require("url");
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_isObject__ = __webpack_require__(444);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_isFunction__ = __webpack_require__(154);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_tryCatch__ = __webpack_require__(56);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_errorObject__ = __webpack_require__(47);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_errorObject__ = __webpack_require__(48);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__util_UnsubscriptionError__ = __webpack_require__(441);
/** PURE_IMPORTS_START _util_isArray,_util_isObject,_util_isFunction,_util_tryCatch,_util_errorObject,_util_UnsubscriptionError PURE_IMPORTS_END */
@@ -25141,6 +25141,12 @@ SafeBuffer.allocUnsafeSlow = function (size) {
/***/ }),
/* 46 */
+/***/ (function(module, exports) {
+
+module.exports = require("os");
+
+/***/ }),
+/* 47 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -25196,7 +25202,7 @@ var MapSubscriber = /*@__PURE__*/ (function (_super) {
/***/ }),
-/* 47 */
+/* 48 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -25207,7 +25213,7 @@ var errorObject = { e: {} };
/***/ }),
-/* 48 */
+/* 49 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -25220,12 +25226,6 @@ function isScheduler(value) {
/***/ }),
-/* 49 */
-/***/ (function(module, exports) {
-
-module.exports = require("os");
-
-/***/ }),
/* 50 */
/***/ (function(module, exports, __webpack_require__) {
@@ -25425,7 +25425,7 @@ module.exports = new Schema({
"use strict";
/* harmony export (immutable) */ __webpack_exports__["a"] = tryCatch;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__errorObject__ = __webpack_require__(47);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__errorObject__ = __webpack_require__(48);
/** PURE_IMPORTS_START _errorObject PURE_IMPORTS_END */
var tryCatchTarget;
@@ -25959,7 +25959,7 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "isEmpty", function() { return __WEBPACK_IMPORTED_MODULE_37__internal_operators_isEmpty__["a"]; });
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_38__internal_operators_last__ = __webpack_require__(868);
/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "last", function() { return __WEBPACK_IMPORTED_MODULE_38__internal_operators_last__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_39__internal_operators_map__ = __webpack_require__(46);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_39__internal_operators_map__ = __webpack_require__(47);
/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "map", function() { return __WEBPACK_IMPORTED_MODULE_39__internal_operators_map__["a"]; });
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_40__internal_operators_mapTo__ = __webpack_require__(869);
/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "mapTo", function() { return __WEBPACK_IMPORTED_MODULE_40__internal_operators_mapTo__["a"]; });
@@ -26636,7 +26636,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
const path = __webpack_require__(0);
-const home = exports.home = __webpack_require__(49).homedir();
+const home = exports.home = __webpack_require__(46).homedir();
const userHomeDir = (_rootUser || _load_rootUser()).default ? path.resolve('/usr/local/share') : home;
@@ -35333,7 +35333,7 @@ function _load_isCi() {
var _os;
function _load_os() {
- return _os = _interopRequireDefault(__webpack_require__(49));
+ return _os = _interopRequireDefault(__webpack_require__(46));
}
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; } }
@@ -40721,7 +40721,7 @@ var FilterSubscriber = /*@__PURE__*/ (function (_super) {
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_subscribeToResult__ = __webpack_require__(14);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__OuterSubscriber__ = __webpack_require__(13);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__InnerSubscriber__ = __webpack_require__(84);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__map__ = __webpack_require__(46);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__map__ = __webpack_require__(47);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__observable_from__ = __webpack_require__(62);
/** PURE_IMPORTS_START tslib,_util_subscribeToResult,_OuterSubscriber,_InnerSubscriber,_map,_observable_from PURE_IMPORTS_END */
@@ -45918,7 +45918,7 @@ var config = {
"use strict";
/* harmony export (immutable) */ __webpack_exports__["a"] = concat;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__util_isScheduler__ = __webpack_require__(48);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__util_isScheduler__ = __webpack_require__(49);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__of__ = __webpack_require__(311);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__from__ = __webpack_require__(62);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__operators_concatAll__ = __webpack_require__(429);
@@ -46321,7 +46321,7 @@ var pump = __webpack_require__(781)
var mkdirp = __webpack_require__(145)
var fs = __webpack_require__(5)
var path = __webpack_require__(0)
-var os = __webpack_require__(49)
+var os = __webpack_require__(46)
var win32 = os.platform() === 'win32'
@@ -46666,7 +46666,7 @@ function mkdirfix (name, opts, cb) {
/* 194 */
/***/ (function(module, exports) {
-module.exports = {"name":"yarn","installationMethod":"unknown","version":"1.19.1","license":"BSD-2-Clause","preferGlobal":true,"description":"📦🐈 Fast, reliable, and secure dependency management.","dependencies":{"@zkochan/cmd-shim":"^3.1.0","babel-runtime":"^6.26.0","bytes":"^3.0.0","camelcase":"^4.0.0","chalk":"^2.1.0","cli-table3":"^0.4.0","commander":"^2.9.0","death":"^1.0.0","debug":"^3.0.0","deep-equal":"^1.0.1","detect-indent":"^5.0.0","dnscache":"^1.0.1","glob":"^7.1.1","gunzip-ma [...]
+module.exports = {"name":"yarn","installationMethod":"unknown","version":"1.22.0","license":"BSD-2-Clause","preferGlobal":true,"description":"📦🐈 Fast, reliable, and secure dependency management.","dependencies":{"@zkochan/cmd-shim":"^3.1.0","babel-runtime":"^6.26.0","bytes":"^3.0.0","camelcase":"^4.0.0","chalk":"^2.1.0","cli-table3":"^0.4.0","commander":"^2.9.0","death":"^1.0.0","debug":"^3.0.0","deep-equal":"^1.0.1","detect-indent":"^5.0.0","dnscache":"^1.0.1","glob":"^7.1.1","gunzip-ma [...]
/***/ }),
/* 195 */
@@ -49416,10 +49416,6 @@ class PackageLinker {
} else if (workspaceLayout && remote.type === 'workspace' && !isShallow) {
src = remote.reference;
type = 'symlink';
- if (dest.indexOf(workspaceLayout.virtualManifestName) !== -1) {
- // we don't need to install virtual manifest
- continue;
- }
// to get real path for non hoisted dependencies
symlinkPaths.set(dest, src);
} else {
@@ -49596,6 +49592,10 @@ class PackageLinker {
possibleExtraneous.add(path.join(filepath, subfile));
}
+ } else if (file[0] === '.' && file !== '.bin') {
+ if (!(yield (_fs || _load_fs()).lstat(filepath)).isDirectory()) {
+ possibleExtraneous.add(filepath);
+ }
} else {
possibleExtraneous.add(filepath);
}
@@ -52045,6 +52045,7 @@ Object.defineProperty(exports, "__esModule", {
value: true
});
exports.isValidLicense = isValidLicense;
+exports.isValidBin = isValidBin;
exports.stringifyPerson = stringifyPerson;
exports.parsePerson = parsePerson;
exports.normalizePerson = normalizePerson;
@@ -52052,12 +52053,20 @@ exports.extractDescription = extractDescription;
exports.extractRepositoryUrl = extractRepositoryUrl;
+const path = __webpack_require__(0);
+
const validateLicense = __webpack_require__(959);
+const PARENT_PATH = /^\.\.([\\\/]|$)/;
+
function isValidLicense(license) {
return !!license && validateLicense(license).validForNewPackages;
}
+function isValidBin(bin) {
+ return !path.isAbsolute(bin) && !PARENT_PATH.test(path.normalize(bin));
+}
+
function stringifyPerson(person) {
if (!person || typeof person !== 'object') {
return person;
@@ -67243,7 +67252,7 @@ var ReplayEvent = /*@__PURE__*/ (function () {
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return CombineLatestOperator; });
/* unused harmony export CombineLatestSubscriber */
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_isScheduler__ = __webpack_require__(48);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_isScheduler__ = __webpack_require__(49);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_isArray__ = __webpack_require__(41);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__OuterSubscriber__ = __webpack_require__(13);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_subscribeToResult__ = __webpack_require__(14);
@@ -67387,7 +67396,7 @@ function defer(observableFactory) {
"use strict";
/* harmony export (immutable) */ __webpack_exports__["a"] = of;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__util_isScheduler__ = __webpack_require__(48);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__util_isScheduler__ = __webpack_require__(49);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__fromArray__ = __webpack_require__(85);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__empty__ = __webpack_require__(39);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__scalar__ = __webpack_require__(312);
@@ -67879,7 +67888,7 @@ var ScanSubscriber = /*@__PURE__*/ (function (_super) {
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__OuterSubscriber__ = __webpack_require__(13);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__InnerSubscriber__ = __webpack_require__(84);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_subscribeToResult__ = __webpack_require__(14);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__map__ = __webpack_require__(46);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__map__ = __webpack_require__(47);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__observable_from__ = __webpack_require__(62);
/** PURE_IMPORTS_START tslib,_OuterSubscriber,_InnerSubscriber,_util_subscribeToResult,_map,_observable_from PURE_IMPORTS_END */
@@ -69793,6 +69802,7 @@ Object.defineProperty(exports, "__esModule", {
value: true
});
exports.getRcConfigForCwd = getRcConfigForCwd;
+exports.getRcConfigForFolder = getRcConfigForFolder;
exports.getRcArgs = getRcArgs;
var _fs;
@@ -69848,13 +69858,23 @@ function getRcConfigForCwd(cwd, args) {
const value = args[index + 1];
if (value && value.charAt(0) !== '-') {
- Object.assign(config, loadRcFile((0, (_fs || _load_fs()).readFileSync)(value).toString(), value));
+ Object.assign(config, loadRcFile((0, (_fs || _load_fs()).readFileSync)(value, 'utf8'), value));
}
}
return config;
}
+function getRcConfigForFolder(cwd) {
+ const filePath = (0, (_path || _load_path()).resolve)(cwd, '.yarnrc');
+ if (!(0, (_fs || _load_fs()).existsSync)(filePath)) {
+ return {};
+ }
+
+ const fileText = (0, (_fs || _load_fs()).readFileSync)(filePath, 'utf8');
+ return loadRcFile(fileText, filePath);
+}
+
function loadRcFile(fileText, filePath) {
var _parse = (0, (_lockfile || _load_lockfile()).parse)(fileText, 'yarnrc');
@@ -69984,7 +70004,7 @@ Object.defineProperty(exports, "__esModule", {
value: true
});
exports.isOffline = isOffline;
-const os = __webpack_require__(49);
+const os = __webpack_require__(46);
const IGNORE_INTERFACES = ['lo0', 'awdl0', 'bridge0'];
const LOCAL_IPS = ['127.0.0.1', '::1'];
@@ -74680,6 +74700,7 @@ let getBinEntries = exports.getBinEntries = (() => {
const registryFolder = _ref4;
+ binFolders.add(path.resolve(config.cwd, registryFolder, '.bin'));
binFolders.add(path.resolve(config.lockfileFolder, registryFolder, '.bin'));
}
@@ -74827,7 +74848,20 @@ let run = exports.run = (() => {
} else {
let suggestion;
- for (const commandName in scripts) {
+ for (var _iterator9 = scripts.keys(), _isArray9 = Array.isArray(_iterator9), _i9 = 0, _iterator9 = _isArray9 ? _iterator9 : _iterator9[Symbol.iterator]();;) {
+ var _ref16;
+
+ if (_isArray9) {
+ if (_i9 >= _iterator9.length) break;
+ _ref16 = _iterator9[_i9++];
+ } else {
+ _i9 = _iterator9.next();
+ if (_i9.done) break;
+ _ref16 = _i9.value;
+ }
+
+ const commandName = _ref16;
+
const steps = leven(commandName, action);
if (steps < 2) {
suggestion = commandName;
@@ -74912,19 +74946,19 @@ let run = exports.run = (() => {
const printedCommands = new Map();
- for (var _iterator9 = pkgCommands, _isArray9 = Array.isArray(_iterator9), _i9 = 0, _iterator9 = _isArray9 ? _iterator9 : _iterator9[Symbol.iterator]();;) {
- var _ref16;
+ for (var _iterator10 = pkgCommands, _isArray10 = Array.isArray(_iterator10), _i10 = 0, _iterator10 = _isArray10 ? _iterator10 : _iterator10[Symbol.iterator]();;) {
+ var _ref17;
- if (_isArray9) {
- if (_i9 >= _iterator9.length) break;
- _ref16 = _iterator9[_i9++];
+ if (_isArray10) {
+ if (_i10 >= _iterator10.length) break;
+ _ref17 = _iterator10[_i10++];
} else {
- _i9 = _iterator9.next();
- if (_i9.done) break;
- _ref16 = _i9.value;
+ _i10 = _iterator10.next();
+ if (_i10.done) break;
+ _ref17 = _i10.value;
}
- const pkgCommand = _ref16;
+ const pkgCommand = _ref17;
const action = scripts.get(pkgCommand);
invariant(action, 'Action must exists');
@@ -76055,6 +76089,11 @@ class TarballFetcher extends (_baseFetcher || _load_baseFetcher()).default {
chown: false, // don't chown. just leave as it is
map: header => {
header.mtime = now;
+ if (header.linkname) {
+ const basePath = path.posix.dirname(path.join('/', header.name));
+ const jailPath = path.posix.join(basePath, header.linkname);
+ header.linkname = path.posix.relative('/', jailPath);
+ }
return header;
},
fs: patchedFs
@@ -78388,6 +78427,11 @@ class RequestManager {
rejectNext(err);
};
+ const rejectWithoutUrl = function rejectWithoutUrl(err) {
+ err.message = err.message;
+ rejectNext(err);
+ };
+
const queueForRetry = reason => {
const attempts = params.retryAttempts || 0;
if (attempts >= this.maxRetryAttempts - 1) {
@@ -78443,6 +78487,11 @@ class RequestManager {
}
}
+ if (res.statusCode === 401 && res.caseless && res.caseless.get('server') === 'GitHub.com') {
+ const message = `${res.body.message}. If using GITHUB_TOKEN in your env, check that it is valid.`;
+ rejectWithoutUrl(new Error(this.reporter.lang('unauthorizedResponse', res.caseless.get('server'), message)));
+ }
+
if (res.statusCode === 401 && res.headers['www-authenticate']) {
const authMethods = res.headers['www-authenticate'].split(/,\s*/).map(s => s.toLowerCase());
@@ -85410,7 +85459,7 @@ var RefCountSubscriber = /*@__PURE__*/ (function (_super) {
"use strict";
/* harmony export (immutable) */ __webpack_exports__["a"] = merge;
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(12);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_isScheduler__ = __webpack_require__(48);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_isScheduler__ = __webpack_require__(49);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__operators_mergeAll__ = __webpack_require__(315);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__fromArray__ = __webpack_require__(85);
/** PURE_IMPORTS_START _Observable,_util_isScheduler,_operators_mergeAll,_fromArray PURE_IMPORTS_END */
@@ -85564,7 +85613,7 @@ var RaceSubscriber = /*@__PURE__*/ (function (_super) {
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(12);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__scheduler_async__ = __webpack_require__(40);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_isNumeric__ = __webpack_require__(190);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_isScheduler__ = __webpack_require__(48);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_isScheduler__ = __webpack_require__(49);
/** PURE_IMPORTS_START _Observable,_scheduler_async,_util_isNumeric,_util_isScheduler PURE_IMPORTS_END */
@@ -85616,7 +85665,7 @@ function dispatch(state) {
/* harmony export (immutable) */ __webpack_exports__["a"] = audit;
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_tryCatch__ = __webpack_require__(56);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_errorObject__ = __webpack_require__(47);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_errorObject__ = __webpack_require__(48);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__OuterSubscriber__ = __webpack_require__(13);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_subscribeToResult__ = __webpack_require__(14);
/** PURE_IMPORTS_START tslib,_util_tryCatch,_util_errorObject,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
@@ -85729,7 +85778,7 @@ function concatMap(project, resultSelector) {
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(7);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_tryCatch__ = __webpack_require__(56);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_errorObject__ = __webpack_require__(47);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_errorObject__ = __webpack_require__(48);
/** PURE_IMPORTS_START tslib,_Subscriber,_util_tryCatch,_util_errorObject PURE_IMPORTS_END */
@@ -96945,6 +96994,24 @@ function _load_asyncToGenerator() {
let run = exports.run = (() => {
var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) {
+ const installVersion = flags[`2`] ? `berry` : flags.install;
+
+ if (installVersion) {
+ const lockfilePath = path.resolve(config.cwd, 'yarn.lock');
+ if (!(yield (_fs || _load_fs()).exists(lockfilePath))) {
+ yield (_fs || _load_fs()).writeFile(lockfilePath, '');
+ }
+ yield (_child || _load_child()).spawn((_constants || _load_constants()).NODE_BIN_PATH, [process.argv[1], 'policies', 'set-version', installVersion], {
+ stdio: 'inherit',
+ cwd: config.cwd
+ });
+ yield (_child || _load_child()).spawn((_constants || _load_constants()).NODE_BIN_PATH, [process.argv[1], 'init', ...(flags.yes ? ['-y'] : []), ...(flags.private ? ['-p'] : [])], {
+ stdio: 'inherit',
+ cwd: config.cwd
+ });
+ return;
+ }
+
const manifests = yield config.getRootManifests();
let repository = {};
@@ -97209,11 +97276,18 @@ function _load_validate() {
return _validate = _interopRequireWildcard(__webpack_require__(125));
}
+var _constants;
+
+function _load_constants() {
+ return _constants = __webpack_require__(8);
+}
+
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 }; }
const objectPath = __webpack_require__(304);
+
const path = __webpack_require__(0);
const yn = __webpack_require__(962);
@@ -97221,6 +97295,8 @@ function setFlags(commander) {
commander.description('Interactively creates or updates a package.json file.');
commander.option('-y, --yes', 'use default options');
commander.option('-p, --private', 'use default options and private true');
+ commander.option('-i, --install <value>', 'install a specific Yarn release');
+ commander.option('-2', 'generates the project using Yarn 2');
}
function hasWrapper(commander, args) {
@@ -98209,6 +98285,7 @@ var _buildSubCommands = (0, (_buildSubCommands2 || _load_buildSubCommands()).def
let bundleUrl;
let bundleVersion;
+ let isV2 = false;
if (range === 'nightly' || range === 'nightlies') {
bundleUrl = 'https://nightly.yarnpkg.com/latest.js';
@@ -98216,10 +98293,18 @@ var _buildSubCommands = (0, (_buildSubCommands2 || _load_buildSubCommands()).def
} else if (range === 'berry' || range === 'v2' || range === '2') {
bundleUrl = 'https://github.com/yarnpkg/berry/raw/master/packages/berry-cli/bin/berry.js';
bundleVersion = 'berry';
+ isV2 = true;
} else {
- const releases = yield fetchReleases(config, {
- includePrereleases: allowRc
- });
+ let releases = [];
+
+ try {
+ releases = yield fetchReleases(config, {
+ includePrereleases: allowRc
+ });
+ } catch (e) {
+ reporter.error(e.message);
+ return;
+ }
const release = releases.find(function (release) {
// $FlowFixMe
@@ -98240,7 +98325,6 @@ var _buildSubCommands = (0, (_buildSubCommands2 || _load_buildSubCommands()).def
reporter.log(`Downloading ${chalk.green(bundleUrl)}...`);
const bundle = yield fetchBundle(config, bundleUrl);
- const rc = (0, (_rc || _load_rc()).getRcConfigForCwd)(config.lockfileFolder, []);
const yarnPath = path.resolve(config.lockfileFolder, `.yarn/releases/yarn-${bundleVersion}.js`);
reporter.log(`Saving it into ${chalk.magenta(yarnPath)}...`);
@@ -98248,10 +98332,22 @@ var _buildSubCommands = (0, (_buildSubCommands2 || _load_buildSubCommands()).def
yield (_fs || _load_fs()).writeFile(yarnPath, bundle);
yield (_fs || _load_fs()).chmod(yarnPath, 0o755);
- const rcPath = `${config.lockfileFolder}/.yarnrc`;
- reporter.log(`Updating ${chalk.magenta(rcPath)}...`);
- rc['yarn-path'] = path.relative(config.lockfileFolder, yarnPath);
- yield (_fs || _load_fs()).writeFilePreservingEol(rcPath, `${(0, (_lockfile || _load_lockfile()).stringify)(rc)}\n`);
+ const targetPath = path.relative(config.lockfileFolder, yarnPath).replace(/\\/g, '/');
+
+ if (isV2) {
+ const rcPath = `${config.lockfileFolder}/.yarnrc.yml`;
+ reporter.log(`Updating ${chalk.magenta(rcPath)}...`);
+
+ yield (_fs || _load_fs()).writeFilePreservingEol(rcPath, `yarnPath: ${JSON.stringify(yarnPath)}\n`);
+ } else {
+ const rcPath = `${config.lockfileFolder}/.yarnrc`;
+ reporter.log(`Updating ${chalk.magenta(rcPath)}...`);
+
+ const rc = (0, (_rc || _load_rc()).getRcConfigForFolder)(config.lockfileFolder);
+ rc['yarn-path'] = targetPath;
+
+ yield (_fs || _load_fs()).writeFilePreservingEol(rcPath, `${(0, (_lockfile || _load_lockfile()).stringify)(rc)}\n`);
+ }
reporter.log(`Done!`);
})();
@@ -99574,11 +99670,11 @@ let run = exports.run = (() => {
throw new (_errors || _load_errors()).MessageError(reporter.lang('workspaceRootNotFound', config.cwd));
}
- if (flags.originalArgs < 1) {
+ if (args.length < 1) {
throw new (_errors || _load_errors()).MessageError(reporter.lang('workspaceMissingWorkspace'));
}
- if (flags.originalArgs < 2) {
+ if (args.length < 2) {
throw new (_errors || _load_errors()).MessageError(reporter.lang('workspaceMissingCommand'));
}
@@ -99587,7 +99683,7 @@ let run = exports.run = (() => {
const workspaces = yield config.resolveWorkspaces(workspaceRootFolder, manifest);
- var _ref2 = flags.originalArgs || [];
+ var _ref2 = args || [];
const workspaceName = _ref2[0],
rest = _ref2.slice(1);
@@ -99773,28 +99869,23 @@ let runScript = exports.runScript = (() => {
const workspaces = yield config.resolveWorkspaces(workspaceRootFolder, manifest);
try {
- var _ref6 = flags.originalArgs || [];
-
- const _ = _ref6[0],
- rest = _ref6.slice(1);
-
for (var _iterator4 = Object.keys(workspaces), _isArray4 = Array.isArray(_iterator4), _i4 = 0, _iterator4 = _isArray4 ? _iterator4 : _iterator4[Symbol.iterator]();;) {
- var _ref7;
+ var _ref6;
if (_isArray4) {
if (_i4 >= _iterator4.length) break;
- _ref7 = _iterator4[_i4++];
+ _ref6 = _iterator4[_i4++];
} else {
_i4 = _iterator4.next();
if (_i4.done) break;
- _ref7 = _i4.value;
+ _ref6 = _i4.value;
}
- const workspaceName = _ref7;
+ const workspaceName = _ref6;
const loc = workspaces[workspaceName].loc;
-
- yield (_child || _load_child()).spawn((_constants2 || _load_constants2()).NODE_BIN_PATH, [(_constants2 || _load_constants2()).YARN_BIN_PATH, ...rest], {
+ reporter.log(`${os.EOL}> ${workspaceName}`);
+ yield (_child || _load_child()).spawn((_constants2 || _load_constants2()).NODE_BIN_PATH, [(_constants2 || _load_constants2()).YARN_BIN_PATH, 'run', ...args], {
stdio: 'inherit',
cwd: loc
});
@@ -99847,6 +99938,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
const invariant = __webpack_require__(9);
const path = __webpack_require__(0);
+const os = __webpack_require__(46);
const semver = __webpack_require__(22);
function hasWrapper(commander, args) {
@@ -100013,7 +100105,11 @@ let main = exports.main = (() => {
commandName = 'install';
isKnownCommand = true;
}
-
+ if (commandName === 'set' && args[0] === 'version') {
+ commandName = 'policies';
+ args.splice(0, 1, 'set-version');
+ isKnownCommand = true;
+ }
if (!isKnownCommand) {
// if command is not recognized, then set default to `run`
args.unshift(commandName);
@@ -100024,15 +100120,20 @@ let main = exports.main = (() => {
let warnAboutRunDashDash = false;
// we are using "yarn <script> -abc", "yarn run <script> -abc", or "yarn node -abc", we want -abc
// to be script options, not yarn options
- const PROXY_COMMANDS = new Set([`run`, `create`, `node`]);
- if (PROXY_COMMANDS.has(commandName)) {
+
+ // PROXY_COMMANDS is a map of command name to the number of preservedArgs
+ const PROXY_COMMANDS = {
+ run: 1, // yarn run {command}
+ create: 1, // yarn create {project}
+ node: 0, // yarn node
+ workspaces: 1, // yarn workspaces {command}
+ workspace: 2 // yarn workspace {package} {command}
+ };
+ if (PROXY_COMMANDS.hasOwnProperty(commandName)) {
if (endArgs.length === 0) {
- let preservedArgs = 0;
- // the "run" and "create" command take one argument that we want to parse as usual (the
- // script/package name), hence the splice(1)
- if (command === (_index3 || _load_index3()).default.run || command === (_index3 || _load_index3()).default.create) {
- preservedArgs += 1;
- }
+ // $FlowFixMe doesn't like that PROXY_COMMANDS doesn't have keys for all commands.
+ let preservedArgs = PROXY_COMMANDS[commandName];
+
// If the --into option immediately follows the command (or the script name in the "run/create"
// case), we parse them as regular options so that we can cd into them
if (args[preservedArgs] === `--into`) {
@@ -100044,7 +100145,6 @@ let main = exports.main = (() => {
}
}
- (_commander || _load_commander()).default.originalArgs = args;
args = [...preCommandArgs, ...args];
command.setFlags((_commander || _load_commander()).default);
@@ -102347,6 +102447,15 @@ class PackageHoister {
// decompress the location and push it to the flat tree. this path could be made
const parts = [];
const keyParts = key.split('#');
+ const isWorkspaceEntry = this.workspaceLayout && keyParts[0] === this.workspaceLayout.virtualManifestName;
+
+ // Don't add the virtual manifest (keyParts.length === 1)
+ // or ws childs which were not hoisted to the root (keyParts.length === 2).
+ // If a ws child was hoisted its key would not contain the virtual manifest name
+ if (isWorkspaceEntry && keyParts.length <= 2) {
+ continue;
+ }
+
for (let i = 0; i < keyParts.length; i++) {
const key = keyParts.slice(0, i + 1).join('#');
const hoisted = this.tree.get(key);
@@ -102355,16 +102464,26 @@ class PackageHoister {
parts.push(keyParts[i]);
}
- const shallowLocs = [];
- if (this.config.modulesFolder) {
- // remove the first part which will be the folder name and replace it with a
- // hardcoded modules folder
- parts.splice(0, 1, this.config.modulesFolder);
+ // Check if the destination is pointing to a sub folder of the virtualManifestName
+ // e.g. _project_/node_modules/workspace-aggregator-123456/node_modules/workspaceChild/node_modules/dependency
+ // This probably happened because the hoister was not able to hoist the workspace child to the root
+ // So we have to change the folder to the workspace package location
+ if (this.workspaceLayout && isWorkspaceEntry) {
+ const wspPkg = this.workspaceLayout.workspaces[keyParts[1]];
+ invariant(wspPkg, `expected workspace package to exist for "${keyParts[1]}"`);
+ parts.splice(0, 4, wspPkg.loc);
} else {
- // first part will be the registry-specific module folder
- parts.splice(0, 0, this.config.lockfileFolder);
+ if (this.config.modulesFolder) {
+ // remove the first part which will be the folder name and replace it with a
+ // hardcoded modules folder
+ parts.splice(0, 1, this.config.modulesFolder);
+ } else {
+ // first part will be the registry-specific module folder
+ parts.splice(0, 0, this.config.lockfileFolder);
+ }
}
+ const shallowLocs = [];
info.shallowPaths.forEach(shallowPath => {
const shallowCopyParts = parts.slice();
shallowCopyParts[0] = this.config.cwd;
@@ -104558,7 +104677,8 @@ const messages = {
couldntClearPackageFromCache: "Couldn't clear package $0 from cache",
clearedPackageFromCache: 'Cleared package $0 from cache',
packWroteTarball: 'Wrote tarball to $0.',
-
+ invalidBinField: 'Invalid bin field for $0.',
+ invalidBinEntry: 'Invalid bin entry for $1 (in $0).',
helpExamples: ' Examples:\n$0\n',
helpCommands: ' Commands:\n$0\n',
helpCommandsMore: ' Run `$0` for more information on specific commands.',
@@ -104857,6 +104977,7 @@ const messages = {
errorExtractingTarball: 'Extracting tar content of $1 failed, the file appears to be corrupt: $0',
updateInstalling: 'Installing $0...',
hostedGitResolveError: 'Error connecting to repository. Please, check the url.',
+ unauthorizedResponse: 'Received a 401 from $0. $1',
unknownFetcherFor: 'Unknown fetcher for $0',
@@ -106035,7 +106156,7 @@ function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj;
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-/* babel-plugin-inline-import './generate-pnp-map-api.tpl.js' */const pnpApi = '#!$$SHEBANG\n\n/* eslint-disable max-len, flowtype/require-valid-file-annotation, flowtype/require-return-type */\n/* global packageInformationStores, $$BLACKLIST, $$SETUP_STATIC_TABLES */\n\n// Used for the resolveUnqualified part of the resolution (ie resolving folder/index.js & file extensions)\n// Deconstructed so that they aren\'t affected by any fs monkeypatching occuring later during the execution\ncon [...]
+/* babel-plugin-inline-import './generate-pnp-map-api.tpl.js' */const pnpApi = '#!$$SHEBANG\n\n/* eslint-disable max-len, flowtype/require-valid-file-annotation, flowtype/require-return-type */\n/* global packageInformationStores, $$BLACKLIST, $$SETUP_STATIC_TABLES */\n\n// Used for the resolveUnqualified part of the resolution (ie resolving folder/index.js & file extensions)\n// Deconstructed so that they aren\'t affected by any fs monkeypatching occuring later during the execution\ncon [...]
const crypto = __webpack_require__(11);
@@ -106731,6 +106852,8 @@ const semver = __webpack_require__(22);
const path = __webpack_require__(0);
const url = __webpack_require__(24);
+const VALID_BIN_KEYS = /^(?!\.{0,2}$)[a-z0-9._-]+$/i;
+
const LICENSE_RENAMES = {
'MIT/X11': 'MIT',
X11: 'MIT'
@@ -106898,6 +107021,37 @@ exports.default = (() => {
info.bin = { [name]: info.bin };
}
+ // Validate that the bin entries reference only files within their package, and that
+ // their name is a valid file name
+ if (typeof info.bin === 'object' && info.bin !== null) {
+ const bin = info.bin;
+ for (var _iterator3 = Object.keys(bin), _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : _iterator3[Symbol.iterator]();;) {
+ var _ref4;
+
+ if (_isArray3) {
+ if (_i3 >= _iterator3.length) break;
+ _ref4 = _iterator3[_i3++];
+ } else {
+ _i3 = _iterator3.next();
+ if (_i3.done) break;
+ _ref4 = _i3.value;
+ }
+
+ const key = _ref4;
+
+ const target = bin[key];
+ if (!VALID_BIN_KEYS.test(key) || !(0, (_util || _load_util()).isValidBin)(target)) {
+ delete bin[key];
+ warn(reporter.lang('invalidBinEntry', info.name, key));
+ } else {
+ bin[key] = path.normalize(target);
+ }
+ }
+ } else if (typeof info.bin !== 'undefined') {
+ delete info.bin;
+ warn(reporter.lang('invalidBinField', info.name));
+ }
+
// bundleDependencies is an alias for bundledDependencies
if (info.bundledDependencies) {
info.bundleDependencies = info.bundledDependencies;
@@ -106938,19 +107092,19 @@ exports.default = (() => {
const fullBinDir = path.join(moduleLoc, binDir);
if (yield (_fs || _load_fs()).exists(fullBinDir)) {
- for (var _iterator3 = yield (_fs || _load_fs()).readdir(fullBinDir), _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : _iterator3[Symbol.iterator]();;) {
- var _ref4;
+ for (var _iterator4 = yield (_fs || _load_fs()).readdir(fullBinDir), _isArray4 = Array.isArray(_iterator4), _i4 = 0, _iterator4 = _isArray4 ? _iterator4 : _iterator4[Symbol.iterator]();;) {
+ var _ref5;
- if (_isArray3) {
- if (_i3 >= _iterator3.length) break;
- _ref4 = _iterator3[_i3++];
+ if (_isArray4) {
+ if (_i4 >= _iterator4.length) break;
+ _ref5 = _iterator4[_i4++];
} else {
- _i3 = _iterator3.next();
- if (_i3.done) break;
- _ref4 = _i3.value;
+ _i4 = _iterator4.next();
+ if (_i4.done) break;
+ _ref5 = _i4.value;
}
- const scriptName = _ref4;
+ const scriptName = _ref5;
if (scriptName[0] === '.') {
continue;
@@ -106969,19 +107123,19 @@ exports.default = (() => {
const fullManDir = path.join(moduleLoc, manDir);
if (yield (_fs || _load_fs()).exists(fullManDir)) {
- for (var _iterator4 = yield (_fs || _load_fs()).readdir(fullManDir), _isArray4 = Array.isArray(_iterator4), _i4 = 0, _iterator4 = _isArray4 ? _iterator4 : _iterator4[Symbol.iterator]();;) {
- var _ref5;
+ for (var _iterator5 = yield (_fs || _load_fs()).readdir(fullManDir), _isArray5 = Array.isArray(_iterator5), _i5 = 0, _iterator5 = _isArray5 ? _iterator5 : _iterator5[Symbol.iterator]();;) {
+ var _ref6;
- if (_isArray4) {
- if (_i4 >= _iterator4.length) break;
- _ref5 = _iterator4[_i4++];
+ if (_isArray5) {
+ if (_i5 >= _iterator5.length) break;
+ _ref6 = _iterator5[_i5++];
} else {
- _i4 = _iterator4.next();
- if (_i4.done) break;
- _ref5 = _i4.value;
+ _i5 = _iterator5.next();
+ if (_i5.done) break;
+ _ref6 = _i5.value;
}
- const filename = _ref5;
+ const filename = _ref6;
if (/^(.*?)\.[0-9]$/.test(filename)) {
man.push(path.join('.', manDir, filename));
@@ -107000,19 +107154,19 @@ exports.default = (() => {
if (Array.isArray(licenses) && !info.license) {
let licenseTypes = [];
- for (var _iterator5 = licenses, _isArray5 = Array.isArray(_iterator5), _i5 = 0, _iterator5 = _isArray5 ? _iterator5 : _iterator5[Symbol.iterator]();;) {
- var _ref6;
+ for (var _iterator6 = licenses, _isArray6 = Array.isArray(_iterator6), _i6 = 0, _iterator6 = _isArray6 ? _iterator6 : _iterator6[Symbol.iterator]();;) {
+ var _ref7;
- if (_isArray5) {
- if (_i5 >= _iterator5.length) break;
- _ref6 = _iterator5[_i5++];
+ if (_isArray6) {
+ if (_i6 >= _iterator6.length) break;
+ _ref7 = _iterator6[_i6++];
} else {
- _i5 = _iterator5.next();
- if (_i5.done) break;
- _ref6 = _i5.value;
+ _i6 = _iterator6.next();
+ if (_i6.done) break;
+ _ref7 = _i6.value;
}
- let license = _ref6;
+ let license = _ref7;
if (license && typeof license === 'object') {
license = license.type;
@@ -107097,19 +107251,19 @@ exports.default = (() => {
}
}
- for (var _iterator6 = (_constants || _load_constants()).MANIFEST_FIELDS, _isArray6 = Array.isArray(_iterator6), _i6 = 0, _iterator6 = _isArray6 ? _iterator6 : _iterator6[Symbol.iterator]();;) {
- var _ref7;
+ for (var _iterator7 = (_constants || _load_constants()).MANIFEST_FIELDS, _isArray7 = Array.isArray(_iterator7), _i7 = 0, _iterator7 = _isArray7 ? _iterator7 : _iterator7[Symbol.iterator]();;) {
+ var _ref8;
- if (_isArray6) {
- if (_i6 >= _iterator6.length) break;
- _ref7 = _iterator6[_i6++];
+ if (_isArray7) {
+ if (_i7 >= _iterator7.length) break;
+ _ref8 = _iterator7[_i7++];
} else {
- _i6 = _iterator6.next();
- if (_i6.done) break;
- _ref7 = _i6.value;
+ _i7 = _iterator7.next();
+ if (_i7.done) break;
+ _ref8 = _i7.value;
}
- const dependencyType = _ref7;
+ const dependencyType = _ref8;
const dependencyList = info[dependencyType];
if (dependencyList && typeof dependencyList === 'object') {
@@ -108267,7 +108421,7 @@ module.exports = (flag, argv) => {
"use strict";
-const os = __webpack_require__(49);
+const os = __webpack_require__(46);
const hasFlag = __webpack_require__(597);
const env = process.env;
@@ -110384,7 +110538,7 @@ THE SOFTWARE.
-var os = __webpack_require__(49);
+var os = __webpack_require__(46);
var hasFlag = __webpack_require__(619);
var env = process.env;
@@ -137062,10 +137216,10 @@ var SubscribeOnObservable = /*@__PURE__*/ (function (_super) {
/* harmony export (immutable) */ __webpack_exports__["a"] = bindCallback;
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(12);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__AsyncSubject__ = __webpack_require__(183);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__operators_map__ = __webpack_require__(46);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__operators_map__ = __webpack_require__(47);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_canReportError__ = __webpack_require__(322);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_isArray__ = __webpack_require__(41);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__util_isScheduler__ = __webpack_require__(48);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__util_isScheduler__ = __webpack_require__(49);
/** PURE_IMPORTS_START _Observable,_AsyncSubject,_operators_map,_util_canReportError,_util_isArray,_util_isScheduler PURE_IMPORTS_END */
@@ -137181,9 +137335,9 @@ function dispatchError(state) {
/* harmony export (immutable) */ __webpack_exports__["a"] = bindNodeCallback;
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(12);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__AsyncSubject__ = __webpack_require__(183);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__operators_map__ = __webpack_require__(46);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__operators_map__ = __webpack_require__(47);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_canReportError__ = __webpack_require__(322);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_isScheduler__ = __webpack_require__(48);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_isScheduler__ = __webpack_require__(49);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__util_isArray__ = __webpack_require__(41);
/** PURE_IMPORTS_START _Observable,_AsyncSubject,_operators_map,_util_canReportError,_util_isScheduler,_util_isArray PURE_IMPORTS_END */
@@ -137312,7 +137466,7 @@ function dispatchError(arg) {
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__empty__ = __webpack_require__(39);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_subscribeToResult__ = __webpack_require__(14);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__OuterSubscriber__ = __webpack_require__(13);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__operators_map__ = __webpack_require__(46);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__operators_map__ = __webpack_require__(47);
/** PURE_IMPORTS_START tslib,_Observable,_util_isArray,_empty,_util_subscribeToResult,_OuterSubscriber,_operators_map PURE_IMPORTS_END */
@@ -137398,7 +137552,7 @@ var ForkJoinSubscriber = /*@__PURE__*/ (function (_super) {
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(12);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_isArray__ = __webpack_require__(41);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_isFunction__ = __webpack_require__(154);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__operators_map__ = __webpack_require__(46);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__operators_map__ = __webpack_require__(47);
/** PURE_IMPORTS_START _Observable,_util_isArray,_util_isFunction,_operators_map PURE_IMPORTS_END */
@@ -137473,7 +137627,7 @@ function isEventTarget(sourceObj) {
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(12);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_isArray__ = __webpack_require__(41);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_isFunction__ = __webpack_require__(154);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__operators_map__ = __webpack_require__(46);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__operators_map__ = __webpack_require__(47);
/** PURE_IMPORTS_START _Observable,_util_isArray,_util_isFunction,_operators_map PURE_IMPORTS_END */
@@ -137654,7 +137808,7 @@ function fromPromise(input, scheduler) {
/* harmony export (immutable) */ __webpack_exports__["a"] = generate;
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(12);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_identity__ = __webpack_require__(118);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_isScheduler__ = __webpack_require__(48);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_isScheduler__ = __webpack_require__(49);
/** PURE_IMPORTS_START _Observable,_util_identity,_util_isScheduler PURE_IMPORTS_END */
@@ -138213,7 +138367,7 @@ var BufferSkipCountSubscriber = /*@__PURE__*/ (function (_super) {
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__scheduler_async__ = __webpack_require__(40);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__Subscriber__ = __webpack_require__(7);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_isScheduler__ = __webpack_require__(48);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_isScheduler__ = __webpack_require__(49);
/** PURE_IMPORTS_START tslib,_scheduler_async,_Subscriber,_util_isScheduler PURE_IMPORTS_END */
@@ -138492,7 +138646,7 @@ var BufferToggleSubscriber = /*@__PURE__*/ (function (_super) {
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscription__ = __webpack_require__(25);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_tryCatch__ = __webpack_require__(56);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_errorObject__ = __webpack_require__(47);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_errorObject__ = __webpack_require__(48);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__OuterSubscriber__ = __webpack_require__(13);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__util_subscribeToResult__ = __webpack_require__(14);
/** PURE_IMPORTS_START tslib,_Subscription,_util_tryCatch,_util_errorObject,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
@@ -139366,7 +139520,7 @@ function elementAt(index, defaultValue) {
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__observable_scalar__ = __webpack_require__(312);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__observable_empty__ = __webpack_require__(39);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__observable_concat__ = __webpack_require__(186);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_isScheduler__ = __webpack_require__(48);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_isScheduler__ = __webpack_require__(49);
/** PURE_IMPORTS_START _observable_fromArray,_observable_scalar,_observable_empty,_observable_concat,_util_isScheduler PURE_IMPORTS_END */
@@ -139528,7 +139682,7 @@ var SwitchFirstSubscriber = /*@__PURE__*/ (function (_super) {
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__OuterSubscriber__ = __webpack_require__(13);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__InnerSubscriber__ = __webpack_require__(84);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_subscribeToResult__ = __webpack_require__(14);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__map__ = __webpack_require__(46);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__map__ = __webpack_require__(47);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__observable_from__ = __webpack_require__(62);
/** PURE_IMPORTS_START tslib,_OuterSubscriber,_InnerSubscriber,_util_subscribeToResult,_map,_observable_from PURE_IMPORTS_END */
@@ -139624,7 +139778,7 @@ var ExhaustMapSubscriber = /*@__PURE__*/ (function (_super) {
/* unused harmony export ExpandSubscriber */
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_tryCatch__ = __webpack_require__(56);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_errorObject__ = __webpack_require__(47);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_errorObject__ = __webpack_require__(48);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__OuterSubscriber__ = __webpack_require__(13);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_subscribeToResult__ = __webpack_require__(14);
/** PURE_IMPORTS_START tslib,_util_tryCatch,_util_errorObject,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
@@ -140074,7 +140228,7 @@ function mergeMapTo(innerObservable, resultSelector, concurrent) {
/* unused harmony export MergeScanSubscriber */
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_tryCatch__ = __webpack_require__(56);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_errorObject__ = __webpack_require__(47);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_errorObject__ = __webpack_require__(48);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_subscribeToResult__ = __webpack_require__(14);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__OuterSubscriber__ = __webpack_require__(13);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__InnerSubscriber__ = __webpack_require__(84);
@@ -140356,7 +140510,7 @@ function partition(predicate, thisArg) {
"use strict";
/* harmony export (immutable) */ __webpack_exports__["a"] = pluck;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__map__ = __webpack_require__(46);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__map__ = __webpack_require__(47);
/** PURE_IMPORTS_START _map PURE_IMPORTS_END */
function pluck() {
@@ -140563,7 +140717,7 @@ var RepeatSubscriber = /*@__PURE__*/ (function (_super) {
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subject__ = __webpack_require__(36);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_tryCatch__ = __webpack_require__(56);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_errorObject__ = __webpack_require__(47);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_errorObject__ = __webpack_require__(48);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__OuterSubscriber__ = __webpack_require__(13);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__util_subscribeToResult__ = __webpack_require__(14);
/** PURE_IMPORTS_START tslib,_Subject,_util_tryCatch,_util_errorObject,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
@@ -140710,7 +140864,7 @@ var RetrySubscriber = /*@__PURE__*/ (function (_super) {
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subject__ = __webpack_require__(36);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_tryCatch__ = __webpack_require__(56);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_errorObject__ = __webpack_require__(47);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_errorObject__ = __webpack_require__(48);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__OuterSubscriber__ = __webpack_require__(13);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__util_subscribeToResult__ = __webpack_require__(14);
/** PURE_IMPORTS_START tslib,_Subject,_util_tryCatch,_util_errorObject,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
@@ -140915,7 +141069,7 @@ function dispatchNotification(state) {
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(7);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_tryCatch__ = __webpack_require__(56);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_errorObject__ = __webpack_require__(47);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_errorObject__ = __webpack_require__(48);
/** PURE_IMPORTS_START tslib,_Subscriber,_util_tryCatch,_util_errorObject PURE_IMPORTS_END */
@@ -141411,7 +141565,7 @@ var SkipWhileSubscriber = /*@__PURE__*/ (function (_super) {
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__observable_scalar__ = __webpack_require__(312);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__observable_empty__ = __webpack_require__(39);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__observable_concat__ = __webpack_require__(186);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_isScheduler__ = __webpack_require__(48);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_isScheduler__ = __webpack_require__(49);
/** PURE_IMPORTS_START _observable_fromArray,_observable_scalar,_observable_empty,_observable_concat,_util_isScheduler PURE_IMPORTS_END */
@@ -141717,7 +141871,7 @@ function dispatchNext(arg) {
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__scheduler_async__ = __webpack_require__(40);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__scan__ = __webpack_require__(317);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__observable_defer__ = __webpack_require__(310);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__map__ = __webpack_require__(46);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__map__ = __webpack_require__(47);
/** PURE_IMPORTS_START _scheduler_async,_scan,_observable_defer,_map PURE_IMPORTS_END */
@@ -141782,7 +141936,7 @@ function timeout(due, scheduler) {
/* harmony export (immutable) */ __webpack_exports__["a"] = timestamp;
/* unused harmony export Timestamp */
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__scheduler_async__ = __webpack_require__(40);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__map__ = __webpack_require__(46);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__map__ = __webpack_require__(47);
/** PURE_IMPORTS_START _scheduler_async,_map PURE_IMPORTS_END */
@@ -142004,7 +142158,7 @@ var WindowCountSubscriber = /*@__PURE__*/ (function (_super) {
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__scheduler_async__ = __webpack_require__(40);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__Subscriber__ = __webpack_require__(7);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_isNumeric__ = __webpack_require__(190);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__util_isScheduler__ = __webpack_require__(48);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__util_isScheduler__ = __webpack_require__(49);
/** PURE_IMPORTS_START tslib,_Subject,_scheduler_async,_Subscriber,_util_isNumeric,_util_isScheduler PURE_IMPORTS_END */
@@ -142172,7 +142326,7 @@ function dispatchWindowClose(state) {
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subject__ = __webpack_require__(36);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__Subscription__ = __webpack_require__(25);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_tryCatch__ = __webpack_require__(56);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_errorObject__ = __webpack_require__(47);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_errorObject__ = __webpack_require__(48);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__OuterSubscriber__ = __webpack_require__(13);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__util_subscribeToResult__ = __webpack_require__(14);
/** PURE_IMPORTS_START tslib,_Subject,_Subscription,_util_tryCatch,_util_errorObject,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
@@ -142316,7 +142470,7 @@ var WindowToggleSubscriber = /*@__PURE__*/ (function (_super) {
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subject__ = __webpack_require__(36);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_tryCatch__ = __webpack_require__(56);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_errorObject__ = __webpack_require__(47);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_errorObject__ = __webpack_require__(48);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__OuterSubscriber__ = __webpack_require__(13);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__util_subscribeToResult__ = __webpack_require__(14);
/** PURE_IMPORTS_START tslib,_Subject,_util_tryCatch,_util_errorObject,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
diff --git a/.yarnrc b/.yarnrc
index 2da4c9f..dd23872 100644
--- a/.yarnrc
+++ b/.yarnrc
@@ -5,5 +5,5 @@
env:
HUGO_VERSION "0.58.2"
-lastUpdateCheck 1572860094163
-yarn-path ".yarn/releases/yarn-1.19.1.js"
+lastUpdateCheck 1581501547594
+yarn-path ".yarn/releases/yarn-1.22.0.js"
diff --git a/antora-ui-camel/.yarn/releases/yarn-1.19.1.js b/antora-ui-camel/.yarn/releases/yarn-1.22.0.js
similarity index 99%
rename from antora-ui-camel/.yarn/releases/yarn-1.19.1.js
rename to antora-ui-camel/.yarn/releases/yarn-1.22.0.js
index 3907b87..32f00a3 100755
--- a/antora-ui-camel/.yarn/releases/yarn-1.19.1.js
+++ b/antora-ui-camel/.yarn/releases/yarn-1.22.0.js
@@ -1405,7 +1405,7 @@ function _load_glob() {
var _os;
function _load_os() {
- return _os = _interopRequireDefault(__webpack_require__(49));
+ return _os = _interopRequireDefault(__webpack_require__(46));
}
var _path;
@@ -1832,7 +1832,7 @@ Object.defineProperty(exports, "__esModule", {
value: true
});
exports.getPathKey = getPathKey;
-const os = __webpack_require__(49);
+const os = __webpack_require__(46);
const path = __webpack_require__(0);
const userHome = __webpack_require__(67).default;
@@ -4388,7 +4388,7 @@ module.exports = require("url");
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_isObject__ = __webpack_require__(444);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_isFunction__ = __webpack_require__(154);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_tryCatch__ = __webpack_require__(56);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_errorObject__ = __webpack_require__(47);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_errorObject__ = __webpack_require__(48);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__util_UnsubscriptionError__ = __webpack_require__(441);
/** PURE_IMPORTS_START _util_isArray,_util_isObject,_util_isFunction,_util_tryCatch,_util_errorObject,_util_UnsubscriptionError PURE_IMPORTS_END */
@@ -25141,6 +25141,12 @@ SafeBuffer.allocUnsafeSlow = function (size) {
/***/ }),
/* 46 */
+/***/ (function(module, exports) {
+
+module.exports = require("os");
+
+/***/ }),
+/* 47 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -25196,7 +25202,7 @@ var MapSubscriber = /*@__PURE__*/ (function (_super) {
/***/ }),
-/* 47 */
+/* 48 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -25207,7 +25213,7 @@ var errorObject = { e: {} };
/***/ }),
-/* 48 */
+/* 49 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -25220,12 +25226,6 @@ function isScheduler(value) {
/***/ }),
-/* 49 */
-/***/ (function(module, exports) {
-
-module.exports = require("os");
-
-/***/ }),
/* 50 */
/***/ (function(module, exports, __webpack_require__) {
@@ -25425,7 +25425,7 @@ module.exports = new Schema({
"use strict";
/* harmony export (immutable) */ __webpack_exports__["a"] = tryCatch;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__errorObject__ = __webpack_require__(47);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__errorObject__ = __webpack_require__(48);
/** PURE_IMPORTS_START _errorObject PURE_IMPORTS_END */
var tryCatchTarget;
@@ -25959,7 +25959,7 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "isEmpty", function() { return __WEBPACK_IMPORTED_MODULE_37__internal_operators_isEmpty__["a"]; });
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_38__internal_operators_last__ = __webpack_require__(868);
/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "last", function() { return __WEBPACK_IMPORTED_MODULE_38__internal_operators_last__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_39__internal_operators_map__ = __webpack_require__(46);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_39__internal_operators_map__ = __webpack_require__(47);
/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "map", function() { return __WEBPACK_IMPORTED_MODULE_39__internal_operators_map__["a"]; });
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_40__internal_operators_mapTo__ = __webpack_require__(869);
/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "mapTo", function() { return __WEBPACK_IMPORTED_MODULE_40__internal_operators_mapTo__["a"]; });
@@ -26636,7 +26636,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
const path = __webpack_require__(0);
-const home = exports.home = __webpack_require__(49).homedir();
+const home = exports.home = __webpack_require__(46).homedir();
const userHomeDir = (_rootUser || _load_rootUser()).default ? path.resolve('/usr/local/share') : home;
@@ -35333,7 +35333,7 @@ function _load_isCi() {
var _os;
function _load_os() {
- return _os = _interopRequireDefault(__webpack_require__(49));
+ return _os = _interopRequireDefault(__webpack_require__(46));
}
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; } }
@@ -40721,7 +40721,7 @@ var FilterSubscriber = /*@__PURE__*/ (function (_super) {
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_subscribeToResult__ = __webpack_require__(14);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__OuterSubscriber__ = __webpack_require__(13);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__InnerSubscriber__ = __webpack_require__(84);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__map__ = __webpack_require__(46);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__map__ = __webpack_require__(47);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__observable_from__ = __webpack_require__(62);
/** PURE_IMPORTS_START tslib,_util_subscribeToResult,_OuterSubscriber,_InnerSubscriber,_map,_observable_from PURE_IMPORTS_END */
@@ -45918,7 +45918,7 @@ var config = {
"use strict";
/* harmony export (immutable) */ __webpack_exports__["a"] = concat;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__util_isScheduler__ = __webpack_require__(48);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__util_isScheduler__ = __webpack_require__(49);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__of__ = __webpack_require__(311);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__from__ = __webpack_require__(62);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__operators_concatAll__ = __webpack_require__(429);
@@ -46321,7 +46321,7 @@ var pump = __webpack_require__(781)
var mkdirp = __webpack_require__(145)
var fs = __webpack_require__(5)
var path = __webpack_require__(0)
-var os = __webpack_require__(49)
+var os = __webpack_require__(46)
var win32 = os.platform() === 'win32'
@@ -46666,7 +46666,7 @@ function mkdirfix (name, opts, cb) {
/* 194 */
/***/ (function(module, exports) {
-module.exports = {"name":"yarn","installationMethod":"unknown","version":"1.19.1","license":"BSD-2-Clause","preferGlobal":true,"description":"📦🐈 Fast, reliable, and secure dependency management.","dependencies":{"@zkochan/cmd-shim":"^3.1.0","babel-runtime":"^6.26.0","bytes":"^3.0.0","camelcase":"^4.0.0","chalk":"^2.1.0","cli-table3":"^0.4.0","commander":"^2.9.0","death":"^1.0.0","debug":"^3.0.0","deep-equal":"^1.0.1","detect-indent":"^5.0.0","dnscache":"^1.0.1","glob":"^7.1.1","gunzip-ma [...]
+module.exports = {"name":"yarn","installationMethod":"unknown","version":"1.22.0","license":"BSD-2-Clause","preferGlobal":true,"description":"📦🐈 Fast, reliable, and secure dependency management.","dependencies":{"@zkochan/cmd-shim":"^3.1.0","babel-runtime":"^6.26.0","bytes":"^3.0.0","camelcase":"^4.0.0","chalk":"^2.1.0","cli-table3":"^0.4.0","commander":"^2.9.0","death":"^1.0.0","debug":"^3.0.0","deep-equal":"^1.0.1","detect-indent":"^5.0.0","dnscache":"^1.0.1","glob":"^7.1.1","gunzip-ma [...]
/***/ }),
/* 195 */
@@ -49416,10 +49416,6 @@ class PackageLinker {
} else if (workspaceLayout && remote.type === 'workspace' && !isShallow) {
src = remote.reference;
type = 'symlink';
- if (dest.indexOf(workspaceLayout.virtualManifestName) !== -1) {
- // we don't need to install virtual manifest
- continue;
- }
// to get real path for non hoisted dependencies
symlinkPaths.set(dest, src);
} else {
@@ -49596,6 +49592,10 @@ class PackageLinker {
possibleExtraneous.add(path.join(filepath, subfile));
}
+ } else if (file[0] === '.' && file !== '.bin') {
+ if (!(yield (_fs || _load_fs()).lstat(filepath)).isDirectory()) {
+ possibleExtraneous.add(filepath);
+ }
} else {
possibleExtraneous.add(filepath);
}
@@ -52045,6 +52045,7 @@ Object.defineProperty(exports, "__esModule", {
value: true
});
exports.isValidLicense = isValidLicense;
+exports.isValidBin = isValidBin;
exports.stringifyPerson = stringifyPerson;
exports.parsePerson = parsePerson;
exports.normalizePerson = normalizePerson;
@@ -52052,12 +52053,20 @@ exports.extractDescription = extractDescription;
exports.extractRepositoryUrl = extractRepositoryUrl;
+const path = __webpack_require__(0);
+
const validateLicense = __webpack_require__(959);
+const PARENT_PATH = /^\.\.([\\\/]|$)/;
+
function isValidLicense(license) {
return !!license && validateLicense(license).validForNewPackages;
}
+function isValidBin(bin) {
+ return !path.isAbsolute(bin) && !PARENT_PATH.test(path.normalize(bin));
+}
+
function stringifyPerson(person) {
if (!person || typeof person !== 'object') {
return person;
@@ -67243,7 +67252,7 @@ var ReplayEvent = /*@__PURE__*/ (function () {
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return CombineLatestOperator; });
/* unused harmony export CombineLatestSubscriber */
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_isScheduler__ = __webpack_require__(48);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_isScheduler__ = __webpack_require__(49);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_isArray__ = __webpack_require__(41);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__OuterSubscriber__ = __webpack_require__(13);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_subscribeToResult__ = __webpack_require__(14);
@@ -67387,7 +67396,7 @@ function defer(observableFactory) {
"use strict";
/* harmony export (immutable) */ __webpack_exports__["a"] = of;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__util_isScheduler__ = __webpack_require__(48);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__util_isScheduler__ = __webpack_require__(49);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__fromArray__ = __webpack_require__(85);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__empty__ = __webpack_require__(39);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__scalar__ = __webpack_require__(312);
@@ -67879,7 +67888,7 @@ var ScanSubscriber = /*@__PURE__*/ (function (_super) {
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__OuterSubscriber__ = __webpack_require__(13);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__InnerSubscriber__ = __webpack_require__(84);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_subscribeToResult__ = __webpack_require__(14);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__map__ = __webpack_require__(46);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__map__ = __webpack_require__(47);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__observable_from__ = __webpack_require__(62);
/** PURE_IMPORTS_START tslib,_OuterSubscriber,_InnerSubscriber,_util_subscribeToResult,_map,_observable_from PURE_IMPORTS_END */
@@ -69793,6 +69802,7 @@ Object.defineProperty(exports, "__esModule", {
value: true
});
exports.getRcConfigForCwd = getRcConfigForCwd;
+exports.getRcConfigForFolder = getRcConfigForFolder;
exports.getRcArgs = getRcArgs;
var _fs;
@@ -69848,13 +69858,23 @@ function getRcConfigForCwd(cwd, args) {
const value = args[index + 1];
if (value && value.charAt(0) !== '-') {
- Object.assign(config, loadRcFile((0, (_fs || _load_fs()).readFileSync)(value).toString(), value));
+ Object.assign(config, loadRcFile((0, (_fs || _load_fs()).readFileSync)(value, 'utf8'), value));
}
}
return config;
}
+function getRcConfigForFolder(cwd) {
+ const filePath = (0, (_path || _load_path()).resolve)(cwd, '.yarnrc');
+ if (!(0, (_fs || _load_fs()).existsSync)(filePath)) {
+ return {};
+ }
+
+ const fileText = (0, (_fs || _load_fs()).readFileSync)(filePath, 'utf8');
+ return loadRcFile(fileText, filePath);
+}
+
function loadRcFile(fileText, filePath) {
var _parse = (0, (_lockfile || _load_lockfile()).parse)(fileText, 'yarnrc');
@@ -69984,7 +70004,7 @@ Object.defineProperty(exports, "__esModule", {
value: true
});
exports.isOffline = isOffline;
-const os = __webpack_require__(49);
+const os = __webpack_require__(46);
const IGNORE_INTERFACES = ['lo0', 'awdl0', 'bridge0'];
const LOCAL_IPS = ['127.0.0.1', '::1'];
@@ -74680,6 +74700,7 @@ let getBinEntries = exports.getBinEntries = (() => {
const registryFolder = _ref4;
+ binFolders.add(path.resolve(config.cwd, registryFolder, '.bin'));
binFolders.add(path.resolve(config.lockfileFolder, registryFolder, '.bin'));
}
@@ -74827,7 +74848,20 @@ let run = exports.run = (() => {
} else {
let suggestion;
- for (const commandName in scripts) {
+ for (var _iterator9 = scripts.keys(), _isArray9 = Array.isArray(_iterator9), _i9 = 0, _iterator9 = _isArray9 ? _iterator9 : _iterator9[Symbol.iterator]();;) {
+ var _ref16;
+
+ if (_isArray9) {
+ if (_i9 >= _iterator9.length) break;
+ _ref16 = _iterator9[_i9++];
+ } else {
+ _i9 = _iterator9.next();
+ if (_i9.done) break;
+ _ref16 = _i9.value;
+ }
+
+ const commandName = _ref16;
+
const steps = leven(commandName, action);
if (steps < 2) {
suggestion = commandName;
@@ -74912,19 +74946,19 @@ let run = exports.run = (() => {
const printedCommands = new Map();
- for (var _iterator9 = pkgCommands, _isArray9 = Array.isArray(_iterator9), _i9 = 0, _iterator9 = _isArray9 ? _iterator9 : _iterator9[Symbol.iterator]();;) {
- var _ref16;
+ for (var _iterator10 = pkgCommands, _isArray10 = Array.isArray(_iterator10), _i10 = 0, _iterator10 = _isArray10 ? _iterator10 : _iterator10[Symbol.iterator]();;) {
+ var _ref17;
- if (_isArray9) {
- if (_i9 >= _iterator9.length) break;
- _ref16 = _iterator9[_i9++];
+ if (_isArray10) {
+ if (_i10 >= _iterator10.length) break;
+ _ref17 = _iterator10[_i10++];
} else {
- _i9 = _iterator9.next();
- if (_i9.done) break;
- _ref16 = _i9.value;
+ _i10 = _iterator10.next();
+ if (_i10.done) break;
+ _ref17 = _i10.value;
}
- const pkgCommand = _ref16;
+ const pkgCommand = _ref17;
const action = scripts.get(pkgCommand);
invariant(action, 'Action must exists');
@@ -76055,6 +76089,11 @@ class TarballFetcher extends (_baseFetcher || _load_baseFetcher()).default {
chown: false, // don't chown. just leave as it is
map: header => {
header.mtime = now;
+ if (header.linkname) {
+ const basePath = path.posix.dirname(path.join('/', header.name));
+ const jailPath = path.posix.join(basePath, header.linkname);
+ header.linkname = path.posix.relative('/', jailPath);
+ }
return header;
},
fs: patchedFs
@@ -78388,6 +78427,11 @@ class RequestManager {
rejectNext(err);
};
+ const rejectWithoutUrl = function rejectWithoutUrl(err) {
+ err.message = err.message;
+ rejectNext(err);
+ };
+
const queueForRetry = reason => {
const attempts = params.retryAttempts || 0;
if (attempts >= this.maxRetryAttempts - 1) {
@@ -78443,6 +78487,11 @@ class RequestManager {
}
}
+ if (res.statusCode === 401 && res.caseless && res.caseless.get('server') === 'GitHub.com') {
+ const message = `${res.body.message}. If using GITHUB_TOKEN in your env, check that it is valid.`;
+ rejectWithoutUrl(new Error(this.reporter.lang('unauthorizedResponse', res.caseless.get('server'), message)));
+ }
+
if (res.statusCode === 401 && res.headers['www-authenticate']) {
const authMethods = res.headers['www-authenticate'].split(/,\s*/).map(s => s.toLowerCase());
@@ -85410,7 +85459,7 @@ var RefCountSubscriber = /*@__PURE__*/ (function (_super) {
"use strict";
/* harmony export (immutable) */ __webpack_exports__["a"] = merge;
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(12);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_isScheduler__ = __webpack_require__(48);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_isScheduler__ = __webpack_require__(49);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__operators_mergeAll__ = __webpack_require__(315);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__fromArray__ = __webpack_require__(85);
/** PURE_IMPORTS_START _Observable,_util_isScheduler,_operators_mergeAll,_fromArray PURE_IMPORTS_END */
@@ -85564,7 +85613,7 @@ var RaceSubscriber = /*@__PURE__*/ (function (_super) {
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(12);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__scheduler_async__ = __webpack_require__(40);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_isNumeric__ = __webpack_require__(190);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_isScheduler__ = __webpack_require__(48);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_isScheduler__ = __webpack_require__(49);
/** PURE_IMPORTS_START _Observable,_scheduler_async,_util_isNumeric,_util_isScheduler PURE_IMPORTS_END */
@@ -85616,7 +85665,7 @@ function dispatch(state) {
/* harmony export (immutable) */ __webpack_exports__["a"] = audit;
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_tryCatch__ = __webpack_require__(56);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_errorObject__ = __webpack_require__(47);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_errorObject__ = __webpack_require__(48);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__OuterSubscriber__ = __webpack_require__(13);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_subscribeToResult__ = __webpack_require__(14);
/** PURE_IMPORTS_START tslib,_util_tryCatch,_util_errorObject,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
@@ -85729,7 +85778,7 @@ function concatMap(project, resultSelector) {
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(7);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_tryCatch__ = __webpack_require__(56);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_errorObject__ = __webpack_require__(47);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_errorObject__ = __webpack_require__(48);
/** PURE_IMPORTS_START tslib,_Subscriber,_util_tryCatch,_util_errorObject PURE_IMPORTS_END */
@@ -96945,6 +96994,24 @@ function _load_asyncToGenerator() {
let run = exports.run = (() => {
var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) {
+ const installVersion = flags[`2`] ? `berry` : flags.install;
+
+ if (installVersion) {
+ const lockfilePath = path.resolve(config.cwd, 'yarn.lock');
+ if (!(yield (_fs || _load_fs()).exists(lockfilePath))) {
+ yield (_fs || _load_fs()).writeFile(lockfilePath, '');
+ }
+ yield (_child || _load_child()).spawn((_constants || _load_constants()).NODE_BIN_PATH, [process.argv[1], 'policies', 'set-version', installVersion], {
+ stdio: 'inherit',
+ cwd: config.cwd
+ });
+ yield (_child || _load_child()).spawn((_constants || _load_constants()).NODE_BIN_PATH, [process.argv[1], 'init', ...(flags.yes ? ['-y'] : []), ...(flags.private ? ['-p'] : [])], {
+ stdio: 'inherit',
+ cwd: config.cwd
+ });
+ return;
+ }
+
const manifests = yield config.getRootManifests();
let repository = {};
@@ -97209,11 +97276,18 @@ function _load_validate() {
return _validate = _interopRequireWildcard(__webpack_require__(125));
}
+var _constants;
+
+function _load_constants() {
+ return _constants = __webpack_require__(8);
+}
+
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 }; }
const objectPath = __webpack_require__(304);
+
const path = __webpack_require__(0);
const yn = __webpack_require__(962);
@@ -97221,6 +97295,8 @@ function setFlags(commander) {
commander.description('Interactively creates or updates a package.json file.');
commander.option('-y, --yes', 'use default options');
commander.option('-p, --private', 'use default options and private true');
+ commander.option('-i, --install <value>', 'install a specific Yarn release');
+ commander.option('-2', 'generates the project using Yarn 2');
}
function hasWrapper(commander, args) {
@@ -98209,6 +98285,7 @@ var _buildSubCommands = (0, (_buildSubCommands2 || _load_buildSubCommands()).def
let bundleUrl;
let bundleVersion;
+ let isV2 = false;
if (range === 'nightly' || range === 'nightlies') {
bundleUrl = 'https://nightly.yarnpkg.com/latest.js';
@@ -98216,10 +98293,18 @@ var _buildSubCommands = (0, (_buildSubCommands2 || _load_buildSubCommands()).def
} else if (range === 'berry' || range === 'v2' || range === '2') {
bundleUrl = 'https://github.com/yarnpkg/berry/raw/master/packages/berry-cli/bin/berry.js';
bundleVersion = 'berry';
+ isV2 = true;
} else {
- const releases = yield fetchReleases(config, {
- includePrereleases: allowRc
- });
+ let releases = [];
+
+ try {
+ releases = yield fetchReleases(config, {
+ includePrereleases: allowRc
+ });
+ } catch (e) {
+ reporter.error(e.message);
+ return;
+ }
const release = releases.find(function (release) {
// $FlowFixMe
@@ -98240,7 +98325,6 @@ var _buildSubCommands = (0, (_buildSubCommands2 || _load_buildSubCommands()).def
reporter.log(`Downloading ${chalk.green(bundleUrl)}...`);
const bundle = yield fetchBundle(config, bundleUrl);
- const rc = (0, (_rc || _load_rc()).getRcConfigForCwd)(config.lockfileFolder, []);
const yarnPath = path.resolve(config.lockfileFolder, `.yarn/releases/yarn-${bundleVersion}.js`);
reporter.log(`Saving it into ${chalk.magenta(yarnPath)}...`);
@@ -98248,10 +98332,22 @@ var _buildSubCommands = (0, (_buildSubCommands2 || _load_buildSubCommands()).def
yield (_fs || _load_fs()).writeFile(yarnPath, bundle);
yield (_fs || _load_fs()).chmod(yarnPath, 0o755);
- const rcPath = `${config.lockfileFolder}/.yarnrc`;
- reporter.log(`Updating ${chalk.magenta(rcPath)}...`);
- rc['yarn-path'] = path.relative(config.lockfileFolder, yarnPath);
- yield (_fs || _load_fs()).writeFilePreservingEol(rcPath, `${(0, (_lockfile || _load_lockfile()).stringify)(rc)}\n`);
+ const targetPath = path.relative(config.lockfileFolder, yarnPath).replace(/\\/g, '/');
+
+ if (isV2) {
+ const rcPath = `${config.lockfileFolder}/.yarnrc.yml`;
+ reporter.log(`Updating ${chalk.magenta(rcPath)}...`);
+
+ yield (_fs || _load_fs()).writeFilePreservingEol(rcPath, `yarnPath: ${JSON.stringify(yarnPath)}\n`);
+ } else {
+ const rcPath = `${config.lockfileFolder}/.yarnrc`;
+ reporter.log(`Updating ${chalk.magenta(rcPath)}...`);
+
+ const rc = (0, (_rc || _load_rc()).getRcConfigForFolder)(config.lockfileFolder);
+ rc['yarn-path'] = targetPath;
+
+ yield (_fs || _load_fs()).writeFilePreservingEol(rcPath, `${(0, (_lockfile || _load_lockfile()).stringify)(rc)}\n`);
+ }
reporter.log(`Done!`);
})();
@@ -99574,11 +99670,11 @@ let run = exports.run = (() => {
throw new (_errors || _load_errors()).MessageError(reporter.lang('workspaceRootNotFound', config.cwd));
}
- if (flags.originalArgs < 1) {
+ if (args.length < 1) {
throw new (_errors || _load_errors()).MessageError(reporter.lang('workspaceMissingWorkspace'));
}
- if (flags.originalArgs < 2) {
+ if (args.length < 2) {
throw new (_errors || _load_errors()).MessageError(reporter.lang('workspaceMissingCommand'));
}
@@ -99587,7 +99683,7 @@ let run = exports.run = (() => {
const workspaces = yield config.resolveWorkspaces(workspaceRootFolder, manifest);
- var _ref2 = flags.originalArgs || [];
+ var _ref2 = args || [];
const workspaceName = _ref2[0],
rest = _ref2.slice(1);
@@ -99773,28 +99869,23 @@ let runScript = exports.runScript = (() => {
const workspaces = yield config.resolveWorkspaces(workspaceRootFolder, manifest);
try {
- var _ref6 = flags.originalArgs || [];
-
- const _ = _ref6[0],
- rest = _ref6.slice(1);
-
for (var _iterator4 = Object.keys(workspaces), _isArray4 = Array.isArray(_iterator4), _i4 = 0, _iterator4 = _isArray4 ? _iterator4 : _iterator4[Symbol.iterator]();;) {
- var _ref7;
+ var _ref6;
if (_isArray4) {
if (_i4 >= _iterator4.length) break;
- _ref7 = _iterator4[_i4++];
+ _ref6 = _iterator4[_i4++];
} else {
_i4 = _iterator4.next();
if (_i4.done) break;
- _ref7 = _i4.value;
+ _ref6 = _i4.value;
}
- const workspaceName = _ref7;
+ const workspaceName = _ref6;
const loc = workspaces[workspaceName].loc;
-
- yield (_child || _load_child()).spawn((_constants2 || _load_constants2()).NODE_BIN_PATH, [(_constants2 || _load_constants2()).YARN_BIN_PATH, ...rest], {
+ reporter.log(`${os.EOL}> ${workspaceName}`);
+ yield (_child || _load_child()).spawn((_constants2 || _load_constants2()).NODE_BIN_PATH, [(_constants2 || _load_constants2()).YARN_BIN_PATH, 'run', ...args], {
stdio: 'inherit',
cwd: loc
});
@@ -99847,6 +99938,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
const invariant = __webpack_require__(9);
const path = __webpack_require__(0);
+const os = __webpack_require__(46);
const semver = __webpack_require__(22);
function hasWrapper(commander, args) {
@@ -100013,7 +100105,11 @@ let main = exports.main = (() => {
commandName = 'install';
isKnownCommand = true;
}
-
+ if (commandName === 'set' && args[0] === 'version') {
+ commandName = 'policies';
+ args.splice(0, 1, 'set-version');
+ isKnownCommand = true;
+ }
if (!isKnownCommand) {
// if command is not recognized, then set default to `run`
args.unshift(commandName);
@@ -100024,15 +100120,20 @@ let main = exports.main = (() => {
let warnAboutRunDashDash = false;
// we are using "yarn <script> -abc", "yarn run <script> -abc", or "yarn node -abc", we want -abc
// to be script options, not yarn options
- const PROXY_COMMANDS = new Set([`run`, `create`, `node`]);
- if (PROXY_COMMANDS.has(commandName)) {
+
+ // PROXY_COMMANDS is a map of command name to the number of preservedArgs
+ const PROXY_COMMANDS = {
+ run: 1, // yarn run {command}
+ create: 1, // yarn create {project}
+ node: 0, // yarn node
+ workspaces: 1, // yarn workspaces {command}
+ workspace: 2 // yarn workspace {package} {command}
+ };
+ if (PROXY_COMMANDS.hasOwnProperty(commandName)) {
if (endArgs.length === 0) {
- let preservedArgs = 0;
- // the "run" and "create" command take one argument that we want to parse as usual (the
- // script/package name), hence the splice(1)
- if (command === (_index3 || _load_index3()).default.run || command === (_index3 || _load_index3()).default.create) {
- preservedArgs += 1;
- }
+ // $FlowFixMe doesn't like that PROXY_COMMANDS doesn't have keys for all commands.
+ let preservedArgs = PROXY_COMMANDS[commandName];
+
// If the --into option immediately follows the command (or the script name in the "run/create"
// case), we parse them as regular options so that we can cd into them
if (args[preservedArgs] === `--into`) {
@@ -100044,7 +100145,6 @@ let main = exports.main = (() => {
}
}
- (_commander || _load_commander()).default.originalArgs = args;
args = [...preCommandArgs, ...args];
command.setFlags((_commander || _load_commander()).default);
@@ -102347,6 +102447,15 @@ class PackageHoister {
// decompress the location and push it to the flat tree. this path could be made
const parts = [];
const keyParts = key.split('#');
+ const isWorkspaceEntry = this.workspaceLayout && keyParts[0] === this.workspaceLayout.virtualManifestName;
+
+ // Don't add the virtual manifest (keyParts.length === 1)
+ // or ws childs which were not hoisted to the root (keyParts.length === 2).
+ // If a ws child was hoisted its key would not contain the virtual manifest name
+ if (isWorkspaceEntry && keyParts.length <= 2) {
+ continue;
+ }
+
for (let i = 0; i < keyParts.length; i++) {
const key = keyParts.slice(0, i + 1).join('#');
const hoisted = this.tree.get(key);
@@ -102355,16 +102464,26 @@ class PackageHoister {
parts.push(keyParts[i]);
}
- const shallowLocs = [];
- if (this.config.modulesFolder) {
- // remove the first part which will be the folder name and replace it with a
- // hardcoded modules folder
- parts.splice(0, 1, this.config.modulesFolder);
+ // Check if the destination is pointing to a sub folder of the virtualManifestName
+ // e.g. _project_/node_modules/workspace-aggregator-123456/node_modules/workspaceChild/node_modules/dependency
+ // This probably happened because the hoister was not able to hoist the workspace child to the root
+ // So we have to change the folder to the workspace package location
+ if (this.workspaceLayout && isWorkspaceEntry) {
+ const wspPkg = this.workspaceLayout.workspaces[keyParts[1]];
+ invariant(wspPkg, `expected workspace package to exist for "${keyParts[1]}"`);
+ parts.splice(0, 4, wspPkg.loc);
} else {
- // first part will be the registry-specific module folder
- parts.splice(0, 0, this.config.lockfileFolder);
+ if (this.config.modulesFolder) {
+ // remove the first part which will be the folder name and replace it with a
+ // hardcoded modules folder
+ parts.splice(0, 1, this.config.modulesFolder);
+ } else {
+ // first part will be the registry-specific module folder
+ parts.splice(0, 0, this.config.lockfileFolder);
+ }
}
+ const shallowLocs = [];
info.shallowPaths.forEach(shallowPath => {
const shallowCopyParts = parts.slice();
shallowCopyParts[0] = this.config.cwd;
@@ -104558,7 +104677,8 @@ const messages = {
couldntClearPackageFromCache: "Couldn't clear package $0 from cache",
clearedPackageFromCache: 'Cleared package $0 from cache',
packWroteTarball: 'Wrote tarball to $0.',
-
+ invalidBinField: 'Invalid bin field for $0.',
+ invalidBinEntry: 'Invalid bin entry for $1 (in $0).',
helpExamples: ' Examples:\n$0\n',
helpCommands: ' Commands:\n$0\n',
helpCommandsMore: ' Run `$0` for more information on specific commands.',
@@ -104857,6 +104977,7 @@ const messages = {
errorExtractingTarball: 'Extracting tar content of $1 failed, the file appears to be corrupt: $0',
updateInstalling: 'Installing $0...',
hostedGitResolveError: 'Error connecting to repository. Please, check the url.',
+ unauthorizedResponse: 'Received a 401 from $0. $1',
unknownFetcherFor: 'Unknown fetcher for $0',
@@ -106035,7 +106156,7 @@ function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj;
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-/* babel-plugin-inline-import './generate-pnp-map-api.tpl.js' */const pnpApi = '#!$$SHEBANG\n\n/* eslint-disable max-len, flowtype/require-valid-file-annotation, flowtype/require-return-type */\n/* global packageInformationStores, $$BLACKLIST, $$SETUP_STATIC_TABLES */\n\n// Used for the resolveUnqualified part of the resolution (ie resolving folder/index.js & file extensions)\n// Deconstructed so that they aren\'t affected by any fs monkeypatching occuring later during the execution\ncon [...]
+/* babel-plugin-inline-import './generate-pnp-map-api.tpl.js' */const pnpApi = '#!$$SHEBANG\n\n/* eslint-disable max-len, flowtype/require-valid-file-annotation, flowtype/require-return-type */\n/* global packageInformationStores, $$BLACKLIST, $$SETUP_STATIC_TABLES */\n\n// Used for the resolveUnqualified part of the resolution (ie resolving folder/index.js & file extensions)\n// Deconstructed so that they aren\'t affected by any fs monkeypatching occuring later during the execution\ncon [...]
const crypto = __webpack_require__(11);
@@ -106731,6 +106852,8 @@ const semver = __webpack_require__(22);
const path = __webpack_require__(0);
const url = __webpack_require__(24);
+const VALID_BIN_KEYS = /^(?!\.{0,2}$)[a-z0-9._-]+$/i;
+
const LICENSE_RENAMES = {
'MIT/X11': 'MIT',
X11: 'MIT'
@@ -106898,6 +107021,37 @@ exports.default = (() => {
info.bin = { [name]: info.bin };
}
+ // Validate that the bin entries reference only files within their package, and that
+ // their name is a valid file name
+ if (typeof info.bin === 'object' && info.bin !== null) {
+ const bin = info.bin;
+ for (var _iterator3 = Object.keys(bin), _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : _iterator3[Symbol.iterator]();;) {
+ var _ref4;
+
+ if (_isArray3) {
+ if (_i3 >= _iterator3.length) break;
+ _ref4 = _iterator3[_i3++];
+ } else {
+ _i3 = _iterator3.next();
+ if (_i3.done) break;
+ _ref4 = _i3.value;
+ }
+
+ const key = _ref4;
+
+ const target = bin[key];
+ if (!VALID_BIN_KEYS.test(key) || !(0, (_util || _load_util()).isValidBin)(target)) {
+ delete bin[key];
+ warn(reporter.lang('invalidBinEntry', info.name, key));
+ } else {
+ bin[key] = path.normalize(target);
+ }
+ }
+ } else if (typeof info.bin !== 'undefined') {
+ delete info.bin;
+ warn(reporter.lang('invalidBinField', info.name));
+ }
+
// bundleDependencies is an alias for bundledDependencies
if (info.bundledDependencies) {
info.bundleDependencies = info.bundledDependencies;
@@ -106938,19 +107092,19 @@ exports.default = (() => {
const fullBinDir = path.join(moduleLoc, binDir);
if (yield (_fs || _load_fs()).exists(fullBinDir)) {
- for (var _iterator3 = yield (_fs || _load_fs()).readdir(fullBinDir), _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : _iterator3[Symbol.iterator]();;) {
- var _ref4;
+ for (var _iterator4 = yield (_fs || _load_fs()).readdir(fullBinDir), _isArray4 = Array.isArray(_iterator4), _i4 = 0, _iterator4 = _isArray4 ? _iterator4 : _iterator4[Symbol.iterator]();;) {
+ var _ref5;
- if (_isArray3) {
- if (_i3 >= _iterator3.length) break;
- _ref4 = _iterator3[_i3++];
+ if (_isArray4) {
+ if (_i4 >= _iterator4.length) break;
+ _ref5 = _iterator4[_i4++];
} else {
- _i3 = _iterator3.next();
- if (_i3.done) break;
- _ref4 = _i3.value;
+ _i4 = _iterator4.next();
+ if (_i4.done) break;
+ _ref5 = _i4.value;
}
- const scriptName = _ref4;
+ const scriptName = _ref5;
if (scriptName[0] === '.') {
continue;
@@ -106969,19 +107123,19 @@ exports.default = (() => {
const fullManDir = path.join(moduleLoc, manDir);
if (yield (_fs || _load_fs()).exists(fullManDir)) {
- for (var _iterator4 = yield (_fs || _load_fs()).readdir(fullManDir), _isArray4 = Array.isArray(_iterator4), _i4 = 0, _iterator4 = _isArray4 ? _iterator4 : _iterator4[Symbol.iterator]();;) {
- var _ref5;
+ for (var _iterator5 = yield (_fs || _load_fs()).readdir(fullManDir), _isArray5 = Array.isArray(_iterator5), _i5 = 0, _iterator5 = _isArray5 ? _iterator5 : _iterator5[Symbol.iterator]();;) {
+ var _ref6;
- if (_isArray4) {
- if (_i4 >= _iterator4.length) break;
- _ref5 = _iterator4[_i4++];
+ if (_isArray5) {
+ if (_i5 >= _iterator5.length) break;
+ _ref6 = _iterator5[_i5++];
} else {
- _i4 = _iterator4.next();
- if (_i4.done) break;
- _ref5 = _i4.value;
+ _i5 = _iterator5.next();
+ if (_i5.done) break;
+ _ref6 = _i5.value;
}
- const filename = _ref5;
+ const filename = _ref6;
if (/^(.*?)\.[0-9]$/.test(filename)) {
man.push(path.join('.', manDir, filename));
@@ -107000,19 +107154,19 @@ exports.default = (() => {
if (Array.isArray(licenses) && !info.license) {
let licenseTypes = [];
- for (var _iterator5 = licenses, _isArray5 = Array.isArray(_iterator5), _i5 = 0, _iterator5 = _isArray5 ? _iterator5 : _iterator5[Symbol.iterator]();;) {
- var _ref6;
+ for (var _iterator6 = licenses, _isArray6 = Array.isArray(_iterator6), _i6 = 0, _iterator6 = _isArray6 ? _iterator6 : _iterator6[Symbol.iterator]();;) {
+ var _ref7;
- if (_isArray5) {
- if (_i5 >= _iterator5.length) break;
- _ref6 = _iterator5[_i5++];
+ if (_isArray6) {
+ if (_i6 >= _iterator6.length) break;
+ _ref7 = _iterator6[_i6++];
} else {
- _i5 = _iterator5.next();
- if (_i5.done) break;
- _ref6 = _i5.value;
+ _i6 = _iterator6.next();
+ if (_i6.done) break;
+ _ref7 = _i6.value;
}
- let license = _ref6;
+ let license = _ref7;
if (license && typeof license === 'object') {
license = license.type;
@@ -107097,19 +107251,19 @@ exports.default = (() => {
}
}
- for (var _iterator6 = (_constants || _load_constants()).MANIFEST_FIELDS, _isArray6 = Array.isArray(_iterator6), _i6 = 0, _iterator6 = _isArray6 ? _iterator6 : _iterator6[Symbol.iterator]();;) {
- var _ref7;
+ for (var _iterator7 = (_constants || _load_constants()).MANIFEST_FIELDS, _isArray7 = Array.isArray(_iterator7), _i7 = 0, _iterator7 = _isArray7 ? _iterator7 : _iterator7[Symbol.iterator]();;) {
+ var _ref8;
- if (_isArray6) {
- if (_i6 >= _iterator6.length) break;
- _ref7 = _iterator6[_i6++];
+ if (_isArray7) {
+ if (_i7 >= _iterator7.length) break;
+ _ref8 = _iterator7[_i7++];
} else {
- _i6 = _iterator6.next();
- if (_i6.done) break;
- _ref7 = _i6.value;
+ _i7 = _iterator7.next();
+ if (_i7.done) break;
+ _ref8 = _i7.value;
}
- const dependencyType = _ref7;
+ const dependencyType = _ref8;
const dependencyList = info[dependencyType];
if (dependencyList && typeof dependencyList === 'object') {
@@ -108267,7 +108421,7 @@ module.exports = (flag, argv) => {
"use strict";
-const os = __webpack_require__(49);
+const os = __webpack_require__(46);
const hasFlag = __webpack_require__(597);
const env = process.env;
@@ -110384,7 +110538,7 @@ THE SOFTWARE.
-var os = __webpack_require__(49);
+var os = __webpack_require__(46);
var hasFlag = __webpack_require__(619);
var env = process.env;
@@ -137062,10 +137216,10 @@ var SubscribeOnObservable = /*@__PURE__*/ (function (_super) {
/* harmony export (immutable) */ __webpack_exports__["a"] = bindCallback;
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(12);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__AsyncSubject__ = __webpack_require__(183);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__operators_map__ = __webpack_require__(46);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__operators_map__ = __webpack_require__(47);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_canReportError__ = __webpack_require__(322);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_isArray__ = __webpack_require__(41);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__util_isScheduler__ = __webpack_require__(48);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__util_isScheduler__ = __webpack_require__(49);
/** PURE_IMPORTS_START _Observable,_AsyncSubject,_operators_map,_util_canReportError,_util_isArray,_util_isScheduler PURE_IMPORTS_END */
@@ -137181,9 +137335,9 @@ function dispatchError(state) {
/* harmony export (immutable) */ __webpack_exports__["a"] = bindNodeCallback;
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(12);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__AsyncSubject__ = __webpack_require__(183);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__operators_map__ = __webpack_require__(46);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__operators_map__ = __webpack_require__(47);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_canReportError__ = __webpack_require__(322);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_isScheduler__ = __webpack_require__(48);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_isScheduler__ = __webpack_require__(49);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__util_isArray__ = __webpack_require__(41);
/** PURE_IMPORTS_START _Observable,_AsyncSubject,_operators_map,_util_canReportError,_util_isScheduler,_util_isArray PURE_IMPORTS_END */
@@ -137312,7 +137466,7 @@ function dispatchError(arg) {
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__empty__ = __webpack_require__(39);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_subscribeToResult__ = __webpack_require__(14);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__OuterSubscriber__ = __webpack_require__(13);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__operators_map__ = __webpack_require__(46);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__operators_map__ = __webpack_require__(47);
/** PURE_IMPORTS_START tslib,_Observable,_util_isArray,_empty,_util_subscribeToResult,_OuterSubscriber,_operators_map PURE_IMPORTS_END */
@@ -137398,7 +137552,7 @@ var ForkJoinSubscriber = /*@__PURE__*/ (function (_super) {
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(12);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_isArray__ = __webpack_require__(41);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_isFunction__ = __webpack_require__(154);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__operators_map__ = __webpack_require__(46);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__operators_map__ = __webpack_require__(47);
/** PURE_IMPORTS_START _Observable,_util_isArray,_util_isFunction,_operators_map PURE_IMPORTS_END */
@@ -137473,7 +137627,7 @@ function isEventTarget(sourceObj) {
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(12);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_isArray__ = __webpack_require__(41);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_isFunction__ = __webpack_require__(154);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__operators_map__ = __webpack_require__(46);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__operators_map__ = __webpack_require__(47);
/** PURE_IMPORTS_START _Observable,_util_isArray,_util_isFunction,_operators_map PURE_IMPORTS_END */
@@ -137654,7 +137808,7 @@ function fromPromise(input, scheduler) {
/* harmony export (immutable) */ __webpack_exports__["a"] = generate;
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(12);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_identity__ = __webpack_require__(118);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_isScheduler__ = __webpack_require__(48);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_isScheduler__ = __webpack_require__(49);
/** PURE_IMPORTS_START _Observable,_util_identity,_util_isScheduler PURE_IMPORTS_END */
@@ -138213,7 +138367,7 @@ var BufferSkipCountSubscriber = /*@__PURE__*/ (function (_super) {
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__scheduler_async__ = __webpack_require__(40);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__Subscriber__ = __webpack_require__(7);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_isScheduler__ = __webpack_require__(48);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_isScheduler__ = __webpack_require__(49);
/** PURE_IMPORTS_START tslib,_scheduler_async,_Subscriber,_util_isScheduler PURE_IMPORTS_END */
@@ -138492,7 +138646,7 @@ var BufferToggleSubscriber = /*@__PURE__*/ (function (_super) {
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscription__ = __webpack_require__(25);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_tryCatch__ = __webpack_require__(56);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_errorObject__ = __webpack_require__(47);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_errorObject__ = __webpack_require__(48);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__OuterSubscriber__ = __webpack_require__(13);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__util_subscribeToResult__ = __webpack_require__(14);
/** PURE_IMPORTS_START tslib,_Subscription,_util_tryCatch,_util_errorObject,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
@@ -139366,7 +139520,7 @@ function elementAt(index, defaultValue) {
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__observable_scalar__ = __webpack_require__(312);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__observable_empty__ = __webpack_require__(39);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__observable_concat__ = __webpack_require__(186);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_isScheduler__ = __webpack_require__(48);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_isScheduler__ = __webpack_require__(49);
/** PURE_IMPORTS_START _observable_fromArray,_observable_scalar,_observable_empty,_observable_concat,_util_isScheduler PURE_IMPORTS_END */
@@ -139528,7 +139682,7 @@ var SwitchFirstSubscriber = /*@__PURE__*/ (function (_super) {
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__OuterSubscriber__ = __webpack_require__(13);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__InnerSubscriber__ = __webpack_require__(84);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_subscribeToResult__ = __webpack_require__(14);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__map__ = __webpack_require__(46);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__map__ = __webpack_require__(47);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__observable_from__ = __webpack_require__(62);
/** PURE_IMPORTS_START tslib,_OuterSubscriber,_InnerSubscriber,_util_subscribeToResult,_map,_observable_from PURE_IMPORTS_END */
@@ -139624,7 +139778,7 @@ var ExhaustMapSubscriber = /*@__PURE__*/ (function (_super) {
/* unused harmony export ExpandSubscriber */
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_tryCatch__ = __webpack_require__(56);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_errorObject__ = __webpack_require__(47);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_errorObject__ = __webpack_require__(48);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__OuterSubscriber__ = __webpack_require__(13);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_subscribeToResult__ = __webpack_require__(14);
/** PURE_IMPORTS_START tslib,_util_tryCatch,_util_errorObject,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
@@ -140074,7 +140228,7 @@ function mergeMapTo(innerObservable, resultSelector, concurrent) {
/* unused harmony export MergeScanSubscriber */
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_tryCatch__ = __webpack_require__(56);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_errorObject__ = __webpack_require__(47);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_errorObject__ = __webpack_require__(48);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_subscribeToResult__ = __webpack_require__(14);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__OuterSubscriber__ = __webpack_require__(13);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__InnerSubscriber__ = __webpack_require__(84);
@@ -140356,7 +140510,7 @@ function partition(predicate, thisArg) {
"use strict";
/* harmony export (immutable) */ __webpack_exports__["a"] = pluck;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__map__ = __webpack_require__(46);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__map__ = __webpack_require__(47);
/** PURE_IMPORTS_START _map PURE_IMPORTS_END */
function pluck() {
@@ -140563,7 +140717,7 @@ var RepeatSubscriber = /*@__PURE__*/ (function (_super) {
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subject__ = __webpack_require__(36);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_tryCatch__ = __webpack_require__(56);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_errorObject__ = __webpack_require__(47);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_errorObject__ = __webpack_require__(48);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__OuterSubscriber__ = __webpack_require__(13);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__util_subscribeToResult__ = __webpack_require__(14);
/** PURE_IMPORTS_START tslib,_Subject,_util_tryCatch,_util_errorObject,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
@@ -140710,7 +140864,7 @@ var RetrySubscriber = /*@__PURE__*/ (function (_super) {
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subject__ = __webpack_require__(36);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_tryCatch__ = __webpack_require__(56);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_errorObject__ = __webpack_require__(47);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_errorObject__ = __webpack_require__(48);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__OuterSubscriber__ = __webpack_require__(13);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__util_subscribeToResult__ = __webpack_require__(14);
/** PURE_IMPORTS_START tslib,_Subject,_util_tryCatch,_util_errorObject,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
@@ -140915,7 +141069,7 @@ function dispatchNotification(state) {
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(7);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_tryCatch__ = __webpack_require__(56);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_errorObject__ = __webpack_require__(47);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_errorObject__ = __webpack_require__(48);
/** PURE_IMPORTS_START tslib,_Subscriber,_util_tryCatch,_util_errorObject PURE_IMPORTS_END */
@@ -141411,7 +141565,7 @@ var SkipWhileSubscriber = /*@__PURE__*/ (function (_super) {
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__observable_scalar__ = __webpack_require__(312);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__observable_empty__ = __webpack_require__(39);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__observable_concat__ = __webpack_require__(186);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_isScheduler__ = __webpack_require__(48);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_isScheduler__ = __webpack_require__(49);
/** PURE_IMPORTS_START _observable_fromArray,_observable_scalar,_observable_empty,_observable_concat,_util_isScheduler PURE_IMPORTS_END */
@@ -141717,7 +141871,7 @@ function dispatchNext(arg) {
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__scheduler_async__ = __webpack_require__(40);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__scan__ = __webpack_require__(317);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__observable_defer__ = __webpack_require__(310);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__map__ = __webpack_require__(46);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__map__ = __webpack_require__(47);
/** PURE_IMPORTS_START _scheduler_async,_scan,_observable_defer,_map PURE_IMPORTS_END */
@@ -141782,7 +141936,7 @@ function timeout(due, scheduler) {
/* harmony export (immutable) */ __webpack_exports__["a"] = timestamp;
/* unused harmony export Timestamp */
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__scheduler_async__ = __webpack_require__(40);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__map__ = __webpack_require__(46);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__map__ = __webpack_require__(47);
/** PURE_IMPORTS_START _scheduler_async,_map PURE_IMPORTS_END */
@@ -142004,7 +142158,7 @@ var WindowCountSubscriber = /*@__PURE__*/ (function (_super) {
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__scheduler_async__ = __webpack_require__(40);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__Subscriber__ = __webpack_require__(7);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_isNumeric__ = __webpack_require__(190);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__util_isScheduler__ = __webpack_require__(48);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__util_isScheduler__ = __webpack_require__(49);
/** PURE_IMPORTS_START tslib,_Subject,_scheduler_async,_Subscriber,_util_isNumeric,_util_isScheduler PURE_IMPORTS_END */
@@ -142172,7 +142326,7 @@ function dispatchWindowClose(state) {
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subject__ = __webpack_require__(36);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__Subscription__ = __webpack_require__(25);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_tryCatch__ = __webpack_require__(56);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_errorObject__ = __webpack_require__(47);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_errorObject__ = __webpack_require__(48);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__OuterSubscriber__ = __webpack_require__(13);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__util_subscribeToResult__ = __webpack_require__(14);
/** PURE_IMPORTS_START tslib,_Subject,_Subscription,_util_tryCatch,_util_errorObject,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
@@ -142316,7 +142470,7 @@ var WindowToggleSubscriber = /*@__PURE__*/ (function (_super) {
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subject__ = __webpack_require__(36);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_tryCatch__ = __webpack_require__(56);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_errorObject__ = __webpack_require__(47);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_errorObject__ = __webpack_require__(48);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__OuterSubscriber__ = __webpack_require__(13);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__util_subscribeToResult__ = __webpack_require__(14);
/** PURE_IMPORTS_START tslib,_Subject,_util_tryCatch,_util_errorObject,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
diff --git a/antora-ui-camel/.yarnrc b/antora-ui-camel/.yarnrc
index 2da4c9f..dd23872 100644
--- a/antora-ui-camel/.yarnrc
+++ b/antora-ui-camel/.yarnrc
@@ -5,5 +5,5 @@
env:
HUGO_VERSION "0.58.2"
-lastUpdateCheck 1572860094163
-yarn-path ".yarn/releases/yarn-1.19.1.js"
+lastUpdateCheck 1581501547594
+yarn-path ".yarn/releases/yarn-1.22.0.js"