fix: minor tweaks

Author: iowillhoit

.github/workflows/onPushToMain.yml

@@ -3,16 +3,15 @@ name: version, tag and github release
 
 on:
   push:
-    branches: [main]
+    branches:
+      - main
+      - prerelease/*
+    tags-ignore:
+      - '*'
 
 jobs:
   release:
     uses: salesforcecli/github-workflows/.github/workflows/githubRelease.yml@main
     secrets: inherit
-
-  # most repos won't use this
-  # depends on previous job to avoid git collisions, not for any functionality reason
-  # docs:
-  #   uses: salesforcecli/github-workflows/.github/workflows/publishTypedoc.yml@main
-  #   secrets: inherit
-  #   needs: release
+    with:
+      prerelease: ${{ github.ref_name != 'main' }}

.github/workflows/onRelease.yml

@@ -2,7 +2,7 @@ name: publish
 
 on:
   release:
-    types: [released]
+    types: [published]
   # support manual release in case something goes wrong and needs to be repeated or tested
   workflow_dispatch:
     inputs:
@@ -11,11 +11,22 @@ on:
         type: string
         required: true
 jobs:
+  getDistTag:
+    outputs:
+      tag: ${{ steps.distTag.outputs.tag }}
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          ref: ${{ github.event.release.tag_name || inputs.tag  }}
+      - uses: salesforcecli/github-workflows/.github/actions/getPreReleaseTag@main
+        id: distTag
   npm:
     uses: salesforcecli/github-workflows/.github/workflows/npmPublish.yml@main
+    needs: [getDistTag]
     with:
       ctc: true
       sign: true
-      tag: latest
+      tag: ${{ needs.getDistTag.outputs.tag || 'latest' }}
       githubTag: ${{ github.event.release.tag_name || inputs.tag }}
     secrets: inherit

LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2022, Salesforce.com, Inc.
+Copyright (c) 2023, Salesforce.com, Inc.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

README.md

@@ -13,8 +13,8 @@ This is an oclif plugin that supports the Salesforce Apex commands.
 Clone the project and `cd` into it:
 
 ```
-$ git clone [email protected]:forcedotcom/salesforcedx-apex.git
-$ cd salesforcedx-apex
+$ git clone [email protected]:salesforcecli/plugin-apex.git
+$ cd plugin-apex
 ```
 
 Ensure you have [Yarn](https://yarnpkg.com/) installed, then run:

package.json

@@ -58,20 +58,25 @@
     "/lib",
     "/messages",
     "/npm-shrinkwrap.json",
-    "/oclif.manifest.json",
-    "yarn.lock"
+    "/oclif.manifest.json"
   ],
-  "homepage": "https://github.com/forcedotcom/salesforcedx-apex",
+  "homepage": "https://github.com/salesforcecli/plugin-apex",
   "keywords": [
     "force",
     "salesforce",
     "sfdx",
     "sfdx-plugin",
-    "apex"
+    "sf-plugin",
+    "apex",
+    "sf"
   ],
   "license": "BSD-3-Clause",
   "oclif": {
     "commands": "./lib/commands",
+    "additionalHelpFlags": [
+      "-h"
+    ],
+    "bin": "sfdx",
     "topics": {
       "force": {
         "external": true,
@@ -85,19 +90,12 @@
               },
               "test": {
                 "description": "run Apex tests and retrieve test reports"
-              },
-              "class": {
-                "external": true
-              },
-              "trigger": {
-                "external": true
               }
             }
           }
         }
       }
     },
-    "bin": "sfdx",
     "devPlugins": [
       "@oclif/plugin-help",
       "@oclif/plugin-command-snapshot",

tsconfig.json

@@ -1,5 +1,5 @@
 {
-  "extends": "./node_modules/@salesforce/dev-config/tsconfig",
+  "extends": "@salesforce/dev-config/tsconfig",
   "compilerOptions": {
     "module": "commonjs",
     "target": "es6",
@@ -17,5 +17,5 @@
     // from the tslib dependency, making our code more efficient
     "importHelpers": true
   },
-  "include": ["./src/**/*"]
+  "include": ["./src/**/*.ts"]
 }