@jayree/sfdx-plugin-manifest 6.0.76 → 6.0.78
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.
- package/CHANGELOG.md +29 -0
- package/README.md +3 -3
- package/lib/SDR-extra/api/statusMatrix.d.ts +2 -2
- package/lib/SDR-extra/api/statusMatrix.js.map +1 -1
- package/lib/SDR-extra/shared/gitComponentSetArray.js +24 -24
- package/lib/SDR-extra/shared/gitComponentSetArray.js.map +1 -1
- package/lib/SDR-extra/shared/local/moveDetection.js +37 -27
- package/lib/SDR-extra/shared/local/moveDetection.js.map +1 -1
- package/oclif.manifest.json +1 -1
- package/package.json +7 -6
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,32 @@
|
|
|
1
|
+
## [6.0.78](https://github.com/jayree/sfdx-plugin-manifest/compare/6.0.77...6.0.78) (2026-10-25)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Bug Fixes
|
|
5
|
+
|
|
6
|
+
* **deps:** bump @salesforce/sf-plugins-core from 13.0.7 to 13.0.8 ([#2526](https://github.com/jayree/sfdx-plugin-manifest/issues/2526)) ([34bcbde](https://github.com/jayree/sfdx-plugin-manifest/commit/34bcbdee3aceed717787e2e6a6bd0c6630f65d61))
|
|
7
|
+
* **deps:** bump markdown-it from 14.3.1 to 14.3.3 ([99e691b](https://github.com/salesforcecli/sf-plugins-core/commit/99e691b861360bf2184f9a87fad0367964abac49))
|
|
8
|
+
|
|
9
|
+
## [6.0.77](https://github.com/jayree/sfdx-plugin-manifest/compare/6.0.76...6.0.77) (2026-10-25)
|
|
10
|
+
|
|
11
|
+
|
|
12
|
+
### Bug Fixes
|
|
13
|
+
|
|
14
|
+
* **deps:** bump @salesforce/source-deploy-retrieve from 13.7.0 to 13.7.1 ([#2517](https://github.com/jayree/sfdx-plugin-manifest/issues/2517)) ([9c66b37](https://github.com/jayree/sfdx-plugin-manifest/commit/9c66b3736c94caeea58425070c5ba7873a0d69b7))
|
|
15
|
+
* report transport operations ([b874424](https://github.com/forcedotcom/source-deploy-retrieve/commit/b874424fcd609e40d3a266dbf215e69059c95568))
|
|
16
|
+
* add ConnectApiTransport for Heroku Compute (PlatformComputeApp) ([b7eae9f](https://github.com/forcedotcom/source-deploy-retrieve/commit/b7eae9f3fdb96d728d4fffa21557ea3dde02cfe3))
|
|
17
|
+
* add TransportProvider abstraction and DeployPipeline scaffolding ([b4ef525](https://github.com/forcedotcom/source-deploy-retrieve/commit/b4ef5254d7995fe1e128dadbb7c4adf8861062b2))
|
|
18
|
+
* add TransportProvider abstraction and DeployPipeline scaffolding ([5114116](https://github.com/forcedotcom/source-deploy-retrieve/commit/51141162f8e3f7fdb56bf31dfd5e10ef908d251d))
|
|
19
|
+
* transport lifecycle events, retrieve flow fix, and improved error messages ([bd880f3](https://github.com/forcedotcom/source-deploy-retrieve/commit/bd880f38962cda13af1a00f82045f3ee436ff572))
|
|
20
|
+
* wire transport pipeline into retrieve path and add skipTransports option ([f73d931](https://github.com/forcedotcom/source-deploy-retrieve/commit/f73d931a4dd1cd7c91cff2e91d0cb8bc218f044d))
|
|
21
|
+
* wire transport pipeline into retrieve path and add skipTransports option ([7b11514](https://github.com/forcedotcom/source-deploy-retrieve/commit/7b1151471ffdb229cea359a6ca4a4efdbf5d556e))
|
|
22
|
+
* retrieve namespace-qualified metadata @W-18220202@ ([#1852](https://github.com/forcedotcom/source-deploy-retrieve/issues/1852)) ([0d23153](https://github.com/forcedotcom/source-deploy-retrieve/commit/0d23153a4c7fc12c1110f5b713d6a9a1ab4a635a))
|
|
23
|
+
* bound transport resources ([3f1b741](https://github.com/forcedotcom/source-deploy-retrieve/commit/3f1b7415aa5f6b4401ce48caa4e1af214e7d3171))
|
|
24
|
+
* harden transport execution ([19ca950](https://github.com/forcedotcom/source-deploy-retrieve/commit/19ca9500cd3c8e048215471850598a306874c996))
|
|
25
|
+
* invalidate transport pipeline cache when transport-eligible component added ([5df5fec](https://github.com/forcedotcom/source-deploy-retrieve/commit/5df5fec511cedd234a89f2c048a3de4a78dfebed))
|
|
26
|
+
* preserve Compute build inputs ([61d47b3](https://github.com/forcedotcom/source-deploy-retrieve/commit/61d47b34739f12014b414377d816eb26ab78175a))
|
|
27
|
+
* export transport result types ([46b6328](https://github.com/forcedotcom/source-deploy-retrieve/commit/46b63280c5d29cdeec3c0608bb8e7e132de41565))
|
|
28
|
+
* export transport types from root ([85f15f0](https://github.com/forcedotcom/source-deploy-retrieve/commit/85f15f083a996410b930055d4c42ace27d16276c))
|
|
29
|
+
|
|
1
30
|
## [6.0.76](https://github.com/jayree/sfdx-plugin-manifest/compare/6.0.75...6.0.76) (2026-10-25)
|
|
2
31
|
|
|
3
32
|
|
package/README.md
CHANGED
|
@@ -112,7 +112,7 @@ EXAMPLES
|
|
|
112
112
|
$ sf jayree manifest cleanup --manifest=package.xml --file=packageignore.xml
|
|
113
113
|
```
|
|
114
114
|
|
|
115
|
-
_See code: [src/commands/jayree/manifest/cleanup.ts](https://github.com/jayree/sfdx-plugin-manifest/blob/6.0.
|
|
115
|
+
_See code: [src/commands/jayree/manifest/cleanup.ts](https://github.com/jayree/sfdx-plugin-manifest/blob/6.0.78/src/commands/jayree/manifest/cleanup.ts)_
|
|
116
116
|
|
|
117
117
|
### `sf jayree manifest generate`
|
|
118
118
|
|
|
@@ -150,7 +150,7 @@ EXAMPLES
|
|
|
150
150
|
<Package xmlns='http://soap.sforce.com/2006/04/metadata'>...</Package>
|
|
151
151
|
```
|
|
152
152
|
|
|
153
|
-
_See code: [src/commands/jayree/manifest/generate.ts](https://github.com/jayree/sfdx-plugin-manifest/blob/6.0.
|
|
153
|
+
_See code: [src/commands/jayree/manifest/generate.ts](https://github.com/jayree/sfdx-plugin-manifest/blob/6.0.78/src/commands/jayree/manifest/generate.ts)_
|
|
154
154
|
|
|
155
155
|
### `sf jayree manifest git diff REF1 [REF2]`
|
|
156
156
|
|
|
@@ -230,7 +230,7 @@ FLAG DESCRIPTIONS
|
|
|
230
230
|
Use this flag to create a 'destructiveChanges.xml' and a blank 'package.xml'.
|
|
231
231
|
```
|
|
232
232
|
|
|
233
|
-
_See code: [src/commands/jayree/manifest/git/diff.ts](https://github.com/jayree/sfdx-plugin-manifest/blob/6.0.
|
|
233
|
+
_See code: [src/commands/jayree/manifest/git/diff.ts](https://github.com/jayree/sfdx-plugin-manifest/blob/6.0.78/src/commands/jayree/manifest/git/diff.ts)_
|
|
234
234
|
<!-- commandsstop -->
|
|
235
235
|
|
|
236
236
|
## Performance Testing
|
|
@@ -150,11 +150,11 @@ import { StatusRow } from 'isomorphic-git';
|
|
|
150
150
|
export declare function statusMatrix({ dir, gitdir, ref1, ref2, filepaths, filter, cache, ignored: shouldIgnore, refresh, }: {
|
|
151
151
|
dir: string;
|
|
152
152
|
gitdir?: string;
|
|
153
|
-
ref1
|
|
153
|
+
ref1?: string;
|
|
154
154
|
ref2?: string;
|
|
155
155
|
filepaths?: string[];
|
|
156
156
|
filter?: ((arg0: string) => boolean) | undefined;
|
|
157
|
-
cache
|
|
157
|
+
cache?: object;
|
|
158
158
|
ignored?: boolean;
|
|
159
159
|
refresh?: boolean;
|
|
160
160
|
}): Promise<StatusRow[]>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"statusMatrix.js","sourceRoot":"","sources":["../../../src/SDR-extra/api/statusMatrix.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"statusMatrix.js","sourceRoot":"","sources":["../../../src/SDR-extra/api/statusMatrix.ts"],"names":[],"mappings":"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"}
|
|
@@ -109,7 +109,6 @@ export const getComponentSets = ({ groupings, sourceApiVersion, registry, resolv
|
|
|
109
109
|
.filter(isDefined)
|
|
110
110
|
.forEach((component) => componentSet.add(component));
|
|
111
111
|
grouping.modifies
|
|
112
|
-
.flat()
|
|
113
112
|
.filter((filename) => {
|
|
114
113
|
if (!parseMetadataXml(filename)) {
|
|
115
114
|
resolverForNonDeletes
|
|
@@ -131,6 +130,13 @@ export const getComponentSets = ({ groupings, sourceApiVersion, registry, resolv
|
|
|
131
130
|
return false;
|
|
132
131
|
}
|
|
133
132
|
return true;
|
|
133
|
+
})
|
|
134
|
+
.filter((comp) => {
|
|
135
|
+
if (!comp.ref1Component || !comp.ref2Component) {
|
|
136
|
+
logger.warn(`unable to resolve ${comp.filename} in both git refs; skipping metadata comparison`);
|
|
137
|
+
return false;
|
|
138
|
+
}
|
|
139
|
+
return true;
|
|
134
140
|
})
|
|
135
141
|
.filter((comp) => {
|
|
136
142
|
if (equal(comp.ref1Component.parseXmlSync(comp.filename), comp.ref2Component.parseXmlSync(comp.filename))) {
|
|
@@ -150,29 +156,23 @@ export const getComponentSets = ({ groupings, sourceApiVersion, registry, resolv
|
|
|
150
156
|
})
|
|
151
157
|
.forEach((comp) => {
|
|
152
158
|
const getUniqueIdentifier = (component) => `${component.type.name}#${getString(component, component.type.uniqueIdElement)}`;
|
|
153
|
-
const
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
const
|
|
157
|
-
|
|
158
|
-
.
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
.
|
|
169
|
-
|
|
170
|
-
for (const childComponentRef1 of childComponentsInRef1AndRef2) {
|
|
171
|
-
const [childComponentRef2] = comp.ref2Component
|
|
172
|
-
.getChildren()
|
|
173
|
-
.filter((childComponent) => getUniqueIdentifier(childComponentRef1) === getUniqueIdentifier(childComponent));
|
|
174
|
-
if (!equal(childComponentRef1.parseXmlSync(), childComponentRef2.parseXmlSync())) {
|
|
175
|
-
componentSet.add(childComponentRef2); // modified! -> add to added
|
|
159
|
+
const ref1Children = comp.ref1Component.getChildren();
|
|
160
|
+
const ref2Children = comp.ref2Component.getChildren();
|
|
161
|
+
const ref1ChildrenById = new Map(ref1Children.map((child) => [getUniqueIdentifier(child), child]));
|
|
162
|
+
const ref2ChildrenById = new Map(ref2Children.map((child) => [getUniqueIdentifier(child), child]));
|
|
163
|
+
for (const child of ref1Children) {
|
|
164
|
+
if (!ref2ChildrenById.has(getUniqueIdentifier(child))) {
|
|
165
|
+
componentSet.add(child, DestructiveChangesType.POST);
|
|
166
|
+
}
|
|
167
|
+
}
|
|
168
|
+
for (const child of ref2Children) {
|
|
169
|
+
const previousChild = ref1ChildrenById.get(getUniqueIdentifier(child));
|
|
170
|
+
if (!previousChild) {
|
|
171
|
+
componentSet.add(child);
|
|
172
|
+
continue;
|
|
173
|
+
}
|
|
174
|
+
if (!equal(previousChild.parseXmlSync(), child.parseXmlSync())) {
|
|
175
|
+
componentSet.add(child);
|
|
176
176
|
}
|
|
177
177
|
}
|
|
178
178
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gitComponentSetArray.js","sourceRoot":"","sources":["../../../src/SDR-extra/shared/gitComponentSetArray.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"gitComponentSetArray.js","sourceRoot":"","sources":["../../../src/SDR-extra/shared/gitComponentSetArray.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,7 +16,7 @@
|
|
|
16
16
|
// https://github.com/forcedotcom/source-tracking/blob/main/src/shared/local/moveDetection.ts
|
|
17
17
|
import path from 'node:path';
|
|
18
18
|
import { isUtf8 } from 'node:buffer';
|
|
19
|
-
import { Lifecycle } from '@salesforce/core';
|
|
19
|
+
import { Lifecycle, Logger } from '@salesforce/core';
|
|
20
20
|
import { MetadataResolver, VirtualTreeContainer, } from '@salesforce/source-deploy-retrieve';
|
|
21
21
|
import { isDefined } from '@salesforce/source-tracking/lib/shared/guards.js';
|
|
22
22
|
import { uniqueArrayConcat } from '@salesforce/source-tracking/lib/shared/functions.js';
|
|
@@ -24,17 +24,20 @@ import { IS_WINDOWS } from '@salesforce/source-tracking/lib/shared/local/functio
|
|
|
24
24
|
import { GitRepo } from './localGitRepo.js';
|
|
25
25
|
const ensureWindows = (filepath) => path.win32.normalize(filepath);
|
|
26
26
|
const JOIN_CHAR = '#__#'; // the __ makes it unlikely to be used in metadata names
|
|
27
|
-
let localRepo;
|
|
28
27
|
/** composed functions to simplified use by the shadowRepo class */
|
|
29
28
|
export const filenameMatchesToMap = (registry) => (projectPath) => async ({ added, deleted }) => {
|
|
29
|
+
if (added.size === 0 || deleted.size === 0) {
|
|
30
|
+
return { fullMatches: new Map(), deleteOnly: new Map() };
|
|
31
|
+
}
|
|
30
32
|
const resolver = new MetadataResolver(registry, VirtualTreeContainer.fromFilePaths(uniqueArrayConcat(added, deleted)));
|
|
31
|
-
localRepo = GitRepo.getInstance({
|
|
33
|
+
const localRepo = GitRepo.getInstance({
|
|
32
34
|
dir: projectPath,
|
|
33
35
|
registry,
|
|
34
36
|
});
|
|
35
37
|
return compareHashes(await buildMaps(addTypes(resolver)(await toFileInfo({
|
|
36
38
|
added,
|
|
37
39
|
deleted,
|
|
40
|
+
localRepo,
|
|
38
41
|
}))));
|
|
39
42
|
};
|
|
40
43
|
export const getLogMessage = (matches) => [
|
|
@@ -45,15 +48,16 @@ export const getLogMessage = (matches) => [
|
|
|
45
48
|
const buildMaps = async ({ addedInfo, deletedInfo }) => {
|
|
46
49
|
const [addedMap, addedIgnoredMap] = buildMap(addedInfo);
|
|
47
50
|
const [deletedMap, deletedIgnoredMap] = buildMap(deletedInfo);
|
|
48
|
-
// If we detected any files that have the same basename and hash, emit a warning
|
|
51
|
+
// If we detected any files that have the same basename and hash, emit a warning
|
|
49
52
|
// These files will still show up as expected in the `sf project deploy preview` output
|
|
50
53
|
// We could add more logic to determine and display filepaths that we ignored...
|
|
51
54
|
// but this is likely rare enough to not warrant the added complexity
|
|
52
|
-
// Telemetry will help us determine how often this occurs
|
|
53
55
|
if (addedIgnoredMap.size || deletedIgnoredMap.size) {
|
|
54
|
-
const message = 'Files were found that have the same basename, hash, metadata type, and parent.';
|
|
56
|
+
const message = 'Files were found that have the same basename, hash, metadata type, and parent. Skipping the commit of these files';
|
|
57
|
+
const logger = Logger.childFromRoot('@jayree/sfdx-plugin-manifest:SDR-extra:moveDetection:compareHashes');
|
|
58
|
+
logger.warn(message);
|
|
55
59
|
const lifecycle = Lifecycle.getInstance();
|
|
56
|
-
await
|
|
60
|
+
await lifecycle.emitWarning(message);
|
|
57
61
|
}
|
|
58
62
|
return { addedMap, deletedMap };
|
|
59
63
|
};
|
|
@@ -86,11 +90,14 @@ const compareHashes = ({ addedMap, deletedMap }) => {
|
|
|
86
90
|
return { fullMatches: matches, deleteOnly: new Map() };
|
|
87
91
|
};
|
|
88
92
|
/** enrich the filenames with basename and oid (hash) */
|
|
89
|
-
const toFileInfo = async ({ added, deleted, }) => {
|
|
90
|
-
const headRef =
|
|
93
|
+
const toFileInfo = async ({ added, deleted, localRepo, }) => {
|
|
94
|
+
const [headRef, autocrlf] = await Promise.all([localRepo.resolveRef('HEAD'), localRepo.getConfig('core.autocrlf')]);
|
|
95
|
+
if (!headRef) {
|
|
96
|
+
throw new Error(`Could not resolve HEAD for repository at ${localRepo.dir}`);
|
|
97
|
+
}
|
|
91
98
|
const [addedInfo, deletedInfo] = await Promise.all([
|
|
92
|
-
Promise.all(Array.from(added).map(getHashForAddedFile)),
|
|
93
|
-
Promise.all(Array.from(deleted).map(getHashFromActualFileContents(headRef))),
|
|
99
|
+
Promise.all(Array.from(added).map(getHashForAddedFile(localRepo, autocrlf))),
|
|
100
|
+
Promise.all(Array.from(deleted).map(getHashFromActualFileContents(localRepo)(headRef))),
|
|
94
101
|
]);
|
|
95
102
|
return { addedInfo, deletedInfo };
|
|
96
103
|
};
|
|
@@ -98,7 +105,7 @@ const toFileInfo = async ({ added, deleted, }) => {
|
|
|
98
105
|
const buildMap = (info) => {
|
|
99
106
|
const map = new Map();
|
|
100
107
|
const ignore = new Map();
|
|
101
|
-
|
|
108
|
+
for (const i of info) {
|
|
102
109
|
const key = toKey(i);
|
|
103
110
|
// If we find a duplicate key, we need to remove it and ignore it in the future.
|
|
104
111
|
// Finding duplicate hash#basename means that we cannot accurately determine where it was moved to or from
|
|
@@ -109,11 +116,10 @@ const buildMap = (info) => {
|
|
|
109
116
|
else {
|
|
110
117
|
map.set(key, i.filename);
|
|
111
118
|
}
|
|
112
|
-
}
|
|
119
|
+
}
|
|
113
120
|
return [map, ignore];
|
|
114
121
|
};
|
|
115
|
-
const getHashForAddedFile = async (filepath) => {
|
|
116
|
-
const autocrlf = await localRepo.getConfig('core.autocrlf');
|
|
122
|
+
const getHashForAddedFile = (localRepo, autocrlf) => async (filepath) => {
|
|
117
123
|
let object = await localRepo.readBlob(filepath);
|
|
118
124
|
if (autocrlf === 'true' && isUtf8(object)) {
|
|
119
125
|
object = Buffer.from(object.toString('utf8').replace(/\r\n/g, '\n'));
|
|
@@ -124,23 +130,27 @@ const getHashForAddedFile = async (filepath) => {
|
|
|
124
130
|
hash: await localRepo.hashBlob(object),
|
|
125
131
|
};
|
|
126
132
|
};
|
|
127
|
-
const resolveType = (resolver) => (filenames) =>
|
|
128
|
-
.
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
})
|
|
136
|
-
|
|
133
|
+
const resolveType = (resolver) => (filenames) => {
|
|
134
|
+
const logger = Logger.childFromRoot('@jayree/sfdx-plugin-manifest:SDR-extra:moveDetection:compareTypes');
|
|
135
|
+
return filenames
|
|
136
|
+
.flatMap((filename) => {
|
|
137
|
+
try {
|
|
138
|
+
return resolver.getComponentsFromPath(filename);
|
|
139
|
+
}
|
|
140
|
+
catch {
|
|
141
|
+
logger.warn(`unable to resolve ${filename}`);
|
|
142
|
+
return undefined;
|
|
143
|
+
}
|
|
144
|
+
})
|
|
145
|
+
.filter(isDefined);
|
|
146
|
+
};
|
|
137
147
|
/** where we don't have git objects to use, read the file contents to generate the hash */
|
|
138
|
-
const getHashFromActualFileContents = (oid) => async (filepath) => ({
|
|
148
|
+
const getHashFromActualFileContents = (localRepo) => (oid) => async (filepath) => ({
|
|
139
149
|
filename: filepath,
|
|
140
150
|
basename: path.basename(filepath),
|
|
141
151
|
hash: await localRepo.readOid(filepath, oid),
|
|
142
152
|
});
|
|
143
|
-
const toKey = (input) => [input.hash, input.basename, input.type, input.
|
|
153
|
+
const toKey = (input) => [input.hash, input.basename, input.type, input.parentType ?? '', input.parentFullName ?? ''].join(JOIN_CHAR);
|
|
144
154
|
const removeHashFromEntry = ([k, v]) => [removeHashFromKey(k), v];
|
|
145
155
|
const removeHashFromKey = (hash) => hash.split(JOIN_CHAR).splice(1).join(JOIN_CHAR);
|
|
146
156
|
/** resolve the metadata types (and possibly parent components) */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"moveDetection.js","sourceRoot":"","sources":["../../../../src/SDR-extra/shared/local/moveDetection.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AACH,6FAA6F;AAC7F,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"moveDetection.js","sourceRoot":"","sources":["../../../../src/SDR-extra/shared/local/moveDetection.ts"],"names":[],"mappings":"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"}
|
package/oclif.manifest.json
CHANGED
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@jayree/sfdx-plugin-manifest",
|
|
3
3
|
"description": "A powerful Salesforce CLI plugin and Node.js library to effortlessly generate, clean up, and manage package.xml and destructiveChanges.xml manifests directly from your Salesforce orgs or from Git changes in your SF projects. Unlock faster, safer, and smarter Salesforce deployments.",
|
|
4
|
-
"version": "6.0.
|
|
4
|
+
"version": "6.0.78",
|
|
5
5
|
"author": "jayree",
|
|
6
6
|
"type": "module",
|
|
7
7
|
"bugs": "https://github.com/jayree/sfdx-plugin-manifest/issues",
|
|
@@ -10,8 +10,8 @@
|
|
|
10
10
|
"@oclif/core": "^5.1.9",
|
|
11
11
|
"@salesforce/core": "^9.4.1",
|
|
12
12
|
"@salesforce/kit": "^4.0.1",
|
|
13
|
-
"@salesforce/sf-plugins-core": "^13.0.
|
|
14
|
-
"@salesforce/source-deploy-retrieve": "13.7.
|
|
13
|
+
"@salesforce/sf-plugins-core": "^13.0.8",
|
|
14
|
+
"@salesforce/source-deploy-retrieve": "13.7.1",
|
|
15
15
|
"@salesforce/source-tracking": "8.1.7",
|
|
16
16
|
"@salesforce/ts-types": "^3.2.2",
|
|
17
17
|
"fast-deep-equal": "^3.1.3",
|
|
@@ -122,20 +122,21 @@
|
|
|
122
122
|
"ci-docs": "sf-ci-docs",
|
|
123
123
|
"clean": "sf-clean",
|
|
124
124
|
"clean-all": "sf-clean all",
|
|
125
|
-
"compare-hashes": "node scripts/compare-filehash/compare.mjs",
|
|
126
125
|
"compile": "wireit",
|
|
127
126
|
"docs": "sf-docs",
|
|
128
127
|
"fix-license": "eslint src test --fix --rule \"header/header: [2]\"",
|
|
129
128
|
"format": "wireit",
|
|
130
|
-
"generate-hashes": "node scripts/compare-filehash/generate.mjs",
|
|
131
129
|
"lint": "wireit",
|
|
132
130
|
"postpack": "sf-clean --ignore-signing-artifacts",
|
|
133
131
|
"prepack": "sf-prepack",
|
|
134
|
-
"prepare": "patch-package && sf-install
|
|
132
|
+
"prepare": "patch-package && sf-install",
|
|
135
133
|
"test": "wireit",
|
|
136
134
|
"test:nuts": "c8 --exclude-after-remap mocha \"**/*.nut.ts\" --slow 4500 --timeout 600000 --parallel",
|
|
137
135
|
"test:nuts:local": "mocha \"**/local/*.nut.ts\" --slow 4500 --timeout 600000 --parallel",
|
|
138
136
|
"test:only": "wireit",
|
|
137
|
+
"upstream-sync": "node scripts/upstream-sync/sync.mjs",
|
|
138
|
+
"upstream-sync:init": "node scripts/upstream-sync/sync.mjs --initialize",
|
|
139
|
+
"upstream-sync:review": "node scripts/upstream-sync/sync.mjs --review-only",
|
|
139
140
|
"version": "oclif readme --no-aliases"
|
|
140
141
|
},
|
|
141
142
|
"publishConfig": {
|