@jayree/sfdx-plugin-manifest 4.0.81 → 4.0.83
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 +20 -0
- package/README.md +5 -5
- package/lib/SDR-extra/resolve/gitDiffResolver.js +0 -3
- package/lib/SDR-extra/resolve/gitDiffResolver.js.map +1 -1
- package/lib/SDR-extra/resolve/treeContainersExtra.js +0 -3
- package/lib/SDR-extra/resolve/treeContainersExtra.js.map +1 -1
- package/lib/SDR-extra/shared/gitComponentSetArray.js +2 -2
- package/lib/SDR-extra/shared/gitComponentSetArray.js.map +1 -1
- package/lib/SDR-extra/shared/local/localGitRepo.js +0 -5
- package/lib/SDR-extra/shared/local/localGitRepo.js.map +1 -1
- package/lib/SDR-extra/shared/local/moveDetection.js +0 -6
- package/lib/SDR-extra/shared/local/moveDetection.js.map +1 -1
- package/lib/tsconfig.tsbuildinfo +1 -1
- package/npm-shrinkwrap.json +660 -132
- package/oclif.lock +496 -117
- package/oclif.manifest.json +1 -1
- package/package.json +6 -6
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,23 @@
|
|
|
1
|
+
## [4.0.83](https://github.com/jayree/sfdx-plugin-manifest/compare/4.0.82...4.0.83) (2025-10-23)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Bug Fixes
|
|
5
|
+
|
|
6
|
+
* **deps:** bump @oclif/core from 4.5.6 to 4.7.2 ([#1965](https://github.com/jayree/sfdx-plugin-manifest/issues/1965)) ([dea1603](https://github.com/jayree/sfdx-plugin-manifest/commit/dea16032d7c60603e0a58b0301ea3a7380781cbd))
|
|
7
|
+
* support the 'combinable' & 'only' flag relationships ([#1487](https://github.com/oclif/core/issues/1487)) ([#1488](https://github.com/oclif/core/issues/1488)) ([d13b448](https://github.com/oclif/core/commit/d13b448f229f182b065e0847cf4b761b8f2cbbd8))
|
|
8
|
+
* support allowNo with alias ([d6de26f](https://github.com/oclif/core/commit/d6de26fca79b63fac7b5f3d87f7d3a07bab7aa0a))
|
|
9
|
+
* warn about unparsed arguments ([#1490](https://github.com/oclif/core/issues/1490)) ([5ad6bf0](https://github.com/oclif/core/commit/5ad6bf0dacd29519d724ebe0c695ceab4e4cfe13))
|
|
10
|
+
* retain description when hiding summary in help ([#1493](https://github.com/oclif/core/issues/1493)) ([3647672](https://github.com/oclif/core/commit/36476723a934e6c1d4069a979da1ec4242f7e9eb))
|
|
11
|
+
|
|
12
|
+
## [4.0.82](https://github.com/jayree/sfdx-plugin-manifest/compare/4.0.81...4.0.82) (2025-10-16)
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
### Bug Fixes
|
|
16
|
+
|
|
17
|
+
* **deps:** bump @oclif/core from 4.5.5 to 4.5.6 ([#1963](https://github.com/jayree/sfdx-plugin-manifest/issues/1963)) ([71a4058](https://github.com/jayree/sfdx-plugin-manifest/commit/71a4058003173493de1144e5ee59b2689faa4c73))
|
|
18
|
+
* first commit on custom autocomplete ([4bd2459](https://github.com/oclif/core/commit/4bd2459d0987b38a8334d024ba7630e7bb6861f2))
|
|
19
|
+
* indicate whether an argument is optional in the help command ([#1453](https://github.com/oclif/core/issues/1453)) ([#1482](https://github.com/oclif/core/issues/1482)) ([94e46f8](https://github.com/oclif/core/commit/94e46f8d0405a4e0f6c008c8dfad6d70a8276e38))
|
|
20
|
+
|
|
1
21
|
## [4.0.81](https://github.com/jayree/sfdx-plugin-manifest/compare/4.0.80...4.0.81) (2025-10-11)
|
|
2
22
|
|
|
3
23
|
|
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/4.0.
|
|
115
|
+
_See code: [src/commands/jayree/manifest/cleanup.ts](https://github.com/jayree/sfdx-plugin-manifest/blob/4.0.83/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/4.0.
|
|
153
|
+
_See code: [src/commands/jayree/manifest/generate.ts](https://github.com/jayree/sfdx-plugin-manifest/blob/4.0.83/src/commands/jayree/manifest/generate.ts)_
|
|
154
154
|
|
|
155
155
|
### `sf jayree manifest git diff REF1 [REF2]`
|
|
156
156
|
|
|
@@ -162,8 +162,8 @@ USAGE
|
|
|
162
162
|
<value>] [--destructive-changes-only]
|
|
163
163
|
|
|
164
164
|
ARGUMENTS
|
|
165
|
-
REF1
|
|
166
|
-
REF2 Commit or branch to compare to the base commit.
|
|
165
|
+
REF1 Base commit or branch.
|
|
166
|
+
[REF2] Commit or branch to compare to the base commit.
|
|
167
167
|
|
|
168
168
|
FLAGS
|
|
169
169
|
-d, --source-dir=<value>... Path to the local source files to include in the manifest.
|
|
@@ -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/4.0.
|
|
233
|
+
_See code: [src/commands/jayree/manifest/git/diff.ts](https://github.com/jayree/sfdx-plugin-manifest/blob/4.0.83/src/commands/jayree/manifest/git/diff.ts)_
|
|
234
234
|
<!-- commandsstop -->
|
|
235
235
|
|
|
236
236
|
## Performance Testing
|
|
@@ -16,7 +16,6 @@
|
|
|
16
16
|
import path from 'node:path';
|
|
17
17
|
import { ComponentSet, RegistryAccess, MetadataResolver } from '@salesforce/source-deploy-retrieve';
|
|
18
18
|
import { SfError, Lifecycle, Logger } from '@salesforce/core';
|
|
19
|
-
import { Performance } from '@oclif/core/performance';
|
|
20
19
|
import { GitRepo } from '../shared/local/localGitRepo.js';
|
|
21
20
|
import { getComponentSets, getGroupedFiles } from '../shared/gitComponentSetArray.js';
|
|
22
21
|
import { VirtualTreeContainerExtra } from '../resolve/treeContainersExtra.js';
|
|
@@ -50,7 +49,6 @@ export class GitDiffResolver {
|
|
|
50
49
|
});
|
|
51
50
|
}
|
|
52
51
|
async resolve(ref1, ref2, fsPaths) {
|
|
53
|
-
const marker = Performance.mark('@jayree/sfdx-plugin-manifest', 'GitDiffResolver.resolve');
|
|
54
52
|
if (ref2 === undefined) {
|
|
55
53
|
const { ref1: r1, ref2: r2 } = await this.localRepo.resolveMultiRefString(ref1);
|
|
56
54
|
ref1 = r1;
|
|
@@ -89,7 +87,6 @@ export class GitDiffResolver {
|
|
|
89
87
|
await lifecycle.emitWarning(`The forceignored file ${file} was ignored.`);
|
|
90
88
|
}
|
|
91
89
|
}
|
|
92
|
-
marker?.stop();
|
|
93
90
|
return cs;
|
|
94
91
|
}
|
|
95
92
|
async gitChangesAsComponentSet(byPackageDir) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gitDiffResolver.js","sourceRoot":"","sources":["../../../src/SDR-extra/resolve/gitDiffResolver.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AACH,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,oCAAoC,CAAC;AACpG,OAAO,EAAa,OAAO,EAAE,SAAS,EAAE,MAAM,EAAmB,MAAM,kBAAkB,CAAC;AAC1F,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"gitDiffResolver.js","sourceRoot":"","sources":["../../../src/SDR-extra/resolve/gitDiffResolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,7 +17,6 @@
|
|
|
17
17
|
import path from 'node:path';
|
|
18
18
|
import { VirtualTreeContainer } from '@salesforce/source-deploy-retrieve';
|
|
19
19
|
import { parseMetadataXml } from '@salesforce/source-deploy-retrieve/lib/src/utils/index.js';
|
|
20
|
-
import { Performance } from '@oclif/core/performance';
|
|
21
20
|
import { GitRepo } from '../shared/local/localGitRepo.js';
|
|
22
21
|
export class VirtualTreeContainerExtra extends VirtualTreeContainer {
|
|
23
22
|
/**
|
|
@@ -30,7 +29,6 @@ export class VirtualTreeContainerExtra extends VirtualTreeContainer {
|
|
|
30
29
|
* @returns VirtualTreeContainer
|
|
31
30
|
*/
|
|
32
31
|
static async fromGitRef(ref, dir, includeBufferForFiles) {
|
|
33
|
-
const marker = Performance.mark('@jayree/sfdx-plugin-manifest', 'VirtualTreeContainerExtra.fromGitRef');
|
|
34
32
|
const localRepo = GitRepo.getInstance({ dir });
|
|
35
33
|
const paths = await localRepo.listFiles(ref);
|
|
36
34
|
const oid = await localRepo.resolveRef(ref);
|
|
@@ -58,7 +56,6 @@ export class VirtualTreeContainerExtra extends VirtualTreeContainer {
|
|
|
58
56
|
});
|
|
59
57
|
}
|
|
60
58
|
}
|
|
61
|
-
marker?.stop();
|
|
62
59
|
return new VirtualTreeContainer(Array.from(virtualDirectoryByFullPath.values()));
|
|
63
60
|
}
|
|
64
61
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"treeContainersExtra.js","sourceRoot":"","sources":["../../../src/SDR-extra/resolve/treeContainersExtra.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AACH,gGAAgG;AAChG,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,oBAAoB,EAAoB,MAAM,oCAAoC,CAAC;AAC5F,OAAO,EAAE,gBAAgB,EAAE,MAAM,2DAA2D,CAAC;AAC7F,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"treeContainersExtra.js","sourceRoot":"","sources":["../../../src/SDR-extra/resolve/treeContainersExtra.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AACH,gGAAgG;AAChG,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,oBAAoB,EAAoB,MAAM,oCAAoC,CAAC;AAC5F,OAAO,EAAE,gBAAgB,EAAE,MAAM,2DAA2D,CAAC;AAC7F,OAAO,EAAE,OAAO,EAAE,MAAM,iCAAiC,CAAC;AAE1D,MAAM,OAAO,yBAA0B,SAAQ,oBAAoB;IACjE;;;;;;;;OAQG;IACI,MAAM,CAAC,KAAK,CAAC,UAAU,CAC5B,GAAW,EACX,GAAW,EACX,qBAA+B;QAE/B,MAAM,SAAS,GAAG,OAAO,CAAC,WAAW,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC;QAC/C,MAAM,KAAK,GAAG,MAAM,SAAS,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;QAC7C,MAAM,GAAG,GAAG,MAAM,SAAS,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;QAC5C,MAAM,0BAA0B,GAAG,IAAI,GAAG,EAA4B,CAAC;QACvE,6DAA6D;QAC7D,IAAI,KAAK,EAAE,MAAM,QAAQ,IAAI,KAAK,EAAE,CAAC;YACnC,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;YACvC,0BAA0B,CAAC,GAAG,CAAC,OAAO,EAAE;gBACtC,OAAO;gBACP,QAAQ,EAAE,KAAK,CAAC,IAAI,CAClB,IAAI,GAAG,CAAC,0BAA0B,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,QAAQ,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC;oBACnE,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC;oBAC7B,IAAI,EACF,gBAAgB,CAAC,QAAQ,CAAC,IAAI,qBAAqB,CAAC,QAAQ,CAAC,QAAQ,CAAC;wBACpE,CAAC,CAAC,MAAM,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,GAAG,CAAC;wBACzC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;iBACtB,CAAC,CACH;aACF,CAAC,CAAC;YACH,MAAM,MAAM,GAAG,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACxC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;gBAC3C,MAAM,aAAa,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBAC5D,MAAM,QAAQ,GAAG,0BAA0B,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;gBAC/D,0BAA0B,CAAC,GAAG,CAAC,aAAa,EAAE;oBAC5C,OAAO,EAAE,aAAa;oBACtB,mDAAmD;oBACnD,QAAQ,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,QAAQ,EAAE,QAAQ,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;iBAC3E,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QAED,OAAO,IAAI,oBAAoB,CAAC,KAAK,CAAC,IAAI,CAAC,0BAA0B,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IACnF,CAAC;CACF"}
|
|
@@ -14,7 +14,7 @@
|
|
|
14
14
|
* limitations under the License.
|
|
15
15
|
*/
|
|
16
16
|
// https://github.com/forcedotcom/source-tracking/blob/main/src/shared/localComponentSetArray.ts
|
|
17
|
-
import { ComponentSet,
|
|
17
|
+
import { ComponentSet, DestructiveChangesType, } from '@salesforce/source-deploy-retrieve';
|
|
18
18
|
import { Logger } from '@salesforce/core';
|
|
19
19
|
import equal from 'fast-deep-equal';
|
|
20
20
|
import { getString } from '@salesforce/ts-types';
|
|
@@ -60,7 +60,7 @@ const getNonSequential = ({ packageDirs, adds, modifies, deletes }) => [
|
|
|
60
60
|
path: packageDirs.map((dir) => dir.name).join(';'),
|
|
61
61
|
},
|
|
62
62
|
];
|
|
63
|
-
export const getComponentSets = ({ groupings, sourceApiVersion, registry
|
|
63
|
+
export const getComponentSets = ({ groupings, sourceApiVersion, registry, resolverForNonDeletes, resolverForDeletes, virtualTreeContainer, }) => {
|
|
64
64
|
const logger = Logger.childFromRoot('gitDiff:gitComponentSetArray');
|
|
65
65
|
return groupings
|
|
66
66
|
.map((grouping) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gitComponentSetArray.js","sourceRoot":"","sources":["../../../src/SDR-extra/shared/gitComponentSetArray.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AACH,gGAAgG;AAChG,OAAO,EACL,YAAY,
|
|
1
|
+
{"version":3,"file":"gitComponentSetArray.js","sourceRoot":"","sources":["../../../src/SDR-extra/shared/gitComponentSetArray.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,7 +20,6 @@ import os from 'node:os';
|
|
|
20
20
|
import fs from 'node:fs/promises';
|
|
21
21
|
import { execSync } from 'node:child_process';
|
|
22
22
|
import git, { readBlob as _readBlob, listFiles as _listFiles } from 'isomorphic-git';
|
|
23
|
-
import { Performance } from '@oclif/core/performance';
|
|
24
23
|
import { Lifecycle, SfError } from '@salesforce/core';
|
|
25
24
|
import { RegistryAccess } from '@salesforce/source-deploy-retrieve';
|
|
26
25
|
import { excludeLwcLocalOnlyTest, folderContainsPath } from '@salesforce/source-tracking/lib/shared/functions.js';
|
|
@@ -179,7 +178,6 @@ export class GitRepo {
|
|
|
179
178
|
return toFilenames(this.getDeletes());
|
|
180
179
|
}
|
|
181
180
|
async getStatus(ref1, ref2) {
|
|
182
|
-
const marker = Performance.mark('@jayree/sfdx-plugin-manifest', 'localGitRepo.getStatus');
|
|
183
181
|
await this.checkLocalGitAutocrlfConfig();
|
|
184
182
|
try {
|
|
185
183
|
this.status = await statusMatrix({
|
|
@@ -201,7 +199,6 @@ export class GitRepo {
|
|
|
201
199
|
catch (e) {
|
|
202
200
|
redirectToCliRepoError(e);
|
|
203
201
|
}
|
|
204
|
-
marker?.stop();
|
|
205
202
|
return this.status;
|
|
206
203
|
}
|
|
207
204
|
async emitStatusWarnings() {
|
|
@@ -240,7 +237,6 @@ export class GitRepo {
|
|
|
240
237
|
const matchingFiles = getMatches(this.status);
|
|
241
238
|
if (!matchingFiles.added.size || !matchingFiles.deleted.size)
|
|
242
239
|
return;
|
|
243
|
-
const movedFilesMarker = Performance.mark('@jayree/sfdx-plugin-manifest', 'localGitRepo.detectMovedFiles');
|
|
244
240
|
const sourceBehaviorOptionsBetaMatches = new Map();
|
|
245
241
|
for (const deletedFilePath of matchingFiles.deleted) {
|
|
246
242
|
const fullName = parseMetadataXml(deletedFilePath)?.fullName;
|
|
@@ -266,7 +262,6 @@ export class GitRepo {
|
|
|
266
262
|
...matches.deleteOnly.values(),
|
|
267
263
|
];
|
|
268
264
|
this.status = this.status.filter((file) => (removeFiles.includes(file[0]) ? false : true));
|
|
269
|
-
movedFilesMarker?.stop();
|
|
270
265
|
}
|
|
271
266
|
async getCommitLog(ref) {
|
|
272
267
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"localGitRepo.js","sourceRoot":"","sources":["../../../../src/SDR-extra/shared/local/localGitRepo.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"localGitRepo.js","sourceRoot":"","sources":["../../../../src/SDR-extra/shared/local/localGitRepo.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,7 +18,6 @@ import path from 'node:path';
|
|
|
18
18
|
import { isUtf8 } from 'node:buffer';
|
|
19
19
|
import { Lifecycle } from '@salesforce/core';
|
|
20
20
|
import { MetadataResolver, VirtualTreeContainer, } from '@salesforce/source-deploy-retrieve';
|
|
21
|
-
import { Performance } from '@oclif/core/performance';
|
|
22
21
|
import { isDefined } from '@salesforce/source-tracking/lib/shared/guards.js';
|
|
23
22
|
import { uniqueArrayConcat } from '@salesforce/source-tracking/lib/shared/functions.js';
|
|
24
23
|
import { IS_WINDOWS, ensureWindows } from '@salesforce/source-tracking/lib/shared/local/functions.js';
|
|
@@ -88,16 +87,11 @@ const compareHashes = ({ addedMap, deletedMap }) => {
|
|
|
88
87
|
};
|
|
89
88
|
/** enrich the filenames with basename and oid (hash) */
|
|
90
89
|
const toFileInfo = async ({ added, deleted, }) => {
|
|
91
|
-
const getInfoMarker = Performance.mark('@jayree/sfdx-plugin-manifest', 'localGitRepo.detectMovedFiles#toFileInfo', {
|
|
92
|
-
addedFiles: added.size,
|
|
93
|
-
deletedFiles: deleted.size,
|
|
94
|
-
});
|
|
95
90
|
const headRef = (await localRepo.resolveRef('HEAD'));
|
|
96
91
|
const [addedInfo, deletedInfo] = await Promise.all([
|
|
97
92
|
Promise.all(Array.from(added).map(getHashForAddedFile)),
|
|
98
93
|
Promise.all(Array.from(deleted).map(getHashFromActualFileContents(headRef))),
|
|
99
94
|
]);
|
|
100
|
-
getInfoMarker?.stop();
|
|
101
95
|
return { addedInfo, deletedInfo };
|
|
102
96
|
};
|
|
103
97
|
const getHashForAddedFile = async (filepath) => {
|
|
@@ -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;AAC7C,OAAO,EACL,gBAAgB,EAGhB,oBAAoB,GACrB,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"moveDetection.js","sourceRoot":"","sources":["../../../../src/SDR-extra/shared/local/moveDetection.ts"],"names":[],"mappings":"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"}
|