Merge pull request #20037 from apache/master

Merge master to release for v5.6.0
apache · Jun 17, 2024 · 9557620 · 9557620
2 parents 0f4967b + a282471
commit 9557620
Show file tree

Hide file tree

Showing 44 changed files with 2,484 additions and 919 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -36,7 +36,7 @@ jobs:
 
       - name: Cache node modules
         id: cache-dep
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         env:
           cache-name: cache-node-modules
         with:
@@ -76,7 +76,7 @@ jobs:
 
       - name: Cache node modules
         id: cache-dep
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         env:
           cache-name: cache-node-modules
         with:
@@ -120,7 +120,7 @@ jobs:
           rm -f *.tgz
           echo -e "Dist files: \n$(ls -l)"
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: ${{ steps.save-pr-data.outcome == 'success' }}
         with:
           name: pr_preview

diff --git a/.github/workflows/pr-preview.yml b/.github/workflows/pr-preview.yml
@@ -13,7 +13,7 @@ jobs:
     steps:
       - name: Determine if workflow build job is successful
         id: check-build-success
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         with:
           result-encoding: string
           script: |

diff --git a/.github/workflows/source-release.yml b/.github/workflows/source-release.yml
@@ -26,7 +26,7 @@ jobs:
           echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
 
       - name: Cache node modules
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         env:
           cache-name: cache-node-modules
         with:
@@ -44,7 +44,7 @@ jobs:
             --out tmp/materials
 
       - name: Archive materials
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: apache-echarts-${{env.RELEASE_VERSION}}-release-materials
           path: |
@@ -72,15 +72,15 @@ jobs:
 
       # Get RELEASE_NOTE.txt and pack it into zip.
       - name: Download materials
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: apache-echarts-${{env.RELEASE_VERSION}}-release-materials
 
       # TODO Check release version is RC
 
       # Archive before run others to avoid packing unknown files.
       - name: Archive source release
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: apache-echarts-${{env.RELEASE_VERSION}}-src
           path: |
@@ -123,7 +123,7 @@ jobs:
           echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
 
       - name: Download source release
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: apache-echarts-${{env.RELEASE_VERSION}}-src
           path: tmp/echarts

diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
@@ -14,7 +14,7 @@ jobs:
     if: ${{ github.repository_owner == 'apache' }}
     steps:
       - name: Close Stale Issues
-        uses: actions/stale@v6
+        uses: actions/stale@v9
         with:
           days-before-stale: 730
           days-before-close: 7

diff --git a/.npmignore b/.npmignore
@@ -8,6 +8,9 @@
 /benchmark
 /src
 /ssr/client/src
+/extension-src
+/build
+/tsconfig.json
 .DS_Store
 Thumbs.db
 Desktop.ini

diff --git a/build/testDts.js b/build/testDts.js
@@ -19,20 +19,18 @@
 */
 
 const { TypeScriptVersion } = require('@definitelytyped/typescript-versions');
-const {
-    cleanTypeScriptInstalls,
-    installAllTypeScriptVersions,
-    typeScriptPath
-} = require('@definitelytyped/utils');
+const { typeScriptPath, install } = require('@definitelytyped/utils');
 const { runTsCompile } = require('./pre-publish');
 const globby = require('globby');
 const semver = require('semver');
 
 const MIN_VERSION = '3.5.0';
 
 async function installTs() {
-    // await cleanTypeScriptInstalls();
-    await installAllTypeScriptVersions();
+    const tsVersions = getTypeScriptVersions();
+    for (const version of tsVersions) {
+        await install(version);
+    }
 }
 
 async function runTests() {
@@ -52,11 +50,8 @@ async function runTests() {
     };
     const testsList = await globby(__dirname + '/../test/types/*.ts');
 
-    for (let version of TypeScriptVersion.shipped) {
-        if (semver.lt(version + '.0', MIN_VERSION)) {
-            continue;
-        }
-
+    const tsVersions = getTypeScriptVersions();
+    for (const version of tsVersions) {
         console.log(`Testing ts version ${version}`);
         const ts = require(typeScriptPath(version));
         await runTsCompile(ts, compilerOptions, testsList);
@@ -65,11 +60,17 @@ async function runTests() {
     }
 }
 
+function getTypeScriptVersions() {
+    return TypeScriptVersion.unsupported
+        .concat(TypeScriptVersion.shipped)
+        .filter(version => semver.gte(version + '.0', MIN_VERSION));
+}
+
 async function main() {
     await installTs();
     await runTests();
 }
 
 module.exports = main;
 
-main();
+main();