refactor: syntax errors TS would have caught

salesforcecli · Jun 23, 2021 · 7754983 · 7754983
1 parent 97c4678
commit 7754983
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/scripts/docker-publish-full.js b/scripts/docker-publish-full.js
@@ -18,7 +18,7 @@ const DOCKER_HUB_REPOSITORY = dockerShared.repo;
 
 (async () => {
   dockerShared.validateDockerEnv();
-  const SALESFORCE_CLI_VERSION = dockerShared.getCliVersion();
+  const SALESFORCE_CLI_VERSION = await dockerShared.getCliVersion();
 
   shell.exec(
     `docker build --file ./dockerfiles/Dockerfile_full --build-arg SALESFORCE_CLI_VERSION=${SALESFORCE_CLI_VERSION} --tag ${DOCKER_HUB_REPOSITORY}:${SALESFORCE_CLI_VERSION}-full --no-cache .`

diff --git a/scripts/docker-publish-slim.js b/scripts/docker-publish-slim.js
@@ -9,7 +9,6 @@
  */
 const shell = require('shelljs');
 const got = require('got');
-const fs = require('fs-extra');
 const dockerShared = require('./docker-shared');
 
 shell.set('-e');
@@ -43,7 +42,7 @@ const getDownloadUrl = async (version) => {
   dockerShared.validateDockerEnv();
 
   // If not in the env, read the package.json to get the version number we'll use for latest-rc
-  const SALESFORCE_CLI_VERSION = dockerShared.getCliVersion();
+  const SALESFORCE_CLI_VERSION = await dockerShared.getCliVersion();
   const CLI_DOWNLOAD_URL = await getDownloadUrl(SALESFORCE_CLI_VERSION);
 
   // build from local dockerfiles

diff --git a/scripts/docker-shared.js b/scripts/docker-shared.js
@@ -1,8 +1,10 @@
 const shell = require('shelljs');
+const fs = require('fs-extra');
+
 shell.set('-e');
 shell.set('+v');
 
-const getCliVersion = () => {
+const getCliVersion = async () => {
   // If not in the env, read the package.json to get the version number we'll use for latest-rc
   const SALESFORCE_CLI_VERSION = process.env['SALESFORCE_CLI_VERSION'] ?? (await fs.readJson('package.json')).version;
   if (!SALESFORCE_CLI_VERSION) {