@salesforce/source-deploy-retrieve 12.19.3 → 12.19.4

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.
@@ -1,4 +1,7 @@
1
1
  "use strict";
2
+ var __importDefault = (this && this.__importDefault) || function (mod) {
3
+ return (mod && mod.__esModule) ? mod : { "default": mod };
4
+ };
2
5
  Object.defineProperty(exports, "__esModule", { value: true });
3
6
  exports.DefaultMetadataTransformer = void 0;
4
7
  /*
@@ -8,6 +11,8 @@ exports.DefaultMetadataTransformer = void 0;
8
11
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
9
12
  */
10
13
  const node_path_1 = require("node:path");
14
+ const node_fs_1 = __importDefault(require("node:fs"));
15
+ const node_path_2 = require("node:path");
11
16
  const messages_1 = require("@salesforce/core/messages");
12
17
  const lifecycle_1 = require("@salesforce/core/lifecycle");
13
18
  const constants_1 = require("../../common/constants");
@@ -53,7 +58,18 @@ const getContentSourceDestination = (source, targetFormat, component, mergeWith)
53
58
  if (component.content && component.tree.isDirectory(component.content)) {
54
59
  // DEs are always inside a dir.
55
60
  if (component.type.strategies?.adapter === 'digitalExperience') {
56
- return (0, node_path_1.join)(mergeWith.content, (0, node_path_1.basename)(source));
61
+ const parts = source.split(node_path_2.sep);
62
+ const file = parts.pop() ?? '';
63
+ const dir = (0, node_path_1.join)(mergeWith.content, parts.pop() ?? '');
64
+ if (source.endsWith('content.json') ||
65
+ source.endsWith('_meta.json') ||
66
+ !(node_fs_1.default.existsSync(dir) && node_fs_1.default.statSync(dir).isDirectory())) {
67
+ return (0, node_path_1.join)(mergeWith.content, (0, node_path_1.basename)(source));
68
+ }
69
+ else {
70
+ // if a directory exists with the same name as source, merge into there
71
+ return (0, node_path_1.join)(dir, file);
72
+ }
57
73
  }
58
74
  else {
59
75
  const relative = (0, path_1.trimUntil)(source, (0, node_path_1.basename)(component.content));
@@ -1 +1 @@
1
- {"version":3,"file":"defaultMetadataTransformer.js","sourceRoot":"","sources":["../../../../src/convert/transformers/defaultMetadataTransformer.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"defaultMetadataTransformer.js","sourceRoot":"","sources":["../../../../src/convert/transformers/defaultMetadataTransformer.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@salesforce/source-deploy-retrieve",
3
- "version": "12.19.3",
3
+ "version": "12.19.4",
4
4
  "description": "JavaScript library to run Salesforce metadata deploys and retrieves",
5
5
  "main": "lib/src/index.js",
6
6
  "author": "Salesforce",
@@ -51,8 +51,8 @@
51
51
  "@types/mime": "2.0.3",
52
52
  "@types/minimatch": "^5.1.2",
53
53
  "deep-equal-in-any-order": "^1.1.19",
54
- "esbuild": "^0.24.2",
55
- "eslint-plugin-sf-plugin": "^1.20.18",
54
+ "esbuild": "^0.25.3",
55
+ "eslint-plugin-sf-plugin": "^1.20.22",
56
56
  "mocha-junit-reporter": "^1.23.3",
57
57
  "mocha-snap": "^5.0.0",
58
58
  "ts-morph": "^24.0.0",