@jayree/sfdx-plugin-manifest 2.2.6 → 2.2.9
Sign up to get free protection for your applications and to get access to all the features.
- package/CHANGELOG.md +32 -0
- package/README.md +13 -12
- package/lib/commands/jayree/manifest/generate.js +5 -68
- package/lib/commands/jayree/manifest/generate.js.map +1 -1
- package/lib/commands/jayree/manifest/git/diff.js +4 -5
- package/lib/commands/jayree/manifest/git/diff.js.map +1 -1
- package/lib/utils/gitdiff.d.ts +1 -0
- package/lib/utils/gitdiff.js +39 -35
- package/lib/utils/gitdiff.js.map +1 -1
- package/messages/gitdiff.js +3 -6
- package/oclif.manifest.json +1 -1
- package/package.json +38 -33
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,35 @@
|
|
|
1
|
+
## [2.2.9](https://github.com/jayree/sfdx-plugin-manifest/compare/v2.2.8...v2.2.9) (2022-08-10)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Bug Fixes
|
|
5
|
+
|
|
6
|
+
* **deps:** bump @oclif/core from 1.13.0 to 1.13.10 ([22b579e](https://github.com/jayree/sfdx-plugin-manifest/commit/22b579e242ba6ee240f851dfb519ca6f7f71bd8f))
|
|
7
|
+
* **deps:** bump @salesforce/source-deploy-retrieve from 6.2.6 to 6.2.9 ([8d0c93d](https://github.com/jayree/sfdx-plugin-manifest/commit/8d0c93daa2f177f51970f838e116d209f492826f))
|
|
8
|
+
* **deps:** bump listr2 from 5.0.1 to 5.0.2 ([d00b56d](https://github.com/jayree/sfdx-plugin-manifest/commit/d00b56d7b3c49fa78589f83665a2a31197dc8230))
|
|
9
|
+
* remove datamappingobjectdefinition ([95c1e02](https://github.com/jayree/sfdx-plugin-manifest/commit/95c1e026209b0eeb60b9ebd802f8a278f45a3139))
|
|
10
|
+
|
|
11
|
+
## [2.2.8](https://github.com/jayree/sfdx-plugin-manifest/compare/v2.2.7...v2.2.8) (2022-08-02)
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
### Bug Fixes
|
|
15
|
+
|
|
16
|
+
* **deps:** bump @oclif/core from 1.12.1 to 1.13.0 ([6764a85](https://github.com/jayree/sfdx-plugin-manifest/commit/6764a850fbd199e34e2093397000f45f0e7d1ea4))
|
|
17
|
+
* **deps:** bump @salesforce/kit from 1.5.44 to 1.5.45 ([9420779](https://github.com/jayree/sfdx-plugin-manifest/commit/9420779e93f1ec65b92c3a8729de109ee953cea8))
|
|
18
|
+
|
|
19
|
+
## [2.2.7](https://github.com/jayree/sfdx-plugin-manifest/compare/v2.2.6...v2.2.7) (2022-07-26)
|
|
20
|
+
|
|
21
|
+
|
|
22
|
+
### Bug Fixes
|
|
23
|
+
|
|
24
|
+
* **deps:** bump @oclif/core from 1.9.3 to 1.12.1 ([d319ac7](https://github.com/jayree/sfdx-plugin-manifest/commit/d319ac7a14695d5ab0fc843f5c1ade2089f95378))
|
|
25
|
+
* **deps:** bump @salesforce/kit from 1.5.42 to 1.5.44 ([1cb9ce7](https://github.com/jayree/sfdx-plugin-manifest/commit/1cb9ce7755690ab62ac5983ab548d36c4a148d27))
|
|
26
|
+
* **deps:** bump @salesforce/source-deploy-retrieve from 6.0.4 to 6.2.6 ([b1bc5b6](https://github.com/jayree/sfdx-plugin-manifest/commit/b1bc5b6db5457329336b35cef197ca3f660043a9))
|
|
27
|
+
* **deps:** bump fast-xml-parser from 4.0.8 to 4.0.9 ([e067348](https://github.com/jayree/sfdx-plugin-manifest/commit/e067348a74b54425a5c76a8a578865b6e8901e5d))
|
|
28
|
+
* **deps:** bump isomorphic-git from 1.18.3 to 1.19.0 ([cdd7253](https://github.com/jayree/sfdx-plugin-manifest/commit/cdd725337544cd1b7697a30927410658a8c777d4))
|
|
29
|
+
* **deps:** bump isomorphic-git from 1.19.0 to 1.19.1 ([6b7a8aa](https://github.com/jayree/sfdx-plugin-manifest/commit/6b7a8aaf68d3bcfe3173b5bdcd23490a3d3b3dec))
|
|
30
|
+
* **deps:** bump listr2 from 4.0.5 to 5.0.1 ([72b2adb](https://github.com/jayree/sfdx-plugin-manifest/commit/72b2adb71a01ce4e13d74dfed2faf01a417bc1c9))
|
|
31
|
+
* **deps:** bump marked from 4.0.17 to 4.0.18 ([70efd50](https://github.com/jayree/sfdx-plugin-manifest/commit/70efd506113d58a8df877c5860ace146eb5e8bc2))
|
|
32
|
+
|
|
1
33
|
## [2.2.6](https://github.com/jayree/sfdx-plugin-manifest/compare/v2.2.5...v2.2.6) (2022-06-19)
|
|
2
34
|
|
|
3
35
|
|
package/README.md
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
# @jayree/sfdx-plugin-manifest
|
|
2
2
|
|
|
3
|
-
|
|
3
|
+
A Salesforce CLI plugin containing commands for creating manifest files from Salesforce orgs or git commits of sfdx projects.
|
|
4
4
|
|
|
5
5
|
[](https://developer.salesforce.com/tools/sfdxcli)
|
|
6
6
|
[](https://npmjs.org/package/@jayree/sfdx-plugin-manifest)
|
|
@@ -9,22 +9,29 @@ jayree sfdx manifest commands
|
|
|
9
9
|
[](https://github.com/jayree-plugins/sfdx-plugin-manifest/blob/main/package.json)
|
|
10
10
|
|
|
11
11
|
<!-- toc -->
|
|
12
|
-
|
|
12
|
+
* [Usage](#usage)
|
|
13
|
+
* [Commands](#commands)
|
|
13
14
|
<!-- tocstop -->
|
|
14
15
|
<!-- install -->
|
|
16
|
+
|
|
17
|
+
## Usage
|
|
18
|
+
|
|
15
19
|
<!-- usage -->
|
|
16
20
|
```sh-session
|
|
17
21
|
$ sfdx plugins:install @jayree/sfdx-plugin-manifest
|
|
18
22
|
$ sfdx jayree:[COMMAND]
|
|
19
23
|
running command...
|
|
20
24
|
$ sfdx plugins
|
|
21
|
-
@jayree/sfdx-plugin-manifest 2.2.
|
|
25
|
+
@jayree/sfdx-plugin-manifest 2.2.9
|
|
22
26
|
$ sfdx help jayree:[COMMAND]
|
|
23
27
|
USAGE
|
|
24
28
|
$ sfdx jayree:COMMAND
|
|
25
29
|
...
|
|
26
30
|
```
|
|
27
31
|
<!-- usagestop -->
|
|
32
|
+
|
|
33
|
+
## Commands
|
|
34
|
+
|
|
28
35
|
<!-- commands -->
|
|
29
36
|
* [`sfdx jayree:manifest:cleanup`](#sfdx-jayreemanifestcleanup)
|
|
30
37
|
* [`sfdx jayree:manifest:generate`](#sfdx-jayreemanifestgenerate)
|
|
@@ -58,7 +65,7 @@ EXAMPLES
|
|
|
58
65
|
$ sfdx jayree:manifest:cleanup --manifest=package.xml --file=packageignore.xml
|
|
59
66
|
```
|
|
60
67
|
|
|
61
|
-
_See code: [src/commands/jayree/manifest/cleanup.ts](https://github.com/jayree/sfdx-plugin-manifest/blob/v2.2.
|
|
68
|
+
_See code: [src/commands/jayree/manifest/cleanup.ts](https://github.com/jayree/sfdx-plugin-manifest/blob/v2.2.9/src/commands/jayree/manifest/cleanup.ts)_
|
|
62
69
|
|
|
63
70
|
### `sfdx jayree:manifest:generate`
|
|
64
71
|
|
|
@@ -102,7 +109,7 @@ EXAMPLES
|
|
|
102
109
|
<Package xmlns='http://soap.sforce.com/2006/04/metadata'>...</Package>
|
|
103
110
|
```
|
|
104
111
|
|
|
105
|
-
_See code: [src/commands/jayree/manifest/generate.ts](https://github.com/jayree/sfdx-plugin-manifest/blob/v2.2.
|
|
112
|
+
_See code: [src/commands/jayree/manifest/generate.ts](https://github.com/jayree/sfdx-plugin-manifest/blob/v2.2.9/src/commands/jayree/manifest/generate.ts)_
|
|
106
113
|
|
|
107
114
|
### `sfdx jayree:manifest:git:diff`
|
|
108
115
|
|
|
@@ -143,24 +150,18 @@ EXAMPLES
|
|
|
143
150
|
|
|
144
151
|
uses the changes between two arbitrary <commit>
|
|
145
152
|
|
|
146
|
-
|
|
147
|
-
|
|
148
153
|
$ sfdx jayree:manifest:git:diff <commit>...<commit>
|
|
149
154
|
|
|
150
155
|
uses the changes on the branch containing and up to the second <commit>, starting at a common ancestor of both <commit>.
|
|
151
156
|
|
|
152
|
-
|
|
153
|
-
|
|
154
157
|
$ sfdx jayree:manifest:git:diff branchA..branchB
|
|
155
158
|
|
|
156
159
|
uses the diff of what is unique in branchB (REF2) and unique in branchA (REF1)
|
|
157
160
|
|
|
158
|
-
|
|
159
|
-
|
|
160
161
|
$ sfdx jayree:manifest:git:diff branchA...branchB
|
|
161
162
|
|
|
162
163
|
uses the diff of what is unique in branchB (REF2)
|
|
163
164
|
```
|
|
164
165
|
|
|
165
|
-
_See code: [src/commands/jayree/manifest/git/diff.ts](https://github.com/jayree/sfdx-plugin-manifest/blob/v2.2.
|
|
166
|
+
_See code: [src/commands/jayree/manifest/git/diff.ts](https://github.com/jayree/sfdx-plugin-manifest/blob/v2.2.9/src/commands/jayree/manifest/git/diff.ts)_
|
|
166
167
|
<!-- commandsstop -->
|
|
@@ -12,73 +12,13 @@ const core_1 = require("@salesforce/core");
|
|
|
12
12
|
const source_deploy_retrieve_1 = require("@salesforce/source-deploy-retrieve");
|
|
13
13
|
const utils_1 = require("@salesforce/source-deploy-retrieve/lib/src/utils");
|
|
14
14
|
const fs = require("fs-extra");
|
|
15
|
-
const source_deploy_retrieve_2 = require("@salesforce/source-deploy-retrieve");
|
|
16
|
-
const utils_2 = require("@salesforce/source-deploy-retrieve/lib/src/utils");
|
|
17
15
|
const jayreeSfdxCommand_1 = require("../../../jayreeSfdxCommand");
|
|
18
|
-
source_deploy_retrieve_2.ConnectionResolver.prototype.resolve = async function (componentFilter = (component) => !!component) {
|
|
19
|
-
var _a;
|
|
20
|
-
const Aggregator = [];
|
|
21
|
-
const childrenPromises = [];
|
|
22
|
-
const componentTypes = new Set();
|
|
23
|
-
const componentPromises = [];
|
|
24
|
-
for (const type of Object.values(source_deploy_retrieve_2.registry.types)) {
|
|
25
|
-
// eslint-disable-next-line
|
|
26
|
-
componentPromises.push(this.listMembers({ type: type.name }));
|
|
27
|
-
}
|
|
28
|
-
for await (const componentResult of componentPromises) {
|
|
29
|
-
for (const component of componentResult) {
|
|
30
|
-
let componentType;
|
|
31
|
-
if (typeof component.type === 'string' && component.type.length) {
|
|
32
|
-
// eslint-disable-next-line
|
|
33
|
-
componentType = this.registry.getTypeByName(component.type);
|
|
34
|
-
}
|
|
35
|
-
else {
|
|
36
|
-
// eslint-disable-next-line
|
|
37
|
-
componentType = this.registry.getTypeBySuffix((0, utils_2.extName)(component.fileName));
|
|
38
|
-
component.type = componentType.name;
|
|
39
|
-
}
|
|
40
|
-
Aggregator.push(component);
|
|
41
|
-
componentTypes.add(componentType);
|
|
42
|
-
const folderContentType = componentType.folderContentType;
|
|
43
|
-
if (folderContentType) {
|
|
44
|
-
childrenPromises.push(
|
|
45
|
-
// eslint-disable-next-line
|
|
46
|
-
this.listMembers({
|
|
47
|
-
// eslint-disable-next-line
|
|
48
|
-
type: this.registry.getTypeByName(folderContentType).name,
|
|
49
|
-
folder: component.fullName,
|
|
50
|
-
}));
|
|
51
|
-
}
|
|
52
|
-
}
|
|
53
|
-
}
|
|
54
|
-
for (const componentType of componentTypes) {
|
|
55
|
-
const childTypes = (_a = componentType.children) === null || _a === void 0 ? void 0 : _a.types;
|
|
56
|
-
if (childTypes) {
|
|
57
|
-
Object.values(childTypes).map((childType) => {
|
|
58
|
-
// eslint-disable-next-line
|
|
59
|
-
childrenPromises.push(this.listMembers({ type: childType.name }));
|
|
60
|
-
});
|
|
61
|
-
}
|
|
62
|
-
}
|
|
63
|
-
for await (const childrenResult of childrenPromises) {
|
|
64
|
-
Aggregator.push(...childrenResult);
|
|
65
|
-
}
|
|
66
|
-
return {
|
|
67
|
-
components: Aggregator.filter(componentFilter).map((component) => {
|
|
68
|
-
// eslint-disable-next-line
|
|
69
|
-
return { fullName: component.fullName, type: this.registry.getTypeByName(component.type) };
|
|
70
|
-
}),
|
|
71
|
-
// eslint-disable-next-line
|
|
72
|
-
apiVersion: this.connection.getApiVersion(),
|
|
73
|
-
};
|
|
74
|
-
};
|
|
75
16
|
const registryAccess = new source_deploy_retrieve_1.RegistryAccess();
|
|
76
17
|
core_1.Messages.importMessagesDirectory(__dirname);
|
|
77
18
|
const messages = core_1.Messages.loadMessages('@jayree/sfdx-plugin-manifest', 'manifestgenerate');
|
|
78
19
|
class GeneratePackageXML extends jayreeSfdxCommand_1.JayreeSfdxCommand {
|
|
79
20
|
// eslint-disable-next-line complexity
|
|
80
21
|
async run() {
|
|
81
|
-
var _a, _b, _c, _d;
|
|
82
22
|
await this.org.refreshAuth();
|
|
83
23
|
const file = this.getFlag('file');
|
|
84
24
|
this.ux.startSpinner(`Generating ${file || 'package.xml'}`);
|
|
@@ -98,12 +38,9 @@ class GeneratePackageXML extends jayreeSfdxCommand_1.JayreeSfdxCommand {
|
|
|
98
38
|
componentFilter,
|
|
99
39
|
});
|
|
100
40
|
if (this.getFlag('includeflowversions')) {
|
|
101
|
-
const
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
for (const component of flowResult.filter(componentFilter)) {
|
|
105
|
-
componentSet.add({ fullName: component.fullName, type: registryAccess.getTypeByName(component.type) });
|
|
106
|
-
}
|
|
41
|
+
const flowResult = await this.listMembers({ type: 'Flow' }, '43.0');
|
|
42
|
+
for (const component of flowResult.filter(componentFilter)) {
|
|
43
|
+
componentSet.add({ fullName: component.fullName, type: registryAccess.getTypeByName(component.type) });
|
|
107
44
|
}
|
|
108
45
|
}
|
|
109
46
|
const quickFilter = this.getFlag('quickfilter');
|
|
@@ -134,8 +71,8 @@ class GeneratePackageXML extends jayreeSfdxCommand_1.JayreeSfdxCommand {
|
|
|
134
71
|
.toString()})`));
|
|
135
72
|
const flowDefinitionRecods = flowDefinitionQuery.records;
|
|
136
73
|
for (const record of flowDefinitionRecods) {
|
|
137
|
-
if (
|
|
138
|
-
this.ux.log(`DeveloperName: ${record.DeveloperName}, ActiveVersion: ${
|
|
74
|
+
if (record.LatestVersion?.VersionNumber !== record.ActiveVersion?.VersionNumber) {
|
|
75
|
+
this.ux.log(`DeveloperName: ${record.DeveloperName}, ActiveVersion: ${record.ActiveVersion?.VersionNumber}, LatestVersion: ${record.LatestVersion?.VersionNumber}`);
|
|
139
76
|
}
|
|
140
77
|
}
|
|
141
78
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate.js","sourceRoot":"","sources":["../../../../src/commands/jayree/manifest/generate.ts"],"names":[],"mappings":";;AAAA;;;;;GAKG;AACH,yBAAyB;AACzB,iDAAyD;AAEzD,2CAAwD;AACxD,+EAAyG;AACzG,4EAAoF;AACpF,+BAA+B;AAC/B
|
|
1
|
+
{"version":3,"file":"generate.js","sourceRoot":"","sources":["../../../../src/commands/jayree/manifest/generate.ts"],"names":[],"mappings":"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"}
|
|
@@ -37,7 +37,6 @@ const unexpectedArgument = async (input) => {
|
|
|
37
37
|
};
|
|
38
38
|
class GitDiff extends jayreeSfdxCommand_1.JayreeSfdxCommand {
|
|
39
39
|
async run() {
|
|
40
|
-
var _a, _b;
|
|
41
40
|
this.destructiveChangesOnly = this.getFlag('destructivechangesonly');
|
|
42
41
|
this.outputDir = this.getFlag('outputdir');
|
|
43
42
|
this.projectRoot = this.project.getPath();
|
|
@@ -106,7 +105,7 @@ class GitDiff extends jayreeSfdxCommand_1.JayreeSfdxCommand {
|
|
|
106
105
|
},
|
|
107
106
|
{
|
|
108
107
|
// title: 'Error output',
|
|
109
|
-
skip: () => !
|
|
108
|
+
skip: () => !this.outputErrors?.length,
|
|
110
109
|
task: (ctx, task) => {
|
|
111
110
|
(0, gitdiff_1.debug)({ errors: this.outputErrors });
|
|
112
111
|
const moreErrors = this.outputErrors.splice(5);
|
|
@@ -119,7 +118,7 @@ class GitDiff extends jayreeSfdxCommand_1.JayreeSfdxCommand {
|
|
|
119
118
|
},
|
|
120
119
|
{
|
|
121
120
|
title: 'Generate manifests',
|
|
122
|
-
skip: () => !
|
|
121
|
+
skip: () => !this.componentSet?.size,
|
|
123
122
|
task: (ctx, task) => task.newListr([
|
|
124
123
|
{
|
|
125
124
|
title: (0, path_1.relative)(this.projectRoot, this.manifest),
|
|
@@ -148,8 +147,8 @@ class GitDiff extends jayreeSfdxCommand_1.JayreeSfdxCommand {
|
|
|
148
147
|
try {
|
|
149
148
|
await tasks.run();
|
|
150
149
|
return {
|
|
151
|
-
destructiveChanges:
|
|
152
|
-
manifest:
|
|
150
|
+
destructiveChanges: this.componentSet?.getObject(source_deploy_retrieve_1.DestructiveChangesType.POST),
|
|
151
|
+
manifest: this.componentSet?.getObject(),
|
|
153
152
|
};
|
|
154
153
|
}
|
|
155
154
|
catch (e) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"diff.js","sourceRoot":"","sources":["../../../../../src/commands/jayree/manifest/git/diff.ts"],"names":[],"mappings":";;AAAA;;;;;GAKG;AACH,yBAAyB;AACzB,+BAA+C;AAE/C,iDAAyD;AACzD,2CAA4C;AAE5C,+BAA+B;AAC/B,mCAAuC;AACvC,uCAAuC;AACvC,+EAK4C;AAC5C,qEAAkE;AAClE,uDASmC;AAEnC,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAE5C,MAAM,QAAQ,GAAG,eAAQ,CAAC,YAAY,CAAC,8BAA8B,EAAE,SAAS,CAAC,CAAC;AAElF,MAAM,MAAM,GAAG,IAAI,eAAM,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC;AAE/C,2DAA2D;AAC3D,6DAA6D;AAC7D,MAAM,QAAQ,GAAG,OAAO,CAAC,WAAW,CAAC;AAErC,OAAO,CAAC,WAAW,GAAG,CAAC,OAAe,EAAQ,EAAE;IAC9C,OAAO,CAAC,IAAI,CAAC,YAAY,EAAE,GAAG,EAAE;QAC9B,OAAO,QAAQ,CAAC,OAAO,CAAC,CAAC;IAC3B,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,4DAA4D;AAC5D,MAAM,kBAAkB,GAAG,KAAK,EAAE,KAAa,EAAmB,EAAE;IAClE,IAAI,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;QACvB,MAAM,IAAI,KAAK,CAAC,wBAAwB,KAAK;4BACrB,CAAC,CAAC;KAC3B;IACD,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAEF,MAAqB,OAAQ,SAAQ,qCAAiB;IAsD7C,KAAK,CAAC,GAAG
|
|
1
|
+
{"version":3,"file":"diff.js","sourceRoot":"","sources":["../../../../../src/commands/jayree/manifest/git/diff.ts"],"names":[],"mappings":"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"}
|
package/lib/utils/gitdiff.d.ts
CHANGED
|
@@ -35,6 +35,7 @@ export declare function ensureOSPath(path: string): string;
|
|
|
35
35
|
export declare function ensureGitPath(path: string): string;
|
|
36
36
|
export declare function createVirtualTreeContainer(ref: string, dir: string, modifiedFiles: string[]): Promise<VirtualTreeContainer>;
|
|
37
37
|
export declare function analyzeFile(path: string, ref1VirtualTreeContainer: VirtualTreeContainer, ref2VirtualTreeContainer: VirtualTreeContainer | FSTreeContainer): Promise<{
|
|
38
|
+
path: string;
|
|
38
39
|
status: number;
|
|
39
40
|
toManifest?: SourceComponent[];
|
|
40
41
|
toDestructiveChanges?: SourceComponent[];
|
package/lib/utils/gitdiff.js
CHANGED
|
@@ -45,19 +45,21 @@ See more help with --help`);
|
|
|
45
45
|
let path = refOrig.substring(firstIndex);
|
|
46
46
|
let ref = refOrig.substring(0, firstIndex);
|
|
47
47
|
while (path.length && ref !== undefined) {
|
|
48
|
-
if (path.
|
|
48
|
+
if (path.startsWith('^')) {
|
|
49
49
|
path = path.substring(1);
|
|
50
50
|
let next = Number(path.substring(0, 1));
|
|
51
51
|
path = next ? path.substring(1) : path;
|
|
52
52
|
next = next ? next : 1;
|
|
53
|
+
// eslint-disable-next-line no-await-in-loop
|
|
53
54
|
ref = (await getCommitLog(ref)).parents[next - 1];
|
|
54
55
|
}
|
|
55
|
-
else if (path.
|
|
56
|
+
else if (path.startsWith('~')) {
|
|
56
57
|
path = path.substring(1);
|
|
57
58
|
let next = Number(path.substring(0, 1));
|
|
58
59
|
path = next ? path.substring(1) : path;
|
|
59
60
|
next = next ? next : 1;
|
|
60
61
|
for (let index = 0; index <= next - 1; index++) {
|
|
62
|
+
// eslint-disable-next-line no-await-in-loop
|
|
61
63
|
ref = (await getCommitLog(ref)).parents[0];
|
|
62
64
|
}
|
|
63
65
|
}
|
|
@@ -123,15 +125,14 @@ function ensureGitPath(path) {
|
|
|
123
125
|
}
|
|
124
126
|
exports.ensureGitPath = ensureGitPath;
|
|
125
127
|
async function createVirtualTreeContainer(ref, dir, modifiedFiles) {
|
|
126
|
-
var _a, _b, _c, _d;
|
|
127
128
|
const paths = (await isomorphic_git_1.default.listFiles({ fs, dir, ref })).map((p) => ensureOSPath(p));
|
|
128
129
|
const oid = await isomorphic_git_1.default.resolveRef({ fs, dir, ref });
|
|
129
130
|
const virtualDirectoryByFullPath = new Map();
|
|
130
|
-
for (const filename of paths) {
|
|
131
|
+
for await (const filename of paths) {
|
|
131
132
|
let dirPath = (0, path_1.dirname)(filename);
|
|
132
133
|
virtualDirectoryByFullPath.set(dirPath, {
|
|
133
134
|
dirPath,
|
|
134
|
-
children: Array.from(new Set(
|
|
135
|
+
children: Array.from(new Set(virtualDirectoryByFullPath.get(dirPath)?.children ?? []).add({
|
|
135
136
|
name: (0, path_1.basename)(filename),
|
|
136
137
|
data: (0, utils_1.parseMetadataXml)(filename) && modifiedFiles.includes(filename)
|
|
137
138
|
? Buffer.from((await isomorphic_git_1.default.readBlob({ fs, dir, oid, filepath: ensureGitPath(filename) })).blob)
|
|
@@ -143,7 +144,7 @@ async function createVirtualTreeContainer(ref, dir, modifiedFiles) {
|
|
|
143
144
|
dirPath = splits.slice(0, i + 1).join(path_1.sep);
|
|
144
145
|
virtualDirectoryByFullPath.set(dirPath, {
|
|
145
146
|
dirPath,
|
|
146
|
-
children: Array.from(new Set(
|
|
147
|
+
children: Array.from(new Set(virtualDirectoryByFullPath.get(dirPath)?.children ?? []).add(splits[i + 1])),
|
|
147
148
|
});
|
|
148
149
|
}
|
|
149
150
|
}
|
|
@@ -152,17 +153,17 @@ async function createVirtualTreeContainer(ref, dir, modifiedFiles) {
|
|
|
152
153
|
exports.createVirtualTreeContainer = createVirtualTreeContainer;
|
|
153
154
|
async function analyzeFile(path, ref1VirtualTreeContainer, ref2VirtualTreeContainer) {
|
|
154
155
|
if (!(0, utils_1.parseMetadataXml)(path)) {
|
|
155
|
-
return { status: 0 };
|
|
156
|
+
return { path, status: 0 };
|
|
156
157
|
}
|
|
157
158
|
const ref2resolver = new source_deploy_retrieve_1.MetadataResolver(registryAccess, ref2VirtualTreeContainer);
|
|
158
159
|
const [ref2Component] = ref2resolver.getComponentsFromPath(path); // git path only conaints files
|
|
159
160
|
const ref1resolver = new source_deploy_retrieve_1.MetadataResolver(registryAccess, ref1VirtualTreeContainer);
|
|
160
161
|
const [ref1Component] = ref1resolver.getComponentsFromPath(path); // git path only conaints files
|
|
161
162
|
if (equal(await ref1Component.parseXml(), await ref2Component.parseXml())) {
|
|
162
|
-
return { status: -1 };
|
|
163
|
+
return { path, status: -1 };
|
|
163
164
|
}
|
|
164
165
|
if (ref1Component.type.strictDirectoryName === true || !ref1Component.type.children) {
|
|
165
|
-
return { status: 0 };
|
|
166
|
+
return { path, status: 0 };
|
|
166
167
|
}
|
|
167
168
|
const ref2ChildUniqueIdArray = ref2Component.getChildren().map((childComponent) => {
|
|
168
169
|
return getUniqueIdentifier(childComponent);
|
|
@@ -180,7 +181,7 @@ async function analyzeFile(path, ref1VirtualTreeContainer, ref2VirtualTreeContai
|
|
|
180
181
|
.getChildren()
|
|
181
182
|
.filter((childComponent) => ref2ChildUniqueIdArray.includes(getUniqueIdentifier(childComponent))); // modified?
|
|
182
183
|
(0, exports.debug)({ childComponentsNotInRef2, childComponentsNotInRef1, childComponentsInRef1AndRef2 });
|
|
183
|
-
for (const childComponentRef1 of childComponentsInRef1AndRef2) {
|
|
184
|
+
for await (const childComponentRef1 of childComponentsInRef1AndRef2) {
|
|
184
185
|
const [childComponentRef2] = ref2Component
|
|
185
186
|
.getChildren()
|
|
186
187
|
.filter((childComponent) => getUniqueIdentifier(childComponentRef1) === getUniqueIdentifier(childComponent));
|
|
@@ -190,6 +191,7 @@ async function analyzeFile(path, ref1VirtualTreeContainer, ref2VirtualTreeContai
|
|
|
190
191
|
}
|
|
191
192
|
(0, exports.debug)({ childComponentsNotInRef1 });
|
|
192
193
|
return {
|
|
194
|
+
path,
|
|
193
195
|
status: childComponentsNotInRef2.length + childComponentsNotInRef1.length,
|
|
194
196
|
toManifest: childComponentsNotInRef1,
|
|
195
197
|
toDestructiveChanges: childComponentsNotInRef2,
|
|
@@ -206,11 +208,11 @@ async function getFileStateChanges(commitHash1, commitHash2, dir) {
|
|
|
206
208
|
dir,
|
|
207
209
|
trees: [isomorphic_git_1.default.TREE({ ref: commitHash1 }), commitHash2 ? isomorphic_git_1.default.TREE({ ref: commitHash2 }) : isomorphic_git_1.default.STAGE()],
|
|
208
210
|
async map(filepath, [A, B]) {
|
|
209
|
-
if (filepath === '.' || (await
|
|
211
|
+
if (filepath === '.' || (await A?.type()) === 'tree' || (await B?.type()) === 'tree') {
|
|
210
212
|
return;
|
|
211
213
|
}
|
|
212
|
-
const Aoid = await
|
|
213
|
-
const Boid = await
|
|
214
|
+
const Aoid = await A?.oid();
|
|
215
|
+
const Boid = await B?.oid();
|
|
214
216
|
let type = 'EQ';
|
|
215
217
|
if (Aoid !== Boid) {
|
|
216
218
|
type = 'M';
|
|
@@ -280,6 +282,7 @@ async function getGitResults(gitLines, ref1VirtualTreeContainer, ref2VirtualTree
|
|
|
280
282
|
}
|
|
281
283
|
return result;
|
|
282
284
|
};
|
|
285
|
+
const analyzedFilesPromises = [];
|
|
283
286
|
for (const [, { status, path }] of gitLines.entries()) {
|
|
284
287
|
if (status === 'D') {
|
|
285
288
|
for (const c of getComponentsFromPath(ref1Resolver, path)) {
|
|
@@ -312,30 +315,32 @@ async function getGitResults(gitLines, ref1VirtualTreeContainer, ref2VirtualTree
|
|
|
312
315
|
}
|
|
313
316
|
}
|
|
314
317
|
else {
|
|
315
|
-
|
|
316
|
-
|
|
317
|
-
|
|
318
|
-
|
|
319
|
-
|
|
320
|
-
|
|
321
|
-
|
|
318
|
+
analyzedFilesPromises.push(analyzeFile(path, ref1VirtualTreeContainer, ref2VirtualTreeContainer));
|
|
319
|
+
}
|
|
320
|
+
}
|
|
321
|
+
for await (const check of analyzedFilesPromises) {
|
|
322
|
+
if (check.status === 0) {
|
|
323
|
+
if (!destructiveChangesOnly) {
|
|
324
|
+
for (const c of getComponentsFromPath(ref2Resolver, check.path)) {
|
|
325
|
+
results.manifest.add(c);
|
|
326
|
+
results.output.counts.added++;
|
|
322
327
|
}
|
|
323
328
|
}
|
|
324
|
-
|
|
325
|
-
|
|
326
|
-
|
|
329
|
+
}
|
|
330
|
+
else if (check.status === -1) {
|
|
331
|
+
results.output.unchanged.push(check.path);
|
|
332
|
+
results.output.counts.unchanged++;
|
|
333
|
+
}
|
|
334
|
+
else {
|
|
335
|
+
if (check.toDestructiveChanges.length > 0 || (check.toManifest.length > 0 && !destructiveChangesOnly)) {
|
|
336
|
+
results.output.counts.modified++;
|
|
337
|
+
}
|
|
338
|
+
for (const c of check.toDestructiveChanges) {
|
|
339
|
+
results.manifest.add(c, source_deploy_retrieve_1.DestructiveChangesType.POST);
|
|
327
340
|
}
|
|
328
|
-
|
|
329
|
-
|
|
330
|
-
results.
|
|
331
|
-
}
|
|
332
|
-
for (const c of check.toDestructiveChanges) {
|
|
333
|
-
results.manifest.add(c, source_deploy_retrieve_1.DestructiveChangesType.POST);
|
|
334
|
-
}
|
|
335
|
-
if (!destructiveChangesOnly) {
|
|
336
|
-
for (const c of check.toManifest) {
|
|
337
|
-
results.manifest.add(c);
|
|
338
|
-
}
|
|
341
|
+
if (!destructiveChangesOnly) {
|
|
342
|
+
for (const c of check.toManifest) {
|
|
343
|
+
results.manifest.add(c);
|
|
339
344
|
}
|
|
340
345
|
}
|
|
341
346
|
}
|
|
@@ -356,7 +361,6 @@ function fixComponentSetChilds(cs) {
|
|
|
356
361
|
...Object.keys(source_deploy_retrieve_1.registry.types.sharingrules.children.types),
|
|
357
362
|
...Object.keys(source_deploy_retrieve_1.registry.types.customobjecttranslation.children.types),
|
|
358
363
|
...Object.keys(source_deploy_retrieve_1.registry.types.bot.children.types),
|
|
359
|
-
...Object.keys(source_deploy_retrieve_1.registry.types.datamappingobjectdefinition.children.types),
|
|
360
364
|
];
|
|
361
365
|
sourceComponents = sourceComponents.map((component) => {
|
|
362
366
|
if (!component.isMarkedForDelete() && childsTobeReplacedByParent.includes(component.type.id)) {
|
package/lib/utils/gitdiff.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gitdiff.js","sourceRoot":"","sources":["../../src/utils/gitdiff.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"gitdiff.js","sourceRoot":"","sources":["../../src/utils/gitdiff.ts"],"names":[],"mappings":"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"}
|
package/messages/gitdiff.js
CHANGED
|
@@ -7,14 +7,11 @@ You can use all ways to spell <commit> which are valid for 'git diff'.
|
|
|
7
7
|
examples: [
|
|
8
8
|
`$ sfdx jayree:manifest:git:diff <commit> <commit>
|
|
9
9
|
$ sfdx jayree:manifest:git:diff <commit>..<commit>
|
|
10
|
-
uses the changes between two arbitrary <commit
|
|
11
|
-
`,
|
|
10
|
+
uses the changes between two arbitrary <commit>`,
|
|
12
11
|
`$ sfdx jayree:manifest:git:diff <commit>...<commit>
|
|
13
|
-
uses the changes on the branch containing and up to the second <commit>, starting at a common ancestor of both <commit
|
|
14
|
-
`,
|
|
12
|
+
uses the changes on the branch containing and up to the second <commit>, starting at a common ancestor of both <commit>.`,
|
|
15
13
|
`$ sfdx jayree:manifest:git:diff branchA..branchB
|
|
16
|
-
uses the diff of what is unique in branchB (REF2) and unique in branchA (REF1)
|
|
17
|
-
`,
|
|
14
|
+
uses the diff of what is unique in branchB (REF2) and unique in branchA (REF1)`,
|
|
18
15
|
`$ sfdx jayree:manifest:git:diff branchA...branchB
|
|
19
16
|
uses the diff of what is unique in branchB (REF2)`,
|
|
20
17
|
],
|
package/oclif.manifest.json
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":"2.2.
|
|
1
|
+
{"version":"2.2.9","commands":{"jayree:manifest:cleanup":{"id":"jayree:manifest:cleanup","description":"removes those tags from a manifest file that are present in a second manifest file\nUse this command to remove components or metadata types from a manifes file.\nIf the 'cleanup' manifest file (--file) doesn't exist, a template file is created, which can then be modified.","strict":true,"usage":"<%= command.id %> [-x <filepath>] [-f <filepath>] [--json] [--loglevel trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]","pluginName":"@jayree/sfdx-plugin-manifest","pluginAlias":"@jayree/sfdx-plugin-manifest","pluginType":"core","aliases":[],"examples":["$ sfdx jayree:manifest:cleanup --manifest=package.xml --file=packageignore.xml"],"flags":{"json":{"name":"json","type":"boolean","description":"format output as json","allowNo":false},"loglevel":{"name":"loglevel","type":"option","description":"logging level for this command invocation","required":false,"helpValue":"(trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL)","multiple":false,"options":["trace","debug","info","warn","error","fatal","TRACE","DEBUG","INFO","WARN","ERROR","FATAL"],"default":"warn"},"manifest":{"name":"manifest","type":"option","char":"x","description":"path to the manifest file","multiple":false},"file":{"name":"file","type":"option","char":"f","description":"path to the second 'cleanup' manifest file","multiple":false}},"args":[],"flagsConfig":{"manifest":{"kind":"filepath","char":"x","description":"path to the manifest file","input":[],"multiple":false,"type":"option"},"file":{"kind":"filepath","char":"f","description":"path to the second 'cleanup' manifest file","input":[],"multiple":false,"type":"option"}},"requiresUsername":false,"supportsDevhubUsername":false,"requiresProject":true},"jayree:manifest:generate":{"id":"jayree:manifest:generate","description":"generate a complete manifest file form the specified org\nUse this command to generate a manifest file based on an existing org.","strict":true,"usage":"<%= command.id %> [-q <array>] [-c] [-w] [--includeflowversions] [-f <string>] [-x | -a] [-u <string>] [--apiversion <string>] [--json] [--loglevel trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]","pluginName":"@jayree/sfdx-plugin-manifest","pluginAlias":"@jayree/sfdx-plugin-manifest","pluginType":"core","aliases":[],"examples":["$ sfdx jayree:manifest:generate --targetusername myOrg@example.com","<?xml version='1.0' encoding='UTF-8'?>","<Package xmlns='http://soap.sforce.com/2006/04/metadata'>...</Package>"],"flags":{"json":{"name":"json","type":"boolean","description":"format output as json","allowNo":false},"loglevel":{"name":"loglevel","type":"option","description":"logging level for this command invocation","required":false,"helpValue":"(trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL)","multiple":false,"options":["trace","debug","info","warn","error","fatal","TRACE","DEBUG","INFO","WARN","ERROR","FATAL"],"default":"warn"},"targetusername":{"name":"targetusername","type":"option","char":"u","description":"username or alias for the target org; overrides default target org","multiple":false},"apiversion":{"name":"apiversion","type":"option","description":"override the api version used for api requests made by this command","multiple":false},"quickfilter":{"name":"quickfilter","type":"option","char":"q","description":"csv separated list of metadata type, member or file names to filter on","multiple":false},"matchcase":{"name":"matchcase","type":"boolean","char":"c","description":"enable 'match case' for the quickfilter","allowNo":false},"matchwholeword":{"name":"matchwholeword","type":"boolean","char":"w","description":"enable 'match whole word' for the quickfilter","allowNo":false},"includeflowversions":{"name":"includeflowversions","type":"boolean","description":"include flow versions as with api version 43.0","allowNo":false},"file":{"name":"file","type":"option","char":"f","description":"write to 'file' instead of stdout","multiple":false},"excludemanaged":{"name":"excludemanaged","type":"boolean","char":"x","description":"exclude managed packages from output","allowNo":false,"exclusive":["excludeall"]},"excludeall":{"name":"excludeall","type":"boolean","char":"a","description":"exclude all packages from output","allowNo":false,"exclusive":["excludemanaged"]}},"args":[],"flagsConfig":{"quickfilter":{"kind":"array","char":"q","description":"csv separated list of metadata type, member or file names to filter on","input":[],"multiple":false,"type":"option"},"matchcase":{"kind":"boolean","char":"c","description":"enable 'match case' for the quickfilter","allowNo":false,"type":"boolean"},"matchwholeword":{"kind":"boolean","char":"w","description":"enable 'match whole word' for the quickfilter","allowNo":false,"type":"boolean"},"includeflowversions":{"kind":"boolean","description":"include flow versions as with api version 43.0","allowNo":false,"type":"boolean"},"file":{"kind":"string","char":"f","description":"write to 'file' instead of stdout","input":[],"multiple":false,"type":"option"},"excludemanaged":{"kind":"boolean","char":"x","description":"exclude managed packages from output","exclusive":["excludeall"],"allowNo":false,"type":"boolean"},"excludeall":{"kind":"boolean","char":"a","description":"exclude all packages from output","exclusive":["excludemanaged"],"allowNo":false,"type":"boolean"}},"requiresUsername":true,"supportsDevhubUsername":false,"requiresProject":false},"jayree:manifest:git:diff":{"id":"jayree:manifest:git:diff","description":"create a manifest and destructiveChanges manifest using 'git diff' data\nUse this command to create a manifest and destructiveChanges manifest file based on the difference (git diff) of two git refs.\n\nYou can use all ways to spell <commit> which are valid for 'git diff'.\n(See https://git-scm.com/docs/git-diff)","strict":true,"usage":"<%= command.id %> [-o <string>] [-d] [--json] [--loglevel trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]","pluginName":"@jayree/sfdx-plugin-manifest","pluginAlias":"@jayree/sfdx-plugin-manifest","pluginType":"core","aliases":[],"examples":["$ sfdx jayree:manifest:git:diff <commit> <commit>","$ sfdx jayree:manifest:git:diff <commit>..<commit>","uses the changes between two arbitrary <commit>","$ sfdx jayree:manifest:git:diff <commit>...<commit>","uses the changes on the branch containing and up to the second <commit>, starting at a common ancestor of both <commit>.","$ sfdx jayree:manifest:git:diff branchA..branchB","uses the diff of what is unique in branchB (REF2) and unique in branchA (REF1)","$ sfdx jayree:manifest:git:diff branchA...branchB","uses the diff of what is unique in branchB (REF2)"],"flags":{"json":{"name":"json","type":"boolean","description":"format output as json","allowNo":false},"loglevel":{"name":"loglevel","type":"option","description":"logging level for this command invocation","required":false,"helpValue":"(trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL)","multiple":false,"options":["trace","debug","info","warn","error","fatal","TRACE","DEBUG","INFO","WARN","ERROR","FATAL"],"default":"warn"},"outputdir":{"name":"outputdir","type":"option","char":"o","description":"directory to save the created manifest files","multiple":false,"default":""},"destructivechangesonly":{"name":"destructivechangesonly","type":"boolean","char":"d","description":"create a destructiveChanges manifest only (package.xml will be empty)","allowNo":false}},"args":[{"name":"ref1","description":"base commit or branch","required":true,"hidden":false},{"name":"ref2","description":"commit or branch to compare to the base commit","required":false,"hidden":false}],"flagsConfig":{"outputdir":{"kind":"string","char":"o","description":"directory to save the created manifest files","default":"","input":[],"multiple":false,"type":"option"},"destructivechangesonly":{"kind":"boolean","char":"d","description":"create a destructiveChanges manifest only (package.xml will be empty)","default":false,"allowNo":false,"type":"boolean"}},"requiresUsername":false,"supportsDevhubUsername":false,"requiresProject":true}}}
|
package/package.json
CHANGED
|
@@ -1,62 +1,62 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@jayree/sfdx-plugin-manifest",
|
|
3
3
|
"description": "A Salesforce CLI plugin containing commands for creating manifest files from Salesforce orgs or git commits of sfdx projects.",
|
|
4
|
-
"version": "2.2.
|
|
4
|
+
"version": "2.2.9",
|
|
5
5
|
"author": "jayree",
|
|
6
6
|
"bugs": "https://github.com/jayree/sfdx-plugin-manifest/issues",
|
|
7
7
|
"dependencies": {
|
|
8
|
-
"@oclif/core": "^1.
|
|
9
|
-
"@salesforce/command": "^5.2.
|
|
10
|
-
"@salesforce/kit": "^1.5.
|
|
11
|
-
"@salesforce/source-deploy-retrieve": "^6.
|
|
8
|
+
"@oclif/core": "^1.13.10",
|
|
9
|
+
"@salesforce/command": "^5.2.4",
|
|
10
|
+
"@salesforce/kit": "^1.5.45",
|
|
11
|
+
"@salesforce/source-deploy-retrieve": "^6.2.9",
|
|
12
12
|
"@salesforce/ts-types": "^1.5.20",
|
|
13
13
|
"debug": "^4.3.4",
|
|
14
14
|
"fast-deep-equal": "^3.1.3",
|
|
15
|
-
"fast-xml-parser": "^4.0.
|
|
15
|
+
"fast-xml-parser": "^4.0.9",
|
|
16
16
|
"fs-extra": "^10.1.0",
|
|
17
|
-
"isomorphic-git": "^1.
|
|
18
|
-
"listr2": "^
|
|
19
|
-
"marked": "^4.0.
|
|
17
|
+
"isomorphic-git": "^1.19.1",
|
|
18
|
+
"listr2": "^5.0.2",
|
|
19
|
+
"marked": "^4.0.18",
|
|
20
20
|
"marked-terminal": "^4.2.0",
|
|
21
21
|
"semver": "^7.3.7",
|
|
22
22
|
"tslib": "^2.4.0"
|
|
23
23
|
},
|
|
24
24
|
"devDependencies": {
|
|
25
|
-
"@commitlint/cli": "^17.0.
|
|
26
|
-
"@commitlint/config-conventional": "^17.0.
|
|
25
|
+
"@commitlint/cli": "^17.0.3",
|
|
26
|
+
"@commitlint/config-conventional": "^17.0.3",
|
|
27
27
|
"@oclif/plugin-command-snapshot": "^3",
|
|
28
28
|
"@oclif/plugin-help": "^5.1.12",
|
|
29
|
-
"@salesforce/dev-config": "^3.0
|
|
30
|
-
"@salesforce/dev-scripts": "^2.0.
|
|
29
|
+
"@salesforce/dev-config": "^3.1.0",
|
|
30
|
+
"@salesforce/dev-scripts": "^2.0.4",
|
|
31
31
|
"@salesforce/prettier-config": "^0.0.2",
|
|
32
32
|
"@salesforce/ts-sinon": "^1.3.21",
|
|
33
|
-
"@types/chai": "^4.3.
|
|
33
|
+
"@types/chai": "^4.3.3",
|
|
34
34
|
"@types/debug": "^4.1.7",
|
|
35
35
|
"@types/fs-extra": "^9.0.13",
|
|
36
36
|
"@types/marked": "^4.0.3",
|
|
37
37
|
"@types/marked-terminal": "^3.1.3",
|
|
38
38
|
"@types/mocha": "^9.1.1",
|
|
39
|
-
"@types/node": "^18.
|
|
39
|
+
"@types/node": "^18.6.5",
|
|
40
40
|
"@types/semver": "^7.3.10",
|
|
41
|
-
"@types/sinon": "10.0.
|
|
42
|
-
"@typescript-eslint/eslint-plugin": "^5.
|
|
43
|
-
"@typescript-eslint/parser": "^5.
|
|
41
|
+
"@types/sinon": "10.0.13",
|
|
42
|
+
"@typescript-eslint/eslint-plugin": "^5.33.0",
|
|
43
|
+
"@typescript-eslint/parser": "^5.33.0",
|
|
44
44
|
"chai": "^4.3.6",
|
|
45
|
-
"eslint": "^8.
|
|
45
|
+
"eslint": "^8.21.0",
|
|
46
46
|
"eslint-config-oclif": "^4.0",
|
|
47
47
|
"eslint-config-prettier": "^8.5.0",
|
|
48
|
-
"eslint-config-salesforce": "^
|
|
49
|
-
"eslint-config-salesforce-typescript": "^0.
|
|
48
|
+
"eslint-config-salesforce": "^1.1.0",
|
|
49
|
+
"eslint-config-salesforce-typescript": "^1.0.0",
|
|
50
50
|
"eslint-plugin-header": "^3.1.1",
|
|
51
51
|
"eslint-plugin-import": "2.26.0",
|
|
52
|
-
"eslint-plugin-jsdoc": "^39.3.
|
|
53
|
-
"eslint-plugin-prettier": "^4.
|
|
52
|
+
"eslint-plugin-jsdoc": "^39.3.6",
|
|
53
|
+
"eslint-plugin-prettier": "^4.2.1",
|
|
54
54
|
"eslint-plugin-sf-plugin": "^0.3.0",
|
|
55
55
|
"husky": "^8.0.1",
|
|
56
56
|
"is-ci": "^3.0.1",
|
|
57
57
|
"mocha": "^10.0.0",
|
|
58
58
|
"nyc": "^15.1.0",
|
|
59
|
-
"oclif": "^3.
|
|
59
|
+
"oclif": "^3.1.2",
|
|
60
60
|
"patch-package": "^6.4.7",
|
|
61
61
|
"pinst": "^3.0.0",
|
|
62
62
|
"prettier": "^2.7.1",
|
|
@@ -64,7 +64,7 @@
|
|
|
64
64
|
"shx": "^0.3.4",
|
|
65
65
|
"sinon": "14.0.0",
|
|
66
66
|
"source-map-support": "~0.5.21",
|
|
67
|
-
"ts-node": "^10.
|
|
67
|
+
"ts-node": "^10.9.1",
|
|
68
68
|
"typescript": "^4.7.4"
|
|
69
69
|
},
|
|
70
70
|
"engines": {
|
|
@@ -80,6 +80,7 @@
|
|
|
80
80
|
"keywords": [
|
|
81
81
|
"git",
|
|
82
82
|
"diff",
|
|
83
|
+
"delta",
|
|
83
84
|
"manifest",
|
|
84
85
|
"salesforce",
|
|
85
86
|
"package",
|
|
@@ -97,13 +98,17 @@
|
|
|
97
98
|
},
|
|
98
99
|
"topics": {
|
|
99
100
|
"jayree": {
|
|
100
|
-
"description": "manifest, source, and org automation toolset"
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
101
|
+
"description": "manifest, source, and org automation toolset",
|
|
102
|
+
"subtopics": {
|
|
103
|
+
"manifest": {
|
|
104
|
+
"description": "generate and manipulate manifest files",
|
|
105
|
+
"subtopics": {
|
|
106
|
+
"git": {
|
|
107
|
+
"description": "generate manifest files based on git data"
|
|
108
|
+
}
|
|
109
|
+
}
|
|
110
|
+
}
|
|
111
|
+
}
|
|
107
112
|
}
|
|
108
113
|
},
|
|
109
114
|
"devPlugins": [
|
|
@@ -138,7 +143,7 @@
|
|
|
138
143
|
"prepublishOnly": "pinst --disable",
|
|
139
144
|
"pretest": "sf-compile-test",
|
|
140
145
|
"test": "sf-test",
|
|
141
|
-
"test:deprecation-policy": "./bin/
|
|
146
|
+
"test:deprecation-policy": "./bin/dev snapshot:compare",
|
|
142
147
|
"version": "oclif readme"
|
|
143
148
|
},
|
|
144
149
|
"publishConfig": {
|