@salesforce/core 3.30.10 → 3.30.11

package/lib/util/sfdcUrl.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import { URL } from 'url';
-export declare function getLoginAudienceCombos(audienceUrl: string, loginUrl: string): [string, string][];
+export declare function getLoginAudienceCombos(audienceUrl: string, loginUrl: string): Array<[string, string]>;
 export declare class SfdcUrl extends URL {
     /**
      * Salesforce URLs

package/lib/util/sfdcUrl.js

@@ -91,9 +91,7 @@ class SfdcUrl extends url_1.URL {
             'crmforce.mil',
         ];
         const allowlistOfSalesforceHosts = ['developer.salesforce.com', 'trailhead.salesforce.com'];
-        return allowlistOfSalesforceDomainPatterns.some((pattern) => {
-            return this.hostname.endsWith(pattern) || allowlistOfSalesforceHosts.includes(this.hostname);
-        });
+        return allowlistOfSalesforceDomainPatterns.some((pattern) => this.hostname.endsWith(pattern) || allowlistOfSalesforceHosts.includes(this.hostname));
     }
     /**
      * Tests whether this url is an internal Salesforce domain
@@ -205,7 +203,7 @@ class SfdcUrl extends url_1.URL {
      * @returns {boolean} true if this domain is a lightning domain
      */
     isLightningDomain() {
-        return /\.lightning\.force\.com/.test(this.origin) || /\.lightning\.crmforce\.mil/.test(this.origin);
+        return this.origin.includes('.lightning.force.com') || this.origin.includes('.lightning.crmforce.mil');
     }
 }
 exports.SfdcUrl = SfdcUrl;

package/lib/util/structuredWriter.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import { Readable } from 'stream';
 export interface StructuredWriter {
     addToStore(contents: string | Readable | Buffer, path: string): Promise<void>;

package/lib/util/zipWriter.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import { Readable, Writable } from 'stream';
 import { StructuredWriter } from './structuredWriter';
 export declare class ZipWriter extends Writable implements StructuredWriter {
@@ -6,10 +7,10 @@ export declare class ZipWriter extends Writable implements StructuredWriter {
     private zip;
     private buffers;
     constructor(rootDestination?: string | undefined);
+    get buffer(): Buffer;
     addToStore(contents: string | Readable | Buffer, path: string): Promise<void>;
     finalize(): Promise<void>;
     getDestinationPath(): string | undefined;
     private getOutputStream;
     private getInputBuffer;
-    get buffer(): Buffer;
 }

package/lib/util/zipWriter.js

@@ -23,6 +23,9 @@ class ZipWriter extends stream_1.Writable {
         this.buffers = [];
         void pipeline(this.zip, this.getOutputStream());
     }
+    get buffer() {
+        return Buffer.concat(this.buffers);
+    }
     async addToStore(contents, path) {
         this.zip.append(contents, { name: path });
         return Promise.resolve();
@@ -55,18 +58,11 @@ class ZipWriter extends stream_1.Writable {
                 inputStream.on('data', (chunk) => {
                     this.buffers.push(chunk);
                 });
-                inputStream.once('end', () => {
-                    return resolve();
-                });
-                inputStream.once('error', (error) => {
-                    return reject(error);
-                });
+                inputStream.once('end', () => resolve());
+                inputStream.once('error', (error) => reject(error));
             });
         }
     }
-    get buffer() {
-        return Buffer.concat(this.buffers);
-    }
 }
 exports.ZipWriter = ZipWriter;
 //# sourceMappingURL=zipWriter.js.map

package/lib/webOAuthServer.js

@@ -5,6 +5,8 @@
  * Licensed under the BSD 3-Clause license.
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
+/* eslint-disable class-methods-use-this */
+/* eslint-disable @typescript-eslint/no-unsafe-member-access */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WebServer = exports.WebOAuthServer = void 0;
 const http = require("http");
