Merge pull request #33 from ubiquity-os-marketplace/development

Merge development into main

.cspell.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://raw.githubusercontent.com/streetsidesoftware/cspell/main/cspell.schema.json",
   "version": "0.2",
-  "ignorePaths": ["**/*.json", "**/*.css", "node_modules", "**/*.log", "./src/adapters/supabase/**/**.ts", "eslint.config.mjs"],
+  "ignorePaths": ["**/*.json", "**/*.css", "node_modules", "**/*.log", "./src/adapters/supabase/**/**.ts", "eslint.config.mjs", "dist"],
   "useGitignore": true,
   "language": "en",
   "words": ["Nektos", "dataurl", "devpool", "outdir", "servedir", "Supabase", "SUPABASE", "typebox", "ubiquibot", "Smee", "typeorm", "timespan", "mswjs"],

.github/knip.ts

@@ -1,12 +1,12 @@
 import type { KnipConfig } from "knip";
 
 const config: KnipConfig = {
-  entry: ["build/index.ts"],
+  entry: ["src/action.ts"],
   project: ["src/**/*.ts"],
   ignore: ["src/types/config.ts", "**/__mocks__/**", "**/__fixtures__/**"],
   ignoreExportsUsedInFile: true,
   // eslint can also be safely ignored as per the docs: https://knip.dev/guides/handling-issues#eslint--jest
-  ignoreDependencies: ["eslint-config-prettier", "eslint-plugin-prettier"],
+  ignoreDependencies: ["eslint-config-prettier", "eslint-plugin-prettier", "ts-node"],
   eslint: true,
 };
 

.github/workflows/compute.yml

@@ -17,28 +17,25 @@ on:
         description: "Ref"
       signature:
         description: "The kernel signature"
+      command:
+        description: "Command"
 
 jobs:
   compute:
     name: "Automated Merging"
     runs-on: ubuntu-latest
     permissions: write-all
+    environment: ${{ github.ref == 'refs/heads/main' && 'main' || 'development' }}
 
     steps:
       - uses: actions/checkout@v4
 
-      - name: Setup node
-        uses: actions/setup-node@v4
-        with:
-          node-version: "20.10.0"
-
-      - name: Install dependencies
-        run: yarn install --immutable --immutable-cache --check-cache
-
       - run: ${{ toJSON(inputs) }}
         shell: cat {0}
 
       - name: Execute directive
         uses: ./
         env:
