@salesforce/source-tracking 1.1.1 → 1.1.4

package/CHANGELOG.md

@@ -2,6 +2,24 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [1.1.4](https://github.com/forcedotcom/source-tracking/compare/v1.1.3...v1.1.4) (2022-03-07)
+
+### Bug Fixes
+
+- clearer messaging and legacy accommodation ([9f14e0f](https://github.com/forcedotcom/source-tracking/commit/9f14e0f02c9df69018b396148b8b4c49c161bf4d))
+
+### [1.1.3](https://github.com/forcedotcom/source-tracking/compare/v1.1.2...v1.1.3) (2022-03-07)
+
+### Bug Fixes
+
+- revert beta/legacy mapping ([4d3380c](https://github.com/forcedotcom/source-tracking/commit/4d3380c74a72572a8c1e464c739c4d5b8af69442))
+
+### [1.1.2](https://github.com/forcedotcom/source-tracking/compare/v1.1.1...v1.1.2) (2022-03-02)
+
+### Bug Fixes
+
+- more metadata polling exclusions based on telemetry ([ae5adf3](https://github.com/forcedotcom/source-tracking/commit/ae5adf34600676f54c0e5efa2f5e7c96e2fd10f6))
+
 ### [1.1.1](https://github.com/forcedotcom/source-tracking/compare/v1.1.0...v1.1.1) (2022-02-23)
 
 ### Bug Fixes

package/lib/compatibility.js

@@ -54,16 +54,16 @@ const throwIfInvalid = ({ org, projectPath, toValidate, command, }) => {
     // We expected it to be the toolbelt version but it is using the new tracking files
     if (toValidate === 'toolbelt') {
         // some of the toolbelt commands aren't using SfdxCommand and the SfdxError actions won't be automatically displayed
-        throw new core_1.SfdxError(`${messages.getMessage('sourceTrackingFileVersionMismatch', ['new'])}\n\nTry this:\n${messages.getMessage('useOtherVersion', ['new', (0, exports.replaceRenamedCommands)(command, true)])}.\n${messages.getMessage('clearSuggestion', [
-            'new',
-            (0, exports.replaceRenamedCommands)('sfdx force:source:tracking:clear', true),
+        throw new core_1.SfdxError(`${messages.getMessage('sourceTrackingFileVersionMismatch', ['new/beta'])}\n\nTry this:\n${messages.getMessage('useOtherVersion', ['new/beta', (0, exports.replaceRenamedCommands)(command.replace(':legacy', ''))])}.\n${messages.getMessage('clearSuggestion', [
+            'new/beta',
+            (0, exports.replaceRenamedCommands)('sfdx force:source:tracking:clear'),
         ])}.`, 'SourceTrackingFileVersionMismatch');
     }
     // We expected it to be the plugin-source version but it is using the old tracking files
     if (toValidate === 'plugin-source') {
-        throw new core_1.SfdxError(messages.getMessage('sourceTrackingFileVersionMismatch', ['old']), 'SourceTrackingFileVersionMismatch', [
-            messages.getMessage('useOtherVersion', ['old', (0, exports.replaceRenamedCommands)(command)]),
-            messages.getMessage('clearSuggestion', ['old', (0, exports.replaceRenamedCommands)('sfdx force:source:tracking:clear')]),
+        throw new core_1.SfdxError(messages.getMessage('sourceTrackingFileVersionMismatch', ['old/legacy']), 'SourceTrackingFileVersionMismatch', [
+            messages.getMessage('useOtherVersion', ['old/legacy', (0, exports.replaceRenamedCommands)(command, true)]),
+            messages.getMessage('clearSuggestion', ['old/legacy', 'sfdx force:source:tracking:clear']),
         ]);
     }
 };
@@ -82,10 +82,10 @@ const replaceRenamedCommands = (input, reverse = false) => {
 };
 exports.replaceRenamedCommands = replaceRenamedCommands;
 const renames = new Map([
-    ['force:source:status', 'force:source:legacy:status'],
-    ['force:source:push', 'force:source:legacy:push'],
-    ['force:source:pull', 'force:source:legacy:pull'],
-    ['force:source:tracking:reset', 'force:source:legacy:tracking:reset'],
-    ['force:source:tracking:clear', 'force:source:legacy:tracking:clear'],
+    ['force:source:status', 'force:source:beta:status'],
+    ['force:source:push', 'force:source:beta:push'],
+    ['force:source:pull', 'force:source:beta:pull'],
+    ['force:source:tracking:reset', 'force:source:beta:tracking:reset'],
+    ['force:source:tracking:clear', 'force:source:beta:tracking:clear'],
 ]);
 //# sourceMappingURL=compatibility.js.map

package/lib/shared/remoteSourceTrackingService.js

@@ -436,27 +436,52 @@ class RemoteSourceTrackingService extends core_1.ConfigFile {
         // filter known Source tracking issues
         expectedMembers
             .filter((fileResponse) => {
-            var _a, _b, _c, _d, _e;
+            var _a, _b, _c, _d, _e, _f, _g, _h;
             // unchanged files will never be in the sourceMembers.  Not really sure why SDR returns them.
             return fileResponse.state !== source_deploy_retrieve_1.ComponentStatus.Unchanged &&
                 // if a listView is the only change inside an object, the object won't have a sourceMember change.  We won't wait for those to be found
                 // we don't know which email folder type might be there, so don't require either
                 // Portal doesn't support source tracking, according to the coverage report
-                !['CustomObject', 'EmailFolder', 'EmailTemplateFolder', 'StandardValueSet', 'Portal'].includes(fileResponse.type) &&
+                ![
+                    'CustomObject',
+                    'EmailFolder',
+                    'EmailTemplateFolder',
+                    'StandardValueSet',
+                    'Portal',
+                    'StandardValueSetTranslation',
+                    'SharingRules',
+                    'SharingCriteriaRule',
+                    'GlobalValueSetTranslation',
+                    'AssignmentRules',
+                ].includes(fileResponse.type) &&
+                // don't wait for standard fields on standard objects
+                !(fileResponse.type === 'CustomField' && !((_a = fileResponse.filePath) === null || _a === void 0 ? void 0 : _a.includes('__c'))) &&
+                // they're settings to mdapi, and FooSettings in sourceMembers
+                !fileResponse.type.includes('Settings') &&
+                // mdapi encodes these, sourceMembers don't have encoding
+                !((fileResponse.type === 'Layout' || fileResponse.type === 'BusinessProcess') &&
+                    ((_b = fileResponse.filePath) === null || _b === void 0 ? void 0 : _b.includes('%'))) &&
+                // namespaced labels and CMDT don't resolve correctly
+                !(['CustomLabels', 'CustomMetadata'].includes(fileResponse.type) && ((_c = fileResponse.filePath) === null || _c === void 0 ? void 0 : _c.includes('__'))) &&
                 // don't wait on workflow children
                 !fileResponse.type.startsWith('Workflow') &&
                 // aura xml aren't tracked as SourceMembers
-                !((_a = fileResponse.filePath) === null || _a === void 0 ? void 0 : _a.endsWith('.cmp-meta.xml')) &&
-                !((_b = fileResponse.filePath) === null || _b === void 0 ? void 0 : _b.endsWith('.tokens-meta.xml')) &&
-                !((_c = fileResponse.filePath) === null || _c === void 0 ? void 0 : _c.endsWith('.evt-meta.xml')) &&
-                !((_d = fileResponse.filePath) === null || _d === void 0 ? void 0 : _d.endsWith('.app-meta.xml')) &&
-                !((_e = fileResponse.filePath) === null || _e === void 0 ? void 0 : _e.endsWith('.intf-meta.xml'));
+                !((_d = fileResponse.filePath) === null || _d === void 0 ? void 0 : _d.endsWith('.cmp-meta.xml')) &&
+                !((_e = fileResponse.filePath) === null || _e === void 0 ? void 0 : _e.endsWith('.tokens-meta.xml')) &&
+                !((_f = fileResponse.filePath) === null || _f === void 0 ? void 0 : _f.endsWith('.evt-meta.xml')) &&
+                !((_g = fileResponse.filePath) === null || _g === void 0 ? void 0 : _g.endsWith('.app-meta.xml')) &&
+                !((_h = fileResponse.filePath) === null || _h === void 0 ? void 0 : _h.endsWith('.intf-meta.xml'));
         })
             .map((member) => {
             (0, metadataKeys_1.getMetadataKeyFromFileResponse)(member)
-                // CustomObject could have been added by the key generator
                 // remove some individual members known to not work with tracking even when their type does
-                .filter((key) => !key.startsWith('CustomObject') && key !== 'Profile__Standard' && key !== 'CustomTab__standard-home')
+                .filter((key) => 
+            // CustomObject could have been re-added by the key generator from one of its fields
+            !key.startsWith('CustomObject') &&
+                key !== 'Profile__Standard' &&
+                key !== 'CustomTab__standard-home' &&
+                key !== 'AssignmentRules__Case' &&
+                key !== 'ListView__CollaborationGroup.All_ChatterGroups')
                 .map((key) => outstandingSourceMembers.set(key, member));
         });
         return outstandingSourceMembers;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@salesforce/source-tracking",
   "description": "API for tracking local and remote Salesforce metadata changes",
-  "version": "1.1.1",
+  "version": "1.1.4",
   "author": "Salesforce",
   "license": "BSD-3-Clause",
   "main": "lib/index.js",