@@ -144,20 +146,23 @@ class WebOAuthServer extends kit_1.AsyncCreatable {
     async executeOauthRequest() {
         return new Promise((resolve, reject) => {
             this.logger.debug('Starting web auth flow');
-            // eslint-disable-next-line @typescript-eslint/no-misused-promises, @typescript-eslint/no-explicit-any
+            // eslint-disable-next-line @typescript-eslint/no-misused-promises, @typescript-eslint/no-explicit-any, @typescript-eslint/require-await
             this.webServer.server.on('request', async (request, response) => {
+                // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
                 const url = (0, url_1.parse)(request.url);
                 this.logger.debug(`processing request for uri: ${url.pathname}`);
                 if (request.method === 'GET') {
-                    if (url.pathname && url.pathname.startsWith('/OauthRedirect')) {
+                    if (url.pathname?.startsWith('/OauthRedirect')) {
                         request.query = (0, querystring_1.parse)(url.query);
                         if (request.query.error) {
-                            const err = new sfError_1.SfError(request.query.error_description || request.query.error, request.query.error);
+                            // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+                            const err = new sfError_1.SfError(request.query.error_description ?? request.query.error, request.query.error);
                             this.webServer.reportError(err, response);
                             return reject(err);
                         }
                         this.logger.debug(`request.query.state: ${request.query.state}`);
                         try {
+                            // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
                             this.oauthConfig.authCode = (0, ts_types_1.asString)(this.parseAuthCodeFromRequest(response, request));
                             resolve(response);
                         }
@@ -175,6 +180,7 @@ class WebOAuthServer extends kit_1.AsyncCreatable {
                 else {
                     this.webServer.sendError(405, 'Unsupported http methods', response);
                     const errName = 'invalidRequestMethod';
+                    // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
                     const errMessage = messages.getMessage(errName, [request.method]);
                     reject(new sfError_1.SfError(errMessage, errName));
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/core",
-  "version": "3.30.10",
+  "version": "3.30.11",
   "description": "Core libraries to interact with SFDX projects, orgs, and APIs.",
   "main": "lib/exported",
   "types": "lib/exported.d.ts",
@@ -35,7 +35,7 @@
   ],
   "dependencies": {
     "@salesforce/bunyan": "^2.0.0",
-    "@salesforce/kit": "^1.5.41",
+    "@salesforce/kit": "^1.7.0",
     "@salesforce/schemas": "^1.1.0",
     "@salesforce/ts-types": "^1.5.20",
     "@types/graceful-fs": "^4.1.5",
@@ -48,13 +48,13 @@
     "form-data": "^4.0.0",
     "graceful-fs": "^4.2.9",
     "js2xmlparser": "^4.0.1",
-    "jsforce": "beta",
+    "jsforce": "^2.0.0-beta.19",
     "jsonwebtoken": "8.5.1",
     "ts-retry-promise": "^0.6.0"
   },
   "devDependencies": {
     "@salesforce/dev-config": "^3.0.1",
-    "@salesforce/dev-scripts": "^2.0.3",
+    "@salesforce/dev-scripts": "^3.1.0",
     "@salesforce/prettier-config": "^0.0.2",
     "@salesforce/ts-sinon": "^1.3.21",
     "@types/archiver": "^5.3.1",
@@ -64,30 +64,29 @@
     "@types/jsonwebtoken": "8.5.7",
     "@types/lodash": "^4.14.182",
     "@types/shelljs": "0.8.11",
-    "@typescript-eslint/eslint-plugin": "^4.33.0",
-    "@typescript-eslint/parser": "4.33.0",
+    "@typescript-eslint/eslint-plugin": "^5.33.0",
+    "@typescript-eslint/parser": "^5.33.0",
     "chai": "^4.3.4",
     "chai-string": "^1.5.0",
     "commitizen": "^3.1.2",
-    "eslint": "^7.27.0",
-    "eslint-config-prettier": "^6.15.0",
-    "eslint-config-salesforce": "^0.1.6",
+    "eslint": "^8.21.0",
+    "eslint-config-prettier": "^8.5.0",
+    "eslint-config-salesforce": "^1.1.0",
     "eslint-config-salesforce-license": "^0.1.6",
-    "eslint-config-salesforce-typescript": "^0.2.8",
-    "eslint-plugin-header": "3.0.0",
-    "eslint-plugin-import": "^2.25.4",
-    "eslint-plugin-jsdoc": "^35.1.2",
-    "eslint-plugin-prettier": "^3.1.3",
+    "eslint-config-salesforce-typescript": "^1.1.1",
+    "eslint-plugin-header": "^3.1.1",
+    "eslint-plugin-import": "^2.26.0",
+    "eslint-plugin-jsdoc": "^39.3.6",
     "husky": "^7.0.4",
     "lodash": "^4.17.21",
     "mocha": "^9.1.3",
     "nyc": "^15.1.0",
-    "prettier": "^2.5.1",
+    "prettier": "^2.7.1",
     "pretty-quick": "^3.1.3",
     "shelljs": "0.8.5",
-    "sinon": "10.0.0",
+    "sinon": "^14.0.1",
     "ts-node": "^10.4.0",
-    "typescript": "4.4.4"
+    "typescript": "^4.8.4"
   },
   "repository": {
     "type": "git",