From 48b1564095be6b72939cdbabc6c7a51623967f79 Mon Sep 17 00:00:00 2001 From: Philip Peterson Date: Fri, 22 Nov 2024 13:45:31 -0900 Subject: [PATCH 1/9] Create codeql.yml Signed-off-by: Philip Peterson --- .github/workflows/codeql.yml | 67 ++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 .github/workflows/codeql.yml diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml new file mode 100644 index 000000000000..569dda765e20 --- /dev/null +++ b/.github/workflows/codeql.yml @@ -0,0 +1,67 @@ +# For most projects, this workflow file will not need changing; you simply need +# to commit it to your repository. +# +# You may wish to alter this file to override the set of languages analyzed, +# or to provide custom queries or build logic. +# +# ******** NOTE ******** +# We have attempted to detect the languages in your repository. Please check +# the `language` matrix defined below to confirm you have the correct set of +# supported CodeQL languages. +# +name: "CodeQL" + +on: + push: + branches: [ canary ] + pull_request: + # The branches below must be a subset of the branches above + branches: [ canary ] + schedule: + - cron: '37 6 * * 5' + +jobs: + analyze: + name: Analyze + runs-on: ubuntu-latest + + strategy: + fail-fast: false + matrix: + language: [ 'javascript' ] + # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ] + # Learn more: + # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed + + steps: + - name: Checkout repository + uses: actions/checkout@v4 + + # Initializes the CodeQL tools for scanning. + - name: Initialize CodeQL + uses: github/codeql-action/init@v3 + with: + languages: ${{ matrix.language }} + # If you wish to specify custom queries, you can do so here or in a config file. + # By default, queries listed here will override any specified in a config file. + # Prefix the list here with "+" to use these queries and those in the config file. + # queries: ./path/to/local/query, your-org/your-repo/queries@main + + # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). + # If this step fails, then you should remove it and run the build manually (see below) + - name: Autobuild + uses: github/codeql-action/autobuild@v3 + + # ℹī¸ Command-line programs to run using the OS shell. + # 📚 https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun + + # ✏ī¸ If the Autobuild fails above, remove it and uncomment the following three lines + # and modify them (or add more) to build your code if your project + # uses a compiled language + + #- run: | + # make bootstrap + # make release + + - name: Perform CodeQL Analysis + uses: github/codeql-action/analyze@v3 From 5ed18b5f1b67c81ccbbd7d6f98b276ebccf0d82e Mon Sep 17 00:00:00 2001 From: Philip Peterson Date: Fri, 22 Nov 2024 14:26:26 -0900 Subject: [PATCH 2/9] Temporarily disable mac and windows builds --- .github/workflows/nodejs.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml index d42e2995aba9..b87656964748 100644 --- a/.github/workflows/nodejs.yml +++ b/.github/workflows/nodejs.yml @@ -16,9 +16,10 @@ jobs: strategy: matrix: os: - - macos-latest - ubuntu-latest - - windows-latest + #TODO re-enable these: + #- macos-latest + #- windows-latest fail-fast: false steps: - name: Checkout From c758523d7f9e74ca98cc8e98ce33ce902910e373 Mon Sep 17 00:00:00 2001 From: Philip Peterson Date: Fri, 22 Nov 2024 15:22:57 -0900 Subject: [PATCH 3/9] rely only on codeql-analysis.yml --- .github/workflows/codeql.yml | 67 ------------------------------------ 1 file changed, 67 deletions(-) delete mode 100644 .github/workflows/codeql.yml diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml deleted file mode 100644 index 569dda765e20..000000000000 --- a/.github/workflows/codeql.yml +++ /dev/null @@ -1,67 +0,0 @@ -# For most projects, this workflow file will not need changing; you simply need -# to commit it to your repository. -# -# You may wish to alter this file to override the set of languages analyzed, -# or to provide custom queries or build logic. -# -# ******** NOTE ******** -# We have attempted to detect the languages in your repository. Please check -# the `language` matrix defined below to confirm you have the correct set of -# supported CodeQL languages. -# -name: "CodeQL" - -on: - push: - branches: [ canary ] - pull_request: - # The branches below must be a subset of the branches above - branches: [ canary ] - schedule: - - cron: '37 6 * * 5' - -jobs: - analyze: - name: Analyze - runs-on: ubuntu-latest - - strategy: - fail-fast: false - matrix: - language: [ 'javascript' ] - # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ] - # Learn more: - # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed - - steps: - - name: Checkout repository - uses: actions/checkout@v4 - - # Initializes the CodeQL tools for scanning. - - name: Initialize CodeQL - uses: github/codeql-action/init@v3 - with: - languages: ${{ matrix.language }} - # If you wish to specify custom queries, you can do so here or in a config file. - # By default, queries listed here will override any specified in a config file. - # Prefix the list here with "+" to use these queries and those in the config file. - # queries: ./path/to/local/query, your-org/your-repo/queries@main - - # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). - # If this step fails, then you should remove it and run the build manually (see below) - - name: Autobuild - uses: github/codeql-action/autobuild@v3 - - # ℹī¸ Command-line programs to run using the OS shell. - # 📚 https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun - - # ✏ī¸ If the Autobuild fails above, remove it and uncomment the following three lines - # and modify them (or add more) to build your code if your project - # uses a compiled language - - #- run: | - # make bootstrap - # make release - - - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v3 From 68b1950357f44a0f4d350a9320ed6d2e10293617 Mon Sep 17 00:00:00 2001 From: Philip Peterson Date: Fri, 22 Nov 2024 16:50:37 -0900 Subject: [PATCH 4/9] empty From 052dbeaf6e76f0fac0547693ce23fe9b6e7a91e5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 23 Nov 2024 03:16:41 +0000 Subject: [PATCH 5/9] Bump @types/node from 18.19.31 to 22.9.2 (#72) --- package.json | 2 +- yarn.lock | 49 +++++++++++++++++++++++++++++++++++++------------ 2 files changed, 38 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index 337b05b5a70b..3be72a322a67 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "@types/lodash": "^4.17.0", "@types/mousetrap": "1.6.15", "@types/ms": "0.7.34", - "@types/node": "18.19.31", + "@types/node": "22.9.2", "@types/plist": "3.0.5", "@types/react": "18.2.79", "@types/react-dom": "18.2.25", diff --git a/yarn.lock b/yarn.lock index 110f0f9ecb25..10726179cab0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1179,12 +1179,12 @@ resolved "https://registry.npmjs.org/@types/ms/-/ms-0.7.34.tgz#10964ba0dee6ac4cd462e2795b6bebd407303433" integrity sha512-nG96G3Wp6acyAgJqGasjODb+acrI7KltPiRxzHPXnP3NgI28bpQDRv53olbqGXbfcgF5aiiHmO3xpwEpS5Ld9g== -"@types/node@*", "@types/node@18.19.31": - version "18.19.31" - resolved "https://registry.npmjs.org/@types/node/-/node-18.19.31.tgz#b7d4a00f7cb826b60a543cebdbda5d189aaecdcd" - integrity sha512-ArgCD39YpyyrtFKIqMDvjz79jto5fcI/SVUs2HwB+f0dAzq68yqOdyaSivLiLugSziTpNXLQrVb7RZFmdZzbhA== +"@types/node@*", "@types/node@22.9.2": + version "22.9.2" + resolved "https://registry.npmjs.org/@types/node/-/node-22.9.2.tgz#51e58f2bf29cc38f529dacbb0eafca890464138e" + integrity sha512-wwuxAVEbsRvDD9x7buvAl7DyQ7Oj+va/d/Veug7higYzp9MF0CINbfWTBgDFMpcVwcdUiYuNmX2KfnvY3N70mw== dependencies: - undici-types "~5.26.4" + undici-types "~6.19.8" "@types/node@^16.11.26", "@types/node@^16.9.2": version "16.18.36" @@ -7855,7 +7855,16 @@ stdin-discarder@^0.2.1: resolved "https://registry.npmjs.org/stdin-discarder/-/stdin-discarder-0.2.2.tgz#390037f44c4ae1a1ae535c5fe38dc3aba8d997be" integrity sha512-UhDfHmA92YAlNnCfhmq0VeNL5bDbiZGg7sZ2IvPsXubGkiNa9EC+tUTsjBRsYUAz87btI6/1wf4XoVvQ3uRnmQ== -"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: +"string-width-cjs@npm:string-width@^4.2.0": + version "4.2.3" + resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" + integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.1" + +"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: version "4.2.3" resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -7966,7 +7975,14 @@ string_decoder@^1.1.1: dependencies: safe-buffer "~5.1.0" -"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1: +"strip-ansi-cjs@npm:strip-ansi@^6.0.1": + version "6.0.1" + resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" + integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== + dependencies: + ansi-regex "^5.0.1" + +strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -8494,10 +8510,10 @@ unbox-primitive@^1.0.2: has-symbols "^1.0.3" which-boxed-primitive "^1.0.2" -undici-types@~5.26.4: - version "5.26.5" - resolved "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617" - integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA== +undici-types@~6.19.8: + version "6.19.8" + resolved "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz#35111c9d1437ab83a7cdc0abae2f26d88eda0a02" + integrity sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw== unicorn-magic@^0.1.0: version "0.1.0" @@ -8799,7 +8815,7 @@ wildcard@^2.0.0: resolved "https://registry.npmjs.org/wildcard/-/wildcard-2.0.0.tgz#a77d20e5200c6faaac979e4b3aadc7b3dd7f8fec" integrity sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw== -"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": version "7.0.0" resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== @@ -8817,6 +8833,15 @@ wrap-ansi@^6.2.0: string-width "^4.1.0" strip-ansi "^6.0.0" +wrap-ansi@^7.0.0: + version "7.0.0" + resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" + integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== + dependencies: + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + wrap-ansi@^8.1.0: version "8.1.0" resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214" From ebd3ac298f56dd2f3cbb5a930dc48525ad99136c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 23 Nov 2024 03:17:51 +0000 Subject: [PATCH 6/9] Bump ava from 6.1.2 to 6.2.0 (#55) --- package.json | 2 +- yarn.lock | 195 ++++++++++++++++++++++++++++----------------------- 2 files changed, 108 insertions(+), 89 deletions(-) diff --git a/package.json b/package.json index 3be72a322a67..4223d74bf582 100644 --- a/package.json +++ b/package.json @@ -100,7 +100,7 @@ "@types/uuid": "9.0.8", "@typescript-eslint/eslint-plugin": "7.0.0", "@typescript-eslint/parser": "6.21.0", - "ava": "6.1.2", + "ava": "6.2.0", "babel-loader": "9.1.3", "concurrently": "8.2.2", "copy-webpack-plugin": "12.0.2", diff --git a/yarn.lock b/yarn.lock index 10726179cab0..7dff8332c085 100644 --- a/yarn.lock +++ b/yarn.lock @@ -865,7 +865,7 @@ lodash "^4.17.15" tmp-promise "^3.0.2" -"@mapbox/node-pre-gyp@^1.0.5": +"@mapbox/node-pre-gyp@^1.0.11": version "1.0.11" resolved "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.11.tgz#417db42b7f5323d79e93b34a6d7a2a12c0df43fa" integrity sha512-Yhlar6v9WQgUp/He7BdgzOz8lqMQ8sU+jkCq7Wx8Myc5YFJLbEe7lgui/V7G1qB1DJykHSGwreceSaD60Y0PUQ== @@ -971,10 +971,10 @@ resolved "https://registry.npmjs.org/@sindresorhus/is/-/is-5.3.0.tgz#0ec9264cf54a527671d990eb874e030b55b70dcc" integrity sha512-CX6t4SYQ37lzxicAqsBtxA3OseeoVrh9cSJ5PFYam0GksYlupRfy1A+Q4aYD3zvcfECLc0zO2u+ZnR2UYKvCrw== -"@sindresorhus/merge-streams@^1.0.0": - version "1.0.0" - resolved "https://registry.npmjs.org/@sindresorhus/merge-streams/-/merge-streams-1.0.0.tgz#9cd84cc15bc865a5ca35fcaae198eb899f7b5c90" - integrity sha512-rUV5WyJrJLoloD4NDN1V1+LDMDWOa4OTsT4yYJwQNpTU6FWxkxHpL7eu4w+DmiH8x/EAM1otkPE1+LaspIbplw== +"@sindresorhus/merge-streams@^2.1.0": + version "2.3.0" + resolved "https://registry.npmjs.org/@sindresorhus/merge-streams/-/merge-streams-2.3.0.tgz#719df7fb41766bc143369eaa0dd56d8dc87c9958" + integrity sha512-LtoMMhxAlorcGhmFYI+LhPgbPZCkgP6ra1YL604EeF6U98pLlQ3iWIGMdWSC+vWmPBWBNgmDBAhnAobLROJmwg== "@szmarczak/http-timer@^4.0.5": version "4.0.5" @@ -1401,21 +1401,21 @@ resolved "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406" integrity sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ== -"@vercel/nft@^0.26.2": - version "0.26.3" - resolved "https://registry.npmjs.org/@vercel/nft/-/nft-0.26.3.tgz#9d8f5195565d67e0fc478a9d611e3236e1512c68" - integrity sha512-h1z/NN9ppS4YOKwSgBoopJlhm7tS2Qb/9Ld1HXjDpvvTE7mY0xVD8nllXs+RihD9uTGJISOIMzp18Eg0EApaMA== +"@vercel/nft@^0.27.5": + version "0.27.6" + resolved "https://registry.npmjs.org/@vercel/nft/-/nft-0.27.6.tgz#4fffb7ad4ffdb70698213cfd67596be5e9cdfb6c" + integrity sha512-mwuyUxskdcV8dd7N7JnxBgvFEz1D9UOePI/WyLLzktv6HSCwgPNQGit/UJ2IykAWGlypKw4pBQjOKWvIbXITSg== dependencies: - "@mapbox/node-pre-gyp" "^1.0.5" + "@mapbox/node-pre-gyp" "^1.0.11" "@rollup/pluginutils" "^4.0.0" acorn "^8.6.0" - acorn-import-attributes "^1.9.2" + acorn-import-attributes "^1.9.5" async-sema "^3.1.1" bindings "^1.4.0" estree-walker "2.0.2" glob "^7.1.3" graceful-fs "^4.2.9" - micromatch "^4.0.2" + micromatch "^4.0.8" node-gyp-build "^4.2.2" resolve-from "^5.0.0" @@ -1607,25 +1607,27 @@ acorn-import-assertions@^1.9.0: resolved "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz#507276249d684797c84e0734ef84860334cfb1ac" integrity sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA== -acorn-import-attributes@^1.9.2: - version "1.9.2" - resolved "https://registry.npmjs.org/acorn-import-attributes/-/acorn-import-attributes-1.9.2.tgz#bc3765bca6ec0c5c69d2293afd582216215279b0" - integrity sha512-O+nfJwNolEA771IYJaiLWK1UAwjNsQmZbTRqqwBYxCgVQTmpFEMvBw6LOIQV0Me339L5UMVYFyRohGnGlQDdIQ== +acorn-import-attributes@^1.9.5: + version "1.9.5" + resolved "https://registry.npmjs.org/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz#7eb1557b1ba05ef18b5ed0ec67591bfab04688ef" + integrity sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ== acorn-jsx@^5.3.2: version "5.3.2" resolved "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937" integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ== -acorn-walk@^8.1.1, acorn-walk@^8.3.2: - version "8.3.2" - resolved "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.2.tgz#7703af9415f1b6db9315d6895503862e231d34aa" - integrity sha512-cjkyv4OtNCIeqhHrfS81QWXoCBPExR/J62oyEqepVw8WaQeSqpW2uhuLPh1m9eWhDuOo/jUXVTlifvesOWp/4A== +acorn-walk@^8.1.1, acorn-walk@^8.3.4: + version "8.3.4" + resolved "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.4.tgz#794dd169c3977edf4ba4ea47583587c5866236b7" + integrity sha512-ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g== + dependencies: + acorn "^8.11.0" -acorn@^8.0.4, acorn@^8.11.3, acorn@^8.4.1, acorn@^8.5.0, acorn@^8.6.0, acorn@^8.7.1, acorn@^8.8.2, acorn@^8.9.0: - version "8.11.3" - resolved "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz#71e0b14e13a4ec160724b38fb7b0f233b1b81d7a" - integrity sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg== +acorn@^8.0.4, acorn@^8.11.0, acorn@^8.13.0, acorn@^8.4.1, acorn@^8.5.0, acorn@^8.6.0, acorn@^8.7.1, acorn@^8.8.2, acorn@^8.9.0: + version "8.14.0" + resolved "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz#063e2c70cac5fb4f6467f0b11152e04c682795b0" + integrity sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA== agent-base@6, agent-base@^6.0.2: version "6.0.2" @@ -2019,19 +2021,19 @@ at-least-node@^1.0.0: resolved "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2" integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg== -ava@6.1.2: - version "6.1.2" - resolved "https://registry.npmjs.org/ava/-/ava-6.1.2.tgz#fe4f107177b8bf511135827bfcd0a4e6f82d457a" - integrity sha512-WcpxJ8yZ7mk9ABTinD0IAjcemovSeVGjuuwZx0JS9johREWFeLTl8UP6wd7l6nmnrWqkKZdwaD71a/ocH4qPKw== +ava@6.2.0: + version "6.2.0" + resolved "https://registry.npmjs.org/ava/-/ava-6.2.0.tgz#77be81e745ae219dd835c4e0941f6cf236bb23aa" + integrity sha512-+GZk5PbyepjiO/68hzCZCUepQOQauKfNnI7sA4JukBTg97jD7E+tDKEA7OhGOGr6EorNNMM9+jqvgHVOTOzG4w== dependencies: - "@vercel/nft" "^0.26.2" - acorn "^8.11.3" - acorn-walk "^8.3.2" + "@vercel/nft" "^0.27.5" + acorn "^8.13.0" + acorn-walk "^8.3.4" ansi-styles "^6.2.1" arrgv "^1.0.2" arrify "^3.0.0" - callsites "^4.1.0" - cbor "^9.0.1" + callsites "^4.2.0" + cbor "^9.0.2" chalk "^5.3.0" chunkd "^2.0.1" ci-info "^4.0.0" @@ -2041,10 +2043,10 @@ ava@6.1.2: common-path-prefix "^3.0.0" concordance "^5.0.4" currently-unhandled "^0.4.1" - debug "^4.3.4" - emittery "^1.0.1" - figures "^6.0.1" - globby "^14.0.0" + debug "^4.3.7" + emittery "^1.0.3" + figures "^6.1.0" + globby "^14.0.2" ignore-by-default "^2.1.0" indent-string "^5.0.0" is-plain-object "^5.0.0" @@ -2052,17 +2054,17 @@ ava@6.1.2: matcher "^5.0.0" memoize "^10.0.0" ms "^2.1.3" - p-map "^7.0.1" + p-map "^7.0.2" package-config "^5.0.0" - picomatch "^3.0.1" + picomatch "^4.0.2" plur "^5.1.0" - pretty-ms "^9.0.0" + pretty-ms "^9.1.0" resolve-cwd "^3.0.0" stack-utils "^2.0.6" strip-ansi "^7.1.0" supertap "^3.0.1" temp-dir "^3.0.0" - write-file-atomic "^5.0.1" + write-file-atomic "^6.0.0" yargs "^17.7.2" available-typed-arrays@^1.0.5: @@ -2190,6 +2192,13 @@ braces@^3.0.1, braces@^3.0.2, braces@~3.0.2: dependencies: fill-range "^7.0.1" +braces@^3.0.3: + version "3.0.3" + resolved "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789" + integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA== + dependencies: + fill-range "^7.1.1" + browserslist@^4.21.10, browserslist@^4.22.2: version "4.22.3" resolved "https://registry.npmjs.org/browserslist/-/browserslist-4.22.3.tgz#299d11b7e947a6b843981392721169e27d60c5a6" @@ -2349,10 +2358,10 @@ callsites@^3.0.0: resolved "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ== -callsites@^4.1.0: - version "4.1.0" - resolved "https://registry.npmjs.org/callsites/-/callsites-4.1.0.tgz#de72b98612eed4e1e2564c952498677faa9d86c2" - integrity sha512-aBMbD1Xxay75ViYezwT40aQONfr+pSXTHwNKvIXhXD6+LY3F1dLIcceoC5OZKBVHbXcysz1hL9D2w0JJIMXpUw== +callsites@^4.2.0: + version "4.2.0" + resolved "https://registry.npmjs.org/callsites/-/callsites-4.2.0.tgz#98761d5be3ce092e4b9c92f7fb8c8eb9b83cadc8" + integrity sha512-kfzR4zzQtAE9PC7CzZsjl3aBNbXWuXiSeOCdLcPpBfGW8YuCqQHcRPFDbr/BPVmd3EEPVpuFzLyuT/cUhPr4OQ== camelcase-keys@^8.0.2: version "8.0.2" @@ -2379,10 +2388,10 @@ caniuse-lite@^1.0.30001580: resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001581.tgz#0dfd4db9e94edbdca67d57348ebc070dece279f4" integrity sha512-whlTkwhqV2tUmP3oYhtNfaWGYHDdS3JYFQBKXxcUR9qqPWsRhFHhoISO2Xnl/g0xyKzht9mI1LZpiNWfMzHixQ== -cbor@^9.0.1: - version "9.0.1" - resolved "https://registry.npmjs.org/cbor/-/cbor-9.0.1.tgz#b16e393d4948d44758cd54ac6151379d443b37ae" - integrity sha512-/TQOWyamDxvVIv+DY9cOLNuABkoyz8K/F3QE56539pGVYohx0+MEA1f4lChFTX79dBTBS7R1PF6ovH7G+VtBfQ== +cbor@^9.0.2: + version "9.0.2" + resolved "https://registry.npmjs.org/cbor/-/cbor-9.0.2.tgz#536b4f2d544411e70ec2b19a2453f10f83cd9fdb" + integrity sha512-JPypkxsB10s9QOWwa6zwPzqE1Md3vqpPc+cai4sAecuCsRyAtAl/pMyhPlMbT/xtPnm2dznJZYRLui57qiRhaQ== dependencies: nofilter "^3.1.0" @@ -2906,12 +2915,12 @@ date-time@^3.1.0: dependencies: time-zone "^1.0.0" -debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4: - version "4.3.4" - resolved "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" - integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== +debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4, debug@^4.3.7: + version "4.3.7" + resolved "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz#87945b4151a011d76d95a198d7111c865c360a52" + integrity sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ== dependencies: - ms "2.1.2" + ms "^2.1.3" debug@^3.2.7: version "3.2.7" @@ -3262,10 +3271,10 @@ electronmon@^2.0.2: runtime-required "^1.1.0" watchboy "^0.4.3" -emittery@^1.0.1: - version "1.0.1" - resolved "https://registry.npmjs.org/emittery/-/emittery-1.0.1.tgz#e0cf36e2d7eef94dbd025969f642d57ae50a56cd" - integrity sha512-2ID6FdrMD9KDLldGesP6317G78K7km/kMcwItRtVFva7I/cSEOIaLpewaUb+YLXVwdAp3Ctfxh/V5zIl1sj7dQ== +emittery@^1.0.3: + version "1.0.3" + resolved "https://registry.npmjs.org/emittery/-/emittery-1.0.3.tgz#c9d2a9c689870f15251bb13b31c67715c26d69ac" + integrity sha512-tJdCJitoy2lrC2ldJcqN4vkqJ00lT+tOWNT1hBJjO/3FDMJa5TTIiYGCKGkn/WfCyOzUMObeohbVTj00fhiLiA== emoji-regex@^10.3.0: version "10.3.0" @@ -4056,10 +4065,10 @@ fd-slicer@~1.1.0: dependencies: pend "~1.2.0" -figures@^6.0.1: - version "6.0.1" - resolved "https://registry.npmjs.org/figures/-/figures-6.0.1.tgz#75a2baf3ca8c63e2ea253179e9f1157833587ea4" - integrity sha512-0oY/olScYD4IhQ8u//gCPA4F3mlTn2dacYmiDm/mbDQvpmLjV4uH+zhsQ5IyXRyvqkvtUkXkNdGvg5OFJTCsuQ== +figures@^6.1.0: + version "6.1.0" + resolved "https://registry.npmjs.org/figures/-/figures-6.1.0.tgz#935479f51865fa7479f6fa94fc6fc7ac14e62c4a" + integrity sha512-d+l3qxjSesT4V7v2fh+QnmFnUWv9lSpjarhShNTgBOfA0ttejbQUAlHLitbjkoRiDulW0OPoQPYIGhIC8ohejg== dependencies: is-unicode-supported "^2.0.0" @@ -4097,6 +4106,13 @@ fill-range@^7.0.1: dependencies: to-regex-range "^5.0.1" +fill-range@^7.1.1: + version "7.1.1" + resolved "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292" + integrity sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg== + dependencies: + to-regex-range "^5.0.1" + find-cache-dir@^4.0.0: version "4.0.0" resolved "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-4.0.0.tgz#a30ee0448f81a3990708f6453633c733e2f6eec2" @@ -4539,12 +4555,12 @@ globby@^13.1.4: merge2 "^1.4.1" slash "^4.0.0" -globby@^14.0.0: - version "14.0.0" - resolved "https://registry.npmjs.org/globby/-/globby-14.0.0.tgz#ea9c062a3614e33f516804e778590fcf055256b9" - integrity sha512-/1WM/LNHRAOH9lZta77uGbq0dAEQM+XjNesWwhlERDVenqothRbnzTrL3/LrIoEPPjeUHC3vrS6TwoyxeHs7MQ== +globby@^14.0.0, globby@^14.0.2: + version "14.0.2" + resolved "https://registry.npmjs.org/globby/-/globby-14.0.2.tgz#06554a54ccfe9264e5a9ff8eded46aa1e306482f" + integrity sha512-s3Fq41ZVh7vbbe2PN3nrW7yC7U7MFVc5c98/iTl9c2GawNMKx/J648KQRW6WKkuU8GIbbh2IXfIRQjOZnXcTnw== dependencies: - "@sindresorhus/merge-streams" "^1.0.0" + "@sindresorhus/merge-streams" "^2.1.0" fast-glob "^3.3.2" ignore "^5.2.4" path-type "^5.0.0" @@ -5931,6 +5947,14 @@ micromatch@^4.0.5: braces "^3.0.2" picomatch "^2.3.1" +micromatch@^4.0.8: + version "4.0.8" + resolved "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz#d66fa18f3a47076789320b9b1af32bd86d9fa202" + integrity sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA== + dependencies: + braces "^3.0.3" + picomatch "^2.3.1" + mime-db@1.51.0: version "1.51.0" resolved "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz#d9ff62451859b18342d960850dc3cfb77e63fb0c" @@ -6108,11 +6132,6 @@ mri@1.1.4: resolved "https://registry.npmjs.org/mri/-/mri-1.1.4.tgz#7cb1dd1b9b40905f1fac053abe25b6720f44744a" integrity sha512-6y7IjGPm8AzlvoUrwAaw1tLnUBudaS3752vcd8JtrpGGQn+rXIe63LFVHm/YMwtqAuh+LJPCFdlLYPWM1nYn6w== -ms@2.1.2: - version "2.1.2" - resolved "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" - integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== - ms@2.1.3, ms@^2.0.0, ms@^2.1.1, ms@^2.1.3: version "2.1.3" resolved "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" @@ -6617,10 +6636,10 @@ p-map@^6.0.0: resolved "https://registry.npmjs.org/p-map/-/p-map-6.0.0.tgz#4d9c40d3171632f86c47601b709f4b4acd70fed4" integrity sha512-T8BatKGY+k5rU+Q/GTYgrEf2r4xRMevAN5mtXc2aPc4rS1j3s+vWTaO2Wag94neXuCAUAs8cxBL9EeB5EA6diw== -p-map@^7.0.1: - version "7.0.1" - resolved "https://registry.npmjs.org/p-map/-/p-map-7.0.1.tgz#1faf994e597160f7851882926bfccabc1d226f80" - integrity sha512-2wnaR0XL/FDOj+TgpDuRb2KTjLnu3Fma6b1ZUwGY7LcqenMcvP/YFpjpbPKY6WVGsbuJZRuoUz8iPrt8ORnAFw== +p-map@^7.0.2: + version "7.0.2" + resolved "https://registry.npmjs.org/p-map/-/p-map-7.0.2.tgz#7c5119fada4755660f70199a66aa3fe2f85a1fe8" + integrity sha512-z4cYYMMdKHzw4O5UkWJImbZynVIo0lSGTXc7bzB1e/rrDqkgGUNysK/o4bTr+0+xKvvLoTyGqYC4Fgljy9qe1Q== p-timeout@^5.0.2: version "5.0.2" @@ -6772,10 +6791,10 @@ picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.2, picomatch@^2.2.3, picomatc resolved "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA== -picomatch@^3.0.1: - version "3.0.1" - resolved "https://registry.npmjs.org/picomatch/-/picomatch-3.0.1.tgz#817033161def55ec9638567a2f3bbc876b3e7516" - integrity sha512-I3EurrIQMlRc9IaAZnqRR044Phh2DXY+55o7uJ0V+hYZAcQYSuFWsc9q5PvyDHUSCe1Qxn/iBz+78s86zWnGag== +picomatch@^4.0.2: + version "4.0.2" + resolved "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz#77c742931e8f3b8820946c76cd0c1f13730d1dab" + integrity sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg== pify@^4.0.1: version "4.0.1" @@ -6908,10 +6927,10 @@ prettier@3.2.5: resolved "https://registry.npmjs.org/prettier/-/prettier-3.2.5.tgz#e52bc3090586e824964a8813b09aba6233b28368" integrity sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A== -pretty-ms@^9.0.0: - version "9.0.0" - resolved "https://registry.npmjs.org/pretty-ms/-/pretty-ms-9.0.0.tgz#53c57f81171c53be7ce3fd20bdd4265422bc5929" - integrity sha512-E9e9HJ9R9NasGOgPaPE8VMeiPKAyWR5jcFpNnwIejslIhWqdqOrb2wShBsncMPUb+BcCd2OPYfh7p2W6oemTng== +pretty-ms@^9.1.0: + version "9.2.0" + resolved "https://registry.npmjs.org/pretty-ms/-/pretty-ms-9.2.0.tgz#e14c0aad6493b69ed63114442a84133d7e560ef0" + integrity sha512-4yf0QO/sllf/1zbZWYnvWw3NxCQwLXKzIj0G849LSufP15BXKM0rbD2Z3wVnkMfjdn/CB0Dpp444gYAACdsplg== dependencies: parse-ms "^4.0.0" @@ -8866,10 +8885,10 @@ write-file-atomic@^3.0.3: signal-exit "^3.0.2" typedarray-to-buffer "^3.1.5" -write-file-atomic@^5.0.1: - version "5.0.1" - resolved "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-5.0.1.tgz#68df4717c55c6fa4281a7860b4c2ba0a6d2b11e7" - integrity sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw== +write-file-atomic@^6.0.0: + version "6.0.0" + resolved "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-6.0.0.tgz#e9c89c8191b3ef0606bc79fb92681aa1aa16fa93" + integrity sha512-GmqrO8WJ1NuzJ2DrziEI2o57jKAVIQNf8a18W3nCYU3H7PNWqCCVTeH6/NQE93CIllIgQS98rrmVkYgTX9fFJQ== dependencies: imurmurhash "^0.1.4" signal-exit "^4.0.1" From bd24ae37655963340f0871791848eefdbcf00b1e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 23 Nov 2024 04:16:40 +0000 Subject: [PATCH 7/9] Bump typescript-json-schema from 0.63.0 to 0.65.1 (#54) --- package.json | 2 +- yarn.lock | 34 +++++++++++++++++++++++----------- 2 files changed, 24 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index 4223d74bf582..4e94f76cc9cb 100644 --- a/package.json +++ b/package.json @@ -58,7 +58,7 @@ "shebang-loader": "0.0.1", "styled-jsx": "5.1.2", "stylis": "3.5.4", - "typescript-json-schema": "0.63.0", + "typescript-json-schema": "0.65.1", "uuid": "9.0.1", "webpack-cli": "5.1.4", "xterm": "5.3.0", diff --git a/yarn.lock b/yarn.lock index 7dff8332c085..7843e09811fd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1186,11 +1186,18 @@ dependencies: undici-types "~6.19.8" -"@types/node@^16.11.26", "@types/node@^16.9.2": +"@types/node@^16.11.26": version "16.18.36" resolved "https://registry.npmjs.org/@types/node/-/node-16.18.36.tgz#0db5d7efc4760d36d0d1d22c85d1a53accd5dc27" integrity sha512-8egDX8dE50XyXWH6C6PRCNkTP106DuUrvdrednFouDSmCi7IOvrqr0frznfZaHifHH/3aq/7a7v9N4wdXMqhBQ== +"@types/node@^18.11.9": + version "18.19.64" + resolved "https://registry.npmjs.org/@types/node/-/node-18.19.64.tgz#122897fb79f2a9ec9c979bded01c11461b2b1478" + integrity sha512-955mDqvO2vFf/oL7V3WiUtiz+BugyX8uVbaT2H8oj3+8dRyH2FLiNdowe7eNqRM7IOIZvzDH76EoAT+gwm6aIQ== + dependencies: + undici-types "~5.26.4" + "@types/normalize-package-data@^2.4.1": version "2.4.1" resolved "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz#d3357479a0fdfdd5907fe67e17e0a85c906e1301" @@ -8480,18 +8487,18 @@ typedarray-to-buffer@^3.1.5: dependencies: is-typedarray "^1.0.0" -typescript-json-schema@0.63.0: - version "0.63.0" - resolved "https://registry.npmjs.org/typescript-json-schema/-/typescript-json-schema-0.63.0.tgz#55ef6c4dde71625425b169d37e0de3d2ea14e093" - integrity sha512-vBfMBq4U/rZ5FIRi7u4o/YAdeRHsSabdGHogUlCPi0cYU0CGvS4Bdu8bSzyUsF+Kf5PTQUGh2TictJuQTDK6eQ== +typescript-json-schema@0.65.1: + version "0.65.1" + resolved "https://registry.npmjs.org/typescript-json-schema/-/typescript-json-schema-0.65.1.tgz#24840812f69b220b75d86ed87e220b3b3345db2c" + integrity sha512-tuGH7ff2jPaUYi6as3lHyHcKpSmXIqN7/mu50x3HlYn0EHzLpmt3nplZ7EuhUkO0eqDRc9GqWNkfjgBPIS9kxg== dependencies: "@types/json-schema" "^7.0.9" - "@types/node" "^16.9.2" + "@types/node" "^18.11.9" glob "^7.1.7" path-equal "^1.2.5" safe-stable-stringify "^2.2.0" ts-node "^10.9.1" - typescript "~5.1.0" + typescript "~5.5.0" yargs "^17.1.1" typescript@5.4.5: @@ -8504,10 +8511,10 @@ typescript@^4.0.2: resolved "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a" integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g== -typescript@~5.1.0: - version "5.1.6" - resolved "https://registry.npmjs.org/typescript/-/typescript-5.1.6.tgz#02f8ac202b6dad2c0dd5e0913745b47a37998274" - integrity sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA== +typescript@~5.5.0: + version "5.5.4" + resolved "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz#d9852d6c82bad2d2eda4fd74a5762a8f5909e9ba" + integrity sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q== unbox-primitive@^1.0.1: version "1.0.1" @@ -8529,6 +8536,11 @@ unbox-primitive@^1.0.2: has-symbols "^1.0.3" which-boxed-primitive "^1.0.2" +undici-types@~5.26.4: + version "5.26.5" + resolved "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617" + integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA== + undici-types@~6.19.8: version "6.19.8" resolved "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz#35111c9d1437ab83a7cdc0abae2f26d88eda0a02" From cfee97ce7693063b406d94e544e7bab2329320df Mon Sep 17 00:00:00 2001 From: Philip Peterson Date: Fri, 22 Nov 2024 23:07:22 -0900 Subject: [PATCH 8/9] Tweak ava config (#77) --- ava-e2e.config.js | 2 +- test/index.ts | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ava-e2e.config.js b/ava-e2e.config.js index 0b2f46db86a0..5cf269b874ce 100644 --- a/ava-e2e.config.js +++ b/ava-e2e.config.js @@ -2,5 +2,5 @@ module.exports = { files: ['test/*'], extensions: ['ts'], require: ['ts-node/register/transpile-only'], - timeout: '30s' + timeout: '2m' }; diff --git a/test/index.ts b/test/index.ts index 522069b81b54..2bfab8f067b9 100644 --- a/test/index.ts +++ b/test/index.ts @@ -51,5 +51,11 @@ test.after(async () => { }); test('see if dev tools are open', async (t) => { - t.false(await app.evaluate(({webContents}) => !!webContents.getFocusedWebContents()?.isDevToolsOpened())); + const result = app.evaluate(({webContents}) => { + const focused = webContents.getFocusedWebContents(); + const isDevOpen = focused?.isDevToolsOpened(); + return Boolean(isDevOpen); + }); + + t.false(await result); }); From cc7141c9cc722d34bebd8926293ceaaf5c6e1015 Mon Sep 17 00:00:00 2001 From: Philip Peterson Date: Sun, 10 Nov 2024 19:21:52 -0900 Subject: [PATCH 9/9] Moves xterm-* dependencies to @xterm/* dependencies and performs select upgrades: * Bumps xterm from 5.3.0 to 5.4.0 * Bumps xterm-addon-canvas from 0.5.0 to 0.6.0 * Bumps xterm-addon-fit from 0.8.0 to 0.9.0 * Bumps xterm-addon-image from 0.5.0 to 0.7.0 * Bumps xterm-addon-ligatures from 0.7.0 to 0.8.0 * Bumps xterm-addon-search from 0.13.0 to 0.14.0 * Bumps xterm-addon-unicode11 from 0.6.0 to 0.7.0 * Bumps xterm-addon-web-links from 0.9.0 to 0.10.0 * Bumps xterm-addon-webgl from 0.16.0 to 0.17.0 Signed-off-by: Philip Peterson --- bin/snapshot-libs.js | 16 +++---- lib/components/term.tsx | 24 +++++------ package.json | 18 ++++---- typings/config.d.ts | 2 +- typings/hyper.d.ts | 6 +-- webpack.config.ts | 14 +++--- yarn.lock | 96 ++++++++++++++++++++--------------------- 7 files changed, 88 insertions(+), 88 deletions(-) diff --git a/bin/snapshot-libs.js b/bin/snapshot-libs.js index 791e8ec868b5..ad4d7f239d0c 100644 --- a/bin/snapshot-libs.js +++ b/bin/snapshot-libs.js @@ -12,7 +12,7 @@ require('redux'); require('reselect'); require('seamless-immutable'); require('stylis'); -require('xterm-addon-unicode11'); +require('@xterm/addon-unicode11'); // eslint-disable-next-line no-constant-condition if (false) { require('args'); @@ -21,11 +21,11 @@ if (false) { require('react-dom'); require('react-redux'); require('react'); - require('xterm-addon-fit'); - require('xterm-addon-image'); - require('xterm-addon-search'); - require('xterm-addon-web-links'); - require('xterm-addon-webgl'); - require('xterm-addon-canvas'); - require('xterm'); + require('@xterm/addon-fit'); + require('@xterm/addon-image'); + require('@xterm/addon-search'); + require('@xterm/addon-web-links'); + require('@xterm/addon-webgl'); + require('@xterm/addon-canvas'); + require('@xterm/xterm'); } diff --git a/lib/components/term.tsx b/lib/components/term.tsx index 45c1464c97cc..923f398cb490 100644 --- a/lib/components/term.tsx +++ b/lib/components/term.tsx @@ -1,20 +1,20 @@ import {clipboard, shell} from 'electron'; import React from 'react'; +import {CanvasAddon} from '@xterm/addon-canvas'; +import {FitAddon} from '@xterm/addon-fit'; +import {ImageAddon} from '@xterm/addon-image'; +import {LigaturesAddon} from '@xterm/addon-ligatures'; +import {SearchAddon} from '@xterm/addon-search'; +import type {ISearchDecorationOptions} from '@xterm/addon-search'; +import {Unicode11Addon} from '@xterm/addon-unicode11'; +import {WebLinksAddon} from '@xterm/addon-web-links'; +import {WebglAddon} from '@xterm/addon-webgl'; +import {Terminal} from '@xterm/xterm'; +import type {ITerminalOptions, IDisposable} from '@xterm/xterm'; import Color from 'color'; import isEqual from 'lodash/isEqual'; import pickBy from 'lodash/pickBy'; -import {Terminal} from 'xterm'; -import type {ITerminalOptions, IDisposable} from 'xterm'; -import {CanvasAddon} from 'xterm-addon-canvas'; -import {FitAddon} from 'xterm-addon-fit'; -import {ImageAddon} from 'xterm-addon-image'; -import {LigaturesAddon} from 'xterm-addon-ligatures'; -import {SearchAddon} from 'xterm-addon-search'; -import type {ISearchDecorationOptions} from 'xterm-addon-search'; -import {Unicode11Addon} from 'xterm-addon-unicode11'; -import {WebLinksAddon} from 'xterm-addon-web-links'; -import {WebglAddon} from 'xterm-addon-webgl'; import type {TermProps} from '../../typings/hyper'; import terms from '../terms'; @@ -23,7 +23,7 @@ import {decorate} from '../utils/plugins'; import _SearchBox from './searchBox'; -import 'xterm/css/xterm.css'; +import '@xterm/xterm/css/xterm.css'; const SearchBox = decorate(_SearchBox, 'SearchBox'); diff --git a/package.json b/package.json index 4e94f76cc9cb..6bfc74a6ea1c 100644 --- a/package.json +++ b/package.json @@ -61,15 +61,15 @@ "typescript-json-schema": "0.65.1", "uuid": "9.0.1", "webpack-cli": "5.1.4", - "xterm": "5.3.0", - "xterm-addon-canvas": "0.5.0", - "xterm-addon-fit": "0.8.0", - "xterm-addon-image": "0.5.0", - "xterm-addon-ligatures": "0.7.0", - "xterm-addon-search": "0.13.0", - "xterm-addon-unicode11": "0.6.0", - "xterm-addon-web-links": "0.9.0", - "xterm-addon-webgl": "0.16.0" + "@xterm/xterm": "5.4.0", + "@xterm/addon-canvas": "0.6.0", + "@xterm/addon-fit": "0.9.0", + "@xterm/addon-image": "0.7.0", + "@xterm/addon-ligatures": "0.8.0", + "@xterm/addon-search": "0.14.0", + "@xterm/addon-unicode11": "0.7.0", + "@xterm/addon-web-links": "0.10.0", + "@xterm/addon-webgl": "0.17.0" }, "devDependencies": { "@ava/babel": "2.0.0", diff --git a/typings/config.d.ts b/typings/config.d.ts index 7a6053e93fe3..583ff5476b49 100644 --- a/typings/config.d.ts +++ b/typings/config.d.ts @@ -1,4 +1,4 @@ -import type {FontWeight} from 'xterm'; +import type {FontWeight} from '@xterm/xterm'; export type ColorMap = { black: string; diff --git a/typings/hyper.d.ts b/typings/hyper.d.ts index dcc48f54a802..4ba77c54c97c 100644 --- a/typings/hyper.d.ts +++ b/typings/hyper.d.ts @@ -41,7 +41,7 @@ export type ITermState = Immutable<{ }>; export type cursorShapes = 'BEAM' | 'UNDERLINE' | 'BLOCK'; -import type {FontWeight, IWindowsPty, Terminal} from 'xterm'; +import type {FontWeight, IWindowsPty, Terminal} from '@xterm/xterm'; import type {ColorMap, configOptions} from './config'; export type uiState = Immutable<{ @@ -342,8 +342,8 @@ export type SearchBoxProps = { font: string; }; -import type {FitAddon} from 'xterm-addon-fit'; -import type {SearchAddon} from 'xterm-addon-search'; +import type {FitAddon} from '@xterm/addon-fit'; +import type {SearchAddon} from '@xterm/addon-search'; export type TermProps = { backgroundColor: string; bell: 'SOUND' | false; diff --git a/webpack.config.ts b/webpack.config.ts index 432b575f2ee2..6953ecc9b20c 100644 --- a/webpack.config.ts +++ b/webpack.config.ts @@ -117,16 +117,16 @@ const config: webpack.Configuration[] = [ reselect: 'require("./node_modules/reselect/lib/index.js")', 'seamless-immutable': 'require("./node_modules/seamless-immutable/src/seamless-immutable.js")', stylis: 'require("./node_modules/stylis/stylis.js")', - 'xterm-addon-unicode11': 'require("./node_modules/xterm-addon-unicode11/lib/xterm-addon-unicode11.js")', + '@xterm/addon-unicode11': 'require("./node_modules/@xterm/addon-unicode11/lib/addon-unicode11.js")', args: 'require("./node_modules/args/lib/index.js")', mousetrap: 'require("./node_modules/mousetrap/mousetrap.js")', open: 'require("./node_modules/open/index.js")', - 'xterm-addon-fit': 'require("./node_modules/xterm-addon-fit/lib/xterm-addon-fit.js")', - 'xterm-addon-image': 'require("./node_modules/xterm-addon-image/lib/xterm-addon-image.js")', - 'xterm-addon-search': 'require("./node_modules/xterm-addon-search/lib/xterm-addon-search.js")', - 'xterm-addon-web-links': 'require("./node_modules/xterm-addon-web-links/lib/xterm-addon-web-links.js")', - 'xterm-addon-webgl': 'require("./node_modules/xterm-addon-webgl/lib/xterm-addon-webgl.js")', - 'xterm-addon-canvas': 'require("./node_modules/xterm-addon-canvas/lib/xterm-addon-canvas.js")', + '@xterm/addon-fit': 'require("./node_modules/@xterm/addon-fit/lib/addon-fit.js")', + '@xterm/addon-image': 'require("./node_modules/@xterm/addon-image/lib/addon-image.js")', + '@xterm/addon-search': 'require("./node_modules/@xterm/addon-search/lib/addon-search.js")', + '@xterm/addon-web-links': 'require("./node_modules/@xterm/addon-web-links/lib/addon-web-links.js")', + '@xterm/addon-webgl': 'require("./node_modules/@xterm/addon-webgl/lib/addon-webgl.js")', + '@xterm/addon-canvas': 'require("./node_modules/@xterm/addon-canvas/lib/addon-canvas.js")', xterm: 'require("./node_modules/xterm/lib/xterm.js")' }, plugins: [ diff --git a/yarn.lock b/yarn.lock index 7843e09811fd..afc80d5ff1b5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1572,6 +1572,54 @@ resolved "https://registry.npmjs.org/@xobotyi/scrollbar-width/-/scrollbar-width-1.9.5.tgz#80224a6919272f405b87913ca13b92929bdf3c4d" integrity sha512-N8tkAACJx2ww8vFMneJmaAgmjAG1tnVBZJRLRcx061tmsLRZHSEZSLuGWnwPtunsSLvSqXQ2wfp7Mgqg1I+2dQ== +"@xterm/addon-canvas@0.6.0": + version "0.6.0" + resolved "https://registry.npmjs.org/@xterm/addon-canvas/-/addon-canvas-0.6.0.tgz#08b2af252b8e4c5af3870820576a9a6ca18d517e" + integrity sha512-+nj2x595vItxfuAFxzXp46Izrh4EnEyS0Z60hX1iy6OFliP5OQu8Wu7n59m7m1vT6Q4nIWoN1WiH+VLAk4D9jQ== + +"@xterm/addon-fit@0.9.0": + version "0.9.0" + resolved "https://registry.npmjs.org/@xterm/addon-fit/-/addon-fit-0.9.0.tgz#29846f08782c51ad85b949528c45b84ad4ec45d7" + integrity sha512-hDlPPbTVPYyvwXu/asW8HbJkI/2RMi0cMaJnBZYVeJB0SWP2NeESMCNr+I7CvBlyI0sAxpxOg8Wk4OMkxBz9WA== + +"@xterm/addon-image@0.7.0": + version "0.7.0" + resolved "https://registry.npmjs.org/@xterm/addon-image/-/addon-image-0.7.0.tgz#86e7342a3fe3fac6ba42944054e660916ec44953" + integrity sha512-OXJvmWXhJ5tdqSFX9yR2/d9AXwOz8+lJOghEPu2lSuwgLlMcOZ2YA+YuxPrisXIB2UctEHPAvVDGLbS9cESbzg== + +"@xterm/addon-ligatures@0.8.0": + version "0.8.0" + resolved "https://registry.npmjs.org/@xterm/addon-ligatures/-/addon-ligatures-0.8.0.tgz#d7f196c09edad0e7e45c691dce74f28bab683c37" + integrity sha512-hvClRA4a4saHXJV+Svxo6tC9NLN17coKbbFChhaQFvTe+TAx+G+LI1NytI8rmSIosOhg9m4uYB3J9o3Qyj4qxA== + dependencies: + font-finder "^1.1.0" + font-ligatures "^1.4.1" + +"@xterm/addon-search@0.14.0": + version "0.14.0" + resolved "https://registry.npmjs.org/@xterm/addon-search/-/addon-search-0.14.0.tgz#783c1a3fb301a98f0d0598453bd80d22cb0863ed" + integrity sha512-gyKIjC1c2bqxBevPmWlMWRsHqiufUgl3HjN3OYim6YPClqNRUlTab7l8aW8i3W83XzU9q0gmAfIOe4KDmo0GfQ== + +"@xterm/addon-unicode11@0.7.0": + version "0.7.0" + resolved "https://registry.npmjs.org/@xterm/addon-unicode11/-/addon-unicode11-0.7.0.tgz#cf4fa4da58b0cbcad3666e03d642184f76fe7d27" + integrity sha512-HIhQpRenrslPn6GlUmCYZcSXvdU0JkTgXQ66dx9QwXEzgNhoh70b7hXPZDBoMD/bH/7DYlseeGO7qKQlFzyhbA== + +"@xterm/addon-web-links@0.10.0": + version "0.10.0" + resolved "https://registry.npmjs.org/@xterm/addon-web-links/-/addon-web-links-0.10.0.tgz#be3eccaf1cbd4063161458205cd4bbee2b0f34f9" + integrity sha512-QhrHCUr8w6ATGviyXwcAIM1qN3nD1hdxwMC8fsW7z/6aaQlb2nt7zmByJt4eOn7ZzrHOzczljqV5S2pkdQp2xw== + +"@xterm/addon-webgl@0.17.0": + version "0.17.0" + resolved "https://registry.npmjs.org/@xterm/addon-webgl/-/addon-webgl-0.17.0.tgz#1da534456b7971ebb2f08c381d4732d1f104d7d8" + integrity sha512-KUH//EZCz7j1+IekW8sZzmcj/y9gOLf/HMcsWXjg0Xr5cT1lIBIIbbBlbf5kZ+XnA/8c1IuBm1vx+blzlfPk0g== + +"@xterm/xterm@5.4.0": + version "5.4.0" + resolved "https://registry.npmjs.org/@xterm/xterm/-/xterm-5.4.0.tgz#a35b585750ca492cbf2a4c99472c480d8c122840" + integrity sha512-GlyzcZZ7LJjhFevthHtikhiDIl8lnTSgol6eTM4aoSNLcuXu3OEhnbqdCVIjtIil3jjabf3gDtb1S8FGahsuEw== + "@xtuc/ieee754@^1.2.0": version "1.2.0" resolved "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790" @@ -8915,54 +8963,6 @@ xtend@^4.0.0, xtend@^4.0.2, xtend@~4.0.0: resolved "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== -xterm-addon-canvas@0.5.0: - version "0.5.0" - resolved "https://registry.npmjs.org/xterm-addon-canvas/-/xterm-addon-canvas-0.5.0.tgz#95d056cec6da42a51b2c47746a011409020c388c" - integrity sha512-QOo/eZCMrCleAgMimfdbaZCgmQRWOml63Ued6RwQ+UTPvQj3Av9QKx3xksmyYrDGRO/AVRXa9oNuzlYvLdmoLQ== - -xterm-addon-fit@0.8.0: - version "0.8.0" - resolved "https://registry.npmjs.org/xterm-addon-fit/-/xterm-addon-fit-0.8.0.tgz#48ca99015385141918f955ca7819e85f3691d35f" - integrity sha512-yj3Np7XlvxxhYF/EJ7p3KHaMt6OdwQ+HDu573Vx1lRXsVxOcnVJs51RgjZOouIZOczTsskaS+CpXspK81/DLqw== - -xterm-addon-image@0.5.0: - version "0.5.0" - resolved "https://registry.npmjs.org/xterm-addon-image/-/xterm-addon-image-0.5.0.tgz#3c9bb332a3de55ab200dbefd3411e3b0d985314f" - integrity sha512-bWXUBeDzhisYh0clVKx4JgQrZjpn+/QRMRwNsfnRpjCMhgmZ+SL3Bivktd7q03O4uKMMcAOe6bSmppwP9/um0Q== - -xterm-addon-ligatures@0.7.0: - version "0.7.0" - resolved "https://registry.npmjs.org/xterm-addon-ligatures/-/xterm-addon-ligatures-0.7.0.tgz#28e24744fc06e83b0e3dad51f96823b036714ab3" - integrity sha512-5HXKCN5vB8KkqLIloItZkYAwMWF4Y2yOQsc4oFUXOjV3GnZskZpH0W+8rJH+80wxLNym7OMpdmg3a/Vd/+owDg== - dependencies: - font-finder "^1.1.0" - font-ligatures "^1.4.1" - -xterm-addon-search@0.13.0: - version "0.13.0" - resolved "https://registry.npmjs.org/xterm-addon-search/-/xterm-addon-search-0.13.0.tgz#21286f4db48aa949fbefce34bb8bc0c9d3cec627" - integrity sha512-sDUwG4CnqxUjSEFh676DlS3gsh3XYCzAvBPSvJ5OPgF3MRL3iHLPfsb06doRicLC2xXNpeG2cWk8x1qpESWJMA== - -xterm-addon-unicode11@0.6.0: - version "0.6.0" - resolved "https://registry.npmjs.org/xterm-addon-unicode11/-/xterm-addon-unicode11-0.6.0.tgz#733fd17bdf2ae6e818493db1d41241c999de0786" - integrity sha512-5pkb8YoS/deRtNqQRw8t640mu+Ga8B2MG3RXGQu0bwgcfr8XiXIRI880TWM49ICAHhTmnOLPzIIBIjEnCq7k2A== - -xterm-addon-web-links@0.9.0: - version "0.9.0" - resolved "https://registry.npmjs.org/xterm-addon-web-links/-/xterm-addon-web-links-0.9.0.tgz#c65b18588d1f613e703eb6feb7f129e7ff1c63e7" - integrity sha512-LIzi4jBbPlrKMZF3ihoyqayWyTXAwGfu4yprz1aK2p71e9UKXN6RRzVONR0L+Zd+Ik5tPVI9bwp9e8fDTQh49Q== - -xterm-addon-webgl@0.16.0: - version "0.16.0" - resolved "https://registry.npmjs.org/xterm-addon-webgl/-/xterm-addon-webgl-0.16.0.tgz#9872d08a64136f893b27ef9a6412136d3bf563c4" - integrity sha512-E8cq1AiqNOv0M/FghPT+zPAEnvIQRDbAbkb04rRYSxUym69elPWVJ4sv22FCLBqM/3LcrmBLl/pELnBebVFKgA== - -xterm@5.3.0: - version "5.3.0" - resolved "https://registry.npmjs.org/xterm/-/xterm-5.3.0.tgz#867daf9cc826f3d45b5377320aabd996cb0fce46" - integrity sha512-8QqjlekLUFTrU6x7xck1MsPzPA571K5zNqWm0M0oroYEWVOptZ0+ubQSkQ3uxIEhcIHRujJy6emDWX4A7qyFzg== - y18n@^5.0.5: version "5.0.5" resolved "https://registry.npmjs.org/y18n/-/y18n-5.0.5.tgz#8769ec08d03b1ea2df2500acef561743bbb9ab18"