npm - @salesforce/source-deploy-retrieve - Versions diffs - 8.6.0 → 9.1.0 - Mend

@salesforce/source-deploy-retrieve 8.6.0 → 9.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (19) hide show

package/lib/src/client/metadataApiDeploy.js CHANGED Viewed

@@ -10,14 +10,13 @@ exports.MetadataApiDeploy = exports.DeployResult = void 0;
 const path_1 = require("path");
 const util_1 = require("util");
 const ts_types_1 = require("@salesforce/ts-types");
-const archiver_1 = require("archiver");
+const JSZip = require("jszip");
 const fs = require("graceful-fs");
 const core_1 = require("@salesforce/core");
 const kit_1 = require("@salesforce/kit");
 const convert_1 = require("../convert");
 const collections_1 = require("../collections");
 const registry_1 = require("../registry");
-const streams_1 = require("../convert/streams");
 const metadataTransfer_1 = require("./metadataTransfer");
 const types_1 = require("./types");
 const diagnosticUtil_1 = require("./diagnosticUtil");
@@ -211,7 +210,7 @@ class MetadataApiDeploy extends metadataTransfer_1.MetadataTransfer {
             throw new core_1.SfError(messages.getMessage('error_no_job_id', ['deploy']), 'MissingJobIdError');
         }
         const conn = await this.getConnection();
-        const response = (await conn.deployRecentValidation({
+        const response = (await conn.metadata.deployRecentValidation({
             id: this.id,
             rest,
         }));
@@ -246,7 +245,6 @@ class MetadataApiDeploy extends metadataTransfer_1.MetadataTransfer {
         await connection.metadata._invoke('cancelDeploy', { id: this.id });
     }
     async pre() {
-        var _a, _b;
         const LifecycleInstance = core_1.Lifecycle.getInstance();
         const connection = await this.getConnection();
         const apiVersion = connection.getApiVersion();
@@ -255,9 +253,9 @@ class MetadataApiDeploy extends metadataTransfer_1.MetadataTransfer {
         // If we have a ComponentSet but no version info, use the apiVersion from the Connection.
         if (this.components) {
             // this is the SOAP/REST API version of the connection
-            (_a = this.components).apiVersion ?? (_a.apiVersion = apiVersion);
+            this.components.apiVersion ??= apiVersion;
             // this is used as the version in the manifest (package.xml).
-            (_b = this.components).sourceApiVersion ?? (_b.sourceApiVersion = apiVersion);
+            this.components.sourceApiVersion ??= apiVersion;
         }
         // only do event hooks if source, (NOT a metadata format) deploy
         if (this.options.components) {
@@ -344,7 +342,7 @@ class MetadataApiDeploy extends metadataTransfer_1.MetadataTransfer {
         // only do event hooks if source, (NOT a metadata format) deploy
         if (this.options.components) {
             // this may not be set if you resume a deploy so that `pre` is skipped.
-            this.orgId ?? (this.orgId = connection.getAuthInfoFields().orgId);
+            this.orgId ??= connection.getAuthInfoFields().orgId;
             // previous step ensures string exists
             if (this.orgId) {
                 await lifecycle.emit('scopedPostDeploy', { deployResult, orgId: this.orgId });
@@ -353,20 +351,35 @@ class MetadataApiDeploy extends metadataTransfer_1.MetadataTransfer {
         return deployResult;
     }
     async getZipBuffer() {
-        if (this.options.mdapiPath) {
-            if (!fs.existsSync(this.options.mdapiPath) || !fs.lstatSync(this.options.mdapiPath).isDirectory()) {
-                throw messages.createError('error_directory_not_found_or_not_directory', [this.options.mdapiPath]);
+        const mdapiPath = this.options.mdapiPath;
+        if (mdapiPath) {
+            if (!fs.existsSync(mdapiPath) || !fs.lstatSync(mdapiPath).isDirectory()) {
+                throw messages.createError('error_directory_not_found_or_not_directory', [mdapiPath]);
             }
-            // make a zip from the given directory
-            const zip = (0, archiver_1.create)('zip', { zlib: { level: 9 } });
-            // anywhere not at the root level is fine
-            zip.directory(this.options.mdapiPath, 'zip');
-            // archiver/zip.finalize looks like it is async, because it extends streams, but it is not meant to be used that way
-            // the typings on it are misleading and unintended.  More info https://github.com/archiverjs/node-archiver/issues/476
-            // If you await it, bad things happen, like the convert process exiting silently.  https://github.com/forcedotcom/cli/issues/1791
-            // leave the void as it is
-            void zip.finalize();
-            return (0, streams_1.stream2buffer)(zip);
+            const zip = JSZip();
+            const zipDirRecursive = (dir) => {
+                const dirents = fs.readdirSync(dir, { withFileTypes: true });
+                for (const dirent of dirents) {
+                    const fullPath = (0, path_1.resolve)(dir, dirent.name);
+                    if (dirent.isDirectory()) {
+                        zipDirRecursive(fullPath);
+                    }
+                    else {
+                        // Add relative file paths to a root of "zip" for MDAPI.
+                        const relPath = (0, path_1.join)('zip', (0, path_1.relative)(mdapiPath, fullPath));
+                        // Ensure only posix paths are added to zip files
+                        const relPosixPath = relPath.replace(/\\/g, '/');
+                        zip.file(relPosixPath, fs.createReadStream(fullPath));
+                    }
+                }
+            };
+            this.logger.debug('Zipping directory for metadata deploy:', mdapiPath);
+            zipDirRecursive(mdapiPath);
+            return zip.generateAsync({
+                type: 'nodebuffer',
+                compression: 'DEFLATE',
+                compressionOptions: { level: 9 },
+            });
         }
         // read the zip into a buffer
         if (this.options.zipPath) {

package/lib/src/client/metadataApiDeploy.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"metadataApiDeploy.js","sourceRoot":"","sources":["../../../src/client/metadataApiDeploy.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"metadataApiDeploy.js","sourceRoot":"","sources":["../../../src/client/metadataApiDeploy.ts"],"names":[],"mappings":"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"}

package/lib/src/client/metadataApiRetrieve.js CHANGED Viewed

@@ -150,7 +150,7 @@ class MetadataApiRetrieve extends metadataTransfer_1.MetadataTransfer {
                 components = await this.extract(zipFileContents);
             }
         }
-        components ?? (components = new collections_1.ComponentSet(undefined, this.options.registry));
+        components ??= new collections_1.ComponentSet(undefined, this.options.registry);
         const retrieveResult = new RetrieveResult(result, components, this.components);
         if (!isMdapiRetrieve && !this.options.suppressEvents) {
             // This should only be done when retrieving source format since retrieving
@@ -164,7 +164,6 @@ class MetadataApiRetrieve extends metadataTransfer_1.MetadataTransfer {
         return retrieveResult;
     }
     async pre() {
-        var _a, _b;
         const packageNames = this.getPackageNames();
         if (this.components?.size === 0 && !packageNames?.length) {
             throw new core_1.SfError(messages.getMessage('error_no_components_to_retrieve'), 'MetadataApiRetrieveError');
@@ -173,8 +172,8 @@ class MetadataApiRetrieve extends metadataTransfer_1.MetadataTransfer {
         const apiVersion = connection.getApiVersion();
         this.orgId = connection.getAuthInfoFields().orgId;
         if (this.components) {
-            (_a = this.components).apiVersion ?? (_a.apiVersion = apiVersion);
-            (_b = this.components).sourceApiVersion ?? (_b.sourceApiVersion = apiVersion);
+            this.components.apiVersion ??= apiVersion;
+            this.components.sourceApiVersion ??= apiVersion;
         }
         // only do event hooks if source, (NOT a metadata format) retrieve
         if (this.options.components && !this.options.suppressEvents) {

package/lib/src/client/metadataApiRetrieve.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"metadataApiRetrieve.js","sourceRoot":"","sources":["../../../src/client/metadataApiRetrieve.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"metadataApiRetrieve.js","sourceRoot":"","sources":["../../../src/client/metadataApiRetrieve.ts"],"names":[],"mappings":"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"}

package/lib/src/client/metadataTransfer.js CHANGED Viewed

@@ -62,8 +62,8 @@ class MetadataTransfer {
         }
         // from the overloaded methods, there's a possibility frequency/timeout isn't set
         // guarantee frequency and timeout are set
-        pollingOptions.frequency ?? (pollingOptions.frequency = kit_1.Duration.milliseconds(this.calculatePollingFrequency()));
-        pollingOptions.timeout ?? (pollingOptions.timeout = kit_1.Duration.minutes(60));
+        pollingOptions.frequency ??= kit_1.Duration.milliseconds(this.calculatePollingFrequency());
+        pollingOptions.timeout ??= kit_1.Duration.minutes(60);
         const pollingClient = await core_1.PollingClient.create(pollingOptions);
         try {
             this.logger.debug(`Polling for metadata transfer status. ID = ${this.id}`);

package/lib/src/client/metadataTransfer.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"metadataTransfer.js","sourceRoot":"","sources":["../../../src/client/metadataTransfer.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,mCAAsC;AACtC,+BAA4B;AAC5B,2CAS0B;AAC1B,yCAA2C;AAC3C,mDAAyD;AACzD,kCAAkC;AAClC,wCAA+D;AAC/D,gDAA8C;AAC9C,mCAAoG;AAEpG,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,QAAQ,GAAG,eAAQ,CAAC,YAAY,CAAC,oCAAoC,EAAE,KAAK,CAAC,CAAC;AASpF,MAAsB,gBAAgB;IAapC,YAAmB,EAAE,oBAAoB,EAAE,UAAU,EAAE,UAAU,EAAE,EAAE,EAAW;QANtE,aAAQ,GAAG,KAAK,CAAC;QAEnB,UAAK,GAAG,IAAI,qBAAY,EAAE,CAAC;QAKjC,IAAI,CAAC,oBAAoB,GAAG,oBAAoB,CAAC;QACjD,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,UAAU,GAAG,EAAE,CAAC;QACrB,IAAI,CAAC,MAAM,GAAG,aAAM,CAAC,aAAa,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IAC5D,CAAC;IAED,kGAAkG;IAClG,IAAW,EAAE;QACX,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;IAED;;;;OAIG;IACI,KAAK,CAAC,KAAK;QAChB,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;QACtB,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,GAAG,EAAE,CAAC;QACrC,IAAI,CAAC,UAAU,GAAG,WAAW,CAAC,EAAE,CAAC;QACjC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mCAAmC,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;QAChE,OAAO,WAAW,CAAC;IACrB,CAAC;IAqBM,KAAK,CAAC,UAAU,CACrB,kBAA4D,EAC5D,OAAgB;QAEhB,IAAI,cAAc,GAA0B;YAC1C,SAAS,EAAE,cAAQ,CAAC,YAAY,CAAC,IAAI,CAAC,yBAAyB,EAAE,CAAC;YAClE,OAAO,EAAE,cAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;YAC7B,mEAAmE;YACnE,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;SAC3B,CAAC;QACF,IAAI,IAAA,mBAAQ,EAAC,kBAAkB,CAAC,EAAE;YAChC,cAAc,CAAC,SAAS,GAAG,cAAQ,CAAC,YAAY,CAAC,kBAAkB,CAAC,CAAC;SACtE;aAAM,IAAI,kBAAkB,KAAK,SAAS,EAAE;YAC3C,cAAc,GAAG,EAAE,GAAG,cAAc,EAAE,GAAG,kBAAkB,EAAE,CAAC;SAC/D;QACD,IAAI,IAAA,mBAAQ,EAAC,OAAO,CAAC,EAAE;YACrB,cAAc,CAAC,OAAO,GAAG,cAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;SACpD;QACD,iFAAiF;QACjF,0CAA0C;QAC1C,cAAc,CAAC,SAAS,~~KAAxB~~,~~cAAc,CAAC,SAAS,GAAK,~~cAAQ,CAAC,YAAY,CAAC,IAAI,CAAC,yBAAyB,EAAE,CAAC,~~EAAC~~;QACrF,cAAc,CAAC,OAAO,~~KAAtB~~,~~cAAc,CAAC,OAAO,GAAK,~~cAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,~~EAAC~~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"}
1	+ {"version":3,"file":"metadataTransfer.js","sourceRoot":"","sources":["../../../src/client/metadataTransfer.ts"],"names":[],"mappings":"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"}

package/lib/src/collections/componentSetBuilder.js CHANGED Viewed

@@ -43,7 +43,7 @@ class ComponentSetBuilder {
             // Return empty ComponentSet and use packageNames in the connection via `.retrieve` options
             if (packagenames) {
                 logger.debug(`Building ComponentSet for packagenames: ${packagenames.toString()}`);
-                componentSet ?? (componentSet = new collections_1.ComponentSet());
+                componentSet ??= new collections_1.ComponentSet();
             }
             // Resolve manifest with source in package directories.
             if (manifest) {
@@ -66,7 +66,7 @@ class ComponentSetBuilder {
                 logger.debug(`Building ComponentSet from metadata: ${metadata.metadataEntries.toString()}`);
                 const registry = new registry_1.RegistryAccess();
                 const compSetFilter = new collections_1.ComponentSet();
-                componentSet ?? (componentSet = new collections_1.ComponentSet());
+                componentSet ??= new collections_1.ComponentSet();
                 // Build a Set of metadata entries
                 metadata.metadataEntries.forEach((rawEntry) => {
                     const splitEntry = rawEntry.split(':').map((entry) => entry.trim());
@@ -91,7 +91,7 @@ class ComponentSetBuilder {
             }
             // Resolve metadata entries with an org connection
             if (org) {
-                componentSet ?? (componentSet = new collections_1.ComponentSet());
+                componentSet ??= new collections_1.ComponentSet();
                 logger.debug(`Building ComponentSet from targetUsername: ${org.username}`);
                 const fromConnection = await collections_1.ComponentSet.fromConnection({
                     usernameOrConnection: (await core_1.StateAggregator.getInstance()).aliases.getUsername(org.username) ?? org.username,
@@ -139,8 +139,8 @@ class ComponentSetBuilder {
         if (componentSet === undefined) {
             throw new core_1.SfError('undefinedComponentSet');
         }
-        componentSet.apiVersion ?? (componentSet.apiVersion = apiversion);
-        componentSet.sourceApiVersion ?? (componentSet.sourceApiVersion = sourceapiversion);
+        componentSet.apiVersion ??= apiversion;
+        componentSet.sourceApiVersion ??= sourceapiversion;
         logger.debug(`ComponentSet apiVersion = ${componentSet.apiVersion}`);
         logger.debug(`ComponentSet sourceApiVersion = ${componentSet.sourceApiVersion}`);
         return componentSet;

package/lib/src/collections/componentSetBuilder.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"componentSetBuilder.js","sourceRoot":"","sources":["../../../src/collections/componentSetBuilder.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,sCAAsC;AAEtC,6BAA6B;AAC7B,2CAA8E;AAC9E,kCAAkC;AAClC,gDAA8C;AAC9C,0CAA6C;AAE7C,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,QAAQ,GAAG,eAAQ,CAAC,YAAY,CAAC,oCAAoC,EAAE,KAAK,CAAC,CAAC;AA6BpF,MAAa,mBAAmB;IAC9B;;;;;;;OAOG;IACH,sCAAsC;IAC/B,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,OAA4B;QACpD,MAAM,MAAM,GAAG,aAAM,CAAC,aAAa,CAAC,qBAAqB,CAAC,CAAC;QAC3D,IAAI,YAAsC,CAAC;QAE3C,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,QAAQ,EAAE,YAAY,EAAE,UAAU,EAAE,gBAAgB,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC;QACpG,IAAI;YACF,IAAI,UAAU,EAAE;gBACd,MAAM,CAAC,KAAK,CAAC,0CAA0C,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;gBAChF,MAAM,OAAO,GAAa,UAAU,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE;oBACpD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE;wBAC5B,MAAM,IAAI,cAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,sBAAsB,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;qBAC5E;oBACD,OAAO,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;gBAChC,CAAC,CAAC,CAAC;gBACH,YAAY,GAAG,0BAAY,CAAC,UAAU,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;aACrD;YAED,2FAA2F;YAC3F,IAAI,YAAY,EAAE;gBAChB,MAAM,CAAC,KAAK,CAAC,2CAA2C,YAAY,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;gBACnF,YAAY,~~KAAZ~~,~~YAAY,GAAK,~~IAAI,0BAAY,EAAE,~~EAAC~~;aACrC;YAED,uDAAuD;YACvD,IAAI,QAAQ,EAAE;gBACZ,MAAM,CAAC,KAAK,CAAC,wCAAwC,QAAQ,CAAC,YAAY,EAAE,CAAC,CAAC;gBAC9E,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE;oBACzC,MAAM,IAAI,cAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,sBAAsB,EAAE,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;iBACzF;gBACD,MAAM,cAAc,GAAG,QAAQ,CAAC,cAAc,CAAC;gBAC/C,MAAM,CAAC,KAAK,CAAC,4BAA4B,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;gBAC5F,YAAY,GAAG,MAAM,0BAAY,CAAC,YAAY,CAAC;oBAC7C,YAAY,EAAE,QAAQ,CAAC,YAAY;oBACnC,kBAAkB,EAAE,cAAc;oBAClC,iBAAiB,EAAE,IAAI;oBACvB,cAAc,EAAE,QAAQ,CAAC,qBAAqB;oBAC9C,eAAe,EAAE,QAAQ,CAAC,sBAAsB;iBACjD,CAAC,CAAC;aACJ;YAED,+DAA+D;YAC/D,IAAI,QAAQ,EAAE;gBACZ,MAAM,CAAC,KAAK,CAAC,wCAAwC,QAAQ,CAAC,eAAe,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;gBAC5F,MAAM,QAAQ,GAAG,IAAI,yBAAc,EAAE,CAAC;gBACtC,MAAM,aAAa,GAAG,IAAI,0BAAY,EAAE,CAAC;gBACzC,YAAY,~~KAAZ~~,~~YAAY,GAAK,~~IAAI,0BAAY,EAAE,~~EAAC~~;gBAEpC,kCAAkC;gBAClC,QAAQ,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;oBAC5C,MAAM,UAAU,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;oBACpE,gEAAgE;oBAChE,QAAQ,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;oBACtC,MAAM,KAAK,GAAG;wBACZ,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC;wBACnB,QAAQ,EAAE,UAAU,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC;qBACxD,CAAC;oBACF,8DAA8D;oBAC9D,iEAAiE;oBACjE,aAAa,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;oBACzB,YAAY,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC;gBAC3B,CAAC,CAAC,CAAC;gBAEH,MAAM,cAAc,GAAG,QAAQ,CAAC,cAAc,CAAC;gBAC/C,MAAM,CAAC,KAAK,CAAC,mDAAmD,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;gBAC7F,MAAM,kBAAkB,GAAG,0BAAY,CAAC,UAAU,CAAC,EAAE,OAAO,EAAE,cAAc,EAAE,OAAO,EAAE,aAAa,EAAE,CAAC,CAAC;gBACxG,YAAY,CAAC,iBAAiB,GAAG,kBAAkB,CAAC,iBAAiB,CAAC;gBACtE,KAAK,MAAM,IAAI,IAAI,kBAAkB,EAAE;oBACrC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;iBACxB;aACF;YAED,kDAAkD;YAClD,IAAI,GAAG,EAAE;gBACP,YAAY,~~KAAZ~~,~~YAAY,GAAK,~~IAAI,0BAAY,EAAE,~~EAAC~~;gBACpC,MAAM,CAAC,KAAK,CAAC,8CAA8C,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;gBAC3E,MAAM,cAAc,GAAG,MAAM,0BAAY,CAAC,cAAc,CAAC;oBACvD,oBAAoB,EAAE,CAAC,MAAM,sBAAe,CAAC,WAAW,EAAE,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,GAAG,CAAC,QAAQ;oBAC7G,sEAAsE;oBACtE,2GAA2G;oBAC3G,uHAAuH;oBACvH,6HAA6H;oBAC7H,eAAe,EAAE,CAAC,SAAS,EAAW,EAAE,CACtC,CAAC,SAAS,EAAE,eAAe,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,QAAQ,CAAC,SAAS,CAAC,eAAe,CAAC;iBACnF,CAAC,CAAC;gBAEH,KAAK,MAAM,IAAI,IAAI,cAAc,EAAE;oBACjC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;iBACxB;aACF;SACF;QAAC,OAAO,CAAC,EAAE;YACV,IAAK,CAAW,CAAC,OAAO,CAAC,QAAQ,CAAC,qDAAqD,CAAC,EAAE;gBACxF,yFAAyF;gBACzF,0FAA0F;gBAC1F,MAAM,SAAS,GAAI,CAAW,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;gBACrD,MAAM,IAAI,cAAO,CAAC,gDAAgD,SAAS,GAAG,CAAC,CAAC;aACjF;iBAAM;gBACL,MAAM,CAAC,CAAC;aACT;SACF;QAED,6EAA6E;QAC7E,qCAAqC;QACrC,IAAI,MAAM,CAAC,YAAY,IAAI,YAAY,EAAE,IAAI,EAAE;YAC7C,MAAM,CAAC,KAAK,CAAC,4BAA4B,YAAY,CAAC,IAAI,IAAI,CAAC,CAAC;YAChE,MAAM,UAAU,GAAG,YAAY,CAAC,mBAAmB,EAAE,CAAC,OAAO,EAAE,CAAC;YAChE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,YAAY,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE;gBAC1C,IAAI,UAAU,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE;oBAC1B,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;iBACrC;qBAAM,IAAI,UAAU,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE;oBAC7B,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;iBACjC;gBAED,IAAI,CAAC,GAAG,EAAE,EAAE;oBACV,MAAM,CAAC,KAAK,CAAC,kBAAkB,YAAY,CAAC,IAAI,WAAW,CAAC,CAAC;oBAC7D,MAAM;iBACP;aACF;SACF;QAED,+DAA+D;QAC/D,IAAI,YAAY,KAAK,SAAS,EAAE;YAC9B,MAAM,IAAI,cAAO,CAAC,uBAAuB,CAAC,CAAC;SAC5C;QAED,YAAY,CAAC,UAAU,~~KAAvB~~,~~YAAY~~,CAAC~~,UAAU,GAAK,UAAU,EAAC~~;QACvC,YAAY,CAAC,gBAAgB,~~KAA7B~~,~~YAAY~~,CAAC~~,gBAAgB,GAAK,gBAAgB,EAAC~~;QACnD,MAAM,CAAC,KAAK,CAAC,6BAA6B,YAAY,CAAC,UAAU,EAAE,CAAC,CAAC;QACrE,MAAM,CAAC,KAAK,CAAC,mCAAmC,YAAY,CAAC,gBAAgB,EAAE,CAAC,CAAC;QAEjF,OAAO,YAAY,CAAC;IACtB,CAAC;CACF;AA7ID,kDA6IC"}
1	+ {"version":3,"file":"componentSetBuilder.js","sourceRoot":"","sources":["../../../src/collections/componentSetBuilder.ts"],"names":[],"mappings":"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"}

package/lib/src/convert/streams.d.ts CHANGED Viewed

@@ -2,6 +2,7 @@
 /// <reference types="node" />
 import { pipeline as cbPipeline, Readable, Stream, Transform, Writable } from 'stream';
 import { JsonMap } from '@salesforce/ts-types';
+import { Logger } from '@salesforce/core';
 import { MetadataResolver, SourceComponent } from '../resolve';
 import { SourcePath } from '../common';
 import { ComponentSet } from '../collections';
@@ -27,24 +28,23 @@ export declare class ComponentConverter extends Transform {
 export declare abstract class ComponentWriter extends Writable {
     forceIgnoredPaths: Set<string>;
     protected rootDestination?: SourcePath;
+    protected logger: Logger;
     constructor(rootDestination?: SourcePath);
 }
 export declare class StandardWriter extends ComponentWriter {
     private resolver;
     converted: SourceComponent[];
-    private logger;
     constructor(rootDestination: SourcePath, resolver?: MetadataResolver);
     _write(chunk: WriterFormat, encoding: string, callback: (err?: Error) => void): Promise<void>;
 }
 export declare class ZipWriter extends ComponentWriter {
     private zip;
-    private buffers;
+    private zipBuffer?;
     constructor(rootDestination?: SourcePath);
     get buffer(): Buffer | undefined;
     _write(chunk: WriterFormat, encoding: string, callback: (err?: Error) => void): Promise<void>;
     _final(callback: (err?: Error) => void): Promise<void>;
     addToZip(contents: string | Readable | Buffer, path: SourcePath): void;
-    private getOutputStream;
 }
 /**
  * Convenient wrapper to serialize a js object to XML content. Implemented as a stream

package/lib/src/convert/streams.js CHANGED Viewed

@@ -11,7 +11,7 @@ const path_1 = require("path");
 const stream_1 = require("stream");
 const util_1 = require("util");
 const core_1 = require("@salesforce/core");
-const archiver_1 = require("archiver");
+const JSZip = require("jszip");
 const graceful_fs_1 = require("graceful-fs");
 const fast_xml_parser_1 = require("fast-xml-parser");
 const core_2 = require("@salesforce/core");
@@ -100,6 +100,7 @@ class ComponentWriter extends stream_1.Writable {
         super({ objectMode: true });
         this.forceIgnoredPaths = new Set();
         this.rootDestination = rootDestination;
+        this.logger = core_2.Logger.childFromRoot(this.constructor.name);
     }
 }
 exports.ComponentWriter = ComponentWriter;
@@ -108,7 +109,6 @@ class StandardWriter extends ComponentWriter {
         super(rootDestination);
         this.resolver = resolver;
         this.converted = [];
-        this.logger = core_2.Logger.childFromRoot(this.constructor.name);
     }
     async _write(chunk, encoding, callback) {
         let err;
@@ -162,15 +162,12 @@ exports.StandardWriter = StandardWriter;
 class ZipWriter extends ComponentWriter {
     constructor(rootDestination) {
         super(rootDestination);
-        // compression-/speed+ (0)<---(3)---------->(9) compression+/speed-
-        // 3 appears to be a decent balance of compression and speed. It felt like
-        // higher values = diminishing returns on compression and made conversion slower
-        this.zip = (0, archiver_1.create)('zip', { zlib: { level: 3 } });
-        this.buffers = [];
-        void (0, exports.pipeline)(this.zip, this.getOutputStream());
+        this.zip = JSZip();
+        const destination = rootDestination ? `for: ${rootDestination}` : 'in memory';
+        this.logger.debug(`generating zip ${destination}`);
     }
     get buffer() {
-        return Buffer.concat(this.buffers);
+        return this.zipBuffer;
     }
     async _write(chunk, encoding, callback) {
         let err;
@@ -183,10 +180,7 @@ class ZipWriter extends ComponentWriter {
                 }
                 // everything else can be zipped immediately to reduce the number of open files (windows has a low limit!) and help perf
                 const streamAsBuffer = await (0, exports.stream2buffer)(writeInfo.source);
-                return streamAsBuffer.length
-                    ? this.addToZip(streamAsBuffer, writeInfo.output)
-                    : // these will be zero-length files, which archiver supports via stream but not buffer
-                        this.addToZip(writeInfo.source, writeInfo.output);
+                return this.addToZip(streamAsBuffer, writeInfo.output);
             }));
         }
         catch (e) {
@@ -197,9 +191,12 @@ class ZipWriter extends ComponentWriter {
     async _final(callback) {
         let err;
         try {
-            // Unlike the other 2 places where zip.finalize is called, this one DOES need to be awaited
-            // the e2e replacement nuts will fail otherwise
-            await this.zip.finalize();
+            this.zipBuffer = await this.zip.generateAsync({
+                type: 'nodebuffer',
+                compression: 'DEFLATE',
+                compressionOptions: { level: 3 },
+            });
+            this.logger.debug('Generated zip complete');
         }
         catch (e) {
             err = e;
@@ -207,21 +204,9 @@ class ZipWriter extends ComponentWriter {
         callback(err);
     }
     addToZip(contents, path) {
-        this.zip.append(contents, { name: path });
-    }
-    getOutputStream() {
-        if (this.rootDestination) {
-            return (0, graceful_fs_1.createWriteStream)(this.rootDestination);
-        }
-        else {
-            const bufferWritable = new stream_1.Writable();
-            // eslint-disable-next-line no-underscore-dangle
-            bufferWritable._write = (chunk, encoding, cb) => {
-                this.buffers.push(chunk);
-                cb();
-            };
-            return bufferWritable;
-        }
+        // Ensure only posix paths are added to zip files
+        const posixPath = path.replace(/\\/g, '/');
+        this.zip.file(posixPath, contents);
     }
 }
 exports.ZipWriter = ZipWriter;

package/lib/src/convert/streams.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"streams.js","sourceRoot":"","sources":["../../../src/convert/streams.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,+BAA2D;AAC3D,mCAAuF;AACvF,+BAAiC;AACjC,2CAAqD;AACrD~~,uCAA6D~~;~~AAC7D~~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~~IAIpD~~,YAAmB,eAA4B;QAC7C,KAAK,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC;~~QAJvB~~,sBAAiB,GAAgB,IAAI,GAAG,EAAU,CAAC;~~QAKxD~~,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;~~IACzC~~,CAAC;CACF;~~AARD~~,~~0CAQC~~;AAED,MAAa,cAAe,SAAQ,eAAe;~~IAIjD~~,YAAmB,eAA2B,EAAU,WAAW,IAAI,0BAAgB,EAAE;QACvF,KAAK,CAAC,eAAe,CAAC,CAAC;QAD+B,aAAQ,GAAR,QAAQ,CAAyB;~~QAHlF~~,cAAS,GAAsB,EAAE,CAAC;~~QAKvC~~,~~IAAI,~~CAAC~~,MAAM,GAAG,aAAM,CAAC,aAAa,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC~~;~~IAC5D,CAAC;~~IAEM,KAAK,CAAC,MAAM,CAAC,KAAmB,EAAE,QAAgB,EAAE,QAA+B;QACxF,IAAI,GAAsB,CAAC;QAC3B,IAAI,KAAK,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE;YACjC,IAAI;gBACF,MAAM,SAAS,GAAa,EAAE,CAAC;gBAC/B,iFAAiF;gBACjF,wFAAwF;gBACxF,2EAA2E;gBAC3E,MAAM,OAAO,CAAC,GAAG,CACf,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,IAAe,EAAE,EAAE;oBACvC,uHAAuH;oBACvH,yEAAyE;oBACzE,4EAA4E;oBAC5E,MAAM,QAAQ,GAAG,IAAA,iBAAU,EAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAA,WAAI,EAAC,IAAI,CAAC,eAAyB,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;oBAC3G,IAAI,CAAC,IAAA,wBAAU,EAAC,QAAQ,CAAC,EAAE;wBACzB,KAAK,MAAM,WAAW,IAAI,IAAI,CAAC,iBAAiB,EAAE;4BAChD,IACE,IAAA,cAAO,EAAC,WAAW,CAAC,CAAC,QAAQ,CAAC,IAAA,cAAO,EAAC,QAAQ,CAAC,CAAC;gCAChD,IAAA,eAAQ,EAAC,WAAW,CAAC,CAAC,QAAQ,CAAC,IAAA,eAAQ,EAAC,QAAQ,CAAC,CAAC,EAClD;gCACA,OAAO;6BACR;yBACF;qBACF;oBACD,IAAI,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE;wBACxC,OAAO;qBACR;oBACD,sFAAsF;oBACtF,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,IAAI,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,EAAE;wBAC3D,6DAA6D;wBAC7D,2CAA2C;wBAC3C,IAAI,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;4BAChC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,oCAAoC,QAAQ,EAAE,CAAC,CAAC;4BAClE,OAAO;yBACR;wBACD,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;qBAC1B;oBACD,IAAA,oCAAgB,EAAC,QAAQ,CAAC,CAAC;oBAC3B,OAAO,IAAA,gBAAQ,EAAC,IAAI,CAAC,MAAM,EAAE,IAAA,+BAAiB,EAAC,QAAQ,CAAC,CAAC,CAAC;gBAC5D,CAAC,CAAC,CACH,CAAC;gBAEF,SAAS,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;oBACvB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC,CAAC;gBACtE,CAAC,CAAC,CAAC;aACJ;YAAC,OAAO,CAAC,EAAE;gBACV,GAAG,GAAG,CAAU,CAAC;aAClB;SACF;QACD,QAAQ,CAAC,GAAG,CAAC,CAAC;IAChB,CAAC;CACF;~~AA5DD~~,~~wCA4DC~~;AAED,MAAa,SAAU,SAAQ,eAAe;~~IAO5C~~,YAAmB,eAA4B;QAC7C,KAAK,CAAC,eAAe,CAAC,CAAC;~~QAPzB~~,~~mEAAmE;QACnE,0EAA0E;QAC1E,gFAAgF;QACxE,~~QAAG,~~GAAa~~,~~IAAA,iBAAa,EAAC,~~KAAK,EAAE,~~EAAE~~,~~IAAI~~,~~EAAE~~,~~EAAE~~,~~KAAK~~,~~EAAE,~~CAAC,~~EAAE,EAAE,~~CAAC,CAAC~~;QAC7D~~,~~YAAO~~,~~GAAa~~,EAAE,CAAC~~;QAI7B~~,~~KAAK~~,~~IAAA~~,~~gBAAQ~~,~~EAAC~~,IAAI,CAAC,~~GAAG~~,~~EAAE~~,~~IAAI~~,CAAC,~~eAAe~~,EAAE,CAAC,CAAC;~~IAClD~~,CAAC;IAED,IAAW,MAAM;QACf,OAAO,~~MAAM,CAAC,MAAM,CAAC,~~IAAI,CAAC,~~OAAO~~,CAAC~~,CAAC~~;~~IACrC~~,CAAC;IAEM,KAAK,CAAC,MAAM,CAAC,KAAmB,EAAE,QAAgB,EAAE,QAA+B;QACxF,IAAI,GAAsB,CAAC;QAC3B,IAAI;YACF,MAAM,OAAO,CAAC,GAAG,CACf,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE;gBACvC,kGAAkG;gBAClG,0EAA0E;gBAC1E,IAAI,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,IAAI,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,iBAAiB,EAAE;oBAC7E,OAAO,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,MAAM,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC;iBAC1D;gBACD,wHAAwH;gBACxH,MAAM,cAAc,GAAG,MAAM,IAAA,qBAAa,EAAC,SAAS,CAAC,MAAM,CAAC,CAAC;gBAC7D,OAAO,~~cAAc,CAAC,MAAM;oBAC1B,CAAC,CAAC,~~IAAI,CAAC,QAAQ,CAAC,cAAc,EAAE,SAAS,CAAC,MAAM,CAAC~~;oBACjD~~,CAAC~~,CAAC,qFAAqF~~;~~wBACrF~~,~~IAAI,~~CAAC,~~QAAQ,~~CAAC,~~SAAS,CAAC,MAAM,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC;YACxD,CAAC,CAAC,~~CACH,CAAC;SACH;QAAC,OAAO,CAAC,EAAE;YACV,GAAG,GAAG,CAAU,CAAC;SAClB;QACD,QAAQ,CAAC,GAAG,CAAC,CAAC;IAChB,CAAC;IAEM,KAAK,CAAC,MAAM,CAAC,QAA+B;QACjD,IAAI,GAAsB,CAAC;QAC3B,IAAI;YACF,~~2FAA2F;YAC3F,+CAA+C;YAC/C~~,MAAM,IAAI,CAAC,GAAG,CAAC,~~QAAQ~~,~~EAAE,~~CAAC;~~SAC3B;QAAC~~,~~OAAO~~,~~CAAC~~,~~EAAE~~;~~YACV~~,~~GAAG~~,~~GAAG~~,~~CAAU,CAAC~~;~~SAClB;QACD~~,~~QAAQ~~,~~CAAC~~,~~GAAG~~,CAAC,~~CAAC~~;~~IAChB~~,CAAC~~;IAEM~~,~~QAAQ,~~CAAC~~,QAAoC,EAAE,IAAgB~~;~~QACpE~~,IAAI,CAAC,~~GAAG~~,CAAC,~~MAAM~~,CAAC,~~QAAQ~~,~~EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,~~CAAC,CAAC;~~IAC5C,CAAC~~;~~IAEO~~,~~eAAe;QACrB~~,~~IAAI,IAAI,~~CAAC,~~eAAe,~~EAAE;~~YACxB~~,~~OAAO~~,~~IAAA,+BAAiB~~,~~EAAC~~,~~IAAI~~,CAAC,~~eAAe~~,CAAC,CAAC;~~SAChD~~;~~aAAM;YACL~~,~~MAAM~~,~~cAAc~~,~~GAAG~~,~~IAAI,iBAAQ,~~EAAE,~~CAAC~~;~~YACtC~~,~~gDAAgD~~;~~YAChD~~,~~cAAc~~,~~CAAC~~,~~MAAM,~~GAAG,CAAC,~~KAAa~~,~~EAAE~~,~~QAAgB~~,EAAE,~~EAAc~~,~~EAAQ~~,~~EAAE~~;~~gBAChF~~,IAAI,CAAC,~~OAAO~~,CAAC,IAAI,CAAC,~~KAAK~~,~~CAAC,CAAC;gBACzB,~~EAAE,~~EAAE~~,CAAC~~;YACP~~,CAAC~~,CAAC~~;~~YACF~~,~~OAAO,cAAc,~~CAAC;~~SACvB;IACH,CAAC;~~CACF;~~AArED~~,~~8BAqEC~~;AAED;;;;GAIG;AACH,MAAa,OAAQ,SAAQ,iBAAQ;IACnC,YAA2B,SAAkB;QAC3C,KAAK,EAAE,CAAC;QADiB,cAAS,GAAT,SAAS,CAAS;IAE7C,CAAC;IAEM,KAAK;QACV,MAAM,OAAO,GAAG,IAAI,4BAAU,CAAC;YAC7B,MAAM,EAAE,IAAI;YACZ,QAAQ,EAAE,MAAM;YAChB,gBAAgB,EAAE,KAAK;YACvB,aAAa,EAAE,SAAS;SACzB,CAAC,CAAC;QAEH,MAAM,QAAQ,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;QACvD,MAAM,UAAU,GAAG,iBAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QAC7C,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACtB,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAClB,CAAC;CACF;AAlBD,0BAkBC"}
1	+ {"version":3,"file":"streams.js","sourceRoot":"","sources":["../../../src/convert/streams.ts"],"names":[],"mappings":"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"}

package/lib/src/convert/transformers/nonDecomposedMetadataTransformer.js CHANGED Viewed

@@ -23,7 +23,6 @@ class NonDecomposedMetadataTransformer extends decomposedMetadataTransformer_1.D
     // streams uses mergeWith for all types.  Removing it would break the interface
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     async toSourceFormat(component, mergeWith) {
-        var _a;
         // this will only include the incoming (retrieved) labels, not the local file
         const parentXml = await component.parseXml();
         const xmlPathToChildren = `${component.type.name}.${component.type.directoryName}`;
@@ -34,7 +33,7 @@ class NonDecomposedMetadataTransformer extends decomposedMetadataTransformer_1.D
         // presumes they only have 1 child!
         const [childTypeId] = Object.keys(component.type.children.types);
         const { uniqueIdElement } = component.type.children.types[childTypeId];
-        (_a = this.context.nonDecomposition.transactionState).exampleComponent ?? (_a.exampleComponent = component);
+        this.context.nonDecomposition.transactionState.exampleComponent ??= component;
         incomingChildrenXml.map((child) => {
             if (!uniqueIdElement) {
                 throw messages.createError('uniqueIdElementNotInRegistry', [

package/lib/src/convert/transformers/nonDecomposedMetadataTransformer.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"nonDecomposedMetadataTransformer.js","sourceRoot":"","sources":["../../../../src/convert/transformers/nonDecomposedMetadataTransformer.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,mDAA+D;AAC/D,yCAA8C;AAC9C,2CAA4C;AAG5C,mFAAgF;AAChF,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,QAAQ,GAAG,eAAQ,CAAC,YAAY,CAAC,oCAAoC,EAAE,KAAK,CAAC,CAAC;AACpF;;;;;GAKG;AACH,MAAa,gCAAiC,SAAQ,6DAA6B;IACjF,+EAA+E;IAC/E,6DAA6D;IACtD,KAAK,CAAC,cAAc,CAAC,SAA0B,EAAE,SAA2B;;QACjF,6EAA6E;QAC7E,MAAM,SAAS,GAAG,MAAM,SAAS,CAAC,QAAQ,EAAE,CAAC;QAC7C,MAAM,iBAAiB,GAAG,GAAG,SAAS,CAAC,IAAI,CAAC,IAAI,IAAI,SAAS,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;QACnF,MAAM,mBAAmB,GAAG,IAAA,iBAAW,EAAC,IAAA,cAAG,EAAC,SAAS,EAAE,iBAAiB,CAAC,CAAc,CAAC;QACxF,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,EAAE;YAC5B,MAAM,QAAQ,CAAC,WAAW,CAAC,cAAc,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,CAAC,QAAQ,EAAE,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC;SACtG;QACD,mCAAmC;QACnC,MAAM,CAAC,WAAW,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QACjE,MAAM,EAAE,eAAe,EAAE,GAAG,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QAEvE,~~MAAA,~~IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,gBAAgB,~~EAAC~~,gBAAgB,~~QAAhB~~,~~gBAAgB,GAAK,~~SAAS,~~EAAC~~;QAE9E,mBAAmB,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;YAChC,IAAI,CAAC,eAAe,EAAE;gBACpB,MAAM,QAAQ,CAAC,WAAW,CAAC,8BAA8B,EAAE;oBACzD,SAAS,CAAC,IAAI,CAAC,IAAI;oBACnB,SAAS,CAAC,QAAQ;oBAClB,SAAS,CAAC,GAAG;iBACd,CAAC,CAAC;aACJ;YACD,MAAM,SAAS,GAAG,IAAA,oBAAS,EAAC,KAAK,EAAE,eAAe,CAAC,CAAC;YACpD,IAAI,CAAC,SAAS,EAAE;gBACd,MAAM,QAAQ,CAAC,WAAW,CAAC,2BAA2B,EAAE,CAAC,eAAe,EAAE,SAAS,CAAC,QAAQ,EAAE,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC;aAC/G;YACD,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,gBAAgB,CAAC,uBAAuB,CAAC,GAAG,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;QAC/F,CAAC,CAAC,CAAC;QAEH,OAAO,EAAE,CAAC;IACZ,CAAC;CACF;AAlCD,4EAkCC"}
1	+ {"version":3,"file":"nonDecomposedMetadataTransformer.js","sourceRoot":"","sources":["../../../../src/convert/transformers/nonDecomposedMetadataTransformer.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,mDAA+D;AAC/D,yCAA8C;AAC9C,2CAA4C;AAG5C,mFAAgF;AAChF,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,QAAQ,GAAG,eAAQ,CAAC,YAAY,CAAC,oCAAoC,EAAE,KAAK,CAAC,CAAC;AACpF;;;;;GAKG;AACH,MAAa,gCAAiC,SAAQ,6DAA6B;IACjF,+EAA+E;IAC/E,6DAA6D;IACtD,KAAK,CAAC,cAAc,CAAC,SAA0B,EAAE,SAA2B;QACjF,6EAA6E;QAC7E,MAAM,SAAS,GAAG,MAAM,SAAS,CAAC,QAAQ,EAAE,CAAC;QAC7C,MAAM,iBAAiB,GAAG,GAAG,SAAS,CAAC,IAAI,CAAC,IAAI,IAAI,SAAS,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;QACnF,MAAM,mBAAmB,GAAG,IAAA,iBAAW,EAAC,IAAA,cAAG,EAAC,SAAS,EAAE,iBAAiB,CAAC,CAAc,CAAC;QACxF,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,EAAE;YAC5B,MAAM,QAAQ,CAAC,WAAW,CAAC,cAAc,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,CAAC,QAAQ,EAAE,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC;SACtG;QACD,mCAAmC;QACnC,MAAM,CAAC,WAAW,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QACjE,MAAM,EAAE,eAAe,EAAE,GAAG,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QAEvE,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,gBAAgB,CAAC,gBAAgB,KAAK,SAAS,CAAC;QAE9E,mBAAmB,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;YAChC,IAAI,CAAC,eAAe,EAAE;gBACpB,MAAM,QAAQ,CAAC,WAAW,CAAC,8BAA8B,EAAE;oBACzD,SAAS,CAAC,IAAI,CAAC,IAAI;oBACnB,SAAS,CAAC,QAAQ;oBAClB,SAAS,CAAC,GAAG;iBACd,CAAC,CAAC;aACJ;YACD,MAAM,SAAS,GAAG,IAAA,oBAAS,EAAC,KAAK,EAAE,eAAe,CAAC,CAAC;YACpD,IAAI,CAAC,SAAS,EAAE;gBACd,MAAM,QAAQ,CAAC,WAAW,CAAC,2BAA2B,EAAE,CAAC,eAAe,EAAE,SAAS,CAAC,QAAQ,EAAE,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC;aAC/G;YACD,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,gBAAgB,CAAC,uBAAuB,CAAC,GAAG,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;QAC/F,CAAC,CAAC,CAAC;QAEH,OAAO,EAAE,CAAC;IACZ,CAAC;CACF;AAlCD,4EAkCC"}

package/lib/src/convert/transformers/staticResourceMetadataTransformer.js CHANGED Viewed

@@ -8,11 +8,13 @@ exports.StaticResourceMetadataTransformer = void 0;
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 const path_1 = require("path");
-const archiver_1 = require("archiver");
+const stream_1 = require("stream");
+const JSZip = require("jszip");
 const mime_1 = require("mime");
 const unzipper_1 = require("unzipper");
 const graceful_fs_1 = require("graceful-fs");
 const core_1 = require("@salesforce/core");
+const kit_1 = require("@salesforce/kit");
 const utils_1 = require("../../utils");
 const fileSystemHandler_1 = require("../../utils/fileSystemHandler");
 const streams_1 = require("../streams");
@@ -20,6 +22,13 @@ const replacements_1 = require("../replacements");
 const baseMetadataTransformer_1 = require("./baseMetadataTransformer");
 core_1.Messages.importMessagesDirectory(__dirname);
 const messages = core_1.Messages.loadMessages('@salesforce/source-deploy-retrieve', 'sdr');
+let logger;
+const getLogger = () => {
+    if (!logger) {
+        logger = core_1.Logger.childFromRoot('StaticResourceMetadataTransformer');
+    }
+    return logger;
+};
 class StaticResourceMetadataTransformer extends baseMetadataTransformer_1.BaseMetadataTransformer {
     // allowed to preserve API
     // eslint-disable-next-line class-methods-use-this
@@ -31,33 +40,37 @@ class StaticResourceMetadataTransformer extends baseMetadataTransformer_1.BaseMe
         if (!xml) {
             throw messages.createError('error_parsing_xml', [component.fullName, component.type.name]);
         }
-        // archiver/zip.finalize looks like it is async, because it extends streams, but it is not meant to be used that way
-        // the typings on it are misleading and unintended.  More info https://github.com/archiverjs/node-archiver/issues/476
-        // If you await it, bad things happen, like the convert process exiting silently.  https://github.com/forcedotcom/cli/issues/1791
-        // leave the void as it is
-        // eslint-disable-next-line @typescript-eslint/require-await
-        const zipIt = async () => {
-            // toolbelt was using level 9 for static resources, so we'll do the same.
-            // Otherwise, you'll see errors like https://github.com/forcedotcom/cli/issues/1098
-            const zip = (0, archiver_1.create)('zip', { zlib: { level: 9 } });
-            if (!component.replacements) {
-                // the easy way...no replacements required
-                zip.directory(content, false);
+        // Zip the static resource from disk to a stream, compressing at level 9.
+        const zipIt = () => {
+            getLogger().debug(`zipping static resource: ${component.content}`);
+            const zip = JSZip();
+            // JSZip does not have an API for adding a directory of files recursively so we always
+            // have to walk the component content. Replacements only happen if set on the component.
+            for (const path of component.walkContent()) {
+                const replacementStream = (0, replacements_1.getReplacementStreamForReadable)(component, path);
+                const relPath = (0, path_1.relative)(content, path);
+                const relPosixPath = relPath.replace(/\\/g, '/');
+                zip.file(relPosixPath, replacementStream);
             }
-            else {
-                // the hard way--we have to walk the content and do replacements on each of the files.
-                for (const path of component.walkContent()) {
-                    const replacementStream = (0, replacements_1.getReplacementStreamForReadable)(component, path);
-                    zip.append(replacementStream, { name: (0, path_1.relative)(content, path) });
-                }
+            // If the generated zip is empty it means either no content files exist or they are
+            // all force-ignored.  Throw an error in this case.
+            if ((0, kit_1.isEmpty)(zip.files)) {
+                throw messages.createError('noContentFound', [component.fullName, component.type.name]);
             }
-            void zip.finalize();
-            return zip;
+            return new stream_1.Readable().wrap(zip
+                .generateNodeStream({
+                compression: 'DEFLATE',
+                compressionOptions: { level: 9 },
+                streamFiles: true,
+            })
+                .on('end', () => {
+                getLogger().debug(`zip complete for: ${component.content}`);
+            }));
         };
         return [
             {
                 source: (await componentIsExpandedArchive(component))
-                    ? await zipIt()
+                    ? zipIt()
                     : (0, replacements_1.getReplacementStreamForReadable)(component, content),
                 output: (0, path_1.join)(type.directoryName, `${(0, utils_1.baseName)(content)}.${type.suffix}`),
             },

package/lib/src/convert/transformers/staticResourceMetadataTransformer.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"staticResourceMetadataTransformer.js","sourceRoot":"","sources":["../../../../src/convert/transformers/staticResourceMetadataTransformer.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,+BAAqE;~~AAErE~~,~~uCAA6D~~;~~AAC7D~~,+BAAoC;AACpC,uCAAkD;AAElD,6CAAgD;AAChD,~~2CAAqD~~;~~AACrD~~,uCAAuC;AAIvC,qEAAiE;AACjE,wCAAsC;AACtC,kDAAkE;AAClE,uEAAoE;AAEpE,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,QAAQ,GAAG,eAAQ,CAAC,YAAY,CAAC,oCAAoC,EAAE,KAAK,CAAC,CAAC;AAEpF,MAAa,iCAAkC,SAAQ,iDAAuB;IAO5E,0BAA0B;IAC1B,kDAAkD;IAC3C,KAAK,CAAC,gBAAgB,CAAC,SAA0B;QACtD,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,SAAS,CAAC;QACzC,IAAI,CAAC,OAAO,EAAE;YACZ,MAAM,QAAQ,CAAC,WAAW,CAAC,gBAAgB,EAAE,CAAC,SAAS,CAAC,QAAQ,EAAE,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;SACzF;QACD,IAAI,CAAC,GAAG,EAAE;YACR,MAAM,QAAQ,CAAC,WAAW,CAAC,mBAAmB,EAAE,CAAC,SAAS,CAAC,QAAQ,EAAE,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;SAC5F;~~QACD~~,~~oHAAoH~~;~~QACpH~~,~~qHAAqH;QACrH~~,~~iIAAiI;QACjI~~,~~0BAA0B;QAC1B~~,~~4DAA4D~~;~~QAC5D~~,~~MAAM~~,~~KAAK~~,~~GAAG~~,KAAK,~~IAAuB~~,EAAE~~;YAC1C~~,~~yEAAyE;YACzE~~,~~mFAAmF~~;~~YACnF~~,MAAM,GAAG,GAAG,~~IAAA~~,~~iBAAa~~,~~EAAC~~,KAAK,~~EAAE~~,~~EAAE~~,IAAI,EAAE,EAAE,~~KAAK~~,EAAE,CAAC,~~EAAE~~,EAAE,CAAC,CAAC;~~YACzD~~,~~IAAI~~,CAAC,~~SAAS~~,CAAC,~~YAAY~~,EAAE~~;gBAC3B~~,~~0CAA0C~~;~~gBAC1C~~,GAAG,CAAC,~~SAAS~~,CAAC,~~OAAO~~,EAAE,~~KAAK~~,CAAC,CAAC;~~aAC/B~~;~~iBAAM~~;~~gBACL~~,~~sFAAsF~~;~~gBACtF~~,~~KAAK~~,~~MAAM~~,~~IAAI~~,~~IAAI~~,~~SAAS~~,CAAC,~~WAAW~~,~~EAAE~~,EAAE;~~oBAC1C~~,MAAM,~~iBAAiB~~,~~GAAG~~,~~IAAA~~,~~8CAA+B~~,~~EAAC~~,SAAS,EAAE,IAAI,CAAC,CAAC;~~oBAC3E~~,~~GAAG~~,CAAC,~~MAAM~~,CAAC,~~iBAAiB~~,EAAE,~~EAAE~~,~~IAAI~~,EAAE,~~IAAA~~,~~eAAQ~~,~~EAAC~~,~~OAAO~~,EAAE,IAAI,CAAC,EAAE,CAAC,~~CAAC~~;~~iBAClE;aACF;YACD~~,KAAK,~~GAAG~~,CAAC,~~QAAQ~~,EAAE,CAAC;~~YACpB~~,~~OAAO~~,~~GAAG~~,CAAC;~~QACb~~,CAAC,CAAC;QAEF,OAAO;YACL;gBACE,MAAM,EAAE,CAAC,MAAM,0BAA0B,CAAC,SAAS,CAAC,CAAC;oBACnD,CAAC,CAAC,~~MAAM,~~KAAK,EAAE;~~oBACf~~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~~AAvHH~~,~~8EA6HC~~;~~AA5HwB~~,oDAAkB,GAAG,IAAI,GAAG,CAAC;IAClD,iBAAiB;IACjB,8BAA8B;IAC9B,iBAAiB;CAClB,CAAC,CAAC;~~AA0HL~~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"}
1	+ {"version":3,"file":"staticResourceMetadataTransformer.js","sourceRoot":"","sources":["../../../../src/convert/transformers/staticResourceMetadataTransformer.ts"],"names":[],"mappings":"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"}

package/lib/src/resolve/adapters/mixedContentSourceAdapter.js CHANGED Viewed

@@ -56,6 +56,8 @@ class MixedContentSourceAdapter extends baseSourceAdapter_1.BaseSourceAdapter {
             ? this.tree.find('content', (0, path_2.baseName)(trimmedPath), (0, path_1.dirname)(trimmedPath))
             : trimmedPath;
         // Content path might be undefined for staticResource where all files are ignored and only the xml is included.
+        // Note that if contentPath is a directory that is not ignored, but all the files within it are
+        // ignored (or it's an empty dir) contentPath will be truthy and the error will not be thrown.
         if (!contentPath || !this.tree.exists(contentPath)) {
             throw new core_1.SfError(messages.getMessage('error_expected_source_files', [trigger, this.type.name]), 'ExpectedSourceFilesError');
         }

package/lib/src/resolve/adapters/mixedContentSourceAdapter.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"mixedContentSourceAdapter.js","sourceRoot":"","sources":["../../../../src/resolve/adapters/mixedContentSourceAdapter.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,+BAAoD;AACpD,2CAAqD;AACrD,2CAA4C;AAE5C,wDAAqD;AACrD,2DAAwD;AAExD,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,QAAQ,GAAG,eAAQ,CAAC,YAAY,CAAC,oCAAoC,EAAE,KAAK,CAAC,CAAC;AACpF;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,MAAa,yBAA0B,SAAQ,qCAAiB;IAC9D;;;OAGG;IACO,sBAAsB,CAAC,OAAmB;QAClD,IAAI,IAAI,CAAC,SAAS,EAAE;YAClB,MAAM,aAAa,GAAG,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;YACtD,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,IAAA,eAAQ,EAAC,aAAa,CAAC,EAAE,aAAa,CAAC,CAAC;SAC9E;QACD,OAAO,IAAI,CAAC,uBAAuB,CAAC,OAAO,CAAC,CAAC;IAC/C,CAAC;IAES,QAAQ,CAAC,OAAmB,EAAE,SAA2B;QACjE,MAAM,WAAW,GAAG,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;QACpD,MAAM,WAAW,GACf,WAAW,KAAK,SAAS,EAAE,GAAG;YAC5B,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAA,eAAQ,EAAC,WAAW,CAAC,EAAE,IAAA,cAAO,EAAC,WAAW,CAAC,CAAC;YACxE,CAAC,CAAC,WAAW,CAAC;QAElB,+GAA+G;QAC/G,IAAI,CAAC,WAAW,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE;YAClD,MAAM,IAAI,cAAO,CACf,QAAQ,CAAC,UAAU,CAAC,6BAA6B,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EAC7E,0BAA0B,CAC3B,CAAC;SACH;QAED,IAAI,SAAS,EAAE;YACb,SAAS,CAAC,OAAO,GAAG,WAAW,CAAC;SACjC;aAAM;YACL,SAAS,GAAG,IAAI,iCAAe,CAC7B;gBACE,IAAI,EAAE,IAAA,eAAQ,EAAC,WAAW,CAAC;gBAC3B,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,OAAO,EAAE,WAAW;gBACpB,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,cAAc,IAAI,IAAA,WAAI,EAAC,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC;aAC7E,EACD,IAAI,CAAC,IAAI,EACT,IAAI,CAAC,WAAW,CACjB,CAAC;SACH;QAED,OAAO,SAAS,CAAC;IACnB,CAAC;IAED;;;;;;;OAOG;IACO,iBAAiB,CAAC,IAAgB;QAC1C,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,UAAG,CAAC,CAAC;QAClC,MAAM,eAAe,GAAG,SAAS,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QACvE,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC1C,OAAO,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,eAAe,GAAG,MAAM,CAAC,CAAC,IAAI,CAAC,UAAG,CAAC,CAAC;IAChE,CAAC;IAED;;;;;;;;OAQG;IACK,uBAAuB,CAAC,IAAgB;QAC9C,MAAM,eAAe,GAAG,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;QACrD,MAAM,iBAAiB,GAAG,IAAA,cAAO,EAAC,eAAe,CAAC,CAAC;QACnD,MAAM,eAAe,GAAG,IAAA,eAAQ,EAAC,eAAe,CAAC,CAAC;QAClD,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,eAAe,EAAE,iBAAiB,CAAC,CAAC;IAC3E,CAAC;CACF;~~AA5ED~~,~~8DA4EC~~"}
1	+ {"version":3,"file":"mixedContentSourceAdapter.js","sourceRoot":"","sources":["../../../../src/resolve/adapters/mixedContentSourceAdapter.ts"],"names":[],"mappings":"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"}

package/messages/sdr.md CHANGED Viewed

@@ -70,6 +70,11 @@ Metadata xml file %s is forceignored but is required for %s.
 SourceComponent %s (metadata type = %s) is missing its content file.
+# noContentFound.actions
+- Ensure the content file exists in the expected location.
+- If the content file is in your .forceignore file, ensure the meta-xml file is also ignored to completely exclude it.
 # error_parsing_xml
 SourceComponent %s (metadata type = %s) does not have an associated metadata xml to parse

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/source-deploy-retrieve",
-  "version": "8.6.0",
+  "version": "9.1.0",
   "description": "JavaScript library to run Salesforce metadata deploys and retrieves",
   "main": "lib/src/index.js",
   "author": "Salesforce",
@@ -22,18 +22,18 @@
     "messages"
   ],
   "engines": {
-    "node": ">=14.0.0"
+    "node": ">=16.0.0"
   },
   "dependencies": {
-    "@salesforce/core": "^3.36.2",
-    "@salesforce/kit": "^1.9.2",
-    "@salesforce/ts-types": "^1.7.2",
-    "archiver": "^5.3.1",
+    "@salesforce/core": "^4.0.1",
+    "@salesforce/kit": "^3.0.1",
+    "@salesforce/ts-types": "^2.0.2",
     "fast-levenshtein": "^3.0.0",
     "fast-xml-parser": "^4.2.2",
     "got": "^11.8.6",
     "graceful-fs": "^4.2.11",
     "ignore": "^5.2.4",
+    "jszip": "^3.10.1",
     "mime": "2.6.0",
     "minimatch": "^5.1.6",
     "proxy-agent": "^5.0.0",
@@ -42,11 +42,10 @@
   },
   "devDependencies": {
     "@salesforce/cli-plugins-testkit": "^3.4.0",
-    "@salesforce/dev-config": "^3.1.0",
-    "@salesforce/dev-scripts": "^4.3.0",
+    "@salesforce/dev-config": "^4.0.1",
+    "@salesforce/dev-scripts": "^5.0.1",
     "@salesforce/prettier-config": "^0.0.3",
-    "@salesforce/ts-sinon": "^1.4.6",
-    "@types/archiver": "^5.3.1",
+    "@salesforce/ts-sinon": "^1.4.7",
     "@types/deep-equal-in-any-order": "^1.0.1",
     "@types/fast-levenshtein": "^0.0.2",
     "@types/graceful-fs": "^4.1.6",
@@ -55,20 +54,20 @@
     "@types/proxy-from-env": "^1.0.1",
     "@types/shelljs": "^0.8.12",
     "@types/unzipper": "^0.10.5",
-    "@typescript-eslint/eslint-plugin": "^5.59.2",
-    "@typescript-eslint/parser": "^5.59.2",
+    "@typescript-eslint/eslint-plugin": "^5.59.7",
+    "@typescript-eslint/parser": "^5.59.7",
     "chai": "^4.3.7",
     "deep-equal-in-any-order": "^1.1.19",
     "deepmerge": "^4.3.1",
     "eslint": "^8.41.0",
     "eslint-config-prettier": "^8.7.0",
-    "eslint-config-salesforce": "^1.2.0",
+    "eslint-config-salesforce": "^2.0.1",
     "eslint-config-salesforce-license": "^0.2.0",
     "eslint-config-salesforce-typescript": "^1.1.1",
     "eslint-plugin-header": "^3.1.1",
     "eslint-plugin-import": "^2.27.5",
-    "eslint-plugin-jsdoc": "^39.9.1",
-    "eslint-plugin-sf-plugin": "^1.15.1",
+    "eslint-plugin-jsdoc": "^44.2.5",
+    "eslint-plugin-sf-plugin": "^1.15.3",
     "husky": "^7.0.4",
     "jsforce": "^2.0.0-beta.23",
     "mocha": "^9.2.2",
@@ -131,7 +130,9 @@
       "files": [
         "src/**/*.ts",
         "**/tsconfig.json",
-        "messages/**"
+        "messages/**",
+        "src/registry/metadataRegistry.json",
+        "src/registry/stdValueSetRegistry.json"
       ],
       "output": [
         "lib/**",
@@ -186,7 +187,9 @@
         "**/tsconfig.json",
         ".mocha*",
         "!*.nut.ts",
-        ".nycrc"
+        ".nycrc",
+        "src/registry/metadataRegistry.json",
+        "src/registry/stdValueSetRegistry.json"
       ],
       "output": []
     }