From d057a57ea41598f59212d864d274f4697b0e8788 Mon Sep 17 00:00:00 2001 From: Eli Schleifer <1265982+EliSchleifer@users.noreply.github.com> Date: Fri, 23 May 2025 12:04:01 -0700 Subject: [PATCH 01/17] Add additional environment variables used by python networking stack Add additional environment variables used by python networking stack --- runtimes/python/plugin.yaml | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/runtimes/python/plugin.yaml b/runtimes/python/plugin.yaml index e1161d33d..c15357f68 100644 --- a/runtimes/python/plugin.yaml +++ b/runtimes/python/plugin.yaml @@ -120,8 +120,14 @@ runtimes: - name: https_proxy value: ${env.https_proxy} optional: true + - name: REQUESTS_CA_BUNDLE + value: ${env.REQUESTS_CA_BUNDLE} + optional: true + - name: PIP_CERT + value: ${env.PIP_CERT} + optional: true - name: PYTHONUTF8 # Necessary for isort and our custom parsers on Windows - value: 1 + value: 1 linter_environment: - name: PATH list: @@ -129,6 +135,15 @@ runtimes: - "${linter}/Scripts" # Windows places binaries here instead of bin/ - name: VIRTUAL_ENV value: ${linter} + - name: http_proxy + value: ${env.http_proxy} + optional: true + - name: https_proxy + value: ${env.https_proxy} + optional: true + - name: REQUESTS_CA_BUNDLE + value: ${env.REQUESTS_CA_BUNDLE } + optional: true known_good_version: 3.10.8 version_commands: - run: python3 --version From 787ea75a018c19c6a0df5f1668ec0137f254a319 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CEli?= Date: Fri, 23 May 2025 19:08:41 +0000 Subject: [PATCH 02/17] format files --- runtimes/python/plugin.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/runtimes/python/plugin.yaml b/runtimes/python/plugin.yaml index c15357f68..cfd9948e1 100644 --- a/runtimes/python/plugin.yaml +++ b/runtimes/python/plugin.yaml @@ -120,14 +120,14 @@ runtimes: - name: https_proxy value: ${env.https_proxy} optional: true - - name: REQUESTS_CA_BUNDLE + - name: REQUESTS_CA_BUNDLE value: ${env.REQUESTS_CA_BUNDLE} optional: true - - name: PIP_CERT + - name: PIP_CERT value: ${env.PIP_CERT} - optional: true + optional: true - name: PYTHONUTF8 # Necessary for isort and our custom parsers on Windows - value: 1 + value: 1 linter_environment: - name: PATH list: @@ -141,9 +141,9 @@ runtimes: - name: https_proxy value: ${env.https_proxy} optional: true - - name: REQUESTS_CA_BUNDLE + - name: REQUESTS_CA_BUNDLE value: ${env.REQUESTS_CA_BUNDLE } - optional: true + optional: true known_good_version: 3.10.8 version_commands: - run: python3 --version From e934007d2a92359418239f050c38babf1bfa5e5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CEli?= Date: Mon, 26 May 2025 00:08:36 +0000 Subject: [PATCH 03/17] --- linters/sqlfluff/plugin.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/linters/sqlfluff/plugin.yaml b/linters/sqlfluff/plugin.yaml index e02c5384e..8f2c51836 100644 --- a/linters/sqlfluff/plugin.yaml +++ b/linters/sqlfluff/plugin.yaml @@ -5,14 +5,14 @@ tools: runtime: python package: sqlfluff shims: [sqlfluff] - known_good_version: 1.4.5 + known_good_version: 3.4.0 lint: definitions: - name: sqlfluff files: [sql, sql-j2, dml, ddl] tools: [sqlfluff] description: A dialect-flexible and configurable SQL linter - known_good_version: 1.4.5 + known_good_version: 3.4.0 direct_configs: - .sqlfluff affects_cache: From 70c3a2a8c6eb947dc6f074907773d751611cd267 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CEli?= Date: Mon, 26 May 2025 00:13:27 +0000 Subject: [PATCH 04/17] --- .trunk/trunk.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml index fa6bd9366..923ea831d 100644 --- a/.trunk/trunk.yaml +++ b/.trunk/trunk.yaml @@ -2,7 +2,7 @@ version: 0.1 # version used for local trunk runs and testing cli: - version: 1.22.12 + version: 1.22.15 shell_hooks: enforce: true @@ -17,7 +17,7 @@ plugins: - id: configs uri: https://github.com/trunk-io/configs - ref: v1.0.11 + ref: v1.0.12 lint: files: @@ -42,7 +42,7 @@ lint: enabled: # enabled linters inherited from github.com/trunk-io/configs plugin - definition-checker - - eslint@9.24.0 + - eslint@9.27.0 - trunk-toolbox@0.5.4 disabled: - pylint # pylint diagnostics are too strict From cfa1385cc6f0803a631183b3ae93e247b833de09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CEli?= Date: Mon, 26 May 2025 00:14:57 +0000 Subject: [PATCH 05/17] --- linters/sourcery/plugin.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linters/sourcery/plugin.yaml b/linters/sourcery/plugin.yaml index 9f83d313f..6a46d26dc 100644 --- a/linters/sourcery/plugin.yaml +++ b/linters/sourcery/plugin.yaml @@ -39,7 +39,7 @@ lint: - pyproject.toml - setup.cfg issue_url_format: https://docs.sourcery.ai/Reference/Python/Default-Rules/{} - known_good_version: 1.2.0 + known_good_version: 1.37.0 version_command: parse_regex: sourcery ${semver} run: sourcery --version From 3861d685a69416f9cceb8ecc9a11dcfcd63aae8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CEli?= Date: Mon, 26 May 2025 00:37:53 +0000 Subject: [PATCH 06/17] --- runtimes/node/plugin.yaml | 2 +- tests/driver/lint_driver.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/runtimes/node/plugin.yaml b/runtimes/node/plugin.yaml index 6457ca6f6..a783ff2a8 100644 --- a/runtimes/node/plugin.yaml +++ b/runtimes/node/plugin.yaml @@ -59,7 +59,7 @@ runtimes: - name: NODE_OPTIONS value: ${env.NODE_OPTIONS} optional: true - known_good_version: 18.20.5 + known_good_version: 22.16.0 version_commands: - run: node --version parse_regex: ${semver} diff --git a/tests/driver/lint_driver.ts b/tests/driver/lint_driver.ts index cee8ce1c9..3220fc681 100644 --- a/tests/driver/lint_driver.ts +++ b/tests/driver/lint_driver.ts @@ -94,7 +94,7 @@ runtimes: enabled: # required in order to query latest - go@1.21.0 - - node@18.20.5 + - node@22.16.0 - python@3.10.8 - ruby@3.1.4 plugins: From 58c20821276d9940248d479ff9dbc2b5e877805d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CEli?= Date: Mon, 26 May 2025 00:48:17 +0000 Subject: [PATCH 07/17] --- linters/cfnlint/plugin.yaml | 4 +- .../cfnlint_v1.35.3_basic.check.shot | 55 +++++++ linters/pmd/plugin.yaml | 2 +- .../test_data/pmd_7.13.0_CUSTOM.check.shot | 140 ++++++++++++++++++ linters/semgrep/semgrep.test.ts | 6 +- linters/squawk/plugin.yaml | 5 +- .../test_data/squawk_v1.5.3_basic.check.shot | 1 - .../test_data/squawk_v2.8.0_basic.check.shot | 126 ++++++++++++++++ 8 files changed, 331 insertions(+), 8 deletions(-) create mode 100644 linters/cfnlint/test_data/cfnlint_v1.35.3_basic.check.shot create mode 100644 linters/pmd/test_data/pmd_7.13.0_CUSTOM.check.shot create mode 100644 linters/squawk/test_data/squawk_v2.8.0_basic.check.shot diff --git a/linters/cfnlint/plugin.yaml b/linters/cfnlint/plugin.yaml index 0d2a2d4f5..f79dd0e43 100644 --- a/linters/cfnlint/plugin.yaml +++ b/linters/cfnlint/plugin.yaml @@ -5,7 +5,7 @@ tools: runtime: python package: cfn-lint shims: [cfn-lint] - known_good_version: 0.58.2 + known_good_version: 1.35.1 lint: definitions: - name: cfnlint @@ -22,7 +22,7 @@ lint: tools: [cfnlint] suggest_if: files_present issue_url_format: https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/rules.md - known_good_version: 0.58.2 + known_good_version: 1.35.1 version_command: parse_regex: ${semver} run: cfn-lint --version diff --git a/linters/cfnlint/test_data/cfnlint_v1.35.3_basic.check.shot b/linters/cfnlint/test_data/cfnlint_v1.35.3_basic.check.shot new file mode 100644 index 000000000..fd863b5e5 --- /dev/null +++ b/linters/cfnlint/test_data/cfnlint_v1.35.3_basic.check.shot @@ -0,0 +1,55 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`Testing linter cfnlint test basic 1`] = ` +{ + "issues": [ + { + "code": "E3030", + "column": "7", + "file": "test_data/basic.in.yaml", + "issueClass": "ISSUE_CLASS_EXISTING", + "issueUrl": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/rules.md", + "level": "LEVEL_HIGH", + "line": "19", + "linter": "cfnlint", + "message": "'DNSS' is not one of ['DNS', 'EMAIL', 'HTTP']", + "targetType": "cloudformation", + }, + { + "code": "E3012", + "column": "7", + "file": "test_data/basic.in.yaml", + "issueClass": "ISSUE_CLASS_EXISTING", + "issueUrl": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/rules.md", + "level": "LEVEL_HIGH", + "line": "21", + "linter": "cfnlint", + "message": "'*.test.io' is not of type 'array'", + "targetType": "cloudformation", + }, + ], + "lintActions": [ + { + "command": "lint", + "fileGroupName": "cloudformation", + "linter": "cfnlint", + "paths": [ + "test_data/basic.in.yaml", + ], + "verb": "TRUNK_VERB_CHECK", + }, + { + "command": "lint", + "fileGroupName": "cloudformation", + "linter": "cfnlint", + "paths": [ + "test_data/basic.in.yaml", + ], + "upstream": true, + "verb": "TRUNK_VERB_CHECK", + }, + ], + "taskFailures": [], + "unformattedFiles": [], +} +`; diff --git a/linters/pmd/plugin.yaml b/linters/pmd/plugin.yaml index 64ca2214b..236284698 100644 --- a/linters/pmd/plugin.yaml +++ b/linters/pmd/plugin.yaml @@ -65,7 +65,7 @@ lint: files: [java] runtime: java suggest_if: never - known_good_version: 6.55.0 + known_good_version: 7.13.0 known_bad_versions: - pmd_releases/7.0.0-rc4 - pmd_releases/7.0.0-rc3 diff --git a/linters/pmd/test_data/pmd_7.13.0_CUSTOM.check.shot b/linters/pmd/test_data/pmd_7.13.0_CUSTOM.check.shot new file mode 100644 index 000000000..f80987865 --- /dev/null +++ b/linters/pmd/test_data/pmd_7.13.0_CUSTOM.check.shot @@ -0,0 +1,140 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`Testing linter pmd test CUSTOM 1`] = ` +{ + "issues": [ + { + "code": "ApexDoc", + "column": "8", + "file": "test_data/apex.in.cls", + "issueClass": "ISSUE_CLASS_EXISTING", + "level": "LEVEL_MEDIUM", + "line": "1", + "linter": "pmd", + "message": "Missing ApexDoc comment", + "ranges": [ + { + "filePath": "test_data/apex.in.cls", + "length": "69", + "offset": "7", + }, + ], + "targetType": "apex", + }, + { + "code": "AvoidGlobalModifier", + "column": "8", + "file": "test_data/apex.in.cls", + "issueClass": "ISSUE_CLASS_EXISTING", + "level": "LEVEL_MEDIUM", + "line": "1", + "linter": "pmd", + "message": "Avoid using global modifier", + "ranges": [ + { + "filePath": "test_data/apex.in.cls", + "length": "69", + "offset": "7", + }, + ], + "targetType": "apex", + }, + { + "code": "ApexDoc", + "column": "8", + "file": "test_data/apex.in.cls", + "issueClass": "ISSUE_CLASS_EXISTING", + "level": "LEVEL_MEDIUM", + "line": "2", + "linter": "pmd", + "message": "Missing ApexDoc comment", + "ranges": [ + { + "filePath": "test_data/apex.in.cls", + "length": "41", + "offset": "33", + }, + ], + "targetType": "apex", + }, + { + "code": "NoPackage", + "column": "1", + "file": "test_data/hello.in.java", + "issueClass": "ISSUE_CLASS_EXISTING", + "level": "LEVEL_MEDIUM", + "line": "3", + "linter": "pmd", + "message": "All classes, interfaces, enums and annotations must belong to a named package", + "ranges": [ + { + "filePath": "test_data/hello.in.java", + "length": "5", + "offset": "23", + }, + ], + "targetType": "java", + }, + { + "code": "UseUtilityClass", + "column": "1", + "file": "test_data/hello.in.java", + "issueClass": "ISSUE_CLASS_EXISTING", + "level": "LEVEL_MEDIUM", + "line": "3", + "linter": "pmd", + "message": "This utility class has a non-private constructor", + "ranges": [ + { + "filePath": "test_data/hello.in.java", + "length": "5", + "offset": "23", + }, + ], + "targetType": "java", + }, + ], + "lintActions": [ + { + "command": "lint-apex", + "fileGroupName": "apex", + "linter": "pmd", + "paths": [ + "test_data/apex.in.cls", + ], + "verb": "TRUNK_VERB_CHECK", + }, + { + "command": "lint-apex", + "fileGroupName": "apex", + "linter": "pmd", + "paths": [ + "test_data/apex.in.cls", + ], + "upstream": true, + "verb": "TRUNK_VERB_CHECK", + }, + { + "command": "lint-java", + "fileGroupName": "java", + "linter": "pmd", + "paths": [ + "test_data/hello.in.java", + ], + "verb": "TRUNK_VERB_CHECK", + }, + { + "command": "lint-java", + "fileGroupName": "java", + "linter": "pmd", + "paths": [ + "test_data/hello.in.java", + ], + "upstream": true, + "verb": "TRUNK_VERB_CHECK", + }, + ], + "taskFailures": [], + "unformattedFiles": [], +} +`; diff --git a/linters/semgrep/semgrep.test.ts b/linters/semgrep/semgrep.test.ts index f96727f06..34fd9accf 100644 --- a/linters/semgrep/semgrep.test.ts +++ b/linters/semgrep/semgrep.test.ts @@ -2,4 +2,8 @@ import { customLinterCheckTest } from "tests"; import { skipOS, TEST_DATA } from "tests/utils"; // Note semgrep runs can take a while since they require downloading rulesets each time. -customLinterCheckTest({ linterName: "semgrep", args: TEST_DATA, skipTestIf: skipOS(["win32"]) }); +customLinterCheckTest({ + linterName: "semgrep", + args: `${TEST_DATA} --cache=false`, + skipTestIf: skipOS(["win32"]), +}); diff --git a/linters/squawk/plugin.yaml b/linters/squawk/plugin.yaml index 23ad5f8ac..767fb764e 100644 --- a/linters/squawk/plugin.yaml +++ b/linters/squawk/plugin.yaml @@ -4,8 +4,7 @@ tools: - name: squawk runtime: node package: squawk-cli - # First version to include Windows install and linux arm64 - known_good_version: 1.4.0 + known_good_version: 2.8.0 shims: [squawk] lint: definitions: @@ -13,7 +12,7 @@ lint: description: A linter for Postgres migrations files: [sql] tools: [squawk] - known_good_version: 1.4.0 + known_good_version: 2.8.0 suggest_if: config_present direct_configs: [.squawk.toml] commands: diff --git a/linters/squawk/test_data/squawk_v1.5.3_basic.check.shot b/linters/squawk/test_data/squawk_v1.5.3_basic.check.shot index 11479bba6..48d34ba0a 100644 --- a/linters/squawk/test_data/squawk_v1.5.3_basic.check.shot +++ b/linters/squawk/test_data/squawk_v1.5.3_basic.check.shot @@ -1,5 +1,4 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -// trunk-upgrade-validation:RELEASE exports[`Testing linter squawk test basic 1`] = ` { diff --git a/linters/squawk/test_data/squawk_v2.8.0_basic.check.shot b/linters/squawk/test_data/squawk_v2.8.0_basic.check.shot new file mode 100644 index 000000000..239f98a51 --- /dev/null +++ b/linters/squawk/test_data/squawk_v2.8.0_basic.check.shot @@ -0,0 +1,126 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`Testing linter squawk test basic 1`] = ` +{ + "issues": [ + { + "code": "prefer-robust-stmts", + "file": "test_data/basic.in.sql", + "issueClass": "ISSUE_CLASS_EXISTING", + "level": "LEVEL_HIGH", + "linter": "squawk", + "message": "Missing \`IF NOT EXISTS\`, the migration can't be rerun if it fails part way through.", + "targetType": "sql", + }, + { + "code": "prefer-bigint-over-int", + "column": "7", + "file": "test_data/basic.in.sql", + "issueClass": "ISSUE_CLASS_EXISTING", + "level": "LEVEL_HIGH", + "line": "1", + "linter": "squawk", + "message": "Using 32-bit integer fields can result in hitting the max \`int\` limit.", + "targetType": "sql", + }, + { + "code": "prefer-identity", + "column": "7", + "file": "test_data/basic.in.sql", + "issueClass": "ISSUE_CLASS_EXISTING", + "level": "LEVEL_HIGH", + "line": "1", + "linter": "squawk", + "message": "Serial types make schema, dependency, and permission management difficult.", + "targetType": "sql", + }, + { + "code": "prefer-text-field", + "column": "10", + "file": "test_data/basic.in.sql", + "issueClass": "ISSUE_CLASS_EXISTING", + "level": "LEVEL_HIGH", + "line": "2", + "linter": "squawk", + "message": "Changing the size of a \`varchar\` field requires an \`ACCESS EXCLUSIVE\` lock, that will prevent all reads and writes to the table.", + "targetType": "sql", + }, + { + "code": "prefer-robust-stmts", + "file": "test_data/basic.in.sql", + "issueClass": "ISSUE_CLASS_EXISTING", + "level": "LEVEL_HIGH", + "line": "5", + "linter": "squawk", + "message": "Missing \`IF NOT EXISTS\`, the migration can't be rerun if it fails part way through.", + "targetType": "sql", + }, + { + "code": "require-concurrent-index-creation", + "file": "test_data/basic.in.sql", + "issueClass": "ISSUE_CLASS_EXISTING", + "level": "LEVEL_HIGH", + "line": "5", + "linter": "squawk", + "message": "During normal index creation, table updates are blocked, but reads are still allowed.", + "targetType": "sql", + }, + { + "code": "constraint-missing-not-valid", + "column": "23", + "file": "test_data/basic.in.sql", + "issueClass": "ISSUE_CLASS_EXISTING", + "level": "LEVEL_HIGH", + "line": "7", + "linter": "squawk", + "message": "By default new constraints require a table scan and block writes to the table while that scan occurs.", + "targetType": "sql", + }, + { + "code": "prefer-robust-stmts", + "column": "23", + "file": "test_data/basic.in.sql", + "issueClass": "ISSUE_CLASS_EXISTING", + "level": "LEVEL_HIGH", + "line": "7", + "linter": "squawk", + "message": "Missing transaction, the migration can't be rerun if it fails part way through.", + "targetType": "sql", + }, + { + "code": "disallowed-unique-constraint", + "column": "27", + "file": "test_data/basic.in.sql", + "issueClass": "ISSUE_CLASS_EXISTING", + "level": "LEVEL_HIGH", + "line": "7", + "linter": "squawk", + "message": "Adding a \`UNIQUE\` constraint requires an \`ACCESS EXCLUSIVE\` lock which blocks reads and writes to the table while the index is built.", + "targetType": "sql", + }, + ], + "lintActions": [ + { + "command": "lint", + "fileGroupName": "sql", + "linter": "squawk", + "paths": [ + "test_data/basic.in.sql", + ], + "verb": "TRUNK_VERB_CHECK", + }, + { + "command": "lint", + "fileGroupName": "sql", + "linter": "squawk", + "paths": [ + "test_data/basic.in.sql", + ], + "upstream": true, + "verb": "TRUNK_VERB_CHECK", + }, + ], + "taskFailures": [], + "unformattedFiles": [], +} +`; From 636f9c15f4cc4232611dd15d1bdd4f562f30ced8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CEli?= Date: Mon, 26 May 2025 01:29:27 +0000 Subject: [PATCH 08/17] --- .trunk/trunk.yaml | 1 + runtimes/python/plugin.yaml | 2 +- tools/awscli/awscli.test.ts | 4 ++-- tools/awscli/plugin.yaml | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml index 923ea831d..a7f5a1425 100644 --- a/.trunk/trunk.yaml +++ b/.trunk/trunk.yaml @@ -107,6 +107,7 @@ actions: - tool-test-helper tools: enabled: + - awscli@1.40.22 - clangd-indexing-tools@19.1.2 - clangd@19.1.2 diff --git a/runtimes/python/plugin.yaml b/runtimes/python/plugin.yaml index cfd9948e1..05fbcfd8a 100644 --- a/runtimes/python/plugin.yaml +++ b/runtimes/python/plugin.yaml @@ -142,7 +142,7 @@ runtimes: value: ${env.https_proxy} optional: true - name: REQUESTS_CA_BUNDLE - value: ${env.REQUESTS_CA_BUNDLE } + value: ${env.REQUESTS_CA_BUNDLE} optional: true known_good_version: 3.10.8 version_commands: diff --git a/tools/awscli/awscli.test.ts b/tools/awscli/awscli.test.ts index 2640735a7..7244f4fa2 100644 --- a/tools/awscli/awscli.test.ts +++ b/tools/awscli/awscli.test.ts @@ -3,11 +3,11 @@ import { skipOS } from "tests/utils"; toolTest({ toolName: "awscli", - toolVersion: "1.29.30", + toolVersion: "1.40.22", testConfigs: [ makeToolTestConfig({ command: ["aws", "--version"], - expectedOut: "aws-cli/1.29.30", + expectedOut: "aws-cli/1.40.22", }), ], // On Windows, the shim is aws.cmd, and we don't support platform-specific shims yet. diff --git a/tools/awscli/plugin.yaml b/tools/awscli/plugin.yaml index 3a5f6cd67..829a8252a 100644 --- a/tools/awscli/plugin.yaml +++ b/tools/awscli/plugin.yaml @@ -4,5 +4,5 @@ tools: - name: awscli runtime: python package: awscli - known_good_version: 1.29.30 + known_good_version: 1.40.22 shims: [aws] From 78257cec938f29bad3694daa72a1874b65bbfade Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CEli?= Date: Mon, 26 May 2025 01:29:36 +0000 Subject: [PATCH 09/17] --- .trunk/trunk.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml index a7f5a1425..923ea831d 100644 --- a/.trunk/trunk.yaml +++ b/.trunk/trunk.yaml @@ -107,7 +107,6 @@ actions: - tool-test-helper tools: enabled: - - awscli@1.40.22 - clangd-indexing-tools@19.1.2 - clangd@19.1.2 From 816717fe1ba261a872d5b4173ab087187d4c1997 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CEli?= Date: Mon, 26 May 2025 06:20:15 +0000 Subject: [PATCH 10/17] --- .trunk/trunk.yaml | 1 + .../test_data/pmd_7.13.0_CUSTOM.check.shot | 140 ------------------ .../test_data/pmd_v7.0.0_CUSTOM.check.shot | 10 +- 3 files changed, 6 insertions(+), 145 deletions(-) delete mode 100644 linters/pmd/test_data/pmd_7.13.0_CUSTOM.check.shot diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml index 923ea831d..5944b17c0 100644 --- a/.trunk/trunk.yaml +++ b/.trunk/trunk.yaml @@ -41,6 +41,7 @@ lint: success_codes: [0] enabled: # enabled linters inherited from github.com/trunk-io/configs plugin + - pmd@pmd_releases/7.12.0 - definition-checker - eslint@9.27.0 - trunk-toolbox@0.5.4 diff --git a/linters/pmd/test_data/pmd_7.13.0_CUSTOM.check.shot b/linters/pmd/test_data/pmd_7.13.0_CUSTOM.check.shot deleted file mode 100644 index f80987865..000000000 --- a/linters/pmd/test_data/pmd_7.13.0_CUSTOM.check.shot +++ /dev/null @@ -1,140 +0,0 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP - -exports[`Testing linter pmd test CUSTOM 1`] = ` -{ - "issues": [ - { - "code": "ApexDoc", - "column": "8", - "file": "test_data/apex.in.cls", - "issueClass": "ISSUE_CLASS_EXISTING", - "level": "LEVEL_MEDIUM", - "line": "1", - "linter": "pmd", - "message": "Missing ApexDoc comment", - "ranges": [ - { - "filePath": "test_data/apex.in.cls", - "length": "69", - "offset": "7", - }, - ], - "targetType": "apex", - }, - { - "code": "AvoidGlobalModifier", - "column": "8", - "file": "test_data/apex.in.cls", - "issueClass": "ISSUE_CLASS_EXISTING", - "level": "LEVEL_MEDIUM", - "line": "1", - "linter": "pmd", - "message": "Avoid using global modifier", - "ranges": [ - { - "filePath": "test_data/apex.in.cls", - "length": "69", - "offset": "7", - }, - ], - "targetType": "apex", - }, - { - "code": "ApexDoc", - "column": "8", - "file": "test_data/apex.in.cls", - "issueClass": "ISSUE_CLASS_EXISTING", - "level": "LEVEL_MEDIUM", - "line": "2", - "linter": "pmd", - "message": "Missing ApexDoc comment", - "ranges": [ - { - "filePath": "test_data/apex.in.cls", - "length": "41", - "offset": "33", - }, - ], - "targetType": "apex", - }, - { - "code": "NoPackage", - "column": "1", - "file": "test_data/hello.in.java", - "issueClass": "ISSUE_CLASS_EXISTING", - "level": "LEVEL_MEDIUM", - "line": "3", - "linter": "pmd", - "message": "All classes, interfaces, enums and annotations must belong to a named package", - "ranges": [ - { - "filePath": "test_data/hello.in.java", - "length": "5", - "offset": "23", - }, - ], - "targetType": "java", - }, - { - "code": "UseUtilityClass", - "column": "1", - "file": "test_data/hello.in.java", - "issueClass": "ISSUE_CLASS_EXISTING", - "level": "LEVEL_MEDIUM", - "line": "3", - "linter": "pmd", - "message": "This utility class has a non-private constructor", - "ranges": [ - { - "filePath": "test_data/hello.in.java", - "length": "5", - "offset": "23", - }, - ], - "targetType": "java", - }, - ], - "lintActions": [ - { - "command": "lint-apex", - "fileGroupName": "apex", - "linter": "pmd", - "paths": [ - "test_data/apex.in.cls", - ], - "verb": "TRUNK_VERB_CHECK", - }, - { - "command": "lint-apex", - "fileGroupName": "apex", - "linter": "pmd", - "paths": [ - "test_data/apex.in.cls", - ], - "upstream": true, - "verb": "TRUNK_VERB_CHECK", - }, - { - "command": "lint-java", - "fileGroupName": "java", - "linter": "pmd", - "paths": [ - "test_data/hello.in.java", - ], - "verb": "TRUNK_VERB_CHECK", - }, - { - "command": "lint-java", - "fileGroupName": "java", - "linter": "pmd", - "paths": [ - "test_data/hello.in.java", - ], - "upstream": true, - "verb": "TRUNK_VERB_CHECK", - }, - ], - "taskFailures": [], - "unformattedFiles": [], -} -`; diff --git a/linters/pmd/test_data/pmd_v7.0.0_CUSTOM.check.shot b/linters/pmd/test_data/pmd_v7.0.0_CUSTOM.check.shot index bed649a29..f80987865 100644 --- a/linters/pmd/test_data/pmd_v7.0.0_CUSTOM.check.shot +++ b/linters/pmd/test_data/pmd_v7.0.0_CUSTOM.check.shot @@ -8,7 +8,7 @@ exports[`Testing linter pmd test CUSTOM 1`] = ` "column": "8", "file": "test_data/apex.in.cls", "issueClass": "ISSUE_CLASS_EXISTING", - "level": "LEVEL_HIGH", + "level": "LEVEL_MEDIUM", "line": "1", "linter": "pmd", "message": "Missing ApexDoc comment", @@ -26,7 +26,7 @@ exports[`Testing linter pmd test CUSTOM 1`] = ` "column": "8", "file": "test_data/apex.in.cls", "issueClass": "ISSUE_CLASS_EXISTING", - "level": "LEVEL_HIGH", + "level": "LEVEL_MEDIUM", "line": "1", "linter": "pmd", "message": "Avoid using global modifier", @@ -44,7 +44,7 @@ exports[`Testing linter pmd test CUSTOM 1`] = ` "column": "8", "file": "test_data/apex.in.cls", "issueClass": "ISSUE_CLASS_EXISTING", - "level": "LEVEL_HIGH", + "level": "LEVEL_MEDIUM", "line": "2", "linter": "pmd", "message": "Missing ApexDoc comment", @@ -62,7 +62,7 @@ exports[`Testing linter pmd test CUSTOM 1`] = ` "column": "1", "file": "test_data/hello.in.java", "issueClass": "ISSUE_CLASS_EXISTING", - "level": "LEVEL_HIGH", + "level": "LEVEL_MEDIUM", "line": "3", "linter": "pmd", "message": "All classes, interfaces, enums and annotations must belong to a named package", @@ -80,7 +80,7 @@ exports[`Testing linter pmd test CUSTOM 1`] = ` "column": "1", "file": "test_data/hello.in.java", "issueClass": "ISSUE_CLASS_EXISTING", - "level": "LEVEL_HIGH", + "level": "LEVEL_MEDIUM", "line": "3", "linter": "pmd", "message": "This utility class has a non-private constructor", From ac42ccf8f3b5257d33a561281aa145980041936b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CEli?= Date: Mon, 26 May 2025 06:28:01 +0000 Subject: [PATCH 11/17] --- linters/semgrep/plugin.yaml | 4 +- linters/semgrep/test_data/basic.go | 8 ++ linters/semgrep/test_data/data_comparison.py | 11 ++ .../semgrep_v1.122.0_CUSTOM.check.shot | 125 ++++++++++++++++++ 4 files changed, 146 insertions(+), 2 deletions(-) create mode 100644 linters/semgrep/test_data/data_comparison.py create mode 100644 linters/semgrep/test_data/semgrep_v1.122.0_CUSTOM.check.shot diff --git a/linters/semgrep/plugin.yaml b/linters/semgrep/plugin.yaml index f3213979a..93e4bcd64 100644 --- a/linters/semgrep/plugin.yaml +++ b/linters/semgrep/plugin.yaml @@ -5,7 +5,7 @@ tools: runtime: python package: semgrep shims: [semgrep] - known_good_version: 1.33.2 + known_good_version: 1.222.0 lint: definitions: - name: semgrep @@ -34,7 +34,7 @@ lint: environment: - name: PATH list: ["${env.PATH}"] - known_good_version: 1.33.2 + known_good_version: 1.122.0 known_bad_versions: [1.5.1, 1.117.0] # Does not work on MacOS version_command: parse_regex: ${semver} diff --git a/linters/semgrep/test_data/basic.go b/linters/semgrep/test_data/basic.go index a125c0d81..3d78ee9f3 100644 --- a/linters/semgrep/test_data/basic.go +++ b/linters/semgrep/test_data/basic.go @@ -8,3 +8,11 @@ func Md5Sum(text string) string { hasher := md5.New() return "" } + +func foo() { + // Note that the Go parser parses this to a Cast of a ParenExpr + x := f([]int("foo")) + + // ruleid: cast-symbol-prop + sink(x) +} diff --git a/linters/semgrep/test_data/data_comparison.py b/linters/semgrep/test_data/data_comparison.py new file mode 100644 index 000000000..05ad4f4ee --- /dev/null +++ b/linters/semgrep/test_data/data_comparison.py @@ -0,0 +1,11 @@ +#ok: date_rule +day1 = "3000-01-15" +#ruleid: date_rule +day2 = "1970-01-01" # TODO: set this date to 1906-12-09 after fixing + # date parsing on Windows. On Windows this leads + # to `exception: Unix_error: Result too large mktime` + # because the date is before the epoch. This is a + # version of what is discussed in + # https://github.com/neo4j/neo4j-python-driver/issues/302 +#ok: date_rule +day3 = "this is not a date" diff --git a/linters/semgrep/test_data/semgrep_v1.122.0_CUSTOM.check.shot b/linters/semgrep/test_data/semgrep_v1.122.0_CUSTOM.check.shot new file mode 100644 index 000000000..97f28cbbc --- /dev/null +++ b/linters/semgrep/test_data/semgrep_v1.122.0_CUSTOM.check.shot @@ -0,0 +1,125 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`Testing linter semgrep test CUSTOM 1`] = ` +{ + "issues": [], + "lintActions": [ + { + "command": "check", + "fileGroupName": "ALL", + "linter": "semgrep", + "paths": [ + "test_data/basic.go", + ], + "verb": "TRUNK_VERB_CHECK", + }, + { + "command": "check", + "fileGroupName": "ALL", + "linter": "semgrep", + "paths": [ + "test_data/element.ts", + ], + "verb": "TRUNK_VERB_CHECK", + }, + { + "command": "check", + "fileGroupName": "ALL", + "linter": "semgrep", + "paths": [ + "test_data/empty_go.go", + ], + "verb": "TRUNK_VERB_CHECK", + }, + { + "command": "check", + "fileGroupName": "ALL", + "linter": "semgrep", + "paths": [ + "test_data/empty_js.js", + ], + "verb": "TRUNK_VERB_CHECK", + }, + { + "command": "check", + "fileGroupName": "ALL", + "linter": "semgrep", + "paths": [ + "test_data/empty_py.py", + ], + "verb": "TRUNK_VERB_CHECK", + }, + { + "command": "check", + "fileGroupName": "ALL", + "linter": "semgrep", + "paths": [ + "test_data/request.py", + ], + "verb": "TRUNK_VERB_CHECK", + }, + { + "command": "check", + "fileGroupName": "ALL", + "linter": "semgrep", + "paths": [ + "test_data/basic.go", + ], + "upstream": true, + "verb": "TRUNK_VERB_CHECK", + }, + { + "command": "check", + "fileGroupName": "ALL", + "linter": "semgrep", + "paths": [ + "test_data/element.ts", + ], + "upstream": true, + "verb": "TRUNK_VERB_CHECK", + }, + { + "command": "check", + "fileGroupName": "ALL", + "linter": "semgrep", + "paths": [ + "test_data/empty_go.go", + ], + "upstream": true, + "verb": "TRUNK_VERB_CHECK", + }, + { + "command": "check", + "fileGroupName": "ALL", + "linter": "semgrep", + "paths": [ + "test_data/empty_js.js", + ], + "upstream": true, + "verb": "TRUNK_VERB_CHECK", + }, + { + "command": "check", + "fileGroupName": "ALL", + "linter": "semgrep", + "paths": [ + "test_data/empty_py.py", + ], + "upstream": true, + "verb": "TRUNK_VERB_CHECK", + }, + { + "command": "check", + "fileGroupName": "ALL", + "linter": "semgrep", + "paths": [ + "test_data/request.py", + ], + "upstream": true, + "verb": "TRUNK_VERB_CHECK", + }, + ], + "taskFailures": [], + "unformattedFiles": [], +} +`; From c242dcd60f8f372e9904659cdc8e733e9e012c37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CEli?= Date: Mon, 26 May 2025 06:29:17 +0000 Subject: [PATCH 12/17] --- linters/semgrep/test_data/data_comparison.py | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 linters/semgrep/test_data/data_comparison.py diff --git a/linters/semgrep/test_data/data_comparison.py b/linters/semgrep/test_data/data_comparison.py deleted file mode 100644 index 05ad4f4ee..000000000 --- a/linters/semgrep/test_data/data_comparison.py +++ /dev/null @@ -1,11 +0,0 @@ -#ok: date_rule -day1 = "3000-01-15" -#ruleid: date_rule -day2 = "1970-01-01" # TODO: set this date to 1906-12-09 after fixing - # date parsing on Windows. On Windows this leads - # to `exception: Unix_error: Result too large mktime` - # because the date is before the epoch. This is a - # version of what is discussed in - # https://github.com/neo4j/neo4j-python-driver/issues/302 -#ok: date_rule -day3 = "this is not a date" From 39481a1efcd341bac55deb29c533e4edac90496a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CEli?= Date: Mon, 26 May 2025 22:59:53 +0000 Subject: [PATCH 13/17] --- linters/cfnlint/plugin.yaml | 4 ++-- tools/sourcery/plugin.yaml | 2 +- tools/sourcery/sourcery.test.ts | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/linters/cfnlint/plugin.yaml b/linters/cfnlint/plugin.yaml index f79dd0e43..2259560be 100644 --- a/linters/cfnlint/plugin.yaml +++ b/linters/cfnlint/plugin.yaml @@ -5,7 +5,7 @@ tools: runtime: python package: cfn-lint shims: [cfn-lint] - known_good_version: 1.35.1 + known_good_version: 1.35.3 lint: definitions: - name: cfnlint @@ -22,7 +22,7 @@ lint: tools: [cfnlint] suggest_if: files_present issue_url_format: https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/rules.md - known_good_version: 1.35.1 + known_good_version: 1.35.3 version_command: parse_regex: ${semver} run: cfn-lint --version diff --git a/tools/sourcery/plugin.yaml b/tools/sourcery/plugin.yaml index cc305162c..963eedbb0 100644 --- a/tools/sourcery/plugin.yaml +++ b/tools/sourcery/plugin.yaml @@ -5,4 +5,4 @@ tools: runtime: python package: sourcery shims: [sourcery] - known_good_version: 1.2.0 + known_good_version: 1.37.0 diff --git a/tools/sourcery/sourcery.test.ts b/tools/sourcery/sourcery.test.ts index afaaa8a14..e66b30c72 100644 --- a/tools/sourcery/sourcery.test.ts +++ b/tools/sourcery/sourcery.test.ts @@ -1,11 +1,11 @@ import { makeToolTestConfig, toolTest } from "tests"; toolTest({ toolName: "sourcery", - toolVersion: "1.2.0", + toolVersion: "1.37.0", testConfigs: [ makeToolTestConfig({ command: ["sourcery", "--version"], - expectedOut: "1.2.0", + expectedOut: "1.37.0", }), ], }); From 92af7149901d7bda22a045ce5b916a4264be4a61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CEli?= Date: Mon, 26 May 2025 23:14:54 +0000 Subject: [PATCH 14/17] --- .github/actions/action_tests/action.yaml | 4 ++-- .github/actions/linter_tests/action.yaml | 4 ++-- .github/actions/tool_tests/action.yaml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/actions/action_tests/action.yaml b/.github/actions/action_tests/action.yaml index 002303b42..eaf56a4a5 100644 --- a/.github/actions/action_tests/action.yaml +++ b/.github/actions/action_tests/action.yaml @@ -28,9 +28,9 @@ runs: using: composite steps: - name: Setup node - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: - node-version: 18 + node-version: 22 - name: Specify defaults run: | diff --git a/.github/actions/linter_tests/action.yaml b/.github/actions/linter_tests/action.yaml index e32fbbb53..48be0d800 100644 --- a/.github/actions/linter_tests/action.yaml +++ b/.github/actions/linter_tests/action.yaml @@ -42,9 +42,9 @@ runs: using: composite steps: - name: Setup node - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: - node-version: 18 + node-version: 22 # NOTE: tzdata is a dependency of php, but without the DEBIAN_FRONTEND=noninteractive # it will prompt for a timezone selection diff --git a/.github/actions/tool_tests/action.yaml b/.github/actions/tool_tests/action.yaml index 03c4e92d2..c36bf3e17 100644 --- a/.github/actions/tool_tests/action.yaml +++ b/.github/actions/tool_tests/action.yaml @@ -32,9 +32,9 @@ runs: using: composite steps: - name: Setup node - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: - node-version: 18 + node-version: 22 - name: Install packages and specify defaults run: | From 8d666b322b4ccf332f67fc2005cf26b2fee83081 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CEli?= Date: Mon, 26 May 2025 23:23:04 +0000 Subject: [PATCH 15/17] --- .trunk/trunk.yaml | 4 + package-lock.json | 527 ++++++++++++++++++++++------------------------ package.json | 20 +- 3 files changed, 264 insertions(+), 287 deletions(-) diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml index 5944b17c0..6c0982bdc 100644 --- a/.trunk/trunk.yaml +++ b/.trunk/trunk.yaml @@ -19,6 +19,10 @@ plugins: uri: https://github.com/trunk-io/configs ref: v1.0.12 +runtimes: + enabled: + - node@22.16.0 + lint: files: - name: plugin.yaml diff --git a/package-lock.json b/package-lock.json index b627e6da4..f892f503a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,44 +8,44 @@ "tests" ], "devDependencies": { - "@jest/console": "^29.4.1", - "@jest/reporters": "^29.4.1", - "@jest/test-result": "^29.4.1", + "@jest/console": "^29.7.0", + "@jest/reporters": "^29.7.0", + "@jest/test-result": "^29.7.0", "@trunkio/launcher": "^1.3.4", "@types/caller": "^1.0.2", "@types/debug": "^4.1.12", "@types/jest": "^29.5.14", "@types/jest-specific-snapshot": "^0.5.9", - "@types/node": "^22.15.18", + "@types/node": "^22.15.21", "@types/semver": "^7.7.0", "@typescript-eslint/eslint-plugin": "^8.32.1", "@typescript-eslint/parser": "^8.32.1", "caller": "^1.1.0", "debug": "^4.4.1", - "eslint": "9.14.0", + "eslint": "9.27.0", "eslint-config-prettier": "^10.1.5", - "eslint-import-resolver-typescript": "^4.3.5", + "eslint-import-resolver-typescript": "^4.4.1", "eslint-plugin-import": "^2.31.0", - "eslint-plugin-import-x": "^4.12.2", + "eslint-plugin-import-x": "^4.13.3", "eslint-plugin-jest": "^28.11.0", "eslint-plugin-n": "^17.18.0", "eslint-plugin-prettier": "^5.4.0", "eslint-plugin-simple-import-sort": "^12.1.1", "fast-sort": "^3.4.1", - "jest": "^29.3.1", + "jest": "^29.7.0", "jest-junit": "^16.0.0", "jest-specific-snapshot": "^8.0.0", "semver": "^7.7.2", "simple-git": "^3.27.0", "ts-jest": "^29.3.4", "ts-node": "^10.9.2", - "tsconfig-paths": "^4.1.2", + "tsconfig-paths": "^4.2.0", "typescript": "^5.8.3", "typescript-eslint": "^8.32.1", "yaml": "^2.8.0" }, "engines": { - "node": ">=16" + "node": ">=22" } }, "node_modules/@aashutoshrathi/word-wrap": { @@ -69,11 +69,14 @@ } }, "node_modules/@babel/code-frame": { - "version": "7.18.6", + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.27.1.tgz", + "integrity": "sha512-cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg==", "dev": true, - "license": "MIT", "dependencies": { - "@babel/highlight": "^7.18.6" + "@babel/helper-validator-identifier": "^7.27.1", + "js-tokens": "^4.0.0", + "picocolors": "^1.1.1" }, "engines": { "node": ">=6.9.0" @@ -122,34 +125,39 @@ "license": "MIT" }, "node_modules/@babel/core/node_modules/semver": { - "version": "6.3.0", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, - "license": "ISC", "bin": { "semver": "bin/semver.js" } }, "node_modules/@babel/generator": { - "version": "7.20.7", + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.27.1.tgz", + "integrity": "sha512-UnJfnIpc/+JO0/+KRVQNGU+y5taA5vCbwN8+azkX6beii/ZF+enZJSOKo11ZSzGJjlNfJHfQtmQT8H+9TXPG2w==", "dev": true, - "license": "MIT", "dependencies": { - "@babel/types": "^7.20.7", - "@jridgewell/gen-mapping": "^0.3.2", - "jsesc": "^2.5.1" + "@babel/parser": "^7.27.1", + "@babel/types": "^7.27.1", + "@jridgewell/gen-mapping": "^0.3.5", + "@jridgewell/trace-mapping": "^0.3.25", + "jsesc": "^3.0.2" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/generator/node_modules/@jridgewell/gen-mapping": { - "version": "0.3.2", + "version": "0.3.8", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.8.tgz", + "integrity": "sha512-imAbBGkb+ebQyxKgzv5Hu2nmROxoDOXHh80evxdoXNOrvAnVx7zimzc1Oo5h9RlfV4vPXaE2iM5pOFbvOCClWA==", "dev": true, - "license": "MIT", "dependencies": { - "@jridgewell/set-array": "^1.0.1", + "@jridgewell/set-array": "^1.2.1", "@jridgewell/sourcemap-codec": "^1.4.10", - "@jridgewell/trace-mapping": "^0.3.9" + "@jridgewell/trace-mapping": "^0.3.24" }, "engines": { "node": ">=6.0.0" @@ -174,9 +182,10 @@ } }, "node_modules/@babel/helper-compilation-targets/node_modules/semver": { - "version": "6.3.0", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, - "license": "ISC", "bin": { "semver": "bin/semver.js" } @@ -189,29 +198,6 @@ "node": ">=6.9.0" } }, - "node_modules/@babel/helper-function-name": { - "version": "7.19.0", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/template": "^7.18.10", - "@babel/types": "^7.19.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-hoist-variables": { - "version": "7.18.6", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/types": "^7.18.6" - }, - "engines": { - "node": ">=6.9.0" - } - }, "node_modules/@babel/helper-module-imports": { "version": "7.18.6", "dev": true, @@ -272,17 +258,19 @@ } }, "node_modules/@babel/helper-string-parser": { - "version": "7.19.4", + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz", + "integrity": "sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==", "dev": true, - "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-validator-identifier": { - "version": "7.19.1", + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.27.1.tgz", + "integrity": "sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow==", "dev": true, - "license": "MIT", "engines": { "node": ">=6.9.0" } @@ -296,91 +284,26 @@ } }, "node_modules/@babel/helpers": { - "version": "7.20.7", + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.27.1.tgz", + "integrity": "sha512-FCvFTm0sWV8Fxhpp2McP5/W53GPllQ9QeQ7SiqGWjMf/LVG07lFa5+pgK05IRhVwtvafT22KF+ZSnM9I545CvQ==", "dev": true, - "license": "MIT", "dependencies": { - "@babel/template": "^7.20.7", - "@babel/traverse": "^7.20.7", - "@babel/types": "^7.20.7" + "@babel/template": "^7.27.1", + "@babel/types": "^7.27.1" }, "engines": { "node": ">=6.9.0" } }, - "node_modules/@babel/highlight": { - "version": "7.18.6", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/helper-validator-identifier": "^7.18.6", - "chalk": "^2.0.0", - "js-tokens": "^4.0.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/highlight/node_modules/ansi-styles": { - "version": "3.2.1", - "dev": true, - "license": "MIT", - "dependencies": { - "color-convert": "^1.9.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/@babel/highlight/node_modules/chalk": { - "version": "2.4.2", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/@babel/highlight/node_modules/color-convert": { - "version": "1.9.3", - "dev": true, - "license": "MIT", - "dependencies": { - "color-name": "1.1.3" - } - }, - "node_modules/@babel/highlight/node_modules/color-name": { - "version": "1.1.3", - "dev": true, - "license": "MIT" - }, - "node_modules/@babel/highlight/node_modules/escape-string-regexp": { - "version": "1.0.5", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.8.0" - } - }, - "node_modules/@babel/highlight/node_modules/supports-color": { - "version": "5.5.0", + "node_modules/@babel/parser": { + "version": "7.27.2", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.27.2.tgz", + "integrity": "sha512-QYLs8299NA7WM/bZAdp+CviYYkVoYXlDW2rzliy3chxd1PQjej7JORuMJDJXJUb9g0TT+B99EwaVLKmX+sPXWw==", "dev": true, - "license": "MIT", "dependencies": { - "has-flag": "^3.0.0" + "@babel/types": "^7.27.1" }, - "engines": { - "node": ">=4" - } - }, - "node_modules/@babel/parser": { - "version": "7.20.7", - "dev": true, - "license": "MIT", "bin": { "parser": "bin/babel-parser.js" }, @@ -552,32 +475,31 @@ } }, "node_modules/@babel/template": { - "version": "7.20.7", + "version": "7.27.2", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.27.2.tgz", + "integrity": "sha512-LPDZ85aEJyYSd18/DkjNh4/y1ntkE5KwUHWTiqgRxruuZL2F1yuHligVHLvcHY2vMHXttKFpJn6LwfI7cw7ODw==", "dev": true, - "license": "MIT", "dependencies": { - "@babel/code-frame": "^7.18.6", - "@babel/parser": "^7.20.7", - "@babel/types": "^7.20.7" + "@babel/code-frame": "^7.27.1", + "@babel/parser": "^7.27.2", + "@babel/types": "^7.27.1" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/traverse": { - "version": "7.20.10", + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.27.1.tgz", + "integrity": "sha512-ZCYtZciz1IWJB4U61UPu4KEaqyfj+r5T1Q5mqPo+IBpcG9kHv30Z0aD8LXPgC1trYa6rK0orRyAhqUgk4MjmEg==", "dev": true, - "license": "MIT", "dependencies": { - "@babel/code-frame": "^7.18.6", - "@babel/generator": "^7.20.7", - "@babel/helper-environment-visitor": "^7.18.9", - "@babel/helper-function-name": "^7.19.0", - "@babel/helper-hoist-variables": "^7.18.6", - "@babel/helper-split-export-declaration": "^7.18.6", - "@babel/parser": "^7.20.7", - "@babel/types": "^7.20.7", - "debug": "^4.1.0", + "@babel/code-frame": "^7.27.1", + "@babel/generator": "^7.27.1", + "@babel/parser": "^7.27.1", + "@babel/template": "^7.27.1", + "@babel/types": "^7.27.1", + "debug": "^4.3.1", "globals": "^11.1.0" }, "engines": { @@ -593,13 +515,13 @@ } }, "node_modules/@babel/types": { - "version": "7.20.7", + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.27.1.tgz", + "integrity": "sha512-+EzkxvLNfiUeKMgy/3luqfsCWFRXLb7U6wNQTk60tovuckwB15B191tJWvpp4HjiQWdJkCxO3Wbvc6jlk3Xb2Q==", "dev": true, - "license": "MIT", "dependencies": { - "@babel/helper-string-parser": "^7.19.4", - "@babel/helper-validator-identifier": "^7.19.1", - "to-fast-properties": "^2.0.0" + "@babel/helper-string-parser": "^7.27.1", + "@babel/helper-validator-identifier": "^7.27.1" }, "engines": { "node": ">=6.9.0" @@ -693,12 +615,12 @@ } }, "node_modules/@eslint/config-array": { - "version": "0.18.0", - "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.18.0.tgz", - "integrity": "sha512-fTxvnS1sRMu3+JjXwJG0j/i4RT9u4qJ+lqS/yCGap4lH4zZGzQ7tu+xZqQmcMZq5OBZDL4QRxQzRjkWcGt8IVw==", + "version": "0.20.0", + "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.20.0.tgz", + "integrity": "sha512-fxlS1kkIjx8+vy2SjuCB94q3htSNrufYTXubwiBFeaQHbH6Ipi43gFJq2zCMt6PHhImH3Xmr0NksKDvchWlpQQ==", "dev": true, "dependencies": { - "@eslint/object-schema": "^2.1.4", + "@eslint/object-schema": "^2.1.6", "debug": "^4.3.1", "minimatch": "^3.1.2" }, @@ -706,19 +628,31 @@ "node": "^18.18.0 || ^20.9.0 || >=21.1.0" } }, + "node_modules/@eslint/config-helpers": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.2.2.tgz", + "integrity": "sha512-+GPzk8PlG0sPpzdU5ZvIRMPidzAnZDl/s9L+y13iodqvb8leL53bTannOrQ/Im7UkpsmFU5Ily5U60LWixnmLg==", + "dev": true, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + } + }, "node_modules/@eslint/core": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.7.0.tgz", - "integrity": "sha512-xp5Jirz5DyPYlPiKat8jaq0EmYvDXKKpzTbxXMpT9eqlRJkRKIz9AGMdlvYjih+im+QlhWrpvVjl8IPC/lHlUw==", + "version": "0.14.0", + "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.14.0.tgz", + "integrity": "sha512-qIbV0/JZr7iSDjqAc60IqbLdsj9GDt16xQtWD+B78d/HAlvysGdZZ6rpJHGAc2T0FQx1X6thsSPdnoiGKdNtdg==", "dev": true, + "dependencies": { + "@types/json-schema": "^7.0.15" + }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" } }, "node_modules/@eslint/eslintrc": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.2.0.tgz", - "integrity": "sha512-grOjVNN8P3hjJn/eIETF1wwd12DdnwFDoyceUJLYYdkpbwq3nLi+4fqrTAONx7XDALqlL220wC/RHSC/QTI/0w==", + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.1.tgz", + "integrity": "sha512-gtF186CXhIl1p4pJNGZw8Yc6RlshoePRvE0X91oPGb3vZ8pM3qOS9W9NGPat9LziaBV7XrJWGylNQXkGcnM3IQ==", "dev": true, "dependencies": { "ajv": "^6.12.4", @@ -739,29 +673,33 @@ } }, "node_modules/@eslint/js": { - "version": "9.14.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.14.0.tgz", - "integrity": "sha512-pFoEtFWCPyDOl+C6Ift+wC7Ro89otjigCf5vcuWqWgqNSQbRrpjSvdeE6ofLz4dHmyxD5f7gIdGT4+p36L6Twg==", + "version": "9.27.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.27.0.tgz", + "integrity": "sha512-G5JD9Tu5HJEu4z2Uo4aHY2sLV64B7CDMXxFzqzjl3NKd6RVzSXNoE80jk7Y0lJkTTkjiIhBAqmlYwjuBY3tvpA==", "dev": true, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "url": "https://eslint.org/donate" } }, "node_modules/@eslint/object-schema": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.4.tgz", - "integrity": "sha512-BsWiH1yFGjXXS2yvrf5LyuoSIIbPrGUWob917o+BTKuZ7qJdxX8aJLRxs1fS9n6r7vESrq1OUqb68dANcFXuQQ==", + "version": "2.1.6", + "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.6.tgz", + "integrity": "sha512-RBMg5FRL0I0gs51M/guSAj5/e14VQ4tpZnQNWwuDT66P14I43ItmPfIZRhO9fUVIPOAQXU47atlywZ/czoqFPA==", "dev": true, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" } }, "node_modules/@eslint/plugin-kit": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.3.tgz", - "integrity": "sha512-2b/g5hRmpbb1o4GnTZax9N9m0FXzz9OV42ZzI4rDDMDuHUqigAiQCEWChBWCY4ztAGVRjoWT19v0yMmc5/L5kA==", + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.3.1.tgz", + "integrity": "sha512-0J+zgWxHN+xXONWIyPWKFMgVuJoZuGiIFu8yxk7RJjxkzpGmyja5wRFqZIVtjDVOQpV+Rw0iOAjYPE2eQyjr0w==", "dev": true, "dependencies": { + "@eslint/core": "^0.14.0", "levn": "^0.4.1" }, "engines": { @@ -816,9 +754,9 @@ } }, "node_modules/@humanwhocodes/retry": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.1.tgz", - "integrity": "sha512-c7hNEllBlenFTHBky65mhq8WD2kbN9Q6gk0bTk8lSBvc554jpXSkST1iePudpt7+A/AQvuHs9EMqjHDXMY1lrA==", + "version": "0.4.3", + "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.3.tgz", + "integrity": "sha512-bV0Tgo9K4hfPCek+aMAn81RppFKv2ySDQeMoSZuvTASywNTnVJCArCZE2FWqpvIatKu7VMRLWlR1EazvVhDyhQ==", "dev": true, "engines": { "node": ">=18.18" @@ -1227,9 +1165,10 @@ } }, "node_modules/@jridgewell/set-array": { - "version": "1.1.2", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz", + "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==", "dev": true, - "license": "MIT", "engines": { "node": ">=6.0.0" } @@ -1240,12 +1179,13 @@ "license": "MIT" }, "node_modules/@jridgewell/trace-mapping": { - "version": "0.3.18", + "version": "0.3.25", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz", + "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==", "dev": true, - "license": "MIT", "dependencies": { - "@jridgewell/resolve-uri": "3.1.0", - "@jridgewell/sourcemap-codec": "1.4.14" + "@jridgewell/resolve-uri": "^3.1.0", + "@jridgewell/sourcemap-codec": "^1.4.14" } }, "node_modules/@kwsites/file-exists": { @@ -1514,11 +1454,10 @@ "license": "MIT" }, "node_modules/@types/node": { - "version": "22.15.18", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.15.18.tgz", - "integrity": "sha512-v1DKRfUdyW+jJhZNEI1PYy29S2YRxMV5AOO/x/SjKmW0acCIOqmbj6Haf9eHAhsPmrhlHSxEhv/1WszcLWV4cg==", + "version": "22.15.21", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.15.21.tgz", + "integrity": "sha512-EV/37Td6c+MgKAbkcLG6vqZ2zEYHD7bvSrzqqs2RIhbA6w3x+Dqz8MZM3sP6kGTeLrdoOgKZe+Xja7tUB2DNkQ==", "dev": true, - "license": "MIT", "dependencies": { "undici-types": "~6.21.0" } @@ -2367,11 +2306,12 @@ } }, "node_modules/braces": { - "version": "3.0.2", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", "dev": true, - "license": "MIT", "dependencies": { - "fill-range": "^7.0.1" + "fill-range": "^7.1.1" }, "engines": { "node": ">=8" @@ -2616,9 +2556,9 @@ "license": "MIT" }, "node_modules/cross-spawn": { - "version": "7.0.5", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.5.tgz", - "integrity": "sha512-ZVJrKKYunU38/76t0RMOulHOnUcbU9GbpWKAOZ0mhjr7CX6FVrH+4FrAapSOekrgFQ3f/8gwMEuIft0aKq6Hug==", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, "dependencies": { "path-key": "^3.1.0", @@ -2991,29 +2931,30 @@ } }, "node_modules/eslint": { - "version": "9.14.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.14.0.tgz", - "integrity": "sha512-c2FHsVBr87lnUtjP4Yhvk4yEhKrQavGafRA/Se1ouse8PfbfC/Qh9Mxa00yWsZRlqeUB9raXip0aiiUZkgnr9g==", + "version": "9.27.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.27.0.tgz", + "integrity": "sha512-ixRawFQuMB9DZ7fjU3iGGganFDp3+45bPOdaRurcFHSXO1e/sYwUX/FtQZpLZJR6SjMoJH8hR2pPEAfDyCoU2Q==", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.12.1", - "@eslint/config-array": "^0.18.0", - "@eslint/core": "^0.7.0", - "@eslint/eslintrc": "^3.1.0", - "@eslint/js": "9.14.0", - "@eslint/plugin-kit": "^0.2.0", + "@eslint/config-array": "^0.20.0", + "@eslint/config-helpers": "^0.2.1", + "@eslint/core": "^0.14.0", + "@eslint/eslintrc": "^3.3.1", + "@eslint/js": "9.27.0", + "@eslint/plugin-kit": "^0.3.1", "@humanfs/node": "^0.16.6", "@humanwhocodes/module-importer": "^1.0.1", - "@humanwhocodes/retry": "^0.4.0", + "@humanwhocodes/retry": "^0.4.2", "@types/estree": "^1.0.6", "@types/json-schema": "^7.0.15", "ajv": "^6.12.4", "chalk": "^4.0.0", - "cross-spawn": "^7.0.2", + "cross-spawn": "^7.0.6", "debug": "^4.3.2", "escape-string-regexp": "^4.0.0", - "eslint-scope": "^8.2.0", + "eslint-scope": "^8.3.0", "eslint-visitor-keys": "^4.2.0", "espree": "^10.3.0", "esquery": "^1.5.0", @@ -3029,8 +2970,7 @@ "lodash.merge": "^4.6.2", "minimatch": "^3.1.2", "natural-compare": "^1.4.0", - "optionator": "^0.9.3", - "text-table": "^0.2.0" + "optionator": "^0.9.3" }, "bin": { "eslint": "bin/eslint.js" @@ -3081,6 +3021,30 @@ "eslint": ">=7.0.0" } }, + "node_modules/eslint-import-context": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/eslint-import-context/-/eslint-import-context-0.1.5.tgz", + "integrity": "sha512-jalO1mLiEvTv0io0koz1AE4LwkHQxDBFLaSXWweWtJR0y/NC1yyxvU61Z54bghIFNeM1M4TvwRwVRhLunQJ3gw==", + "dev": true, + "dependencies": { + "get-tsconfig": "^4.10.1", + "stable-hash": "^0.0.5" + }, + "engines": { + "node": "^12.20.0 || ^14.18.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint-import-context" + }, + "peerDependencies": { + "unrs-resolver": "^1.0.0" + }, + "peerDependenciesMeta": { + "unrs-resolver": { + "optional": true + } + } + }, "node_modules/eslint-import-resolver-node": { "version": "0.3.9", "dev": true, @@ -3100,18 +3064,18 @@ } }, "node_modules/eslint-import-resolver-typescript": { - "version": "4.3.5", - "resolved": "https://registry.npmjs.org/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-4.3.5.tgz", - "integrity": "sha512-QGwhLrwn/WGOsdrWvjhm9n8BvKN/Wr41SQERMV7DQ2hm9+Ozas39CyQUxum///l2G2vefQVr7VbIaCFS5h9g5g==", + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-4.4.1.tgz", + "integrity": "sha512-KHQnjMAn/Hbs1AcMs2YfJTeNoWsaOoMRvJUKr77Y2dv7jNOaT8/IJYlvfN/ZIwTxUsv2B6amwv7u9bt2Vl9lZg==", "dev": true, - "license": "ISC", "dependencies": { - "debug": "^4.4.0", - "get-tsconfig": "^4.10.0", + "debug": "^4.4.1", + "eslint-import-context": "^0.1.5", + "get-tsconfig": "^4.10.1", "is-bun-module": "^2.0.0", "stable-hash": "^0.0.5", - "tinyglobby": "^0.2.13", - "unrs-resolver": "^1.6.3" + "tinyglobby": "^0.2.14", + "unrs-resolver": "^1.7.2" }, "engines": { "node": "^16.17.0 || >=18.6.0" @@ -3213,23 +3177,22 @@ } }, "node_modules/eslint-plugin-import-x": { - "version": "4.12.2", - "resolved": "https://registry.npmjs.org/eslint-plugin-import-x/-/eslint-plugin-import-x-4.12.2.tgz", - "integrity": "sha512-0jVUgJQipbs0yUfLe7LwYD6p8rIGqCysWZdyJFgkPzDyJgiKpuCaXlywKUAWgJ6u1nLpfrdt21B60OUkupyBrQ==", + "version": "4.13.3", + "resolved": "https://registry.npmjs.org/eslint-plugin-import-x/-/eslint-plugin-import-x-4.13.3.tgz", + "integrity": "sha512-CDewJDEeYQhm94KGCDYiuwU1SdaWc/vh+SziSKkF7kichAqAFnQYtSYUvSwSBbiBjYLxV5uUxocxxQobRI9YXA==", "dev": true, - "license": "MIT", "dependencies": { - "@typescript-eslint/utils": "^8.31.0", + "@typescript-eslint/utils": "^8.32.1", "comment-parser": "^1.4.1", - "debug": "^4.4.0", + "debug": "^4.4.1", + "eslint-import-context": "^0.1.5", "eslint-import-resolver-node": "^0.3.9", - "get-tsconfig": "^4.10.0", "is-glob": "^4.0.3", "minimatch": "^9.0.3 || ^10.0.1", - "semver": "^7.7.1", + "semver": "^7.7.2", "stable-hash": "^0.0.5", "tslib": "^2.8.1", - "unrs-resolver": "^1.7.0" + "unrs-resolver": "^1.7.2" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -3450,9 +3413,9 @@ } }, "node_modules/eslint-scope": { - "version": "8.2.0", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.2.0.tgz", - "integrity": "sha512-PHlWUfG6lvPc3yvP5A4PNyBL1W8fkDUccmI21JUu/+GKZBoH/W5u6usENXUrWFRsyoW5ACUjFGgAFQp5gUlb/A==", + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.3.0.tgz", + "integrity": "sha512-pUNxi75F8MJ/GdeKtVLSbYg4ZI34J6C0C7sbL4YOp2exGwen7ZsuBqKzUhXd0qMQ362yET3z+uPwKeg/0C2XCQ==", "dev": true, "dependencies": { "esrecurse": "^4.3.0", @@ -3665,7 +3628,8 @@ "version": "3.4.1", "resolved": "https://registry.npmjs.org/fast-sort/-/fast-sort-3.4.1.tgz", "integrity": "sha512-76uvGPsF6So53sZAqenP9UVT3p5l7cyTHkLWVCMinh41Y8NDrK1IYXJgaBMfc1gk7nJiSRZp676kddFG2Aa5+A==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/fastq": { "version": "1.14.0", @@ -3726,9 +3690,10 @@ } }, "node_modules/fill-range": { - "version": "7.0.1", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", "dev": true, - "license": "MIT", "dependencies": { "to-regex-range": "^5.0.1" }, @@ -3811,6 +3776,20 @@ "dev": true, "license": "ISC" }, + "node_modules/fsevents": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", + "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", + "dev": true, + "hasInstallScript": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + } + }, "node_modules/function-bind": { "version": "1.1.2", "dev": true, @@ -3918,11 +3897,10 @@ } }, "node_modules/get-tsconfig": { - "version": "4.10.0", - "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.10.0.tgz", - "integrity": "sha512-kGzZ3LWWQcGIAmg6iWvXn0ei6WDtV26wzHRMwDSzmAbcXrTEXxHy6IehI6/4eT6VRKyMP1eF1VqwrVUmE/LR7A==", + "version": "4.10.1", + "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.10.1.tgz", + "integrity": "sha512-auHyJ4AgMz7vgS8Hp3N6HXSmlMdUyhSUrfBF16w153rxtLIEOE+HGqaBppczZvnHLqQJfiHotCYpNhl0lUROFQ==", "dev": true, - "license": "MIT", "dependencies": { "resolve-pkg-maps": "^1.0.0" }, @@ -4016,14 +3994,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/has-flag": { - "version": "3.0.0", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=4" - } - }, "node_modules/has-property-descriptors": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz", @@ -4109,9 +4079,9 @@ } }, "node_modules/import-fresh": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", - "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.1.tgz", + "integrity": "sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==", "dev": true, "dependencies": { "parent-module": "^1.0.0", @@ -4339,8 +4309,9 @@ }, "node_modules/is-number": { "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", "dev": true, - "license": "MIT", "engines": { "node": ">=0.12.0" } @@ -4490,9 +4461,10 @@ } }, "node_modules/istanbul-lib-instrument/node_modules/semver": { - "version": "6.3.0", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, - "license": "ISC", "bin": { "semver": "bin/semver.js" } @@ -4555,6 +4527,8 @@ }, "node_modules/jest": { "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest/-/jest-29.7.0.tgz", + "integrity": "sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==", "dev": true, "license": "MIT", "dependencies": { @@ -4787,6 +4761,8 @@ }, "node_modules/jest-junit": { "version": "16.0.0", + "resolved": "https://registry.npmjs.org/jest-junit/-/jest-junit-16.0.0.tgz", + "integrity": "sha512-A94mmw6NfJab4Fg/BlvVOUXzXgF0XIH6EmTgJ5NDPp4xoKq0Kr7sErb+4Xs9nZvu58pJojz5RFGpqnZYJTrRfQ==", "dev": true, "license": "Apache-2.0", "dependencies": { @@ -5007,6 +4983,8 @@ }, "node_modules/jest-specific-snapshot": { "version": "8.0.0", + "resolved": "https://registry.npmjs.org/jest-specific-snapshot/-/jest-specific-snapshot-8.0.0.tgz", + "integrity": "sha512-PjK0cqPbN3ZGU1pdP78YBEFMsS1AsV28hIHg249E0v/bTtGAJqDm7lNDLj0Cs0O26P2sulbXbgEQU9xLm34WmA==", "dev": true, "license": "MIT", "dependencies": { @@ -5115,8 +5093,9 @@ }, "node_modules/js-tokens": { "version": "4.0.0", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", + "dev": true }, "node_modules/js-yaml": { "version": "4.1.0", @@ -5131,14 +5110,15 @@ } }, "node_modules/jsesc": { - "version": "2.5.2", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz", + "integrity": "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==", "dev": true, - "license": "MIT", "bin": { "jsesc": "bin/jsesc" }, "engines": { - "node": ">=4" + "node": ">=6" } }, "node_modules/json-buffer": { @@ -5263,9 +5243,10 @@ } }, "node_modules/make-dir/node_modules/semver": { - "version": "6.3.0", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, - "license": "ISC", "bin": { "semver": "bin/semver.js" } @@ -5297,11 +5278,12 @@ } }, "node_modules/micromatch": { - "version": "4.0.5", + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", + "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", "dev": true, - "license": "MIT", "dependencies": { - "braces": "^3.0.2", + "braces": "^3.0.3", "picomatch": "^2.3.1" }, "engines": { @@ -5658,9 +5640,10 @@ "license": "MIT" }, "node_modules/picocolors": { - "version": "1.0.0", - "dev": true, - "license": "ISC" + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", + "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==", + "dev": true }, "node_modules/picomatch": { "version": "2.3.1", @@ -6112,6 +6095,7 @@ "resolved": "https://registry.npmjs.org/simple-git/-/simple-git-3.27.0.tgz", "integrity": "sha512-ivHoFS9Yi9GY49ogc6/YAi3Fl9ROnF4VyubNylgCkA+RVqLaKWnDSzXOVzya8csELIaWaYNutsEuAhZrtOjozA==", "dev": true, + "license": "MIT", "dependencies": { "@kwsites/file-exists": "^1.1.1", "@kwsites/promise-deferred": "^1.1.1", @@ -6351,9 +6335,10 @@ } }, "node_modules/tar": { - "version": "6.2.0", + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz", + "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==", "dev": true, - "license": "ISC", "dependencies": { "chownr": "^2.0.0", "fs-minipass": "^2.0.0", @@ -6384,18 +6369,11 @@ "node": ">=8" } }, - "node_modules/text-table": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", - "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", - "dev": true - }, "node_modules/tinyglobby": { - "version": "0.2.13", - "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.13.tgz", - "integrity": "sha512-mEwzpUgrLySlveBwEVDMKk5B57bhLPYovRfPAXD5gA/98Opn0rCDj3GtLwFvCvH5RK9uPCExUROW5NjDwvqkxw==", + "version": "0.2.14", + "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.14.tgz", + "integrity": "sha512-tX5e7OM1HnYr2+a2C/4V0htOcSQcoSTH9KgJnVvNm5zm/cyEWKJ7j7YutsH9CxMdtOkkLFy2AHrMci9IM8IPZQ==", "dev": true, - "license": "MIT", "dependencies": { "fdir": "^6.4.4", "picomatch": "^4.0.2" @@ -6412,7 +6390,6 @@ "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.4.tgz", "integrity": "sha512-1NZP+GK4GfuAv3PqKvxQRDMjdSRZjnkq7KfhlNrCNNlZ0ygQFpebfrnfnq/W7fpUnAv9aGWmY1zKx7FYL3gwhg==", "dev": true, - "license": "MIT", "peerDependencies": { "picomatch": "^3 || ^4" }, @@ -6427,7 +6404,6 @@ "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz", "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==", "dev": true, - "license": "MIT", "engines": { "node": ">=12" }, @@ -6440,18 +6416,11 @@ "dev": true, "license": "BSD-3-Clause" }, - "node_modules/to-fast-properties": { - "version": "2.0.0", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=4" - } - }, "node_modules/to-regex-range": { "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", "dev": true, - "license": "MIT", "dependencies": { "is-number": "^7.0.0" }, @@ -6524,6 +6493,8 @@ }, "node_modules/ts-node": { "version": "10.9.2", + "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.2.tgz", + "integrity": "sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==", "dev": true, "license": "MIT", "dependencies": { @@ -6566,6 +6537,8 @@ }, "node_modules/tsconfig-paths": { "version": "4.2.0", + "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-4.2.0.tgz", + "integrity": "sha512-NoZ4roiN7LnbKn9QqE1amc9DJfzvZXxF4xDavcOWt1BPkdx+m+0gJuPM+S0vCe7zTJMYUP0R8pO2XMr+Y8oLIg==", "dev": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index 51711ceb6..49d1dff31 100644 --- a/package.json +++ b/package.json @@ -6,38 +6,38 @@ "trunk": "trunk" }, "devDependencies": { - "@jest/console": "^29.4.1", - "@jest/reporters": "^29.4.1", - "@jest/test-result": "^29.4.1", + "@jest/console": "^29.7.0", + "@jest/reporters": "^29.7.0", + "@jest/test-result": "^29.7.0", "@trunkio/launcher": "^1.3.4", "@types/caller": "^1.0.2", "@types/debug": "^4.1.12", "@types/jest": "^29.5.14", "@types/jest-specific-snapshot": "^0.5.9", - "@types/node": "^22.15.18", + "@types/node": "^22.15.21", "@types/semver": "^7.7.0", "@typescript-eslint/eslint-plugin": "^8.32.1", "@typescript-eslint/parser": "^8.32.1", "caller": "^1.1.0", "debug": "^4.4.1", - "eslint": "9.14.0", + "eslint": "9.27.0", "eslint-config-prettier": "^10.1.5", - "eslint-import-resolver-typescript": "^4.3.5", + "eslint-import-resolver-typescript": "^4.4.1", "eslint-plugin-import": "^2.31.0", - "eslint-plugin-import-x": "^4.12.2", + "eslint-plugin-import-x": "^4.13.3", "eslint-plugin-jest": "^28.11.0", "eslint-plugin-n": "^17.18.0", "eslint-plugin-prettier": "^5.4.0", "eslint-plugin-simple-import-sort": "^12.1.1", "fast-sort": "^3.4.1", - "jest": "^29.3.1", + "jest": "^29.7.0", "jest-junit": "^16.0.0", "jest-specific-snapshot": "^8.0.0", "semver": "^7.7.2", "simple-git": "^3.27.0", "ts-jest": "^29.3.4", "ts-node": "^10.9.2", - "tsconfig-paths": "^4.1.2", + "tsconfig-paths": "^4.2.0", "typescript": "^5.8.3", "typescript-eslint": "^8.32.1", "yaml": "^2.8.0" @@ -46,6 +46,6 @@ "tests" ], "engines": { - "node": ">=16" + "node": ">=22" } } From d66df6f8b7772fa2b2ff9fb93c2c596efc4aee2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CEli?= Date: Tue, 27 May 2025 04:18:47 +0000 Subject: [PATCH 16/17] merge --- package.json | 6 ------ 1 file changed, 6 deletions(-) diff --git a/package.json b/package.json index 7250fdd98..49d1dff31 100644 --- a/package.json +++ b/package.json @@ -22,15 +22,9 @@ "debug": "^4.4.1", "eslint": "9.27.0", "eslint-config-prettier": "^10.1.5", -<<<<<<< HEAD "eslint-import-resolver-typescript": "^4.4.1", "eslint-plugin-import": "^2.31.0", "eslint-plugin-import-x": "^4.13.3", -======= - "eslint-import-resolver-typescript": "^4.4.0", - "eslint-plugin-import": "^2.31.0", - "eslint-plugin-import-x": "^4.13.0", ->>>>>>> main "eslint-plugin-jest": "^28.11.0", "eslint-plugin-n": "^17.18.0", "eslint-plugin-prettier": "^5.4.0", From 4b7070074af0dd349045929456487ea57cbe0552 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CEli?= Date: Tue, 27 May 2025 04:19:19 +0000 Subject: [PATCH 17/17] --- package-lock.json | 322 +--------------------------------------------- 1 file changed, 1 insertion(+), 321 deletions(-) diff --git a/package-lock.json b/package-lock.json index f0fecd483..6285d0c0d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -552,40 +552,6 @@ "@jridgewell/sourcemap-codec": "^1.4.10" } }, - "node_modules/@emnapi/core": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.4.3.tgz", - "integrity": "sha512-4m62DuCE07lw01soJwPiBGC0nAww0Q+RY70VZ+n49yDIO13yyinhbWCeNnaob0lakDtWQzSdtNWzJeOJt2ma+g==", - "dev": true, - "license": "MIT", - "optional": true, - "dependencies": { - "@emnapi/wasi-threads": "1.0.2", - "tslib": "^2.4.0" - } - }, - "node_modules/@emnapi/runtime": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.4.3.tgz", - "integrity": "sha512-pBPWdu6MLKROBX05wSNKcNb++m5Er+KQ9QkB+WVM+pW2Kx9hoSrVTnu3BdkI5eBLZoKu/J6mW/B6i6bJB2ytXQ==", - "dev": true, - "license": "MIT", - "optional": true, - "dependencies": { - "tslib": "^2.4.0" - } - }, - "node_modules/@emnapi/wasi-threads": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.0.2.tgz", - "integrity": "sha512-5n3nTJblwRi8LlXkJ9eBzu+kZR8Yxcc7ubakyQTFzPMtIhFpUBRbsnc2Dv88IZDIbCDlBiWrknhB4Lsz7mg6BA==", - "dev": true, - "license": "MIT", - "optional": true, - "dependencies": { - "tslib": "^2.4.0" - } - }, "node_modules/@eslint-community/eslint-utils": { "version": "4.7.0", "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.7.0.tgz", @@ -1201,19 +1167,6 @@ "dev": true, "license": "MIT" }, - "node_modules/@napi-rs/wasm-runtime": { - "version": "0.2.9", - "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-0.2.9.tgz", - "integrity": "sha512-OKRBiajrrxB9ATokgEQoG87Z25c67pCpYcCwmXYX8PBftC9pBfN18gnm/fh1wurSLEKIAt+QRFLFCQISrb66Jg==", - "dev": true, - "license": "MIT", - "optional": true, - "dependencies": { - "@emnapi/core": "^1.4.0", - "@emnapi/runtime": "^1.4.0", - "@tybys/wasm-util": "^0.9.0" - } - }, "node_modules/@nodelib/fs.scandir": { "version": "2.1.5", "dev": true, @@ -1323,17 +1276,6 @@ "dev": true, "license": "MIT" }, - "node_modules/@tybys/wasm-util": { - "version": "0.9.0", - "resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.9.0.tgz", - "integrity": "sha512-6+7nlbMVX/PVDCwaIQ8nTOPveOcFLSt8GcXdx8hD0bt39uWxYT88uXzqTd4fTvqta7oeUJqudepapKNt2DYJFw==", - "dev": true, - "license": "MIT", - "optional": true, - "dependencies": { - "tslib": "^2.4.0" - } - }, "node_modules/@types/babel__core": { "version": "7.20.1", "dev": true, @@ -1716,160 +1658,6 @@ "url": "https://opencollective.com/eslint" } }, - "node_modules/@unrs/resolver-binding-darwin-arm64": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-darwin-arm64/-/resolver-binding-darwin-arm64-1.7.2.tgz", - "integrity": "sha512-vxtBno4xvowwNmO/ASL0Y45TpHqmNkAaDtz4Jqb+clmcVSSl8XCG/PNFFkGsXXXS6AMjP+ja/TtNCFFa1QwLRg==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ] - }, - "node_modules/@unrs/resolver-binding-darwin-x64": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-darwin-x64/-/resolver-binding-darwin-x64-1.7.2.tgz", - "integrity": "sha512-qhVa8ozu92C23Hsmv0BF4+5Dyyd5STT1FolV4whNgbY6mj3kA0qsrGPe35zNR3wAN7eFict3s4Rc2dDTPBTuFQ==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ] - }, - "node_modules/@unrs/resolver-binding-freebsd-x64": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-freebsd-x64/-/resolver-binding-freebsd-x64-1.7.2.tgz", - "integrity": "sha512-zKKdm2uMXqLFX6Ac7K5ElnnG5VIXbDlFWzg4WJ8CGUedJryM5A3cTgHuGMw1+P5ziV8CRhnSEgOnurTI4vpHpg==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "freebsd" - ] - }, - "node_modules/@unrs/resolver-binding-linux-arm-gnueabihf": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm-gnueabihf/-/resolver-binding-linux-arm-gnueabihf-1.7.2.tgz", - "integrity": "sha512-8N1z1TbPnHH+iDS/42GJ0bMPLiGK+cUqOhNbMKtWJ4oFGzqSJk/zoXFzcQkgtI63qMcUI7wW1tq2usZQSb2jxw==", - "cpu": [ - "arm" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@unrs/resolver-binding-linux-arm-musleabihf": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm-musleabihf/-/resolver-binding-linux-arm-musleabihf-1.7.2.tgz", - "integrity": "sha512-tjYzI9LcAXR9MYd9rO45m1s0B/6bJNuZ6jeOxo1pq1K6OBuRMMmfyvJYval3s9FPPGmrldYA3mi4gWDlWuTFGA==", - "cpu": [ - "arm" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@unrs/resolver-binding-linux-arm64-gnu": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm64-gnu/-/resolver-binding-linux-arm64-gnu-1.7.2.tgz", - "integrity": "sha512-jon9M7DKRLGZ9VYSkFMflvNqu9hDtOCEnO2QAryFWgT6o6AXU8du56V7YqnaLKr6rAbZBWYsYpikF226v423QA==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@unrs/resolver-binding-linux-arm64-musl": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm64-musl/-/resolver-binding-linux-arm64-musl-1.7.2.tgz", - "integrity": "sha512-c8Cg4/h+kQ63pL43wBNaVMmOjXI/X62wQmru51qjfTvI7kmCy5uHTJvK/9LrF0G8Jdx8r34d019P1DVJmhXQpA==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@unrs/resolver-binding-linux-ppc64-gnu": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-ppc64-gnu/-/resolver-binding-linux-ppc64-gnu-1.7.2.tgz", - "integrity": "sha512-A+lcwRFyrjeJmv3JJvhz5NbcCkLQL6Mk16kHTNm6/aGNc4FwPHPE4DR9DwuCvCnVHvF5IAd9U4VIs/VvVir5lg==", - "cpu": [ - "ppc64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@unrs/resolver-binding-linux-riscv64-gnu": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-riscv64-gnu/-/resolver-binding-linux-riscv64-gnu-1.7.2.tgz", - "integrity": "sha512-hQQ4TJQrSQW8JlPm7tRpXN8OCNP9ez7PajJNjRD1ZTHQAy685OYqPrKjfaMw/8LiHCt8AZ74rfUVHP9vn0N69Q==", - "cpu": [ - "riscv64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@unrs/resolver-binding-linux-riscv64-musl": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-riscv64-musl/-/resolver-binding-linux-riscv64-musl-1.7.2.tgz", - "integrity": "sha512-NoAGbiqrxtY8kVooZ24i70CjLDlUFI7nDj3I9y54U94p+3kPxwd2L692YsdLa+cqQ0VoqMWoehDFp21PKRUoIQ==", - "cpu": [ - "riscv64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@unrs/resolver-binding-linux-s390x-gnu": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-s390x-gnu/-/resolver-binding-linux-s390x-gnu-1.7.2.tgz", - "integrity": "sha512-KaZByo8xuQZbUhhreBTW+yUnOIHUsv04P8lKjQ5otiGoSJ17ISGYArc+4vKdLEpGaLbemGzr4ZeUbYQQsLWFjA==", - "cpu": [ - "s390x" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] - }, "node_modules/@unrs/resolver-binding-linux-x64-gnu": { "version": "1.7.2", "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-x64-gnu/-/resolver-binding-linux-x64-gnu-1.7.2.tgz", @@ -1898,65 +1686,6 @@ "linux" ] }, - "node_modules/@unrs/resolver-binding-wasm32-wasi": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-wasm32-wasi/-/resolver-binding-wasm32-wasi-1.7.2.tgz", - "integrity": "sha512-y797JBmO9IsvXVRCKDXOxjyAE4+CcZpla2GSoBQ33TVb3ILXuFnMrbR/QQZoauBYeOFuu4w3ifWLw52sdHGz6g==", - "cpu": [ - "wasm32" - ], - "dev": true, - "license": "MIT", - "optional": true, - "dependencies": { - "@napi-rs/wasm-runtime": "^0.2.9" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@unrs/resolver-binding-win32-arm64-msvc": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-win32-arm64-msvc/-/resolver-binding-win32-arm64-msvc-1.7.2.tgz", - "integrity": "sha512-gtYTh4/VREVSLA+gHrfbWxaMO/00y+34htY7XpioBTy56YN2eBjkPrY1ML1Zys89X3RJDKVaogzwxlM1qU7egg==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "win32" - ] - }, - "node_modules/@unrs/resolver-binding-win32-ia32-msvc": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-win32-ia32-msvc/-/resolver-binding-win32-ia32-msvc-1.7.2.tgz", - "integrity": "sha512-Ywv20XHvHTDRQs12jd3MY8X5C8KLjDbg/jyaal/QLKx3fAShhJyD4blEANInsjxW3P7isHx1Blt56iUDDJO3jg==", - "cpu": [ - "ia32" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "win32" - ] - }, - "node_modules/@unrs/resolver-binding-win32-x64-msvc": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-win32-x64-msvc/-/resolver-binding-win32-x64-msvc-1.7.2.tgz", - "integrity": "sha512-friS8NEQfHaDbkThxopGk+LuE5v3iY0StruifjQEt7SLbA46OnfgMO15sOTkbpJkol6RB+1l1TYPXh0sCddpvA==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "win32" - ] - }, "node_modules/acorn": { "version": "8.14.0", "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz", @@ -3022,28 +2751,20 @@ } }, "node_modules/eslint-import-context": { -<<<<<<< HEAD "version": "0.1.5", "resolved": "https://registry.npmjs.org/eslint-import-context/-/eslint-import-context-0.1.5.tgz", "integrity": "sha512-jalO1mLiEvTv0io0koz1AE4LwkHQxDBFLaSXWweWtJR0y/NC1yyxvU61Z54bghIFNeM1M4TvwRwVRhLunQJ3gw==", "dev": true, + "license": "MIT", "dependencies": { "get-tsconfig": "^4.10.1", "stable-hash": "^0.0.5" }, -======= - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/eslint-import-context/-/eslint-import-context-0.1.3.tgz", - "integrity": "sha512-dmdfEU9i8EgxV7jR9IAeiC6mp22wNfclhs33D8zctPYiclQhq61idm/Q4VJv00SPvqLWTokvN5lDyNkuQZYzUg==", - "dev": true, - "license": "MIT", ->>>>>>> main "engines": { "node": "^12.20.0 || ^14.18.0 || >=16.0.0" }, "funding": { "url": "https://opencollective.com/eslint-import-context" -<<<<<<< HEAD }, "peerDependencies": { "unrs-resolver": "^1.0.0" @@ -3052,8 +2773,6 @@ "unrs-resolver": { "optional": true } -======= ->>>>>>> main } }, "node_modules/eslint-import-resolver-node": { @@ -3075,31 +2794,17 @@ } }, "node_modules/eslint-import-resolver-typescript": { -<<<<<<< HEAD "version": "4.4.1", "resolved": "https://registry.npmjs.org/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-4.4.1.tgz", "integrity": "sha512-KHQnjMAn/Hbs1AcMs2YfJTeNoWsaOoMRvJUKr77Y2dv7jNOaT8/IJYlvfN/ZIwTxUsv2B6amwv7u9bt2Vl9lZg==", -======= - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-4.4.0.tgz", - "integrity": "sha512-wGgsNnIzv9Rm4UbjZ5ELHtyOMLpYPa/UcMhqtiRx6sL80ySmbc3D/E6zeHHU3JtpxCvaIafo+V53+2u68LIdGA==", ->>>>>>> main "dev": true, "dependencies": { "debug": "^4.4.1", -<<<<<<< HEAD "eslint-import-context": "^0.1.5", "get-tsconfig": "^4.10.1", "is-bun-module": "^2.0.0", "stable-hash": "^0.0.5", "tinyglobby": "^0.2.14", -======= - "eslint-import-context": "^0.1.3", - "get-tsconfig": "^4.10.1", - "is-bun-module": "^2.0.0", - "stable-hash": "^0.0.5", - "tinyglobby": "^0.2.13", ->>>>>>> main "unrs-resolver": "^1.7.2" }, "engines": { @@ -3202,26 +2907,15 @@ } }, "node_modules/eslint-plugin-import-x": { -<<<<<<< HEAD "version": "4.13.3", "resolved": "https://registry.npmjs.org/eslint-plugin-import-x/-/eslint-plugin-import-x-4.13.3.tgz", "integrity": "sha512-CDewJDEeYQhm94KGCDYiuwU1SdaWc/vh+SziSKkF7kichAqAFnQYtSYUvSwSBbiBjYLxV5uUxocxxQobRI9YXA==", -======= - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-import-x/-/eslint-plugin-import-x-4.13.0.tgz", - "integrity": "sha512-YtbaFHEQYGvR9zPuI525UhwPKEK0sXAvPyHKBUZYadJeIhD6UIuQE60Fje4q5nP17fkhzxjECrFV20nSdLrQtg==", ->>>>>>> main "dev": true, "dependencies": { "@typescript-eslint/utils": "^8.32.1", "comment-parser": "^1.4.1", -<<<<<<< HEAD "debug": "^4.4.1", "eslint-import-context": "^0.1.5", -======= - "debug": "^4.4.0", - "eslint-import-context": "^0.1.3", ->>>>>>> main "eslint-import-resolver-node": "^0.3.9", "is-glob": "^4.0.3", "minimatch": "^9.0.3 || ^10.0.1", @@ -3812,20 +3506,6 @@ "dev": true, "license": "ISC" }, - "node_modules/fsevents": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", - "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", - "dev": true, - "hasInstallScript": true, - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": "^8.16.0 || ^10.6.0 || >=11.0.0" - } - }, "node_modules/function-bind": { "version": "1.1.2", "dev": true, pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy