@salesforce/packaging 3.4.0 → 3.5.1

package/lib/interfaces/packagingInterfacesAndType.d.ts

@@ -1,10 +1,10 @@
 import { Duration } from '@salesforce/kit';
 import { Connection, NamedPackageDir, SfProject } from '@salesforce/core';
-import { SaveResult } from 'jsforce';
+import type { SaveResult } from '@jsforce/jsforce-node';
 import { Attributes } from 'graphology-types';
 import { Optional } from '@salesforce/ts-types';
 import { ConvertResult } from '@salesforce/source-deploy-retrieve';
-import { Package } from 'jsforce/lib/api/metadata';
+import { Package } from '@jsforce/jsforce-node/lib/api/metadata';
 import { PackageProfileApi } from '../package/packageProfileApi';
 import { PackageAncestryNode } from '../package/packageAncestry';
 import { PackagingSObjects } from './packagingSObjects';

package/lib/package/packageAncestry.js

@@ -1,4 +1,27 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PackageAncestryNode = exports.AncestryDotProducer = exports.AncestryJsonProducer = exports.AncestryTreeProducer = exports.PackageAncestry = void 0;
 /*
@@ -13,7 +36,7 @@ const graphology_1 = require("graphology");
 const kit_1 = require("@salesforce/kit");
 const tree_1 = require("@oclif/core/lib/cli-ux/styled/tree");
 const graphology_traversal_1 = require("graphology-traversal");
-const pkgUtils = require("../utils/packageUtils");
+const pkgUtils = __importStar(require("../utils/packageUtils"));
 const packageVersion_1 = require("./packageVersion");
 const package_1 = require("./package");
 const versionNumber_1 = require("./versionNumber");

package/lib/package/packageConvert.js

@@ -5,18 +5,43 @@
  * 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
  */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createPackageVersionCreateRequest = exports.convertPackage = exports.findOrCreatePackage2 = void 0;
-const path = require("node:path");
-const os = require("node:os");
-const fs = require("node:fs");
+const node_path_1 = __importDefault(require("node:path"));
+const node_os_1 = __importDefault(require("node:os"));
+const node_fs_1 = __importDefault(require("node:fs"));
 const core_1 = require("@salesforce/core");
 const kit_1 = require("@salesforce/kit");
-const scratchOrgSettingsGenerator_1 = require("@salesforce/core/lib/org/scratchOrgSettingsGenerator");
-const pkgUtils = require("../utils/packageUtils");
+const pkgUtils = __importStar(require("../utils/packageUtils"));
 const packageUtils_1 = require("../utils/packageUtils");
 const interfaces_1 = require("../interfaces");
-const pvcr = require("./packageVersionCreateRequest");
+const pvcr = __importStar(require("./packageVersionCreateRequest"));
 const packageVersionCreateRequest_1 = require("./packageVersionCreateRequest");
 const packageVersionCreate_1 = require("./packageVersionCreate");
 var Package2VersionStatus = interfaces_1.PackagingSObjects.Package2VersionStatus;
