Merge branch 'master' into force-character

Signed-off-by: Kuuuube <[email protected]>
yomidevs · Nov 5, 2024 · fed3fa5 · fed3fa5
2 parents 78b3d4c + e7cfac4
commit fed3fa5
Show file tree

Hide file tree

Showing 53 changed files with 2,359 additions and 103 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -560,6 +560,7 @@
                 "ext/js/dom/css-style-applier.js",
                 "ext/js/language/CJK-util.js",
                 "ext/js/language/ja/japanese.js",
+                "ext/js/language/text-processors.js",
                 "ext/js/language/text-utilities.js",
                 "ext/js/templates/anki-template-renderer-content-manager.js",
                 "ext/js/templates/anki-template-renderer.js",
@@ -694,6 +695,25 @@
                     }
                 }]
             }
+        },
+        {
+            "files": [
+                "ext/data/recommended-settings.json"
+            ],
+            "rules": {
+                "jsonc/sort-keys": ["error", {
+                    "pathPattern": ".*",
+                    "order": [
+                        "modification",
+                        "description"
+                    ]
+                }, {
+                    "pathPattern": ".*",
+                    "order": {
+                        "type": "asc"
+                    }
+                }]
+            }
         }
     ]
 }
diff --git a/.github/workflows/bench.yml b/.github/workflows/bench.yml
@@ -26,7 +26,7 @@ jobs:
         run: npm run build:libs
 
       - name: Run Benchmarks
-        uses: CodSpeedHQ/action@v2
+        uses: CodSpeedHQ/action@v3
         with:
           token: ${{ secrets.CODSPEED_TOKEN }}
           run: npm run bench
diff --git a/.github/workflows/broken-links.yml b/.github/workflows/broken-links.yml
@@ -21,7 +21,7 @@ jobs:
         run: npm ci
       - name: Build Legal
         run: npm run license-report:html
-      - uses: lycheeverse/[email protected].0
+      - uses: lycheeverse/[email protected].2
         with:
           fail: true
           jobSummary: false

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -51,7 +51,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3.26.12
+      uses: github/codeql-action/init@v3.27.0
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -65,7 +65,7 @@ jobs:
     # Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v3.26.12
+      uses: github/codeql-action/autobuild@v3.27.0
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -78,6 +78,6 @@ jobs:
     #     ./location_of_script_within_repo/buildscript.sh
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3.26.12
+      uses: github/codeql-action/analyze@v3.27.0
       with:
         category: "/language:${{matrix.language}}"
diff --git a/.github/workflows/create-prerelease-on-tag.yml b/.github/workflows/create-prerelease-on-tag.yml
@@ -40,7 +40,7 @@ jobs:
 
       - name: Release
         id: release
-        uses: softprops/action-gh-release@c062e08bd532815e2082a85e87e3ef29c3e6d191 # pin@v2
+        uses: softprops/action-gh-release@e7a8f85e1c67a31e6ed99a94b41bd0b71bbee6b8 # pin@v2
         with:
           generate_release_notes: true
           prerelease: true

diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml
@@ -24,4 +24,4 @@ jobs:
       - name: 'Checkout Repository'
         uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
       - name: 'Dependency Review'
-        uses: actions/dependency-review-action@5a2ce3f5b92ee19cbb1541a4984c76d921601d7c # v4.3.4
+        uses: actions/dependency-review-action@4081bf99e2866ebe428fc0477b69eb4fcda7220a # v4.4.0
diff --git a/.github/workflows/playwright.yml b/.github/workflows/playwright.yml
@@ -106,3 +106,9 @@ jobs:
           name: playwright-output
           path: playwright-output
         if: github.event_name == 'pull_request'
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: playwright-results-json
+          path: playwright-results.json
+        if: github.event_name == 'pull_request'
diff --git a/.github/workflows/playwright_comment.yml b/.github/workflows/playwright_comment.yml
@@ -35,6 +35,19 @@ jobs:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           run_id: ${{ github.event.workflow_run.id }}
           name: master-screenshots-outcome
+      - name: Grab playwright-results-json from PR run
+        uses: dawidd6/action-download-artifact@bf251b5aa9c2f7eeb574a96ee720e24f801b7c11 # pin@v2
+        continue-on-error: true
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          run_id: ${{ github.event.workflow_run.id }}
+          name: playwright-results-json
+
+      - name: Generate summary from playwright-results.json (expected to fail to comment)
+        id: playwright-summary
+        uses: daun/playwright-report-summary@v3
+        with:
+          report-file: playwright-results.json
 
       - name: Load artifacts into environment variables
         id: playwright
@@ -70,18 +83,12 @@ jobs:
         if: steps.playwright.outputs.MASTER_SCREENSHOTS_OUTCOME != 'failure' && (steps.playwright.outputs.FLAKY != 0 || steps.playwright.outputs.FAILED != 0)
         with:
           issue: ${{ steps.source-run-info.outputs.pullRequestNumber }}
-          message: |
-            :warning: Flaky tests or visual differences caused by this PR; please check the playwright report.
-
-            <a href="${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.event.workflow_run.id }}#artifacts">View Playwright Report</a> (note: open the "playwright-report" artifact)
+          message: ${{ steps.playwright-summary.outputs.summary }}
 
       - name: "[Comment] Success: No visual differences introduced by this PR"
         uses: mshick/add-pr-comment@dd126dd8c253650d181ad9538d8b4fa218fc31e8 # pin@v2
         if: steps.playwright.outputs.MASTER_SCREENSHOTS_OUTCOME != 'failure' && steps.playwright.outputs.FLAKY == 0 && steps.playwright.outputs.FAILED == 0
         with:
           issue: ${{ steps.source-run-info.outputs.pullRequestNumber }}
-          message: |
-            :heavy_check_mark: No visual differences introduced by this PR.
-
-            <a href="${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.event.workflow_run.id }}#artifacts">View Playwright Report</a> (note: open the "playwright-report" artifact)
+          message: ${{ steps.playwright-summary.outputs.summary }}
           update-only: true
diff --git a/.github/workflows/publish-edge.yml b/.github/workflows/publish-edge.yml
@@ -15,11 +15,10 @@ jobs:
           fileName: "*"
 
       - name: Publish on Microsoft Edge Addons
-        uses: wdzeng/edge-addon@v1
+        uses: wdzeng/edge-addon@v2
         id: webStorePublish
         with:
           product-id: 18e6c4cd-6383-4f38-95e9-92a629f60817
           zip-path: yomitan-edge.zip
           client-id: ${{ secrets.EDGE_CLIENT_ID }}
-          client-secret: ${{ secrets.EDGE_CLIENT_SECRET }}
-          access-token-url: ${{ secrets.EDGE_ACCESS_TOKEN_URL }}
+          api-key: ${{ secrets.EDGE_API_KEY }}
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
@@ -64,6 +64,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@572cc5268d94f11b89e12e7a166cf93275856072 # v2.22.12
+        uses: github/codeql-action/upload-sarif@48c3e2675613624ea7978e5d132169f97bc3b578 # v2.22.12
         with:
           sarif_file: results.sarif