@jayree/sfdx-plugin-manifest 3.7.16 → 3.7.17

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 (9) hide show
  1. package/CHANGELOG.md +11 -0
  2. package/README.md +3 -3
  3. package/lib/commands/jayree/manifest/generate.js +1 -3
  4. package/lib/commands/jayree/manifest/generate.js.map +1 -1
  5. package/lib/tsconfig.tsbuildinfo +1 -1
  6. package/npm-shrinkwrap.json +407 -420
  7. package/oclif.lock +126 -278
  8. package/oclif.manifest.json +1 -1
  9. package/package.json +5 -5
package/CHANGELOG.md CHANGED
@@ -1,3 +1,14 @@
1
+ ## [3.7.17](https://github.com/jayree/sfdx-plugin-manifest/compare/3.7.16...3.7.17) (2025-04-23)
2
+
3
+
4
+ ### Bug Fixes
5
+
6
+ * **deps:** bump fast-xml-parser from 5.2.0 to 5.2.1 ([#1754](https://github.com/jayree/sfdx-plugin-manifest/issues/1754)) ([a85c342](https://github.com/jayree/sfdx-plugin-manifest/commit/a85c342620d0690883afd63169723cb78212649d))
7
+ * fix: read DOCTYPE entity value correctly
8
+ * read DOCTYPE NOTATION, ELEMENT exp but not using read values
9
+
10
+
11
+
1
12
  ## [3.7.16](https://github.com/jayree/sfdx-plugin-manifest/compare/3.7.15...3.7.16) (2025-04-18)
2
13
 
3
14
 
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/3.7.16/src/commands/jayree/manifest/cleanup.ts)_
115
+ _See code: [src/commands/jayree/manifest/cleanup.ts](https://github.com/jayree/sfdx-plugin-manifest/blob/3.7.17/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/3.7.16/src/commands/jayree/manifest/generate.ts)_
153
+ _See code: [src/commands/jayree/manifest/generate.ts](https://github.com/jayree/sfdx-plugin-manifest/blob/3.7.17/src/commands/jayree/manifest/generate.ts)_
154
154
 
155
155
  ### `sf jayree manifest git diff REF1 [REF2]`
156
156
 
@@ -233,7 +233,7 @@ FLAG DESCRIPTIONS
233
233
  Use this flag to create a 'destructiveChanges.xml' and a blank 'package.xml'.
234
234
  ```
235
235
 
236
- _See code: [src/commands/jayree/manifest/git/diff.ts](https://github.com/jayree/sfdx-plugin-manifest/blob/3.7.16/src/commands/jayree/manifest/git/diff.ts)_
236
+ _See code: [src/commands/jayree/manifest/git/diff.ts](https://github.com/jayree/sfdx-plugin-manifest/blob/3.7.17/src/commands/jayree/manifest/git/diff.ts)_
237
237
  <!-- commandsstop -->
238
238
 
239
239
  ## Performance Testing
package/lib/commands/jayree/manifest/generate.js CHANGED
@@ -146,9 +146,7 @@ export default class GeneratePackageXML extends SfCommand {
146
146
  async listMembers(query, apiVersion) {
147
147
  let members;
148
148
  try {
149
- if (!apiVersion) {
150
- apiVersion = this.conn.getApiVersion();
151
- }
149
+ apiVersion ??= this.conn.getApiVersion();
152
150
  members = ensureArray((await this.conn.metadata.list(query, apiVersion)));
153
151
  }
154
152
  catch (error) {
package/lib/commands/jayree/manifest/generate.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"generate.js","sourceRoot":"","sources":["../../../../src/commands/jayree/manifest/generate.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"generate.js","sourceRoot":"","sources":["../../../../src/commands/jayree/manifest/generate.ts"],"names":[],"mappings":"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"}