@@ -112,25 +137,25 @@ exports.convertPackage = convertPackage;
  */
 async function createPackageVersionCreateRequest(context, packageId, apiVersion) {
     const uniqueId = (0, packageUtils_1.uniqid)({ template: `${packageId}-%s` });
-    const packageVersTmpRoot = path.join(os.tmpdir(), uniqueId);
-    const packageVersMetadataFolder = path.join(packageVersTmpRoot, 'md-files');
-    const seedMetadataFolder = path.join(packageVersTmpRoot, 'seed-md-files');
-    const packageVersBlobDirectory = path.join(packageVersTmpRoot, 'package-version-info');
-    const seedMetadataZipFile = path.join(packageVersBlobDirectory, 'seed-metadata-package.zip');
-    const settingsZipFile = path.join(packageVersBlobDirectory, 'settings.zip');
-    const metadataZipFile = path.join(packageVersBlobDirectory, 'package.zip');
-    const packageVersBlobZipFile = path.join(packageVersTmpRoot, 'package-version-info.zip');
+    const packageVersTmpRoot = node_path_1.default.join(node_os_1.default.tmpdir(), uniqueId);
+    const packageVersMetadataFolder = node_path_1.default.join(packageVersTmpRoot, 'md-files');
+    const seedMetadataFolder = node_path_1.default.join(packageVersTmpRoot, 'seed-md-files');
+    const packageVersBlobDirectory = node_path_1.default.join(packageVersTmpRoot, 'package-version-info');
+    const seedMetadataZipFile = node_path_1.default.join(packageVersBlobDirectory, 'seed-metadata-package.zip');
+    const settingsZipFile = node_path_1.default.join(packageVersBlobDirectory, 'settings.zip');
+    const metadataZipFile = node_path_1.default.join(packageVersBlobDirectory, 'package.zip');
+    const packageVersBlobZipFile = node_path_1.default.join(packageVersTmpRoot, 'package-version-info.zip');
     let packageDescriptorJson = {
         id: packageId,
     };
-    const settingsGenerator = new scratchOrgSettingsGenerator_1.default({ asDirectory: true });
+    const settingsGenerator = new core_1.ScratchOrgSettingsGenerator({ asDirectory: true });
     const definitionFile = context.definitionfile;
     let definitionFileJson;
     if (definitionFile) {
-        if (!fs.existsSync(definitionFile)) {
+        if (!node_fs_1.default.existsSync(definitionFile)) {
             throw messages.createError('errorReadingDefintionFile', [definitionFile]);
         }
-        const definitionFilePayload = await fs.promises.readFile(definitionFile, 'utf8');
+        const definitionFilePayload = await node_fs_1.default.promises.readFile(definitionFile, 'utf8');
         definitionFileJson = JSON.parse(definitionFilePayload);
         // Load any settings from the definition
         await settingsGenerator.extract(definitionFileJson);
@@ -140,9 +165,9 @@ async function createPackageVersionCreateRequest(context, packageId, apiVersion)
         }
         packageDescriptorJson = (0, packageUtils_1.copyDescriptorProperties)(packageDescriptorJson, definitionFileJson);
     }
-    await fs.promises.mkdir(packageVersTmpRoot, { recursive: true });
-    await fs.promises.mkdir(packageVersBlobDirectory, { recursive: true });
-    await fs.promises.mkdir(packageVersMetadataFolder, { recursive: true });
+    await node_fs_1.default.promises.mkdir(packageVersTmpRoot, { recursive: true });
+    await node_fs_1.default.promises.mkdir(packageVersBlobDirectory, { recursive: true });
+    await node_fs_1.default.promises.mkdir(packageVersMetadataFolder, { recursive: true });
     const hasSeedMetadata = await new packageVersionCreate_1.MetadataResolver().resolveMetadata(context.seedmetadata, seedMetadataFolder, 'seedMDDirectoryDoesNotExist', apiVersion);
     if (hasSeedMetadata) {
         // Zip the seedMetadataFolder folder and put the zip in {packageVersBlobDirectory}/{seedMetadataZipFile}
@@ -151,20 +176,20 @@ async function createPackageVersionCreateRequest(context, packageId, apiVersion)
     }
     await settingsGenerator.createDeploy();
     await settingsGenerator.createDeployPackageContents(apiVersion);
-    await pkgUtils.zipDir(`${settingsGenerator.getDestinationPath()}${path.sep}${settingsGenerator.getShapeDirName()}`, settingsZipFile);
-    const shapeDirectory = `${settingsGenerator.getDestinationPath()}${path.sep}${settingsGenerator.getShapeDirName()}`;
-    const currentPackageXml = await fs.promises.readFile(path.join(shapeDirectory, 'package.xml'), 'utf8');
-    await fs.promises.writeFile(path.join(packageVersMetadataFolder, 'package.xml'), currentPackageXml, 'utf-8');
+    await pkgUtils.zipDir(`${settingsGenerator.getDestinationPath()}${node_path_1.default.sep}${settingsGenerator.getShapeDirName()}`, settingsZipFile);
+    const shapeDirectory = `${settingsGenerator.getDestinationPath()}${node_path_1.default.sep}${settingsGenerator.getShapeDirName()}`;
+    const currentPackageXml = await node_fs_1.default.promises.readFile(node_path_1.default.join(shapeDirectory, 'package.xml'), 'utf8');
+    await node_fs_1.default.promises.writeFile(node_path_1.default.join(packageVersMetadataFolder, 'package.xml'), currentPackageXml, 'utf-8');
     // Zip the packageVersMetadataFolder folder and put the zip in {packageVersBlobDirectory}/package.zip
     await pkgUtils.zipDir(packageVersMetadataFolder, metadataZipFile);
-    await fs.promises.writeFile(path.join(packageVersBlobDirectory, 'package2-descriptor.json'), JSON.stringify(packageDescriptorJson, undefined, 2));
+    await node_fs_1.default.promises.writeFile(node_path_1.default.join(packageVersBlobDirectory, 'package2-descriptor.json'), JSON.stringify(packageDescriptorJson, undefined, 2));
     // Zip the Version Info and package.zip files into another zip
     await pkgUtils.zipDir(packageVersBlobDirectory, packageVersBlobZipFile);
     return createRequestObject(packageId, context, packageVersTmpRoot, packageVersBlobZipFile);
 }
 exports.createPackageVersionCreateRequest = createPackageVersionCreateRequest;
 async function createRequestObject(packageId, options, packageVersTmpRoot, packageVersBlobZipFile) {
-    const zipFileBase64 = (await fs.promises.readFile(packageVersBlobZipFile)).toString('base64');
+    const zipFileBase64 = (await node_fs_1.default.promises.readFile(packageVersBlobZipFile)).toString('base64');
     const requestObject = {
         Package2Id: packageId,
         VersionInfo: zipFileBase64,
@@ -172,7 +197,7 @@ async function createRequestObject(packageId, options, packageVersTmpRoot, packa
         Instance: options.buildinstance,
         IsConversionRequest: true,
     };
-    await fs.promises.rm(packageVersTmpRoot, { recursive: true });
+    await node_fs_1.default.promises.rm(packageVersTmpRoot, { recursive: true });
     return requestObject;
 }
 async function pollForStatusWithInterval(id, retries, packageId, branch, project, connection, interval) {

package/lib/package/packageCreate.js

@@ -5,11 +5,34 @@
  * 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
  */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createPackage = exports.createPackageDirEntry = exports.createPackageRequestFromContext = void 0;
 const core_1 = require("@salesforce/core");
 const kit_1 = require("@salesforce/kit");
-const pkgUtils = require("../utils/packageUtils");
+const pkgUtils = __importStar(require("../utils/packageUtils"));
 const packageUtils_1 = require("../utils/packageUtils");
 function createPackageRequestFromContext(project, options) {
     const namespace = options.noNamespace ? '' : project.getSfProjectJson().getContents().namespace ?? '';

package/lib/package/packageInstall.d.ts

@@ -1,6 +1,6 @@
 import { Connection } from '@salesforce/core';
 import { Nullable } from '@salesforce/ts-types';
-import { QueryResult } from 'jsforce';
+import type { QueryResult } from '@jsforce/jsforce-node';
 import { Duration } from '@salesforce/kit';
 import { PackageInstallCreateRequest, PackageInstallOptions, PackageType, PackagingSObjects } from '../interfaces';
 import PackageInstallRequest = PackagingSObjects.PackageInstallRequest;

package/lib/package/packageInstall.js

@@ -130,7 +130,9 @@ async function waitForPublish(connection, subscriberPackageVersionId, frequency,
     catch (e) {
         // if polling timed out
         const error = installMsgs.createError('subscriberPackageVersionNotPublished');
-        error.setData(queryResult?.records[0]);
+        if (queryResult?.records[0]) {
+            error.setData(queryResult?.records[0]);
+        }
         if (error.stack && e instanceof Error && e.stack) {
             getLogger().debug(`Error during waitForPublish polling:\n${e.stack}`);
             // append the original stack to this new error

package/lib/package/packageProfileApi.js

@@ -1,4 +1,7 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PackageProfileApi = void 0;
 /*
@@ -7,10 +10,10 @@ exports.PackageProfileApi = void 0;
  * 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
  */
-const path = require("node:path");
-const os = require("node:os");
-const fs = require("node:fs");
-const globby = require("globby");
+const node_path_1 = __importDefault(require("node:path"));
+const node_os_1 = __importDefault(require("node:os"));
+const node_fs_1 = __importDefault(require("node:fs"));
+const globby_1 = __importDefault(require("globby"));
 const core_1 = require("@salesforce/core");
 const kit_1 = require("@salesforce/kit");
 const profileRewriter_1 = require("./profileRewriter");
@@ -44,7 +47,7 @@ class PackageProfileApi extends kit_1.AsyncCreatable {
         const logger = core_1.Logger.childFromRoot('PackageProfileApi');
         return (this.getProfilesWithNamesAndPaths(excludedDirectories)
             .map(({ profilePath, name: profileName }) => {
-            const originalProfile = (0, profileRewriter_1.profileStringToProfile)(fs.readFileSync(profilePath, 'utf-8'));
+            const originalProfile = (0, profileRewriter_1.profileStringToProfile)(node_fs_1.default.readFileSync(profilePath, 'utf-8'));
             const adjustedProfile = (0, profileRewriter_1.profileRewriter)(originalProfile, (0, profileRewriter_1.manifestTypesToMap)(manifestTypes), this.includeUserLicenses);
             return {
                 profileName,
@@ -66,7 +69,7 @@ class PackageProfileApi extends kit_1.AsyncCreatable {
                 removedSettings.forEach((setting) => {
                     logger.info(profileApiMessages.getMessage('removeProfileSetting', [setting, profileName]));
                 });
-                fs.writeFileSync(xmlFileLocation, (0, profileRewriter_1.profileObjectToString)(adjustedProfile), 'utf-8');
+                node_fs_1.default.writeFileSync(xmlFileLocation, (0, profileRewriter_1.profileObjectToString)(adjustedProfile), 'utf-8');
             }
         })
             .map(({ xmlFileLocation }) => xmlFileLocation.replace(/(.*)(\.profile)/, '$1')));
@@ -86,14 +89,14 @@ class PackageProfileApi extends kit_1.AsyncCreatable {
     }
     // Look for profiles in all package directories
     findAllProfiles(excludedDirectories = []) {
-        const ignore = excludedDirectories.map((dir) => `**/${dir.split(path.sep).join(path.posix.sep)}/**`);
+        const ignore = excludedDirectories.map((dir) => `**/${dir.split(node_path_1.default.sep).join(node_path_1.default.posix.sep)}/**`);
         const patterns = this.project
             .getUniquePackageDirectories()
             .map((pDir) => pDir.fullPath)
-            .map((fullDir) => os.type() === 'Windows_NT'
-            ? path.posix.join(...fullDir.split(path.sep), '**', '*.profile-meta.xml')
-            : path.join(fullDir, '**', '*.profile-meta.xml'));
-        return globby.sync(patterns, { ignore });
+            .map((fullDir) => node_os_1.default.type() === 'Windows_NT'
+            ? node_path_1.default.posix.join(...fullDir.split(node_path_1.default.sep), '**', '*.profile-meta.xml')
+            : node_path_1.default.join(fullDir, '**', '*.profile-meta.xml'));
+        return globby_1.default.sync(patterns, { ignore });
     }
     getProfilesWithNamesAndPaths(excludedDirectories) {
         return this.findAllProfiles(excludedDirectories)
@@ -104,7 +107,7 @@ class PackageProfileApi extends kit_1.AsyncCreatable {
 exports.PackageProfileApi = PackageProfileApi;
 const isProfilePathWithName = (profilePathWithName) => typeof profilePathWithName.name === 'string';
 const profilePathToName = (profilePath) => profilePath.match(/([^/]+)\.profile-meta.xml/)?.[1];
-const getXmlFileLocation = (destPath, profilePath) => path.join(destPath, path.basename(profilePath).replace(/(.*)(-meta.xml)/, '$1'));
+const getXmlFileLocation = (destPath, profilePath) => node_path_1.default.join(destPath, node_path_1.default.basename(profilePath).replace(/(.*)(-meta.xml)/, '$1'));
 const getRemovedSettings = (originalProfile, adjustedProfile) => {
     const originalProfileSettings = Object.keys(originalProfile);
     const adjustedProfileSettings = new Set(Object.keys(adjustedProfile));

package/lib/package/packageUninstall.js

@@ -1,4 +1,7 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.uninstallPackage = exports.pollUninstall = exports.getUninstallErrors = void 0;
 /*
@@ -7,7 +10,7 @@ exports.uninstallPackage = exports.pollUninstall = exports.getUninstallErrors =
  * 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
  */
-const os = require("node:os");
+const node_os_1 = __importDefault(require("node:os"));
 const core_1 = require("@salesforce/core");
 const kit_1 = require("@salesforce/kit");
 const interfaces_1 = require("../interfaces");
@@ -39,8 +42,8 @@ async function pollUninstall(uninstallRequestId, conn, frequency, wait) {
             default: {
                 const err = pkgMessages.getMessage('defaultErrorMessage', [id, uninstallRequest.Id]);
                 const errorMessages = await getUninstallErrors(conn, id);
-                const errors = errorMessages.map((error, index) => `(${index + 1}) ${error.Message}${os.EOL}`);
-                const combinedErrors = errors.length ? `\n=== Errors\n${errors.join(os.EOL)}` : '';
+                const errors = errorMessages.map((error, index) => `(${index + 1}) ${error.Message}${node_os_1.default.EOL}`);
+                const combinedErrors = errors.length ? `\n=== Errors\n${errors.join(node_os_1.default.EOL)}` : '';
                 throw new core_1.SfError(`${err}${combinedErrors}`, 'UNINSTALL_ERROR', [messages.getMessage('uninstallErrorAction')]);
             }
         }

package/lib/package/packageVersionCreate.js

@@ -5,18 +5,43 @@
  * 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
  */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateVersionNumber = exports.validateAncestorId = exports.packageXmlJsonToXmlString = exports.packageXmlStringToPackageXmlJson = exports.MetadataResolver = exports.PackageVersionCreate = void 0;
-const path = require("node:path");
-const os = require("node:os");
-const fs = require("node:fs");
+const node_path_1 = __importDefault(require("node:path"));
+const node_os_1 = __importDefault(require("node:os"));
+const node_fs_1 = __importDefault(require("node:fs"));
 const core_1 = require("@salesforce/core");
 const source_deploy_retrieve_1 = require("@salesforce/source-deploy-retrieve");
-const scratchOrgSettingsGenerator_1 = require("@salesforce/core/lib/org/scratchOrgSettingsGenerator");
 const kit_1 = require("@salesforce/kit");
 const fast_xml_parser_1 = require("fast-xml-parser");
 const ts_types_1 = require("@salesforce/ts-types");
-const pkgUtils = require("../utils/packageUtils");
+const pkgUtils = __importStar(require("../utils/packageUtils"));
 const packageUtils_1 = require("../utils/packageUtils");
 const interfaces_1 = require("../interfaces");
 const packageProfileApi_1 = require("./packageProfileApi");
@@ -180,7 +205,7 @@ class PackageVersionCreate {
         return `${results.records[0].expr0}`;
     }
     async createRequestObject(preserveFiles, packageVersTmpRoot, packageVersBlobZipFile) {
-        const zipFileBase64 = fs.readFileSync(packageVersBlobZipFile).toString('base64');
+        const zipFileBase64 = node_fs_1.default.readFileSync(packageVersBlobZipFile).toString('base64');
         const requestObject = {
             Package2Id: this.packageId,
             VersionInfo: zipFileBase64,
@@ -212,7 +237,7 @@ class PackageVersionCreate {
             return requestObject;
         }
         else {
-            return fs.promises.rm(packageVersTmpRoot, { recursive: true, force: true }).then(() => requestObject);
+            return node_fs_1.default.promises.rm(packageVersTmpRoot, { recursive: true, force: true }).then(() => requestObject);
         }
     }
     /**
@@ -224,25 +249,25 @@ class PackageVersionCreate {
     async createPackageVersionCreateRequestFromOptions() {
         const preserveFiles = !!(this.options.preserve ?? kit_1.env.getBoolean('SF_PACKAGE2_VERSION_CREATE_PRESERVE'));
         const uniqueHash = (0, packageUtils_1.uniqid)({ template: `${this.packageId}-%s` });
-        const packageVersTmpRoot = path.join(os.tmpdir(), `${uniqueHash}`);
-        const packageVersMetadataFolder = path.join(packageVersTmpRoot, 'md-files');
-        const unpackagedMetadataFolder = path.join(packageVersTmpRoot, 'unpackaged-md-files');
-        const seedMetadataFolder = path.join(packageVersTmpRoot, 'seed-md-files');
-        const packageVersProfileFolder = path.join(packageVersMetadataFolder, 'profiles');
-        const packageVersBlobDirectory = path.join(packageVersTmpRoot, 'package-version-info');
-        const metadataZipFile = path.join(packageVersBlobDirectory, 'package.zip');
-        const unpackagedMetadataZipFile = path.join(packageVersBlobDirectory, 'unpackaged-metadata-package.zip');
-        const seedMetadataZipFile = path.join(packageVersBlobDirectory, 'seed-metadata-package.zip');
-        const settingsZipFile = path.join(packageVersBlobDirectory, 'settings.zip');
-        const packageVersBlobZipFile = path.join(packageVersTmpRoot, 'package-version-info.zip');
-        const sourceBaseDir = path.join(this.project.getPath(), this.packageObject?.path ?? '');
+        const packageVersTmpRoot = node_path_1.default.join(node_os_1.default.tmpdir(), `${uniqueHash}`);
+        const packageVersMetadataFolder = node_path_1.default.join(packageVersTmpRoot, 'md-files');
+        const unpackagedMetadataFolder = node_path_1.default.join(packageVersTmpRoot, 'unpackaged-md-files');
+        const seedMetadataFolder = node_path_1.default.join(packageVersTmpRoot, 'seed-md-files');
+        const packageVersProfileFolder = node_path_1.default.join(packageVersMetadataFolder, 'profiles');
+        const packageVersBlobDirectory = node_path_1.default.join(packageVersTmpRoot, 'package-version-info');
+        const metadataZipFile = node_path_1.default.join(packageVersBlobDirectory, 'package.zip');
+        const unpackagedMetadataZipFile = node_path_1.default.join(packageVersBlobDirectory, 'unpackaged-metadata-package.zip');
+        const seedMetadataZipFile = node_path_1.default.join(packageVersBlobDirectory, 'seed-metadata-package.zip');
+        const settingsZipFile = node_path_1.default.join(packageVersBlobDirectory, 'settings.zip');
+        const packageVersBlobZipFile = node_path_1.default.join(packageVersTmpRoot, 'package-version-info.zip');
+        const sourceBaseDir = node_path_1.default.join(this.project.getPath(), this.packageObject?.path ?? '');
         const mdOptions = {
             deploydir: packageVersMetadataFolder,
             sourceDir: sourceBaseDir,
             sourceApiVersion: this.project?.getSfProjectJson()?.get('sourceApiVersion') ?? undefined,
         };
-        await fs.promises.mkdir(packageVersBlobDirectory, { recursive: true });
-        const settingsGenerator = new scratchOrgSettingsGenerator_1.default({ asDirectory: true });
+        await node_fs_1.default.promises.mkdir(packageVersBlobDirectory, { recursive: true });
+        const settingsGenerator = new core_1.ScratchOrgSettingsGenerator({ asDirectory: true });
         let packageDescriptorJson = structuredClone(this.packageObject);
         const apvLanguage = packageDescriptorJson.language;
         // Copy all the metadata from the workspace to a tmp folder
@@ -267,7 +292,7 @@ class PackageVersionCreate {
             delete packageDescriptorJson.orgPreferences;
             delete packageDescriptorJson.definitionFile;
             delete packageDescriptorJson.snapshot;
-            const definitionFilePayload = await fs.promises.readFile(definitionFile, 'utf8');
+            const definitionFilePayload = await node_fs_1.default.promises.readFile(definitionFile, 'utf8');
             const definitionFileJson = JSON.parse(definitionFilePayload);
             // Load any settings from the definition
             await settingsGenerator.extract(definitionFileJson);
@@ -297,13 +322,13 @@ class PackageVersionCreate {
         }
         packageDescriptorJson = cleanPackageDescriptorJson(packageDescriptorJson);
         packageDescriptorJson = setPackageDescriptorJsonValues(packageDescriptorJson, this.options, this.logger);
-        await fs.promises.mkdir(packageVersTmpRoot, { recursive: true });
-        await fs.promises.mkdir(packageVersBlobDirectory, { recursive: true });
+        await node_fs_1.default.promises.mkdir(packageVersTmpRoot, { recursive: true });
+        await node_fs_1.default.promises.mkdir(packageVersBlobDirectory, { recursive: true });
         if (Reflect.has(packageDescriptorJson, 'ancestorVersion')) {
             delete packageDescriptorJson.ancestorVersion;
         }
         packageDescriptorJson.ancestorId = ancestorId;
-        await fs.promises.writeFile(path.join(packageVersBlobDirectory, DESCRIPTOR_FILE), JSON.stringify(packageDescriptorJson), 'utf-8');
+        await node_fs_1.default.promises.writeFile(node_path_1.default.join(packageVersBlobDirectory, DESCRIPTOR_FILE), JSON.stringify(packageDescriptorJson), 'utf-8');
         await this.cleanGeneratedPackage({
             packageVersMetadataFolder,
             packageVersProfileFolder,
@@ -328,7 +353,7 @@ class PackageVersionCreate {
         // As part of the source convert process, the package.xml has been written into the tmp metadata directory.
         // The package.xml may need to be manipulated due to processing profiles in the workspace or additional
         // metadata exclusions. If necessary, read the existing package.xml and then re-write it.
-        const currentPackageXml = await fs.promises.readFile(path.join(packageVersMetadataFolder, 'package.xml'), 'utf8');
+        const currentPackageXml = await node_fs_1.default.promises.readFile(node_path_1.default.join(packageVersMetadataFolder, 'package.xml'), 'utf8');
         // convert to json
         const packageXmlAsJson = (0, exports.packageXmlStringToPackageXmlJson)(currentPackageXml);
         if (!packageXmlAsJson) {
@@ -337,8 +362,8 @@ class PackageVersionCreate {
         if (!packageXmlAsJson?.types) {
             throw messages.createError('packageXmlDoesNotContainPackageTypes');
         }
-        fs.mkdirSync(packageVersMetadataFolder, { recursive: true });
-        fs.mkdirSync(packageVersProfileFolder, { recursive: true });
+        node_fs_1.default.mkdirSync(packageVersMetadataFolder, { recursive: true });
+        node_fs_1.default.mkdirSync(packageVersProfileFolder, { recursive: true });
         this.apiVersionFromPackageXml = packageXmlAsJson.version;
         const sourceApiVersion = this.project?.getSfProjectJson()?.get('sourceApiVersion');
         const hasSeedMetadata = await this.metadataResolver.resolveMetadata(this.packageObject.seedMetadata?.path, seedMetadataFolder, 'seedMDDirectoryDoesNotExist', sourceApiVersion);
@@ -382,7 +407,7 @@ class PackageVersionCreate {
             return { ...type, members: type.members.filter((m) => !excludedProfiles?.includes(m)) };
         });
         const xml = (0, exports.packageXmlJsonToXmlString)(packageXmlAsJson);
-        await fs.promises.writeFile(path.join(packageVersMetadataFolder, 'package.xml'), xml, 'utf-8');
+        await node_fs_1.default.promises.writeFile(node_path_1.default.join(packageVersMetadataFolder, 'package.xml'), xml, 'utf-8');
         // Zip the packageVersMetadataFolder folder and put the zip in {packageVersBlobDirectory}/package.zip
         await (0, packageUtils_1.zipDir)(packageVersMetadataFolder, metadataZipFile);
         if (hasSeedMetadata) {
@@ -397,7 +422,7 @@ class PackageVersionCreate {
         if (settingsGenerator.hasSettings()) {
             await settingsGenerator.createDeploy();
             await settingsGenerator.createDeployPackageContents(this.apiVersionFromPackageXml);
-            await (0, packageUtils_1.zipDir)(`${settingsGenerator.getDestinationPath()}${path.sep}${settingsGenerator.getShapeDirName()}`, settingsZipFile);
+            await (0, packageUtils_1.zipDir)(`${settingsGenerator.getDestinationPath()}${node_path_1.default.sep}${settingsGenerator.getShapeDirName()}`, settingsZipFile);
         }
         // Zip the Version Info and package.zip files into another zip
         await (0, packageUtils_1.zipDir)(packageVersBlobDirectory, packageVersBlobZipFile);
@@ -710,11 +735,11 @@ exports.PackageVersionCreate = PackageVersionCreate;
 class MetadataResolver {
     async resolveMetadata(metadataRelativePath, metadataOutputPath, errorMessageLabel, sourceApiVersion) {
         if (metadataRelativePath) {
-            const metadataFullPath = path.join(process.cwd(), metadataRelativePath);
-            if (!fs.existsSync(metadataFullPath)) {
+            const metadataFullPath = node_path_1.default.join(process.cwd(), metadataRelativePath);
+            if (!node_fs_1.default.existsSync(metadataFullPath)) {
                 throw messages.createError(errorMessageLabel, [metadataRelativePath]);
             }
-            fs.mkdirSync(metadataOutputPath, { recursive: true });
+            node_fs_1.default.mkdirSync(metadataOutputPath, { recursive: true });
             await this.generateMDFolderForArtifact({
                 deploydir: metadataOutputPath,
                 sourceDir: metadataFullPath,
@@ -736,7 +761,7 @@ class MetadataResolver {
         }
         const componentSet = await source_deploy_retrieve_1.ComponentSetBuilder.build(componentSetOptions);
         const packageName = options.packageName;
-        const outputDirectory = path.resolve(options.deploydir);
+        const outputDirectory = node_path_1.default.resolve(options.deploydir);
         const convertResult = await this.convertMetadata(componentSet, outputDirectory, packageName);
         if (packageName) {
             // SDR will build an output path like /output/directory/packageName/package.xml
@@ -746,12 +771,12 @@ class MetadataResolver {
             }
             (0, packageUtils_1.copyDir)(convertResult.packagePath, outputDirectory);
             try {
-                fs.rmSync(convertResult.packagePath, { recursive: true });
+                node_fs_1.default.rmSync(convertResult.packagePath, { recursive: true });
             }
             catch (e) {
                 // rmdirSync is being deprecated and emits a warning
                 // but rmSync is introduced in node 14 so fall back to rmdirSync
-                fs.rmdirSync(convertResult.packagePath, { recursive: true });
+                node_fs_1.default.rmdirSync(convertResult.packagePath, { recursive: true });
             }
             convertResult.packagePath = outputDirectory;
         }

package/lib/package/packageVersionCreateRequest.js

@@ -5,9 +5,12 @@
  * 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
  */
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.byId = exports.list = void 0;
-const util = require("node:util");
+const node_util_1 = __importDefault(require("node:util"));
 const core_1 = require("@salesforce/core");
 const interfaces_1 = require("../interfaces");
 const packageUtils_1 = require("../utils/packageUtils");
@@ -26,7 +29,7 @@ function formatDate(date) {
 async function list(connection, options) {
     try {
         const whereClause = constructWhere(options);
-        return await query(util.format(QUERY, whereClause), connection);
+        return await query(node_util_1.default.format(QUERY, whereClause), connection);
     }
     catch (err) {
         if (err instanceof Error) {
@@ -37,7 +40,7 @@ async function list(connection, options) {
 }
 exports.list = list;
 async function byId(packageVersionCreateRequestId, connection) {
-    const results = await query(util.format(QUERY, `WHERE Id = '${packageVersionCreateRequestId}' `), connection);
+    const results = await query(node_util_1.default.format(QUERY, `WHERE Id = '${packageVersionCreateRequestId}' `), connection);
     if (results && results.length === 1 && results[0].Status === interfaces_1.PackagingSObjects.Package2VersionStatus.error) {
         results[0].Error = await queryForErrors(packageVersionCreateRequestId, connection);
     }

package/lib/package/packageVersionCreateRequestReport.js

@@ -5,9 +5,32 @@
  * 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
  */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCreatePackageVersionCreateRequestReport = void 0;
-const pkgUtils = require("../utils/packageUtils");
+const pkgUtils = __importStar(require("../utils/packageUtils"));
 const packageUtils_1 = require("../utils/packageUtils");
 const packageVersionCreateRequest_1 = require("./packageVersionCreateRequest");
 async function getCreatePackageVersionCreateRequestReport(options) {

package/lib/package/packageVersionList.d.ts

@@ -1,5 +1,5 @@
 import { Connection } from '@salesforce/core';
-import { QueryResult } from 'jsforce';
+import { QueryResult } from '@jsforce/jsforce-node';
 import { PackageVersionListOptions, PackageVersionListResult } from '../interfaces';
 export declare const DEFAULT_ORDER_BY_FIELDS = "Package2Id, Branch, MajorVersion, MinorVersion, PatchVersion, BuildNumber";
 /**

package/lib/package/packageVersionReport.js

@@ -5,13 +5,39 @@
  * 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
  */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPackageVersionReport = void 0;
 // Node
-const util = require("node:util");
+const node_util_1 = __importDefault(require("node:util"));
 // Local
 const core_1 = require("@salesforce/core");
-const pkgUtils = require("../utils/packageUtils");
+const pkgUtils = __importStar(require("../utils/packageUtils"));
 const QUERY = 'SELECT Package2Id, SubscriberPackageVersionId, Name, Description, Tag, Branch, AncestorId, ValidationSkipped, ' +
     'MajorVersion, MinorVersion, PatchVersion, BuildNumber, IsReleased, CodeCoverage, HasPassedCodeCoverageCheck, ' +
     'Package2.IsOrgDependent, ReleaseVersion, BuildDurationInSeconds, HasMetadataRemoved, CreatedById, ConvertedFromVersionId  ' +
@@ -34,8 +60,8 @@ const getLogger = () => {
     return logger;
 };
 async function getPackageVersionReport(options) {
-    getLogger().debug(`entering getPackageVersionReport(${util.inspect(options, { depth: null })})`);
-    const queryResult = await options.connection.tooling.query(util.format(options.verbose ? QUERY_VERBOSE : QUERY, options.packageVersionId));
+    getLogger().debug(`entering getPackageVersionReport(${node_util_1.default.inspect(options, { depth: null })})`);
+    const queryResult = await options.connection.tooling.query(node_util_1.default.format(options.verbose ? QUERY_VERBOSE : QUERY, options.packageVersionId));
     const records = queryResult.records;
     if (records?.length > 0) {
         const record = records[0];

package/lib/package/packageVersionRetrieve.js

@@ -1,4 +1,7 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.retrievePackageVersionMetadata = void 0;
 /*
@@ -7,8 +10,8 @@ exports.retrievePackageVersionMetadata = void 0;
  * 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
  */
-const path = require("node:path");
-const fs = require("node:fs");
+const node_path_1 = __importDefault(require("node:path"));
+const node_fs_1 = __importDefault(require("node:fs"));
 const core_1 = require("@salesforce/core");
 const source_deploy_retrieve_1 = require("@salesforce/source-deploy-retrieve");
 const kit_1 = require("@salesforce/kit");
@@ -36,12 +39,12 @@ const getLogger = () => {
 async function retrievePackageVersionMetadata(project, options, connection) {
     // Validate the destination path is suitable to extract package version metadata (must be new or empty)
     const destinationFolder = options.destinationFolder ?? 'force-app';
-    if (path.isAbsolute(destinationFolder)) {
+    if (node_path_1.default.isAbsolute(destinationFolder)) {
         throw messages.createError('sourcesDownloadDirectoryMustBeRelative');
     }
-    const destinationPath = path.join(project.getPath(), destinationFolder);
-    if (!fs.existsSync(destinationPath)) {
-        fs.mkdirSync(destinationPath, { recursive: true });
+    const destinationPath = node_path_1.default.join(project.getPath(), destinationFolder);
+    if (!node_fs_1.default.existsSync(destinationPath)) {
+        node_fs_1.default.mkdirSync(destinationPath, { recursive: true });
     }
     if (!(0, packageUtils_1.isPackageDirectoryEffectivelyEmpty)(destinationPath)) {
         throw messages.createError('sourcesDownloadDirectoryNotEmpty');

package/lib/package/profileRewriter.d.ts

@@ -1,4 +1,4 @@
-import { Profile } from 'jsforce/api/metadata';
+import type { Profile } from '@jsforce/jsforce-node/lib/api/metadata';
 import { PackageXml } from '../interfaces';
 type ProfileCustomSettingAccess = {
     name: string;

package/lib/package1/package1Version.js

@@ -1,4 +1,7 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Package1Version = void 0;
 /*
@@ -7,7 +10,7 @@ exports.Package1Version = void 0;
  * 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
  */
-const os = require("node:os");
+const node_os_1 = __importDefault(require("node:os"));
 const core_1 = require("@salesforce/core");
 const kit_1 = require("@salesforce/kit");
 const interfaces_1 = require("../interfaces");
@@ -125,7 +128,7 @@ class Package1Version {
                 const errors = pollingResult?.Errors?.errors;
                 if (errors?.length > 0) {
                     throw messages.createError('package1VersionCreateCommandUploadFailure', [
-                        errors.map((e) => e.message).join(os.EOL),
+                        errors.map((e) => e.message).join(node_os_1.default.EOL),
                     ]);
                 }
                 else {

package/lib/utils/packageUtils.d.ts

@@ -1,6 +1,6 @@
 import { Connection, ScratchOrgInfo, SfdcUrl, SfError, SfProject } from '@salesforce/core';
 import { Many, Nullable } from '@salesforce/ts-types';
-import { SaveError } from 'jsforce';
+import type { SaveError } from '@jsforce/jsforce-node';
 import { Duration } from '@salesforce/kit';
 import { PackageDescriptorJson, PackageType, PackagingSObjects } from '../interfaces';
 export declare const VERSION_NUMBER_SEP = ".";

package/lib/utils/packageUtils.js

@@ -1,4 +1,30 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isPackageDirectoryEffectivelyEmpty = exports.replaceIfEmpty = exports.copyDescriptorProperties = exports.copyDir = exports.zipDir = exports.numberToDuration = exports.combineSaveErrors = exports.generatePackageAliasEntry = exports.getPackageVersionNumber = exports.queryWithInConditionChunking = exports.getPackageVersionStrings = exports.getContainerOptions = exports.escapeInstallationKey = exports.getPackageVersionId = exports.massageErrorMessage = exports.applyErrorAction = exports.validateIdNoThrow = exports.validateId = exports.uniqid = exports.BY_LABEL = exports.DEFAULT_PACKAGE_DIR = exports.POLL_INTERVAL_SECONDS = exports.INSTALL_URL_BASE = exports.VERSION_NUMBER_SEP = void 0;
 /*
@@ -7,18 +33,17 @@ exports.isPackageDirectoryEffectivelyEmpty = exports.replaceIfEmpty = exports.co
  * 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
  */
-const os = require("node:os");
-const fs = require("node:fs");
+const node_os_1 = __importDefault(require("node:os"));
+const node_fs_1 = __importDefault(require("node:fs"));
 const node_path_1 = require("node:path");
 const node_stream_1 = require("node:stream");
-const util = require("node:util");
-const node_util_1 = require("node:util");
+const node_util_1 = __importStar(require("node:util"));
 const node_crypto_1 = require("node:crypto");
 const core_1 = require("@salesforce/core");
 const ts_types_1 = require("@salesforce/ts-types");
 const kit_1 = require("@salesforce/kit");
-const globby = require("globby");
-const JSZIP = require("jszip");
+const globby_1 = __importDefault(require("globby"));
+const jszip_1 = __importDefault(require("jszip"));
 core_1.Messages.importMessagesDirectory(__dirname);
 const messages = core_1.Messages.loadMessages('@salesforce/packaging', 'pkg_utils');
 exports.VERSION_NUMBER_SEP = '.';
@@ -71,7 +96,7 @@ function uniqid(options) {
         return uniqueString;
     }
     return options.template.includes('%s')
-        ? util.format(options.template, uniqueString)
+        ? node_util_1.default.format(options.template, uniqueString)
         : `${options.template}${uniqueString}`;
 }
 exports.uniqid = uniqid;
@@ -335,7 +360,7 @@ function combineSaveErrors(sObject, crudOperation, errors) {
         const fieldsString = error.fields?.length ? `Fields: [${error.fields?.join(', ')}]` : '';
         return `Error: ${error.errorCode} Message: ${error.message} ${fieldsString}`;
     });
-    return messages.createError('errorDuringSObjectCRUDOperation', [crudOperation, sObject, errorMessages.join(os.EOL)]);
+    return messages.createError('errorDuringSObjectCRUDOperation', [crudOperation, sObject, errorMessages.join(node_os_1.default.EOL)]);
 }
 exports.combineSaveErrors = combineSaveErrors;
 /**
@@ -363,11 +388,11 @@ const pipeline = (0, node_util_1.promisify)(node_stream_1.pipeline);
 async function zipDir(dir, zipfile) {
     const logger = core_1.Logger.childFromRoot('srcDevUtils#zipDir');
     const timer = process.hrtime();
-    const globbyResult = await globby('**/*', { expandDirectories: true, cwd: dir });
-    const zip = new JSZIP();
+    const globbyResult = await (0, globby_1.default)('**/*', { expandDirectories: true, cwd: dir });
+    const zip = new jszip_1.default();
     // add files tp zip
     for (const file of globbyResult) {
-        zip.file(file, fs.readFileSync((0, node_path_1.join)(dir, file)));
+        zip.file(file, node_fs_1.default.readFileSync((0, node_path_1.join)(dir, file)));
     }
     // write zip to file
     const zipStream = zip.generateNodeStream({
@@ -378,8 +403,8 @@ async function zipDir(dir, zipfile) {
             level: 3,
         },
     });
-    await pipeline(zipStream, fs.createWriteStream(zipfile));
-    const stat = fs.statSync(zipfile);
+    await pipeline(zipStream, node_fs_1.default.createWriteStream(zipfile));
+    const stat = node_fs_1.default.statSync(zipfile);
     logger.debug(`${stat.size} bytes written to ${zipfile} in ${getElapsedTime(timer)}ms`);
     return;
 }
@@ -389,12 +414,12 @@ function getElapsedTime(timer) {
     return (elapsed[0] * 1000 + elapsed[1] / 1_000_000).toFixed(3);
 }
 function copyDir(src, dest) {
-    fs.mkdirSync(dest, { recursive: true });
-    const entries = fs.readdirSync(src, { withFileTypes: true });
+    node_fs_1.default.mkdirSync(dest, { recursive: true });
+    const entries = node_fs_1.default.readdirSync(src, { withFileTypes: true });
     entries.map((entry) => {
         const srcPath = (0, node_path_1.join)(src, entry.name);
         const destPath = (0, node_path_1.join)(dest, entry.name);
-        return entry.isDirectory() ? copyDir(srcPath, destPath) : fs.copyFileSync(srcPath, destPath);
+        return entry.isDirectory() ? copyDir(srcPath, destPath) : node_fs_1.default.copyFileSync(srcPath, destPath);
     });
 }
 exports.copyDir = copyDir;
@@ -429,10 +454,10 @@ exports.replaceIfEmpty = replaceIfEmpty;
  * directories containing only an .eslintrc.json file.
  */
 function isPackageDirectoryEffectivelyEmpty(directory) {
-    if (!fs.lstatSync(directory).isDirectory()) {
+    if (!node_fs_1.default.lstatSync(directory).isDirectory()) {
         return false;
     }
-    const entries = fs.readdirSync(directory, { withFileTypes: true });
+    const entries = node_fs_1.default.readdirSync(directory, { withFileTypes: true });
     return entries.every((entry) => entry.isDirectory()
         ? isPackageDirectoryEffectivelyEmpty((0, node_path_1.join)(directory, entry.name))
         : entry.name === '.eslintrc.json');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/packaging",
-  "version": "3.4.0",
+  "version": "3.5.1",
   "description": "Packaging library for the Salesforce packaging platform",
   "main": "lib/exported",
   "types": "lib/exported.d.ts",
@@ -41,27 +41,27 @@
     "!lib/**/*.map"
   ],
   "dependencies": {
+    "@jsforce/jsforce-node": "^3.1.0",
     "@oclif/core": "^3",
-    "@salesforce/core": "^6.7.6",
+    "@salesforce/core": "^7.2.0",
     "@salesforce/kit": "^3.1.0",
     "@salesforce/schemas": "^1.7.0",
-    "@salesforce/source-deploy-retrieve": "^10.7.0",
+    "@salesforce/source-deploy-retrieve": "^11.0.0",
     "@salesforce/ts-types": "^2.0.9",
     "fast-xml-parser": "^4.3.6",
     "globby": "^11",
     "graphology": "^0.25.4",
     "graphology-traversal": "^0.3.1",
     "graphology-types": "^0.24.7",
-    "jsforce": "^2.0.0-beta.29",
     "jszip": "^3.10.1"
   },
   "devDependencies": {
-    "@salesforce/cli-plugins-testkit": "^4.4.12",
+    "@salesforce/cli-plugins-testkit": "^5.2.0",
     "@salesforce/dev-scripts": "^8.4.2",
     "@salesforce/ts-sinon": "^1.4.19",
     "@types/globby": "^9.1.0",
     "@types/jszip": "^3.4.1",
-    "eslint-plugin-sf-plugin": "^1.17.5",
+    "eslint-plugin-sf-plugin": "^1.18.0",
     "shelljs": "0.8.5",
     "ts-node": "^10.9.2",
     "typescript": "^5.4.3"