From 1331caf24e22b933e0ebd99e0762be9d8a0b1ceb Mon Sep 17 00:00:00 2001 From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com> Date: Tue, 11 Nov 2025 22:29:19 -0500 Subject: [PATCH 1/2] Upgrade pnpm, re-roll lockfile --- .github/workflows/ci.yml | 11 +-- package.json | 2 +- pnpm-lock.yaml | 138 ++++++++++++++++++++++----- test-projects/gjs-types/package.json | 2 - 4 files changed, 119 insertions(+), 34 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f47cc90..4bd79df 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,8 +7,8 @@ on: pull_request: {} concurrency: - group: ci-${{ github.head_ref || github.ref }} - cancel-in-progress: true + group: ci-${{ github.head_ref || github.ref }} + cancel-in-progress: true jobs: # Fills the dep cache so parallel jobs can start faster. @@ -54,7 +54,7 @@ jobs: - ^8 - canary tsVersion: - - 5.3 + - 5.3 - 5.4 - 5.5 - 5.6 @@ -64,7 +64,7 @@ jobs: steps: - uses: actions/checkout@v4 - uses: wyvox/action-setup-pnpm@v3 - - name: 'TS: ${{ matrix.tsVersion }}, eslint-plugin-ts: ${{ matrix.eslintTsVersion }}' + - name: "TS: ${{ matrix.tsVersion }}, eslint-plugin-ts: ${{ matrix.eslintTsVersion }}" run: |- function sponge() { local line; @@ -84,8 +84,6 @@ jobs: - run: pnpm --filter '*' test:check - run: pnpm --filter '*' test:fix - - test_eslint-plugin-ember: name: "eslint-plugin-ember" runs-on: ubuntu-latest @@ -105,4 +103,3 @@ jobs: - uses: wyvox/action-setup-pnpm@v3 - name: Lint run: pnpm lint - diff --git a/package.json b/package.json index ee99b69..434f860 100644 --- a/package.json +++ b/package.json @@ -66,7 +66,7 @@ "optional": true } }, - "packageManager": "pnpm@9.15.4", + "packageManager": "pnpm@10.21.0", "engines": { "node": ">=16.0.0" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 50aeee0..e9d54f8 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -117,7 +117,7 @@ importers: version: 8.57.1 eslint-plugin-ember: specifier: ^12.0.0 - version: 12.3.3(@typescript-eslint/parser@8.19.1(eslint@8.57.1)(typescript@5.7.2))(eslint@8.57.1) + version: 12.3.3(@typescript-eslint/parser@8.46.4(eslint@8.57.1)(typescript@5.7.2))(eslint@8.57.1) globals: specifier: ^13.24.0 version: 13.24.0 @@ -1545,6 +1545,19 @@ packages: eslint: ^8.57.0 || ^9.0.0 typescript: '>=4.8.4 <5.8.0' + '@typescript-eslint/parser@8.46.4': + resolution: {integrity: sha512-tK3GPFWbirvNgsNKto+UmB/cRtn6TZfyw0D6IKrW55n6Vbs7KJoZtI//kpTKzE/DUmmnAFD8/Ca46s7Obs92/w==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + peerDependencies: + eslint: ^8.57.0 || ^9.0.0 + typescript: '>=4.8.4 <6.0.0' + + '@typescript-eslint/project-service@8.46.4': + resolution: {integrity: sha512-nPiRSKuvtTN+no/2N1kt2tUh/HoFzeEgOm9fQ6XQk4/ApGqjx0zFIIaLJ6wooR1HIoozvj2j6vTi/1fgAz7UYQ==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + peerDependencies: + typescript: '>=4.8.4 <6.0.0' + '@typescript-eslint/scope-manager@6.21.0': resolution: {integrity: sha512-OwLUIWZJry80O99zvqXVEioyniJMa+d2GrqpUTqi5/v5D5rOrppJVBPa0yKCblcigC0/aYAzxxqQ1B+DS2RYsg==} engines: {node: ^16.0.0 || >=18.0.0} @@ -1557,12 +1570,22 @@ packages: resolution: {integrity: sha512-60L9KIuN/xgmsINzonOcMDSB8p82h95hoBfSBtXuO4jlR1R9L1xSkmVZKgCPVfavDlXihh4ARNjXhh1gGnLC7Q==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + '@typescript-eslint/scope-manager@8.46.4': + resolution: {integrity: sha512-tMDbLGXb1wC+McN1M6QeDx7P7c0UWO5z9CXqp7J8E+xGcJuUuevWKxuG8j41FoweS3+L41SkyKKkia16jpX7CA==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + '@typescript-eslint/tsconfig-utils@8.38.0': resolution: {integrity: sha512-Lum9RtSE3EroKk/bYns+sPOodqb2Fv50XOl/gMviMKNvanETUuUcC9ObRbzrJ4VSd2JalPqgSAavwrPiPvnAiQ==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: typescript: '>=4.8.4 <5.9.0' + '@typescript-eslint/tsconfig-utils@8.46.4': + resolution: {integrity: sha512-+/XqaZPIAk6Cjg7NWgSGe27X4zMGqrFqZ8atJsX3CWxH/jACqWnrWI68h7nHQld0y+k9eTTjb9r+KU4twLoo9A==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + peerDependencies: + typescript: '>=4.8.4 <6.0.0' + '@typescript-eslint/type-utils@6.21.0': resolution: {integrity: sha512-rZQI7wHfao8qMX3Rd3xqeYSMCL3SoiSQLBATSiVKARdFGCYSRvmViieZjqc58jKgs8Y8i9YvVVhRbHSTA4VBag==} engines: {node: ^16.0.0 || >=18.0.0} @@ -1592,6 +1615,10 @@ packages: resolution: {integrity: sha512-JBVHMLj7B1K1v1051ZaMMgLW4Q/jre5qGK0Ew6UgXz1Rqh+/xPzV1aW581OM00X6iOfyr1be+QyW8LOUf19BbA==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + '@typescript-eslint/types@8.46.4': + resolution: {integrity: sha512-USjyxm3gQEePdUwJBFjjGNG18xY9A2grDVGuk7/9AkjIF1L+ZrVnwR5VAU5JXtUnBL/Nwt3H31KlRDaksnM7/w==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + '@typescript-eslint/typescript-estree@6.21.0': resolution: {integrity: sha512-6npJTkZcO+y2/kr+z0hc4HwNfrrP4kNYh57ek7yCNlrBjWQ1Y0OS7jiZTkgumrvkX5HkEKXFZkkdFNkaW2wmUQ==} engines: {node: ^16.0.0 || >=18.0.0} @@ -1616,6 +1643,12 @@ packages: peerDependencies: typescript: '>=4.8.4 <5.8.0' + '@typescript-eslint/typescript-estree@8.46.4': + resolution: {integrity: sha512-7oV2qEOr1d4NWNmpXLR35LvCfOkTNymY9oyW+lUHkmCno7aOmIf/hMaydnJBUTBMRCOGZh8YjkFOc8dadEoNGA==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + peerDependencies: + typescript: '>=4.8.4 <6.0.0' + '@typescript-eslint/utils@6.21.0': resolution: {integrity: sha512-NfWVaC8HP9T8cbKQxHcsJBY5YE1O33+jpMwN45qzWWaPDZgLIbo12toGMWnmhvCpd3sIxkpDw3Wv1B3dYrbDQQ==} engines: {node: ^16.0.0 || >=18.0.0} @@ -1641,6 +1674,10 @@ packages: resolution: {integrity: sha512-fzmjU8CHK853V/avYZAvuVut3ZTfwN5YtMaoi+X9Y9MA9keaWNHC3zEQ9zvyX/7Hj+5JkNyK1l7TOR2hevHB6Q==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + '@typescript-eslint/visitor-keys@8.46.4': + resolution: {integrity: sha512-/++5CYLQqsO9HFGLI7APrxBJYo+5OCMpViuhV8q5/Qa3o5mMrF//eQHks+PXcsAVaLdn817fMuS7zqoXNNZGaw==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + '@ungap/structured-clone@1.2.1': resolution: {integrity: sha512-fEzPV3hSkSMltkw152tJKNARhOupqbH96MZWyRjNaYZOMIzbrTeQDG+MTc6Mr2pgzFQzFxAfmhGDNP5QK++2ZA==} @@ -2642,6 +2679,10 @@ packages: resolution: {integrity: sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + eslint-visitor-keys@4.2.1: + resolution: {integrity: sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + eslint@8.57.1: resolution: {integrity: sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} @@ -4686,8 +4727,8 @@ packages: peerDependencies: typescript: '>=4.2.0' - ts-api-utils@2.0.0: - resolution: {integrity: sha512-xCt/TOAc+EOHS1XPnijD3/yzpH6qg2xppZO1YDqGoVsNXfQfzHpOdNuXwrwOU8u4ITXJyDCTyt8w5g1sZv9ynQ==} + ts-api-utils@2.1.0: + resolution: {integrity: sha512-CUgTZL1irw8u29bzrOD/nH85jqyc74D6SshFgujOIA7osm2Rz7dYH77agkx7H4FBNxDq7Cjf+IjaX/8zwFW+ZQ==} engines: {node: '>=18.12'} peerDependencies: typescript: '>=4.8.4' @@ -6545,7 +6586,7 @@ snapshots: graphemer: 1.4.0 ignore: 5.3.2 natural-compare: 1.4.0 - ts-api-utils: 2.0.0(typescript@5.7.2) + ts-api-utils: 2.1.0(typescript@5.7.2) typescript: 5.7.2 transitivePeerDependencies: - supports-color @@ -6576,30 +6617,40 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/parser@8.19.1(eslint@8.57.1)(typescript@5.7.2)': + '@typescript-eslint/parser@8.19.1(eslint@9.17.0)(typescript@5.7.2)': dependencies: '@typescript-eslint/scope-manager': 8.19.1 '@typescript-eslint/types': 8.19.1 '@typescript-eslint/typescript-estree': 8.19.1(typescript@5.7.2) '@typescript-eslint/visitor-keys': 8.19.1 debug: 4.4.0 + eslint: 9.17.0 + typescript: 5.7.2 + transitivePeerDependencies: + - supports-color + + '@typescript-eslint/parser@8.46.4(eslint@8.57.1)(typescript@5.7.2)': + dependencies: + '@typescript-eslint/scope-manager': 8.46.4 + '@typescript-eslint/types': 8.46.4 + '@typescript-eslint/typescript-estree': 8.46.4(typescript@5.7.2) + '@typescript-eslint/visitor-keys': 8.46.4 + debug: 4.4.0 eslint: 8.57.1 typescript: 5.7.2 transitivePeerDependencies: - supports-color optional: true - '@typescript-eslint/parser@8.19.1(eslint@9.17.0)(typescript@5.7.2)': + '@typescript-eslint/project-service@8.46.4(typescript@5.7.2)': dependencies: - '@typescript-eslint/scope-manager': 8.19.1 - '@typescript-eslint/types': 8.19.1 - '@typescript-eslint/typescript-estree': 8.19.1(typescript@5.7.2) - '@typescript-eslint/visitor-keys': 8.19.1 + '@typescript-eslint/tsconfig-utils': 8.46.4(typescript@5.7.2) + '@typescript-eslint/types': 8.46.4 debug: 4.4.0 - eslint: 9.17.0 typescript: 5.7.2 transitivePeerDependencies: - supports-color + optional: true '@typescript-eslint/scope-manager@6.21.0': dependencies: @@ -6616,10 +6667,21 @@ snapshots: '@typescript-eslint/types': 8.19.1 '@typescript-eslint/visitor-keys': 8.19.1 + '@typescript-eslint/scope-manager@8.46.4': + dependencies: + '@typescript-eslint/types': 8.46.4 + '@typescript-eslint/visitor-keys': 8.46.4 + optional: true + '@typescript-eslint/tsconfig-utils@8.38.0(typescript@5.7.2)': dependencies: typescript: 5.7.2 + '@typescript-eslint/tsconfig-utils@8.46.4(typescript@5.7.2)': + dependencies: + typescript: 5.7.2 + optional: true + '@typescript-eslint/type-utils@6.21.0(eslint@8.57.1)(typescript@5.7.2)': dependencies: '@typescript-eslint/typescript-estree': 6.21.0(typescript@5.7.2) @@ -6638,7 +6700,7 @@ snapshots: '@typescript-eslint/utils': 8.19.1(eslint@9.17.0)(typescript@5.7.2) debug: 4.4.0 eslint: 9.17.0 - ts-api-utils: 2.0.0(typescript@5.7.2) + ts-api-utils: 2.1.0(typescript@5.7.2) typescript: 5.7.2 transitivePeerDependencies: - supports-color @@ -6649,6 +6711,9 @@ snapshots: '@typescript-eslint/types@8.19.1': {} + '@typescript-eslint/types@8.46.4': + optional: true + '@typescript-eslint/typescript-estree@6.21.0(typescript@5.7.2)': dependencies: '@typescript-eslint/types': 6.21.0 @@ -6688,11 +6753,28 @@ snapshots: is-glob: 4.0.3 minimatch: 9.0.5 semver: 7.6.3 - ts-api-utils: 2.0.0(typescript@5.7.2) + ts-api-utils: 2.1.0(typescript@5.7.2) typescript: 5.7.2 transitivePeerDependencies: - supports-color + '@typescript-eslint/typescript-estree@8.46.4(typescript@5.7.2)': + dependencies: + '@typescript-eslint/project-service': 8.46.4(typescript@5.7.2) + '@typescript-eslint/tsconfig-utils': 8.46.4(typescript@5.7.2) + '@typescript-eslint/types': 8.46.4 + '@typescript-eslint/visitor-keys': 8.46.4 + debug: 4.4.0 + fast-glob: 3.3.3 + is-glob: 4.0.3 + minimatch: 9.0.5 + semver: 7.6.3 + ts-api-utils: 2.1.0(typescript@5.7.2) + typescript: 5.7.2 + transitivePeerDependencies: + - supports-color + optional: true + '@typescript-eslint/utils@6.21.0(eslint@8.57.1)(typescript@5.7.2)': dependencies: '@eslint-community/eslint-utils': 4.4.1(eslint@8.57.1) @@ -6731,7 +6813,13 @@ snapshots: '@typescript-eslint/visitor-keys@8.19.1': dependencies: '@typescript-eslint/types': 8.19.1 - eslint-visitor-keys: 4.2.0 + eslint-visitor-keys: 4.2.1 + + '@typescript-eslint/visitor-keys@8.46.4': + dependencies: + '@typescript-eslint/types': 8.46.4 + eslint-visitor-keys: 4.2.1 + optional: true '@ungap/structured-clone@1.2.1': {} @@ -8273,37 +8361,37 @@ snapshots: optionalDependencies: '@typescript-eslint/parser': 6.21.0(eslint@8.57.1)(typescript@5.7.2) - eslint-plugin-ember@12.3.3(@typescript-eslint/parser@8.19.1(eslint@8.57.1)(typescript@5.7.2))(eslint@8.57.1): + eslint-plugin-ember@12.3.3(@typescript-eslint/parser@8.19.1(eslint@9.17.0)(typescript@5.7.2))(eslint@9.17.0): dependencies: '@ember-data/rfc395-data': 0.0.4 css-tree: 3.1.0 ember-eslint-parser: 'link:' ember-rfc176-data: 0.3.18 - eslint: 8.57.1 - eslint-utils: 3.0.0(eslint@8.57.1) + eslint: 9.17.0 + eslint-utils: 3.0.0(eslint@9.17.0) estraverse: 5.3.0 lodash.camelcase: 4.3.0 lodash.kebabcase: 4.1.1 requireindex: 1.2.0 snake-case: 3.0.4 optionalDependencies: - '@typescript-eslint/parser': 8.19.1(eslint@8.57.1)(typescript@5.7.2) + '@typescript-eslint/parser': 8.19.1(eslint@9.17.0)(typescript@5.7.2) - eslint-plugin-ember@12.3.3(@typescript-eslint/parser@8.19.1(eslint@9.17.0)(typescript@5.7.2))(eslint@9.17.0): + eslint-plugin-ember@12.3.3(@typescript-eslint/parser@8.46.4(eslint@8.57.1)(typescript@5.7.2))(eslint@8.57.1): dependencies: '@ember-data/rfc395-data': 0.0.4 css-tree: 3.1.0 ember-eslint-parser: 'link:' ember-rfc176-data: 0.3.18 - eslint: 9.17.0 - eslint-utils: 3.0.0(eslint@9.17.0) + eslint: 8.57.1 + eslint-utils: 3.0.0(eslint@8.57.1) estraverse: 5.3.0 lodash.camelcase: 4.3.0 lodash.kebabcase: 4.1.1 requireindex: 1.2.0 snake-case: 3.0.4 optionalDependencies: - '@typescript-eslint/parser': 8.19.1(eslint@9.17.0)(typescript@5.7.2) + '@typescript-eslint/parser': 8.46.4(eslint@8.57.1)(typescript@5.7.2) eslint-plugin-es-x@7.8.0(eslint@8.57.1): dependencies: @@ -8477,6 +8565,8 @@ snapshots: eslint-visitor-keys@4.2.0: {} + eslint-visitor-keys@4.2.1: {} + eslint@8.57.1: dependencies: '@eslint-community/eslint-utils': 4.4.1(eslint@8.57.1) @@ -8563,7 +8653,7 @@ snapshots: dependencies: acorn: 8.14.0 acorn-jsx: 5.3.2(acorn@8.14.0) - eslint-visitor-keys: 4.2.0 + eslint-visitor-keys: 4.2.1 espree@9.6.1: dependencies: @@ -10792,7 +10882,7 @@ snapshots: dependencies: typescript: 5.7.2 - ts-api-utils@2.0.0(typescript@5.7.2): + ts-api-utils@2.1.0(typescript@5.7.2): dependencies: typescript: 5.7.2 diff --git a/test-projects/gjs-types/package.json b/test-projects/gjs-types/package.json index cef731f..61ac2d8 100644 --- a/test-projects/gjs-types/package.json +++ b/test-projects/gjs-types/package.json @@ -8,8 +8,6 @@ "test:check:with-allow-js": "eslint . --max-warnings=0", "test:check:without-allow-gjs": "ALLOW_GJS=false pnpm run _:lint-with-error", "test:check:project-service": "PROJECT_SERVICE=true eslint . --max-warnings=0", - "test:check:project-service:alternate": "PROJECT_SERVICE=true DEFAULT_PROJECT=tsconfig.nojs.json pnpm run _:lint-with-error", - "test:check:project": "PROJECT=tsconfig.json TSCONFIG_ROOT_DIR=$(pwd) eslint . --max-warnings=0", "test:check:project:alternate": "PROJECT=tsconfig.nojs.json pnpm run _:lint-with-error", "test:check:allow-gjs-false": "ALLOW_GJS=false pnpm run _:lint-with-error", "test:check:allow-gjs-true": "ALLOW_GJS=true eslint . --max-warnings=0" From dcce83427e608a93afb3c7d782799a93c7f84f0e Mon Sep 17 00:00:00 2001 From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com> Date: Wed, 12 Nov 2025 09:07:17 -0500 Subject: [PATCH 2/2] Revert removal of test scenarios --- test-projects/gjs-types/package.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test-projects/gjs-types/package.json b/test-projects/gjs-types/package.json index 61ac2d8..cef731f 100644 --- a/test-projects/gjs-types/package.json +++ b/test-projects/gjs-types/package.json @@ -8,6 +8,8 @@ "test:check:with-allow-js": "eslint . --max-warnings=0", "test:check:without-allow-gjs": "ALLOW_GJS=false pnpm run _:lint-with-error", "test:check:project-service": "PROJECT_SERVICE=true eslint . --max-warnings=0", + "test:check:project-service:alternate": "PROJECT_SERVICE=true DEFAULT_PROJECT=tsconfig.nojs.json pnpm run _:lint-with-error", + "test:check:project": "PROJECT=tsconfig.json TSCONFIG_ROOT_DIR=$(pwd) eslint . --max-warnings=0", "test:check:project:alternate": "PROJECT=tsconfig.nojs.json pnpm run _:lint-with-error", "test:check:allow-gjs-false": "ALLOW_GJS=false pnpm run _:lint-with-error", "test:check:allow-gjs-true": "ALLOW_GJS=true eslint . --max-warnings=0"