+          KERNEL_PUBLIC_KEY: ${{ secrets.KERNEL_PUBLIC_KEY }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          PLUGIN_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/conventional-commits.yml

@@ -8,5 +8,5 @@ jobs:
     name: Conventional Commits
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ubiquity/action-conventional-commits@master

.github/workflows/formatting-checks.yml

@@ -0,0 +1,28 @@
+name: Formatting Check
+
+on:
+  push:
+
+jobs:
+  format-check:
+    name: Check for formatting errors
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup Bun
+        uses: oven-sh/setup-bun@v2
+
+      - name: Install toolchain
+        run: bun install --frozen-lockfile
+
+      - name: Eslint
+        run: bun run eslint --fix-dry-run
+
+      - name: Cspell
+        run: bun run format:cspell
+
+      - name: Prettier
+        run: bun run prettier --check .

.github/workflows/jest-testing.yml

@@ -11,16 +11,14 @@ jobs:
     permissions: write-all
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/setup-node@v4
-        with:
-          node-version: "20.10.0"
+      - uses: oven-sh/setup-bun@v2
 
       - uses: actions/checkout@master
         with:
           fetch-depth: 0
 
       - name: Jest With Coverage
-        run: yarn install --immutable --immutable-cache --check-cache && yarn test
+        run: bun install --frozen-lockfile && bun run test
 
       - name: Add Jest Report to Summary
         if: always()

.github/workflows/knip.yml

@@ -11,19 +11,16 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Setup Node
-        uses: actions/setup-node@v4
-        with:
-          node-version: 20.10.0
+      - uses: oven-sh/setup-bun@v2
 
       - name: Install toolchain
-        run: yarn install
+        run: bun install --frozen-lockfile
 
       - name: Store PR number
         run: echo ${{ github.event.number }} > pr-number.txt
 
       - name: Run Knip
-        run: yarn knip || yarn knip --reporter json > knip-results.json
+        run: bun run knip || bun run knip --reporter json > knip-results.json
 
       - name: Upload knip result
         if: failure()

.github/workflows/update-configuration.yml

@@ -1,58 +1,21 @@
-name: "Update Configuration"
+name: "Update Configuration and Build"
 
 on:
   workflow_dispatch:
   push:
 
 jobs:
   update:
-    name: "Update Configuration in manifest.json"
+    name: "Update Configuration & Build"
     runs-on: ubuntu-latest
     permissions: write-all
 
     steps:
-      - uses: actions/checkout@v4
-
-      - name: Setup node
-        uses: actions/setup-node@v4
+      - uses: ubiquity-os/action-deploy-plugin@main
         with:
-          node-version: "20.10.0"
-
-      - name: Install deps and run configuration update
-        run: |
-          yarn install --immutable --immutable-cache --check-cache
-          yarn tsc --noCheck --project tsconfig.json
-
-      - name: Update manifest configuration using GitHub Script
-        uses: actions/github-script@v7
-        with:
-          script: |
-            const fs = require('fs');
-            const path = require('path');
-
-            const { pluginSettingsSchema } = require('./src/types');
-
-            const manifestPath = path.resolve("${{ github.workspace }}", './manifest.json');
-            const manifest = JSON.parse(fs.readFileSync(manifestPath, 'utf8'));
-
-            const configuration = JSON.stringify(pluginSettingsSchema);
-
-            manifest["configuration"] = JSON.parse(configuration);
-
-            const updatedManifest = JSON.stringify(manifest, null, 2)
-            console.log('Updated manifest:', updatedManifest);
-            fs.writeFileSync(manifestPath, updatedManifest);
-
-      - name: Commit and Push generated types
-        run: |
-          git config --global user.name 'ubiquity-os[bot]'
-          git config --global user.email 'ubiquity-os[bot]@users.noreply.github.com'
-          git add ./manifest.json
-          if [ -n "$(git diff-index --cached --name-only HEAD)" ]; then
-            git commit -m "chore: updated generated configuration" || echo "Lint-staged check failed"
-            git push origin HEAD:${{ github.ref_name }}
-          else
-            echo "No changes to commit"
-          fi
+          treatAsEsm: true
+          sourcemap: false
+          pluginEntry: "${{ github.workspace }}/src/action.ts"
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          APP_ID: ${{ secrets.APP_ID }}
+          APP_PRIVATE_KEY: ${{ secrets.APP_PRIVATE_KEY }}

.husky/commit-msg

@@ -1,4 +1,4 @@
 #!/usr/bin/env sh
 . "$(dirname -- "$0")/_/husky.sh"
 
-yarn commitlint --edit "$1"
+bun commitlint --edit "$1"

.husky/pre-commit

@@ -1,4 +1,4 @@
 #!/usr/bin/env sh
 . "$(dirname -- "$0")/_/husky.sh"
 
-yarn lint-staged
+bun lint-staged

.prettierignore

@@ -0,0 +1,2 @@
+dist/
+coverage/

README.md

@@ -17,7 +17,7 @@ on the association of the pull-request author.
     mergeTimeout:
       collaborator: "3.5 days" # defaults to 3.5 days
       contributor: "7 days" # defaults to 7 days
-    repos: 
+    repos:
       monitor: ["ubiquibot/automated-merging"]
       ignore: ["ubiquibot/automated-merging"]
     allowedReviewerRoles: ["COLLABORATOR", "MEMBER", "OWNER"]
@@ -26,5 +26,5 @@ on the association of the pull-request author.
 ## Testing
 
 ```shell
-yarn test
+bun test
 ```

action.yml

@@ -5,12 +5,5 @@ outputs:
     description: "Conditionally merge pull requests after a timeout."
     value: ${{ steps.main.outputs.result }}
 runs:
-  using: "composite"
-  steps:
-    - run: |
-        yarn --cwd ${{ github.action_path }} --production=true
-      id: install
-      shell: bash
-    - run: yarn --cwd ${{ github.action_path }} start
-      shell: bash
-      id: main
+  using: "node20"
+  main: "dist/index.js"

dist/package.json

@@ -0,0 +1,3 @@
+{
+  "type": "module"
+}

eslint.config.mjs

@@ -9,7 +9,7 @@ export default tsEslint.config({
     "@typescript-eslint": tsEslint.plugin,
     "check-file": checkFile,
   },
-  ignores: [".github/knip.ts"],
+  ignores: [".github/knip.ts", ".wrangler/**/*.ts", ".wrangler/**/*.js", "dist/**", "eslint.config.mjs"],
   extends: [eslint.configs.recommended, ...tsEslint.configs.recommended, sonarjs.configs.recommended],
   languageOptions: {
     parser: tsEslint.parser,

jest.config.ts

@@ -0,0 +1,27 @@
+import type { Config } from "jest";
+
+const cfg: Config = {
+  transform: {
+    "^.+\\.tsx?$": [
+      "ts-jest",
+      {
+        useESM: true,
+      },
+    ],
+  },
+  moduleFileExtensions: ["ts", "tsx", "js", "jsx", "json", "node"],
+  coveragePathIgnorePatterns: ["node_modules", "mocks"],
+  collectCoverage: true,
+  coverageReporters: ["json", "lcov", "text", "clover", "json-summary"],
+  reporters: ["default", "jest-junit", "jest-md-dashboard"],
+  coverageDirectory: "coverage",
+  testTimeout: 20000,
+  roots: ["<rootDir>", "tests"],
+  extensionsToTreatAsEsm: [".ts"],
+  moduleNameMapper: {
+    "^(\\.{1,2}/.*)\\.js$": "$1",
+  },
+  setupFilesAfterEnv: ["dotenv/config"],
+};
+
+export default cfg;