Merge branch 'main' into zlw-font-reload

osm-americana · Dec 13, 2023 · 0b59d81 · 0b59d81
2 parents eb16c23 + 8baee21
commit 0b59d81
Show file tree

Hide file tree

Showing 10 changed files with 429 additions and 291 deletions.
diff --git a/.github/workflows/build-preview.yml b/.github/workflows/build-preview.yml
@@ -70,7 +70,7 @@ jobs:
           mkdir -p pr
           echo '${{ env.MAIN_STATS }}'
           echo '${{ env.PR_STATS }}'
-          npm exec ts-node scripts/stats_compare '${{ env.MAIN_STATS }}' '${{ env.PR_STATS }}' > pr/stats-difference.md
+          npm exec tsx scripts/stats_compare '${{ env.MAIN_STATS }}' '${{ env.PR_STATS }}' > pr/stats-difference.md
       - name: Save PR artifacts
         env:
           PR_NUMBER: ${{ github.event.pull_request.number }}

diff --git a/.mocharc.yml b/.mocharc.yml
@@ -4,7 +4,4 @@ extension:
 spec:
   - test/**/*.js
   - test/**/*.spec.ts
-require: ts-node/register
-node-option:
-  - loader=ts-node/esm
-  - experimental-specifier-resolution=node
+import: tsx