fix: lint undefined template literals

* chore: updates from devScripts * fix: lint undefined template literals --------- Co-authored-by: mshanemc <[email protected]>
salesforcecli · Jul 30, 2024 · 150b2b7 · 150b2b7
1 parent 21938ed
commit 150b2b7
Show file tree

Hide file tree

Showing 6 changed files with 258 additions and 458 deletions.
diff --git a/package.json b/package.json
@@ -34,7 +34,7 @@
   },
   "devDependencies": {
     "@oclif/plugin-command-snapshot": "^5.2.7",
-    "@salesforce/dev-scripts": "^10.2.2",
+    "@salesforce/dev-scripts": "^10.2.4",
     "@salesforce/ts-sinon": "^1.4.22",
     "@types/semver": "^7.5.8",
     "@types/shelljs": "^0.8.15",

diff --git a/src/amazonS3.ts b/src/amazonS3.ts
@@ -29,7 +29,7 @@ type GetObjectOption = Omit<GetObjectRequest, 'Bucket'>;
 
 type AmazonS3Options = {
   bucket?: string;
-  cli?: CLI;
+  cli: CLI;
   channel?: Channel;
   baseUrl?: string;
   credentials?: CredentialsOptions;

diff --git a/src/commands/cli/release/build.ts b/src/commands/cli/release/build.ts
@@ -298,8 +298,8 @@ export default class build extends SfCommand<void> {
     const email = await this.exec('git config user.email', true);
     if (!username || !email) {
       const user = await octokit.request('GET /user');
-      if (!username) await this.exec(`git config user.name "${user.data.name}"`);
-      if (!email) await this.exec(`git config user.email "${user.data.email}"`);
+      if (!username && user.data.name) await this.exec(`git config user.name "${user.data.name}"`);
+      if (!email && user.data.email) await this.exec(`git config user.email "${user.data.email}"`);
     }
   }
 }
diff --git a/src/commands/cli/releasenotes.ts b/src/commands/cli/releasenotes.ts
@@ -81,14 +81,14 @@ export default class ReleaseNotes extends SfCommand<ChangesByPlugin> {
     if (differences.upgraded.size) {
       this.styledHeader('Upgraded Plugins');
       for (const [plugin, version] of differences.upgraded.entries()) {
-        this.log(`• ${plugin} ${oldPlugins.get(plugin)} => ${version}`);
+        this.log(`• ${plugin} ${oldPlugins.get(plugin) ?? '<no match in old plugins>'} => ${version}`);
       }
     }
 
     if (differences.downgraded.size) {
       this.styledHeader('Downgraded Plugins');
       for (const [plugin, version] of differences.downgraded.entries()) {
-        this.log(`• ${plugin} ${oldPlugins.get(plugin)} => ${version}`);
+        this.log(`• ${plugin} ${oldPlugins.get(plugin) ?? '<no match in old plugins>'} => ${version}`);
       }
     }
 
@@ -155,10 +155,9 @@ export default class ReleaseNotes extends SfCommand<ChangesByPlugin> {
           (pr) => pr.merged_at && (!publishDate || pr.merged_at > publishDate) && !pr.user?.login.includes('dependabot')
         )
         .map(async (pr) => {
-          const username = await this.getNameOfUser(
-            ensureString(pr.user?.login, `No user.login property found for ${JSON.stringify(pr)}`)
-          );
-          const author = pr.user?.login === username ? username : `${username} (${pr.user?.login})`;
+          const prUserLogin = ensureString(pr.user?.login, `No user.login property found for ${JSON.stringify(pr)}`);
+          const username = await this.getNameOfUser(prUserLogin);
+          const author = pr.user?.login === username ? username : `${username} (${prUserLogin})`;
           return {
             author,
             mergedAt: pr.merged_at,

diff --git a/src/registry.ts b/src/registry.ts
@@ -31,6 +31,9 @@ export class Registry {
    * Return a properly formatted --registry string
    */
   public getRegistryParameter(): string {
+    if (!this.registryUrl) {
+      throw new SfError('registry is not set');
+    }
     return `--registry ${this.registryUrl}`;
   }
 
@@ -47,12 +50,12 @@ export class Registry {
         npmrc = npmrc.map((line) => {
           if (line.includes('registry=')) {
             if (this.registryUrl && line.endsWith(this.registryUrl)) return line;
-            return `registry=${this.registryUrl}`;
+            return `registry=${this.registryUrl ?? ''}`;
           }
           return line;
         });
       } else {
-        npmrc.push(`registry=${this.registryUrl}`);
+        npmrc.push(`registry=${this.registryUrl ?? ''}`);
       }
       await this.writeNpmrc(packageDirectory, npmrc);
     }
@@ -75,7 +78,7 @@ export class Registry {
       npmrc = npmrc.map((line) => {
         if (line.includes('_authToken')) {
           if (line.includes(normalizedRegistry)) return line;
-          return `${normalizedRegistry}:_authToken="${this.authToken}"`;
+          return `${normalizedRegistry}:_authToken="${this.authToken ?? ''}"`;
         }
         return line;
       });