Skip to content

Commit

Permalink
Lock file maintenance (#39288)
Browse files Browse the repository at this point in the history
* Lock file maintenance

* Work around parsel-js assuming "browser" is esm

* Downgrade framer-motion to 11.4.0 to avoid a deprecation

Gutenberg is planning on removing the dep entirely, so let's not go to too much trouble to work around it.

* Remove pnpmfile hack for fixed issue

---------

Co-authored-by: Renovate Bot <[email protected]>
Co-authored-by: Brad Jorsch <[email protected]>

Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/10778041548

Upstream-Ref: Automattic/jetpack@1e3851d
  • Loading branch information
zinigor authored and matticbot committed Sep 9, 2024
1 parent cadc521 commit 8aa2d8f
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 11 deletions.
33 changes: 23 additions & 10 deletions dist/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -524,8 +524,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
};
Object.defineProperty(exports, "__esModule", ({ value: true }));
exports.OidcClient = void 0;
const http_client_1 = __nccwpck_require__(4271);
const auth_1 = __nccwpck_require__(1445);
const http_client_1 = __nccwpck_require__(4102);
const auth_1 = __nccwpck_require__(4328);
const core_1 = __nccwpck_require__(2722);
class OidcClient {
static createHttpClient(allowRetry = true, maxRetry = 10) {
Expand Down Expand Up @@ -1143,7 +1143,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
};
Object.defineProperty(exports, "__esModule", ({ value: true }));
exports.getApiBaseUrl = exports.getProxyFetch = exports.getProxyAgentDispatcher = exports.getProxyAgent = exports.getAuthString = void 0;
const httpClient = __importStar(__nccwpck_require__(4271));
const httpClient = __importStar(__nccwpck_require__(4102));
const undici_1 = __nccwpck_require__(6806);
function getAuthString(token, options) {
if (!token && !options.auth) {
Expand Down Expand Up @@ -1247,7 +1247,7 @@ exports.getOctokitOptions = getOctokitOptions;

/***/ }),

/***/ 1445:
/***/ 4328:
/***/ (function(__unused_webpack_module, exports) {

"use strict";
Expand Down Expand Up @@ -1335,7 +1335,7 @@ exports.PersonalAccessTokenCredentialHandler = PersonalAccessTokenCredentialHand

/***/ }),

/***/ 4271:
/***/ 4102:
/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {

"use strict";
Expand Down Expand Up @@ -1377,7 +1377,7 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
exports.HttpClient = exports.isHttps = exports.HttpClientResponse = exports.HttpClientError = exports.getProxyUrl = exports.MediaTypes = exports.Headers = exports.HttpCodes = void 0;
const http = __importStar(__nccwpck_require__(3685));
const https = __importStar(__nccwpck_require__(5687));
const pm = __importStar(__nccwpck_require__(1709));
const pm = __importStar(__nccwpck_require__(2825));
const tunnel = __importStar(__nccwpck_require__(5112));
const undici_1 = __nccwpck_require__(6806);
var HttpCodes;
Expand Down Expand Up @@ -1902,7 +1902,7 @@ class HttpClient {
}
const usingSsl = parsedUrl.protocol === 'https:';
proxyAgent = new undici_1.ProxyAgent(Object.assign({ uri: proxyUrl.href, pipelining: !this._keepAlive ? 0 : 1 }, ((proxyUrl.username || proxyUrl.password) && {
token: `${proxyUrl.username}:${proxyUrl.password}`
token: `Basic ${Buffer.from(`${proxyUrl.username}:${proxyUrl.password}`).toString('base64')}`
})));
this._proxyAgentDispatcher = proxyAgent;
if (usingSsl && this._ignoreSslError) {
Expand Down Expand Up @@ -1994,7 +1994,7 @@ const lowercaseKeys = (obj) => Object.keys(obj).reduce((c, k) => ((c[k.toLowerCa

/***/ }),

/***/ 1709:
/***/ 2825:
/***/ ((__unused_webpack_module, exports) => {

"use strict";
Expand All @@ -2016,11 +2016,11 @@ function getProxyUrl(reqUrl) {
})();
if (proxyVar) {
try {
return new URL(proxyVar);
return new DecodedURL(proxyVar);
}
catch (_a) {
if (!proxyVar.startsWith('http://') && !proxyVar.startsWith('https://'))
return new URL(`http://${proxyVar}`);
return new DecodedURL(`http://${proxyVar}`);
}
}
else {
Expand Down Expand Up @@ -2079,6 +2079,19 @@ function isLoopbackAddress(host) {
hostLower.startsWith('[::1]') ||
hostLower.startsWith('[0:0:0:0:0:0:0:1]'));
}
class DecodedURL extends URL {
constructor(url, base) {
super(url, base);
this._decodedUsername = decodeURIComponent(super.username);
this._decodedPassword = decodeURIComponent(super.password);
}
get username() {
return this._decodedUsername;
}
get password() {
return this._decodedPassword;
}
}
//# sourceMappingURL=proxy.js.map

/***/ }),
Expand Down
2 changes: 1 addition & 1 deletion dist/index.js.map

Large diffs are not rendered by default.

0 comments on commit 8aa2d8f

Please sign in to comment.