sillsdev
diff --git a/‎.eslintrc.js‎
Lines changed: 33 additions & 6 deletions b/‎.eslintrc.js‎
Lines changed: 33 additions & 6 deletions
diff --git a/‎README.md‎
Lines changed: 24 additions & 23 deletions b/‎README.md‎
Lines changed: 24 additions & 23 deletions
diff --git a/‎lib/git.util.ts‎
Lines changed: 12 additions & 2 deletions b/‎lib/git.util.ts‎
Lines changed: 12 additions & 2 deletions
@@ -4,16 +4,22 @@ const path = require('path');
 
 module.exports = {
   extends: [
-    // https://github.com/electron-react-boilerplate/eslint-config-erb/blob/main/index.js
-    // airbnb rules are embedded in erb https://github.com/airbnb/javascript/tree/master/packages/eslint-config-airbnb
-    'erb',
+    // https://github.com/airbnb/javascript/tree/master/packages/eslint-config-airbnb
+    'airbnb',
+    'airbnb/hooks',
+    'plugin:promise/recommended',
+    'plugin:compat/recommended',
     // https://github.com/import-js/eslint-plugin-import?tab=readme-ov-file#typescript
     'plugin:import/recommended',
     'plugin:import/typescript',
     // Make sure this is last so it gets the chance to override other configs.
     // See https://github.com/prettier/eslint-config-prettier and https://github.com/prettier/eslint-plugin-prettier
     'plugin:prettier/recommended',
   ],
+  env: {
+    browser: true,
+    node: true,
+  },
 
   rules: {
     // Some rules in this following shared region are not applied since they are overridden in subsequent regions
@@ -30,6 +36,7 @@ module.exports = {
     'import/no-import-module-exports': 'off',
     'import/no-unresolved': 'error',
     'import/prefer-default-export': 'off',
+    'no-param-reassign': ['error', { props: false }],
     'react/jsx-filename-extension': 'off',
     'react/react-in-jsx-scope': 'off',
 
@@ -47,12 +54,32 @@ module.exports = {
     ],
     '@typescript-eslint/explicit-member-accessibility': ['error', { accessibility: 'no-public' }],
     'lines-between-class-members': 'off',
-    '@typescript-eslint/lines-between-class-members': [
+    '@stylistic/ts/lines-between-class-members': [
       'error',
       'always',
       { exceptAfterSingleLine: true, exceptAfterOverload: true },
     ],
     '@typescript-eslint/member-ordering': 'error',
+    '@typescript-eslint/naming-convention': [
+      'error',
+      {
+        selector: 'variableLike',
+        format: ['camelCase', 'PascalCase', 'UPPER_CASE'],
+        leadingUnderscore: 'allowSingleOrDouble',
+      },
+      {
+        selector: 'enumMember',
+        format: ['PascalCase'],
+      },
+      {
+        selector: 'function',
+        format: ['camelCase', 'PascalCase'],
+      },
+      {
+        selector: 'typeLike',
+        format: ['PascalCase'],
+      },
+    ],
     'no-empty-function': 'off',
     '@typescript-eslint/no-empty-function': [
       'error',
@@ -166,14 +193,14 @@ module.exports = {
       },
     },
   ],
+  parser: '@typescript-eslint/parser',
   parserOptions: {
     ecmaVersion: 2022,
     sourceType: 'module',
     project: './tsconfig.lint.json',
     tsconfigRootDir: __dirname,
-    createDefaultProgram: true,
   },
-  plugins: ['@typescript-eslint', 'jest', 'no-type-assertion', 'no-null'],
+  plugins: ['@typescript-eslint', '@stylistic/ts', 'jest', 'no-type-assertion', 'no-null'],
   settings: {
     'import/resolver': {
       typescript: {
 
@@ -160,39 +160,40 @@ These steps will walk you through releasing a version on GitHub and bumping the
 1. Make sure the versions in this repo are on the version number you want to release. If they are not, manually dispatch the [Bump Versions workflow](#bumping-version-without-publishing-a-release) or run the `bump-versions` npm script to set the versions to what you want to release on the branch you want to release from.
 
 2. Manually dispatch the Publish workflow in GitHub Actions targeting the branch you want to release from. This workflow creates a new pre-release for the version you intend to release and creates a new `bump-versions-<next_version>` branch to bump the version after the release so future changes apply to a new in-progress version instead of to the already released version. This workflow has the following inputs:
-   - `version`: Enter the version you intend to publish (e.g. 0.2.0). This is simply for verification to make sure you release the code that you intend to release. It is compared to the version in the code, and the workflow will fail if they do not match.
-   - `newVersionAfterPublishing`: Enter the version you want to bump to after releasing (e.g. 0.3.0-alpha.0). Future changes will apply to this new version instead of to the version that was already released. Leave blank if you don't want to bump.
-   - `bumpRef`: Enter the Git ref you want to create the bump versions branch from, e.g. `main`. Leave blank if you want to use the branch selected for the workflow run. For example, if you release from a stable branch named `release-prep`, you may want to bump the version on `main` so future development work happens on the new version, then you can rebase `release-prep` onto `main` when you are ready to start preparing the next stable release.
+
+- `version`: Enter the version you intend to publish (e.g. 0.2.0). This is simply for verification to make sure you release the code that you intend to release. It is compared to the version in the code, and the workflow will fail if they do not match.
+- `newVersionAfterPublishing`: Enter the version you want to bump to after releasing (e.g. 0.3.0-alpha.0). Future changes will apply to this new version instead of to the version that was already released. Leave blank if you don't want to bump.
+- `bumpRef`: Enter the Git ref you want to create the bump versions branch from, e.g. `main`. Leave blank if you want to use the branch selected for the workflow run. For example, if you release from a stable branch named `release-prep`, you may want to bump the version on `main` so future development work happens on the new version, then you can rebase `release-prep` onto `main` when you are ready to start preparing the next stable release.
 
     <details>
         <summary>[Optional] Create a new pre-release and bump versions branch manually </summary>
 
-   #### Manually create a new pre-release and bump versions branch
+  #### Manually create a new pre-release and bump versions branch
 
-   Alternatively, you can create a new pre-release manually:
+  Alternatively, you can create a new pre-release manually:
 
-   ```bash
-   npm run package
-   # Create a new pre-release in GitHub on tag `v<version>`
-   # Copy `.github/assets/release-body.md` into the release body
-   # Press the "Generate release notes" button in the release creation page to generate a changelog
-   # Attach contents of `release` folder to the release
-   ```
+  ```bash
+  npm run package
+  # Create a new pre-release in GitHub on tag `v<version>`
+  # Copy `.github/assets/release-body.md` into the release body
+  # Press the "Generate release notes" button in the release creation page to generate a changelog
+  # Attach contents of `release` folder to the release
+  ```
 
-   Then bump versions by running the following:
+  Then bump versions by running the following:
 
-   ```bash
-   npm run bump-versions <next_version>
-   ```
+  ```bash
+  npm run bump-versions <next_version>
+  ```
 
-   Or bump versions manually:
+  Or bump versions manually:
 
-   ```bash
-   git checkout -b bump-versions-<next_version>
-   npm version <next_version> --git-tag-version false
-   # Change version in the extension's `manifest.json`
-   git commit -a -m "Bumped versions to <next_version>"; git push -u origin HEAD
-   ```
+  ```bash
+  git checkout -b bump-versions-<next_version>
+  npm version <next_version> --git-tag-version false
+  # Change version in the extension's `manifest.json`
+  git commit -a -m "Bumped versions to <next_version>"; git push -u origin HEAD
+  ```
 
     </details>
 
 
@@ -2,8 +2,15 @@ import { exec, ExecException, ExecOptions } from 'child_process';
 import { promisify } from 'util';
 import path from 'path';
 
+// #region shared with https://github.com/paranext/paranext-multi-extension-template/blob/main/lib/git.util.ts
+
 const execAsync = promisify(exec);
 
+/** Absolute path to the repo root directory */
+const repoRoot = path.resolve(path.join(__dirname, '..'));
+
+// #endregion
+
 // #region shared with https://github.com/paranext/paranext-multi-extension-template/blob/main/lib/git.util.ts
 
 /**
@@ -23,12 +30,15 @@ export async function execCommand(
   if (!quiet) console.log(`\n>${execOptions.cwd ? ` cd ${execOptions.cwd};` : ''} ${command}`);
   try {
     const result = await execAsync(command, {
-      cwd: path.resolve(path.join(__dirname, '..')),
+      cwd: repoRoot,
       ...execOptions,
     });
     if (!quiet && result.stdout) console.log(result.stdout);
     if (!quiet && result.stderr) console.log(result.stderr);
-    return result;
+    return {
+      stdout: result.stdout.toString(),
+      stderr: result.stderr.toString(),
+    };
   } catch (error: unknown) {
     if (error instanceof Error) {
       // Use the more specific type for `exec`.