Merge branch 'meniole-development' into fix/bulk

.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", "**/tests/**"],
+  "ignorePaths": ["**/*.json", "**/*.css", "node_modules", "**/*.log", "**/tests/**", "dist/**"],
   "useGitignore": true,
   "language": "en",
   "words": [

.github/workflows/build.yml

@@ -27,10 +27,11 @@ jobs:
           git config --global user.email 'ubiquity-os[bot]@users.noreply.github.com'
           git add -f ${{ github.workspace }}/dist/\*
           if [ -n "$(git diff-index --cached --name-only HEAD)" ]; then
+            git pull
             git commit -m "chore: updated dist" || echo "Lint-staged check failed"
             git push origin HEAD:${{ github.ref_name }}
           else
             echo "No changes to commit"
           fi
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/compute.yml

@@ -35,37 +35,9 @@ jobs:
       PERMIT_ERC20_TOKENS_NO_FEE_WHITELIST: ${{ secrets.PERMIT_ERC20_TOKENS_NO_FEE_WHITELIST }}
 
     steps:
-      - name: Post starting comment to issue
-        uses: actions/github-script@v7
-        id: post-comment
-        with:
-          github-token: ${{ inputs.authToken }}
-          script: |
-            const comment_body = '\`\`\`diff\n+ Evaluating results. Please wait...';
-            const obj = ${{ inputs.eventPayload }}
-            if (obj.issue && "${{ inputs.eventName }}" === "issues.closed" && obj.issue.state_reason === "completed") {
-              const response = await github.rest.issues.createComment({
-                owner: obj.repository.owner.login,
-                repo: obj.repository.name,
-                issue_number: obj.issue.number,
-                body: comment_body,
-              });
-              core.setOutput('comment_id', response.data.id);
-            }
-
-      - name: Set environment variable
-        run: echo "COMMENT_ID=${{ steps.post-comment.outputs.comment_id }}" >> $GITHUB_ENV
-
-      - run: ${{ toJSON(inputs) }}
-        shell: cat {0}
-
-      - name: Checkout code
+      # Note: the checkout could potentially be avoided by calling the workflow on the repo/branch directly.
+      # However, this would mean that we would be unable to call it from the branch specified in ubiquity-os-config
+      - name: Checkout
         uses: actions/checkout@v4
-
-      - name: Set up Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: "20.10.0"
-
-      - name: Generate Rewards
+      - name: Run compute rewards
         uses: ./

.github/workflows/formatting-checks.yml

@@ -21,4 +21,6 @@ jobs:
       - name: Run formatting checks
         run: |
           yarn install
-          yarn format
+          yarn eslint --fix-dry-run --ignore-pattern dist/
+          yarn format:cspell
+          yarn prettier --check .

.github/workflows/update-configuration.yml

@@ -21,7 +21,7 @@ jobs:
       - name: Install deps and run configuration update
         run: |
           yarn install --immutable --immutable-cache --check-cache
-          yarn tsc --noCheck --project tsconfig.json
+          yarn tsc --noCheck --project tsconfig.json -m commonjs
 
       - name: Update manifest configuration using GitHub Script
         uses: actions/github-script@v7
@@ -49,6 +49,7 @@ jobs:
           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 pull
             git commit -m "chore: updated generated configuration" || echo "Lint-staged check failed"
             git push origin HEAD:${{ github.ref_name }}
           else

action.yml

@@ -18,5 +18,5 @@ outputs:
     description: "The result containing all the rewards of the users"
     value: ${{ steps.main.outputs.result }}
 runs:
-  using: 'node20'
-  main: 'dist/index.js'
+  using: "node20"
+  main: "dist/index.js"

dist/package.json

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

eslint.config.mjs

@@ -9,12 +9,16 @@ export default tsEslint.config({
     "@typescript-eslint": tsEslint.plugin,
     "check-file": checkFile,
   },
-  ignores: [".github/knip.ts"],
+  ignores: [".github/knip.ts", "dist/", "tests/__mocks__/**", "coverage/**"],
   extends: [eslint.configs.recommended, ...tsEslint.configs.recommended, sonarjs.configs.recommended],
   languageOptions: {
     parser: tsEslint.parser,
     parserOptions: {
-      project: ["./tsconfig.json"],
+      projectService: {
+        defaultProject: "tsconfig.json",
+        allowDefaultProject: ["*.mjs"],
+      },
+      tsconfigRootDir: import.meta.dirname,
     },
   },
   rules: {

knip.ts

@@ -3,7 +3,7 @@ import type { KnipConfig } from "knip";
 const config: KnipConfig = {
   entry: ["src/index.ts"],
   project: ["src/**/*.ts"],
-  ignore: ["src/data-collection/examples/*.ts", "src/configuration/common-config-type.ts"],
+  ignore: ["src/data-collection/examples/*.ts", "src/configuration/common-config-type.ts", "dist/**"],
   ignoreExportsUsedInFile: true,
   ignoreDependencies: ["ts-node", "msw", "@mswjs/data"],
   jest: {

tsconfig.json

@@ -105,5 +105,6 @@
     /* Completeness */
     // "skipDefaultLibCheck": true,                      /* Skip type checking .d.ts files that are included with TypeScript. */
     "skipLibCheck": true /* Skip type checking all .d.ts files. */
-  }
+  },
+  "exclude": ["dist/"]
 }