Skip to content

Commit

Permalink
Merge pull request #483 from forcedotcom/sm/source-api-version-on-cha…
Browse files Browse the repository at this point in the history 
…nges-retrieve

fix: stl uses project api version
  • Loading branch information
@shetzel
shetzel authored Oct 3, 2023
2 parents 6c9296a + 3fe585f commit 2ed9b52
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 32 deletions.
8 changes: 4 additions & 4 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,17 +46,17 @@
"node": ">=16.0.0"
},
"dependencies": {
"@salesforce/core": "^5.3.1",
"@salesforce/kit": "^3.0.12",
"@salesforce/source-deploy-retrieve": "^9.7.18",
"@salesforce/core": "^5.3.3",
"@salesforce/kit": "^3.0.13",
"@salesforce/source-deploy-retrieve": "^9.7.20",
"@salesforce/ts-types": "^2.0.8",
"fast-xml-parser": "^4.2.5",
"graceful-fs": "^4.2.11",
"isomorphic-git": "1.23.0",
"ts-retry-promise": "^0.7.0"
},
"devDependencies": {
"@salesforce/cli-plugins-testkit": "^4.4.2",
"@salesforce/cli-plugins-testkit": "^4.4.5",
"@salesforce/dev-config": "^4.0.1",
"@salesforce/dev-scripts": "^5.10.0",
"@salesforce/prettier-config": "^0.0.3",
Expand Down
8 changes: 7 additions & 1 deletion src/sourceTracking.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ export class SourceTracking extends AsyncCreatable {
if (applyIgnore) {
this.forceIgnore ??= ForceIgnore.findAndCreate(this.project.getDefaultPackage().path);
}
const [changeResults, sourceBackedComponents] = await Promise.all([
const [changeResults, sourceBackedComponents, projectConfig] = await Promise.all([
// all changes based on remote tracking
this.getChanges({
origin: 'remote',
Expand All @@ -167,6 +167,9 @@ export class SourceTracking extends AsyncCreatable {
state: 'nondelete',
format: 'SourceComponent',
}),
this.project.resolveProjectConfig() as {
sourceApiVersion?: string;
},
]);
const componentSet = new ComponentSet(
applyIgnore
Expand All @@ -181,6 +184,9 @@ export class SourceTracking extends AsyncCreatable {
componentSet.add(mm);
});

if (projectConfig.sourceApiVersion) {
componentSet.sourceApiVersion = projectConfig.sourceApiVersion;
}
return componentSet;
}
/**
Expand Down
54 changes: 27 additions & 27 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -535,29 +535,29 @@
"@nodelib/fs.scandir" "2.1.5"
fastq "^1.6.0"

"@salesforce/cli-plugins-testkit@^4.4.2":
version "4.4.2"
resolved "https://registry.yarnpkg.com/@salesforce/cli-plugins-testkit/-/cli-plugins-testkit-4.4.2.tgz#5b3a70906a032698303c220d768dec3608cfff9d"
integrity sha512-1KRhBKAT+3aAChlhvFenmfgsrhphpA9bzvg/J/gAB3O113iwLCuH5ipzo1SU+fR3wWogIPubOWX0U7JNoHDkIw==
"@salesforce/cli-plugins-testkit@^4.4.5":
version "4.4.5"
resolved "https://registry.yarnpkg.com/@salesforce/cli-plugins-testkit/-/cli-plugins-testkit-4.4.5.tgz#ffd8724fc1110c97e9511cc3fb19a3189f41b667"
integrity sha512-98ucjuEnwdaQiDci3X9c24ASdsaRajZefmXVYvHF6QIIb4Bav3SZVMngo11mQhcmPLyzbJWfT94aImmg1ch82A==
dependencies:
"@salesforce/core" "^5.2.10"
"@salesforce/kit" "^3.0.11"
"@salesforce/core" "^5.3.1"
"@salesforce/kit" "^3.0.12"
"@salesforce/ts-types" "^2.0.6"
"@types/shelljs" "^0.8.12"
"@types/shelljs" "^0.8.13"
debug "^4.3.1"
jszip "^3.10.1"
shelljs "^0.8.4"
strip-ansi "6.0.1"
ts-retry-promise "^0.7.1"

"@salesforce/core@^5.2.10", "@salesforce/core@^5.2.7", "@salesforce/core@^5.3.1":
version "5.3.1"
resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-5.3.1.tgz#93c49760faa7b503bbfea8376d80a66815065e4a"
integrity sha512-LEQ3Yp7GxexsGXxT85Pp4AgOzzqY9Y3kol8ByVsHpHGvs8XLRbKl44IPxTXBdMB2roFM+Iosd46i0KbTuh2MQg==
"@salesforce/core@^5.2.7", "@salesforce/core@^5.3.1", "@salesforce/core@^5.3.3":
version "5.3.3"
resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-5.3.3.tgz#394c50cd9007591b5858c33f08fc6f7a18c9abfb"
integrity sha512-MRp4RpF4cf6eXPuXaRfrjqZYoesh/EvuTrxGd7d3D/XVMlxO5HiuNqpUvAXa5fN3Co8gxVvw7Uj2AYERHxnXYQ==
dependencies:
"@salesforce/kit" "^3.0.11"
"@salesforce/kit" "^3.0.12"
"@salesforce/schemas" "^1.6.0"
"@salesforce/ts-types" "^2.0.7"
"@salesforce/ts-types" "^2.0.8"
"@types/semver" "^7.5.2"
ajv "^8.12.0"
change-case "^4.1.2"
Expand Down Expand Up @@ -618,12 +618,12 @@
typescript "^4.9.5"
wireit "^0.9.5"

"@salesforce/kit@^3.0.11", "@salesforce/kit@^3.0.12":
version "3.0.12"
resolved "https://registry.yarnpkg.com/@salesforce/kit/-/kit-3.0.12.tgz#8d598813fd3dce9545951186cfa579bafaac374a"
integrity sha512-+2bjUaIbS1/XrYBYxpS5zKyQER8dgVakIL6X/MxZVZFJaLHithkLXvrUKYd5tZEaijxBZq1ooIkGm2yCLrg8Ew==
"@salesforce/kit@^3.0.11", "@salesforce/kit@^3.0.12", "@salesforce/kit@^3.0.13":
version "3.0.13"
resolved "https://registry.yarnpkg.com/@salesforce/kit/-/kit-3.0.13.tgz#10b47ad6e0e27c3a9f97eb6a5cdcfffa9ba1f163"
integrity sha512-HLQ5L5bBi0tsMeH5ZHJAhHUpvNUNPQoNJt2O82Jf6C60GGsrlzwzQ5ONAHGNBgKSZ7HLr0UGL5xaA+hE9uOcgw==
dependencies:
"@salesforce/ts-types" "^2.0.7"
"@salesforce/ts-types" "^2.0.8"
tslib "^2.6.2"

"@salesforce/prettier-config@^0.0.3":
Expand All @@ -636,12 +636,12 @@
resolved "https://registry.yarnpkg.com/@salesforce/schemas/-/schemas-1.6.0.tgz#14505ebad2fb2d4f7b14837545d662766d293561"
integrity sha512-SwhDTLucj/GRbPpxlEoDZeqlX22o+G6fiebTXTu1cZKmd1oE0W2L7SlTTgJnWck8bhTeBIgQi9cpD8c2t5ISKA==

"@salesforce/source-deploy-retrieve@^9.7.18":
version "9.7.18"
resolved "https://registry.yarnpkg.com/@salesforce/source-deploy-retrieve/-/source-deploy-retrieve-9.7.18.tgz#38b1577eec7ae08c3ed627c7a38f59c87632b01d"
integrity sha512-kdnX8P/cjUwgKnDF60kXlvm4zwP2xXpFqEB3KniSrvuvbzXKrPbaa05cJvHVnTohAcYTNPHiM+LNkTgZuENNmA==
"@salesforce/source-deploy-retrieve@^9.7.20":
version "9.7.20"
resolved "https://registry.yarnpkg.com/@salesforce/source-deploy-retrieve/-/source-deploy-retrieve-9.7.20.tgz#0ab4e1bd87677fe836ef4dd7765926c4379bf3c8"
integrity sha512-wp9sNJbSkxTbwiHiToPFAAkZOestV61YHL/d4qNQsueEU54/zcKMTCgegp8JH7hVwkxO1EkpvfY2W9o0IDMgQA==
dependencies:
"@salesforce/core" "^5.2.10"
"@salesforce/core" "^5.3.1"
"@salesforce/kit" "^3.0.11"
"@salesforce/ts-types" "^2.0.7"
fast-levenshtein "^3.0.0"
Expand Down Expand Up @@ -909,10 +909,10 @@
resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.2.tgz#31f6eec1ed7ec23f4f05608d3a2d381df041f564"
integrity sha512-7aqorHYgdNO4DM36stTiGO3DvKoex9TQRwsJU6vMaFGyqpBA1MNZkz+PG3gaNUPpTAOYhT1WR7M1JyA3fbS9Cw==

"@types/shelljs@^0.8.11", "@types/shelljs@^0.8.12":
version "0.8.12"
resolved "https://registry.yarnpkg.com/@types/shelljs/-/shelljs-0.8.12.tgz#79dc9632af7d5ca1b5afb65a6bfc1422d79b5fa0"
integrity sha512-ZA8U81/gldY+rR5zl/7HSHrG2KDfEb3lzG6uCUDhW1DTQE9yC/VBQ45fXnXq8f3CgInfhZmjtdu/WOUlrXRQUg==
"@types/shelljs@^0.8.11", "@types/shelljs@^0.8.13":
version "0.8.13"
resolved "https://registry.yarnpkg.com/@types/shelljs/-/shelljs-0.8.13.tgz#a94bf7f2b82b7cd9f4496bbe063c3adb0868a650"
integrity sha512-++uMLOQSLlse1kCfEOwhgmHuaABZwinkylmUKCpvcEGZUov3TtM+gJZloSkW/W+9pEAEg/VBOwiSR05oqJsa5A==
dependencies:
"@types/glob" "~7.2.0"
"@types/node" "*"
Expand Down

0 comments on commit 2ed9b52

Please sign in to comment.