From 99dc5fbfbec557119d2ecf5f263eb4abe47ed381 Mon Sep 17 00:00:00 2001 From: LongYinan Date: Sun, 21 Jan 2024 19:08:32 +0800 Subject: [PATCH] update toolchain --- .github/workflows/CI.yaml | 28 +++--- .github/workflows/cargo-test.yaml | 1 - package.json | 26 ++--- skia | 2 +- yarn.lock | 158 +++++++++++++++--------------- 5 files changed, 107 insertions(+), 108 deletions(-) diff --git a/.github/workflows/CI.yaml b/.github/workflows/CI.yaml index f9e23b5c..032f30bd 100644 --- a/.github/workflows/CI.yaml +++ b/.github/workflows/CI.yaml @@ -202,7 +202,7 @@ jobs: run: ${{ matrix.settings.build }} - name: Upload artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: bindings-${{ matrix.settings.target }} path: ${{ env.APP_NAME }}.*.node @@ -251,7 +251,7 @@ jobs: run: yarn install --immutable --mode=skip-build - name: Download artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: bindings-${{ matrix.settings.target }} path: . @@ -265,7 +265,7 @@ jobs: - name: Test failed if: ${{ failure() }} - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: failure-images-${{ matrix.settings.target }}-${{ matrix.node }} path: __test__/failure/** @@ -302,7 +302,7 @@ jobs: run: yarn install --immutable --mode=skip-build - name: Download artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: bindings-x86_64-unknown-linux-gnu path: . @@ -316,7 +316,7 @@ jobs: - name: Test failed if: ${{ failure() }} - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: failure-images-x86_64-unknown-linux-gnu-${{ matrix.node }} path: __test__/failure/** @@ -355,7 +355,7 @@ jobs: yarn install --immutable --mode=skip-build - name: Download artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: bindings-x86_64-unknown-linux-musl path: . @@ -369,7 +369,7 @@ jobs: - name: Test failed if: ${{ failure() }} - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: failure-images-x86_64-unknown-linux-musl-${{ matrix.node }} path: __test__/failure/** @@ -397,7 +397,7 @@ jobs: out-file-path: __test__/fonts/ - name: Download artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: bindings-aarch64-unknown-linux-gnu path: . @@ -430,7 +430,7 @@ jobs: - name: Test failed if: ${{ failure() }} - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: failure-images-aarch64-unknown-linux-gnu-${{ matrix.node }} path: __test__/failure/** @@ -455,7 +455,7 @@ jobs: out-file-path: __test__/fonts/ - name: Download artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: bindings-aarch64-unknown-linux-musl path: . @@ -488,7 +488,7 @@ jobs: - name: Test failed if: ${{ failure() }} - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: failure-images-aarch64-unknown-linux-musl-lts path: __test__/failure/** @@ -516,7 +516,7 @@ jobs: out-file-path: __test__/fonts/ - name: Download artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: bindings-armv7-unknown-linux-gnueabihf path: . @@ -549,7 +549,7 @@ jobs: - name: Test failed if: ${{ failure() }} - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: failure-images-armv7-unknown-linux-gnueabihf-${{ matrix.node }} path: __test__/failure/** @@ -580,7 +580,7 @@ jobs: run: yarn install --immutable --mode=skip-build - name: Download all artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: path: artifacts diff --git a/.github/workflows/cargo-test.yaml b/.github/workflows/cargo-test.yaml index c1b03b5b..3d608266 100644 --- a/.github/workflows/cargo-test.yaml +++ b/.github/workflows/cargo-test.yaml @@ -14,7 +14,6 @@ on: jobs: build: - if: "!contains(github.event.head_commit.message, 'skip ci')" name: stable - macOS - cargo - test runs-on: macos-latest diff --git a/package.json b/package.json index 28a04c1e..e3a08556 100644 --- a/package.json +++ b/package.json @@ -67,37 +67,37 @@ "@jimp/custom": "^0.22.10", "@jimp/jpeg": "^0.22.10", "@jimp/png": "^0.22.10", - "@napi-rs/cli": "^2.16.4", + "@napi-rs/cli": "^2.18.0", "@octokit/rest": "^20.0.2", "@swc-node/register": "^1.6.8", - "@swc/core": "^1.3.95", + "@swc/core": "^1.3.105", "@taplo/cli": "^0.5.2", - "@types/lodash": "^4.14.200", - "@types/node": "^20.8.10", - "@typescript-eslint/eslint-plugin": "^6.9.1", - "@typescript-eslint/parser": "^6.9.1", - "ava": "^6.0.0", + "@types/lodash": "^4.14.202", + "@types/node": "^20.11.5", + "@typescript-eslint/eslint-plugin": "^6.19.0", + "@typescript-eslint/parser": "^6.19.0", + "ava": "^6.0.1", "benny": "^3.7.1", "canvas": "^2.11.2", "canvaskit-wasm": "^0.39.1", "colorette": "^2.0.20", "conventional-changelog-cli": "^4.1.0", "echarts": "^5.4.3", - "eslint": "^8.52.0", - "eslint-config-prettier": "^9.0.0", - "eslint-plugin-import": "^2.29.0", + "eslint": "^8.56.0", + "eslint-config-prettier": "^9.1.0", + "eslint-plugin-import": "^2.29.1", "eslint-plugin-sonarjs": "^0.23.0", "husky": "^8.0.3", - "lint-staged": "^15.0.2", + "lint-staged": "^15.2.0", "lodash": "^4.17.21", "npm-run-all": "^4.1.5", "pinst": "^3.0.0", "png.js": "^0.2.1", - "prettier": "^3.0.3", + "prettier": "^3.2.4", "pretty-bytes": "^6.1.1", "skia-canvas": "^1.0.1", "table": "^6.8.1", - "typescript": "^5.2.2" + "typescript": "^5.3.3" }, "lint-staged": { "*.@(js|ts|tsx|yml|yaml|md|json|html)": [ diff --git a/skia b/skia index e8d7db9f..589c4655 160000 --- a/skia +++ b/skia @@ -1 +1 @@ -Subproject commit e8d7db9facb4f23ab15d6205204d9b4bb61fe538 +Subproject commit 589c46555055ec23bcc4634c209f7f543f6b424c diff --git a/yarn.lock b/yarn.lock index a55c4928..5239d317 100644 --- a/yarn.lock +++ b/yarn.lock @@ -257,46 +257,46 @@ __metadata: "@jimp/custom": "npm:^0.22.10" "@jimp/jpeg": "npm:^0.22.10" "@jimp/png": "npm:^0.22.10" - "@napi-rs/cli": "npm:^2.16.4" + "@napi-rs/cli": "npm:^2.18.0" "@octokit/rest": "npm:^20.0.2" "@swc-node/register": "npm:^1.6.8" - "@swc/core": "npm:^1.3.95" + "@swc/core": "npm:^1.3.105" "@taplo/cli": "npm:^0.5.2" - "@types/lodash": "npm:^4.14.200" - "@types/node": "npm:^20.8.10" - "@typescript-eslint/eslint-plugin": "npm:^6.9.1" - "@typescript-eslint/parser": "npm:^6.9.1" - ava: "npm:^6.0.0" + "@types/lodash": "npm:^4.14.202" + "@types/node": "npm:^20.11.5" + "@typescript-eslint/eslint-plugin": "npm:^6.19.0" + "@typescript-eslint/parser": "npm:^6.19.0" + ava: "npm:^6.0.1" benny: "npm:^3.7.1" canvas: "npm:^2.11.2" canvaskit-wasm: "npm:^0.39.1" colorette: "npm:^2.0.20" conventional-changelog-cli: "npm:^4.1.0" echarts: "npm:^5.4.3" - eslint: "npm:^8.52.0" - eslint-config-prettier: "npm:^9.0.0" - eslint-plugin-import: "npm:^2.29.0" + eslint: "npm:^8.56.0" + eslint-config-prettier: "npm:^9.1.0" + eslint-plugin-import: "npm:^2.29.1" eslint-plugin-sonarjs: "npm:^0.23.0" husky: "npm:^8.0.3" - lint-staged: "npm:^15.0.2" + lint-staged: "npm:^15.2.0" lodash: "npm:^4.17.21" npm-run-all: "npm:^4.1.5" pinst: "npm:^3.0.0" png.js: "npm:^0.2.1" - prettier: "npm:^3.0.3" + prettier: "npm:^3.2.4" pretty-bytes: "npm:^6.1.1" skia-canvas: "npm:^1.0.1" table: "npm:^6.8.1" - typescript: "npm:^5.2.2" + typescript: "npm:^5.3.3" languageName: unknown linkType: soft -"@napi-rs/cli@npm:^2.16.4": - version: 2.17.0 - resolution: "@napi-rs/cli@npm:2.17.0" +"@napi-rs/cli@npm:^2.18.0": + version: 2.18.0 + resolution: "@napi-rs/cli@npm:2.18.0" bin: napi: scripts/index.js - checksum: da50d466da7dadf92d818431b4e903189424280d0060f847f8b45a62a7fc54912207200b844e7e7d3e060528bf8a61c1afc72cfad2fe06fd2d8345b7593b225f + checksum: db00a70212511bf19a5165bb5397af40b8ee8be26345fa0c7fe3f35803216603f6f757dec99bf385e6db377b8eb82d69956e073c315e3e1f8e0452af04a7ce7f languageName: node linkType: hard @@ -357,8 +357,8 @@ __metadata: linkType: hard "@octokit/core@npm:^5.0.0": - version: 5.0.2 - resolution: "@octokit/core@npm:5.0.2" + version: 5.1.0 + resolution: "@octokit/core@npm:5.1.0" dependencies: "@octokit/auth-token": "npm:^4.0.0" "@octokit/graphql": "npm:^7.0.0" @@ -367,7 +367,7 @@ __metadata: "@octokit/types": "npm:^12.0.0" before-after-hook: "npm:^2.2.0" universal-user-agent: "npm:^6.0.0" - checksum: f3b3cb72f8f374e763e60922eacad56cb08fc05ee0be26f2a7b61937f89a377a8fd1b54f3d621a2b9627a9402c595d4b7e24900602e401b8a8edaffd995fa98f + checksum: a1d2882373b4a33cd9f6e56d76bcc82e5589a477829fc3491b1ef471a8a83fa437b339a2c76d97d9e8ea4ca12bf3ebf32e66119ba16977e542d98f1f5dd3c994 languageName: node linkType: hard @@ -534,90 +534,90 @@ __metadata: languageName: node linkType: hard -"@swc/core-darwin-arm64@npm:1.3.104": - version: 1.3.104 - resolution: "@swc/core-darwin-arm64@npm:1.3.104" +"@swc/core-darwin-arm64@npm:1.3.105": + version: 1.3.105 + resolution: "@swc/core-darwin-arm64@npm:1.3.105" conditions: os=darwin & cpu=arm64 languageName: node linkType: hard -"@swc/core-darwin-x64@npm:1.3.104": - version: 1.3.104 - resolution: "@swc/core-darwin-x64@npm:1.3.104" +"@swc/core-darwin-x64@npm:1.3.105": + version: 1.3.105 + resolution: "@swc/core-darwin-x64@npm:1.3.105" conditions: os=darwin & cpu=x64 languageName: node linkType: hard -"@swc/core-linux-arm-gnueabihf@npm:1.3.104": - version: 1.3.104 - resolution: "@swc/core-linux-arm-gnueabihf@npm:1.3.104" +"@swc/core-linux-arm-gnueabihf@npm:1.3.105": + version: 1.3.105 + resolution: "@swc/core-linux-arm-gnueabihf@npm:1.3.105" conditions: os=linux & cpu=arm languageName: node linkType: hard -"@swc/core-linux-arm64-gnu@npm:1.3.104": - version: 1.3.104 - resolution: "@swc/core-linux-arm64-gnu@npm:1.3.104" +"@swc/core-linux-arm64-gnu@npm:1.3.105": + version: 1.3.105 + resolution: "@swc/core-linux-arm64-gnu@npm:1.3.105" conditions: os=linux & cpu=arm64 & libc=glibc languageName: node linkType: hard -"@swc/core-linux-arm64-musl@npm:1.3.104": - version: 1.3.104 - resolution: "@swc/core-linux-arm64-musl@npm:1.3.104" +"@swc/core-linux-arm64-musl@npm:1.3.105": + version: 1.3.105 + resolution: "@swc/core-linux-arm64-musl@npm:1.3.105" conditions: os=linux & cpu=arm64 & libc=musl languageName: node linkType: hard -"@swc/core-linux-x64-gnu@npm:1.3.104": - version: 1.3.104 - resolution: "@swc/core-linux-x64-gnu@npm:1.3.104" +"@swc/core-linux-x64-gnu@npm:1.3.105": + version: 1.3.105 + resolution: "@swc/core-linux-x64-gnu@npm:1.3.105" conditions: os=linux & cpu=x64 & libc=glibc languageName: node linkType: hard -"@swc/core-linux-x64-musl@npm:1.3.104": - version: 1.3.104 - resolution: "@swc/core-linux-x64-musl@npm:1.3.104" +"@swc/core-linux-x64-musl@npm:1.3.105": + version: 1.3.105 + resolution: "@swc/core-linux-x64-musl@npm:1.3.105" conditions: os=linux & cpu=x64 & libc=musl languageName: node linkType: hard -"@swc/core-win32-arm64-msvc@npm:1.3.104": - version: 1.3.104 - resolution: "@swc/core-win32-arm64-msvc@npm:1.3.104" +"@swc/core-win32-arm64-msvc@npm:1.3.105": + version: 1.3.105 + resolution: "@swc/core-win32-arm64-msvc@npm:1.3.105" conditions: os=win32 & cpu=arm64 languageName: node linkType: hard -"@swc/core-win32-ia32-msvc@npm:1.3.104": - version: 1.3.104 - resolution: "@swc/core-win32-ia32-msvc@npm:1.3.104" +"@swc/core-win32-ia32-msvc@npm:1.3.105": + version: 1.3.105 + resolution: "@swc/core-win32-ia32-msvc@npm:1.3.105" conditions: os=win32 & cpu=ia32 languageName: node linkType: hard -"@swc/core-win32-x64-msvc@npm:1.3.104": - version: 1.3.104 - resolution: "@swc/core-win32-x64-msvc@npm:1.3.104" +"@swc/core-win32-x64-msvc@npm:1.3.105": + version: 1.3.105 + resolution: "@swc/core-win32-x64-msvc@npm:1.3.105" conditions: os=win32 & cpu=x64 languageName: node linkType: hard -"@swc/core@npm:^1.3.95": - version: 1.3.104 - resolution: "@swc/core@npm:1.3.104" +"@swc/core@npm:^1.3.105": + version: 1.3.105 + resolution: "@swc/core@npm:1.3.105" dependencies: - "@swc/core-darwin-arm64": "npm:1.3.104" - "@swc/core-darwin-x64": "npm:1.3.104" - "@swc/core-linux-arm-gnueabihf": "npm:1.3.104" - "@swc/core-linux-arm64-gnu": "npm:1.3.104" - "@swc/core-linux-arm64-musl": "npm:1.3.104" - "@swc/core-linux-x64-gnu": "npm:1.3.104" - "@swc/core-linux-x64-musl": "npm:1.3.104" - "@swc/core-win32-arm64-msvc": "npm:1.3.104" - "@swc/core-win32-ia32-msvc": "npm:1.3.104" - "@swc/core-win32-x64-msvc": "npm:1.3.104" + "@swc/core-darwin-arm64": "npm:1.3.105" + "@swc/core-darwin-x64": "npm:1.3.105" + "@swc/core-linux-arm-gnueabihf": "npm:1.3.105" + "@swc/core-linux-arm64-gnu": "npm:1.3.105" + "@swc/core-linux-arm64-musl": "npm:1.3.105" + "@swc/core-linux-x64-gnu": "npm:1.3.105" + "@swc/core-linux-x64-musl": "npm:1.3.105" + "@swc/core-win32-arm64-msvc": "npm:1.3.105" + "@swc/core-win32-ia32-msvc": "npm:1.3.105" + "@swc/core-win32-x64-msvc": "npm:1.3.105" "@swc/counter": "npm:^0.1.1" "@swc/types": "npm:^0.1.5" peerDependencies: @@ -646,7 +646,7 @@ __metadata: peerDependenciesMeta: "@swc/helpers": optional: true - checksum: 20cde96707b61c2fdae0c7c0fbff7d6c1a1888ca4b0c3937972222644c62e29710ce8fa68ecec20654236e038dee32ea4227ca880a679ee38f80fef751de35fa + checksum: 719283fa1bb7e25a9e3bfb4bb2fca8dec98a1cbbcd53cdd6a8cc9d9e2ac701d0fe409b2f3f9b6ddd466b2c1592cdae9c2302a114036bb5adc08e8f95549543e0 languageName: node linkType: hard @@ -694,14 +694,14 @@ __metadata: languageName: node linkType: hard -"@types/lodash@npm:^4.14.200": +"@types/lodash@npm:^4.14.202": version: 4.14.202 resolution: "@types/lodash@npm:4.14.202" checksum: 6064d43c8f454170841bd67c8266cc9069d9e570a72ca63f06bceb484cb4a3ee60c9c1f305c1b9e3a87826049fd41124b8ef265c4dd08b00f6766609c7fe9973 languageName: node linkType: hard -"@types/node@npm:^20.8.10": +"@types/node@npm:^20.11.5": version: 20.11.5 resolution: "@types/node@npm:20.11.5" dependencies: @@ -724,7 +724,7 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/eslint-plugin@npm:^6.9.1": +"@typescript-eslint/eslint-plugin@npm:^6.19.0": version: 6.19.0 resolution: "@typescript-eslint/eslint-plugin@npm:6.19.0" dependencies: @@ -749,7 +749,7 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/parser@npm:^6.9.1": +"@typescript-eslint/parser@npm:^6.19.0": version: 6.19.0 resolution: "@typescript-eslint/parser@npm:6.19.0" dependencies: @@ -1213,7 +1213,7 @@ __metadata: languageName: node linkType: hard -"ava@npm:^6.0.0": +"ava@npm:^6.0.1": version: 6.0.1 resolution: "ava@npm:6.0.1" dependencies: @@ -2230,7 +2230,7 @@ __metadata: languageName: node linkType: hard -"eslint-config-prettier@npm:^9.0.0": +"eslint-config-prettier@npm:^9.1.0": version: 9.1.0 resolution: "eslint-config-prettier@npm:9.1.0" peerDependencies: @@ -2264,7 +2264,7 @@ __metadata: languageName: node linkType: hard -"eslint-plugin-import@npm:^2.29.0": +"eslint-plugin-import@npm:^2.29.1": version: 2.29.1 resolution: "eslint-plugin-import@npm:2.29.1" dependencies: @@ -2317,7 +2317,7 @@ __metadata: languageName: node linkType: hard -"eslint@npm:^8.52.0": +"eslint@npm:^8.56.0": version: 8.56.0 resolution: "eslint@npm:8.56.0" dependencies: @@ -3615,7 +3615,7 @@ __metadata: languageName: node linkType: hard -"lint-staged@npm:^15.0.2": +"lint-staged@npm:^15.2.0": version: 15.2.0 resolution: "lint-staged@npm:15.2.0" dependencies: @@ -4623,7 +4623,7 @@ __metadata: languageName: node linkType: hard -"prettier@npm:^3.0.3": +"prettier@npm:^3.2.4": version: 3.2.4 resolution: "prettier@npm:3.2.4" bin: @@ -4849,9 +4849,9 @@ __metadata: linkType: hard "rfdc@npm:^1.3.0": - version: 1.3.0 - resolution: "rfdc@npm:1.3.0" - checksum: a17fd7b81f42c7ae4cb932abd7b2f677b04cc462a03619fb46945ae1ccae17c3bc87c020ffdde1751cbfa8549860a2883486fdcabc9b9de3f3108af32b69a667 + version: 1.3.1 + resolution: "rfdc@npm:1.3.1" + checksum: 69f65e3ed30970f8055fac9fbbef9ce578800ca19554eab1dcbffe73a4b8aef536bc4248313889cf25e3b4e38b212c721eabe30856575bf2b2bc3d90f8ba93ef languageName: node linkType: hard @@ -5662,7 +5662,7 @@ __metadata: languageName: node linkType: hard -"typescript@npm:^5.2.2": +"typescript@npm:^5.3.3": version: 5.3.3 resolution: "typescript@npm:5.3.3" bin: @@ -5672,7 +5672,7 @@ __metadata: languageName: node linkType: hard -"typescript@patch:typescript@npm%3A^5.2.2#optional!builtin": +"typescript@patch:typescript@npm%3A^5.3.3#optional!builtin": version: 5.3.3 resolution: "typescript@patch:typescript@npm%3A5.3.3#optional!builtin::version=5.3.3&hash=e012d7" bin: