@salesforce/source-deploy-retrieve 12.14.3 → 12.14.5
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.
|
@@ -129,9 +129,15 @@ function getMergeConfigOutputs(output, targetFormatIsSource, registry) {
|
|
|
129
129
|
}
|
|
130
130
|
const defaultDirectory = output.defaultDirectory;
|
|
131
131
|
const mergeSet = new componentSet_1.ComponentSet(undefined, registry);
|
|
132
|
-
// since child components are composed in metadata format, we need to merge using the parent
|
|
133
132
|
for (const component of output.mergeWith) {
|
|
134
|
-
|
|
133
|
+
if (component.type.strategies?.adapter === 'digitalExperience' && !component.parent?.content) {
|
|
134
|
+
// DE is addressable without its parent (DEB)
|
|
135
|
+
mergeSet.add(component);
|
|
136
|
+
}
|
|
137
|
+
else {
|
|
138
|
+
// since child components are composed in metadata format, we need to merge using the parent
|
|
139
|
+
mergeSet.add(component.parent ?? component);
|
|
140
|
+
}
|
|
135
141
|
}
|
|
136
142
|
const writer = new streams_1.StandardWriter(output.defaultDirectory);
|
|
137
143
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metadataConverter.js","sourceRoot":"","sources":["../../../src/convert/metadataConverter.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"metadataConverter.js","sourceRoot":"","sources":["../../../src/convert/metadataConverter.ts"],"names":[],"mappings":"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"}
|
|
@@ -51,8 +51,14 @@ const getWriteInfos = (component, targetFormat, mergeWith) => component
|
|
|
51
51
|
const getContentSourceDestination = (source, targetFormat, component, mergeWith) => {
|
|
52
52
|
if (mergeWith?.content) {
|
|
53
53
|
if (component.content && component.tree.isDirectory(component.content)) {
|
|
54
|
-
|
|
55
|
-
|
|
54
|
+
// DEs are always inside a dir.
|
|
55
|
+
if (component.type.strategies?.adapter === 'digitalExperience') {
|
|
56
|
+
return (0, node_path_1.join)(mergeWith.content, (0, node_path_1.basename)(source));
|
|
57
|
+
}
|
|
58
|
+
else {
|
|
59
|
+
const relative = (0, path_1.trimUntil)(source, (0, node_path_1.basename)(component.content));
|
|
60
|
+
return (0, node_path_1.join)((0, node_path_1.dirname)(mergeWith.content), relative);
|
|
61
|
+
}
|
|
56
62
|
}
|
|
57
63
|
return mergeWith.content;
|
|
58
64
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"defaultMetadataTransformer.js","sourceRoot":"","sources":["../../../../src/convert/transformers/defaultMetadataTransformer.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,yCAAoD;AACpD,wDAAqD;AACrD,0DAAuD;AAEvD,sDAAyD;AAGzD,2CAAsD;AACtD,kDAAkE;AAClE,uEAAoE;AAEpE,MAAM,qBAAqB,GAAG,IAAI,MAAM,CAAC,iBAAiB,GAAG,2BAAe,GAAG,IAAI,CAAC,CAAC;AAErF;;;;;;GAMG;AACH,MAAa,0BAA2B,SAAQ,iDAAuB;IACrE,oFAAoF;IAC7E,KAAK,CAAC,gBAAgB,CAAC,SAA0B;QACtD,OAAO,aAAa,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;IAC9C,CAAC;IAED,oFAAoF;IAC7E,KAAK,CAAC,cAAc,CAAC,EAC1B,SAAS,EACT,SAAS,GAIV;QACC,OAAO,aAAa,CAAC,SAAS,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;IACvD,CAAC;CACF;AAhBD,gEAgBC;AAED,MAAM,aAAa,GAAG,CACpB,SAA0B,EAC1B,YAA4B,EAC5B,SAA2B,EACd,EAAE,CACf,SAAS;KACN,WAAW,EAAE;KACb,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IACd,MAAM,EAAE,IAAA,8CAA+B,EAAC,SAAS,EAAE,IAAI,CAAC;IACxD,MAAM,EAAE,2BAA2B,CAAC,IAAI,EAAE,YAAY,EAAE,SAAS,EAAE,SAAS,CAAC;CAC9E,CAAC,CAAC;KACF,MAAM,CACL,SAAS,CAAC,GAAG;IACX,CAAC,CAAC;QACE;YACE,MAAM,EAAE,IAAA,8CAA+B,EAAC,SAAS,EAAE,SAAS,CAAC,GAAG,CAAC;YACjE,MAAM,EAAE,iBAAiB,CAAC,YAAY,EAAE,SAAS,EAAE,SAAS,CAAC;SAC9D;KACF;IACH,CAAC,CAAC,EAAE,CACP,CAAC;AAEN,gCAAgC;AAChC,MAAM,2BAA2B,GAAG,CAClC,MAAkB,EAClB,YAA4B,EAC5B,SAA0B,EAC1B,SAA2B,EACf,EAAE;IACd,IAAI,SAAS,EAAE,OAAO,EAAE,CAAC;QACvB,IAAI,SAAS,CAAC,OAAO,IAAI,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC;YACvE,MAAM,QAAQ,GAAG,IAAA,gBAAS,EAAC,MAAM,EAAE,IAAA,oBAAQ,EAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"defaultMetadataTransformer.js","sourceRoot":"","sources":["../../../../src/convert/transformers/defaultMetadataTransformer.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED