Merge branch 'main' into dependabot/npm_and_yarn/npm-574b0d5a74

Author: poad

bin/package.json

@@ -1 +1 @@
-{"name":"appstore-connect-jwt-generator-cli","version":"1.1.2","author":"poad","license":"MIT","private":false,"homepage":"https://github.com/poad/appstore-connect-jwt-generator-cli#readme","main":"bin/cli.js","bin":{"jwt-gen":"./bin/cli.js","appstore-jwt-gen":"./bin/cli.js"},"type":"module","repository":{"type":"git","url":"git+https://github.com/poad/appstore-connect-jwt-generator-cli.git"},"keywords":["appstore","jwt","api","cli"],"preferGlobal":false,"scripts":{"test":"vitest run --silent=false --coverage --passWithNoTests","prebuild":"tsc --build --clean","watch":"tsc --watch","build":"tsc","dev":"tsx src/main.ts","package":"ncc build --license licenses.txt -m -q -o bin && chmod +x bin/cli.js","lint":"eslint","lint-fix":"eslint --fix","all":"pnpm build && pnpm package && pnpm lint && pnpm test"},"devDependencies":{"@eslint/compat":"^2.0.3","@eslint/js":"^10.0.1","@stylistic/eslint-plugin":"^5.10.0","@types/node":"^25.5.0","@vercel/ncc":"^0.38.4","@vitest/coverage-v8":"^4.1.2","eslint":"^10.1.0","eslint-config-prettier":"^10.1.8","eslint-import-resolver-typescript":"^4.4.4","eslint-plugin-flowtype":"^8.0.3","eslint-plugin-import":"^2.32.0","eslint-plugin-jest":"^29.15.1","eslint-plugin-prettier":"^5.5.5","eslint-plugin-promise":"^7.2.1","jiti":"^2.6.1","prettier":"^3.8.1","tsx":"^4.21.0","typescript":"^5.9.3","typescript-eslint":"^8.57.2","vite":"^8.0.3","vite-tsconfig-paths":"^6.1.1","vitest":"^4.1.2"},"dependencies":{"appstore-connect-jwt-generator-core":"^2.0.6","arg":"^5.0.2","chalk":"^5.6.2","chalk-template":"^1.1.2","log4js":"^6.9.1"},"files":["package.json","bin/*","README.md"],"exports":{".":{"node":"./bin/index.js","default":"./bin/index.js"}},"engines":{"npm":"use pnpm please!","yarn":"use pnpm please!","node":">=22.0.0"},"publishConfig":{"registry":"https://registry.npmjs.org/","access":"public"},"packageManager":"pnpm@10.33.0"}
+{"name":"appstore-connect-jwt-generator-cli","version":"1.1.2","author":"poad","license":"MIT","private":false,"homepage":"https://github.com/poad/appstore-connect-jwt-generator-cli#readme","main":"bin/cli.js","bin":{"jwt-gen":"./bin/cli.js","appstore-jwt-gen":"./bin/cli.js"},"type":"module","repository":{"type":"git","url":"git+https://github.com/poad/appstore-connect-jwt-generator-cli.git"},"keywords":["appstore","jwt","api","cli"],"preferGlobal":false,"scripts":{"test":"vitest run --silent=false --coverage --passWithNoTests","prebuild":"tsc --build --clean","watch":"tsc --watch","build":"tsc","dev":"tsx src/main.ts","package":"ncc build --license licenses.txt -m -q -o bin && chmod +x bin/cli.js","lint":"eslint","lint-fix":"eslint --fix","all":"pnpm build && pnpm package && pnpm lint && pnpm test"},"devDependencies":{"@eslint/compat":"^2.0.3","@eslint/js":"^10.0.1","@stylistic/eslint-plugin":"^5.10.0","@types/node":"^24.12.0","@vercel/ncc":"^0.38.4","@vitest/coverage-v8":"^4.1.2","eslint":"^10.1.0","eslint-import-resolver-typescript":"^4.4.4","eslint-plugin-import-x":"^4.16.2","eslint-plugin-promise":"^7.2.1","jiti":"^2.6.1","tsx":"^4.21.0","typescript":"^6.0.2","typescript-eslint":"^8.57.2","vite":"^8.0.3","vite-tsconfig-paths":"^6.1.1","vitest":"^4.1.2"},"dependencies":{"appstore-connect-jwt-generator-core":"^2.0.6","arg":"^5.0.2","chalk":"^5.6.2","chalk-template":"^1.1.2","log4js":"^6.9.1"},"files":["package.json","bin/*","README.md"],"exports":{".":{"node":"./bin/index.js","default":"./bin/index.js"}},"engines":{"npm":"use pnpm please!","yarn":"use pnpm please!","node":">=22.0.0"},"publishConfig":{"registry":"https://registry.npmjs.org/","access":"public"},"packageManager":"pnpm@10.33.0"}

eslint.config.ts

@@ -1,10 +1,8 @@
 import { defineConfig } from 'eslint/config';
 import eslint from '@eslint/js';
-import { configs, parser } from 'typescript-eslint';
 import stylistic from '@stylistic/eslint-plugin';
-import importPlugin from 'eslint-plugin-import';
-// @ts-expect-error ignore type errors
-import pluginPromise from 'eslint-plugin-promise';
+import { configs, parser } from 'typescript-eslint';
+import eslintImport from 'eslint-plugin-import-x';
 
 import { includeIgnoreFile } from '@eslint/compat';
 import path from 'node:path';
@@ -14,27 +12,24 @@ const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 const gitignorePath = path.resolve(__dirname, '.gitignore');
 
-const eslintConfig = defineConfig(
+export default defineConfig(
+  includeIgnoreFile(gitignorePath),
   {
     ignores: [
-      ...(includeIgnoreFile(gitignorePath).ignores || []),
       '**/*.d.ts',
-      'src/tsconfig.json',
-      'src/stories',
-      '**/*.css',
+      '**/*.js',
       'node_modules/**/*',
       'out',
-      'cdk.out',
       'dist',
-      'bin',
+      'cdk.out',
+      '.output',
     ],
   },
   eslint.configs.recommended,
-  configs.strict,
-  configs.stylistic,
-  pluginPromise.configs['flat/recommended'],
+  ...configs.strict,
+  ...configs.stylistic,
   {
-    files: ['**/*.ts', '*.js'],
+    files: ['{bin,lib,lambda}/**/*.{ts,tsx}', '*.js'],
     plugins: {
       '@stylistic': stylistic,
     },
@@ -44,15 +39,15 @@ const eslintConfig = defineConfig(
       parser,
       parserOptions: {
         tsconfigRootDir: __dirname,
-        project: './tsconfig-eslint.json',
+        allowDefaultProject: ['*.ts'],
       },
     },
     extends: [
-      importPlugin.flatConfigs.recommended,
-      importPlugin.flatConfigs.typescript,
+      eslintImport.flatConfigs.recommended,
+      eslintImport.flatConfigs.typescript,
     ],
     settings: {
-      'import/resolver': {
+      'import-x/resolver': {
         // You will also need to install and configure the TypeScript resolver
         // See also https://github.com/import-js/eslint-import-resolver-typescript#configuration
         'typescript': true,
@@ -63,10 +58,8 @@ const eslintConfig = defineConfig(
       '@stylistic/semi': ['error', 'always'],
       '@stylistic/indent': ['error', 2],
       '@stylistic/comma-dangle': ['error', 'always-multiline'],
-      '@stylistic/arrow-parens': ['error', 'always'],
       '@stylistic/quotes': ['error', 'single'],
+      'awscdk/require-jsdoc': 'off',
     },
   },
 );
-
-export default eslintConfig;

node_modules/.modules.yaml

@@ -37,19 +37,14 @@
     "@eslint/compat": "^2.0.3",
     "@eslint/js": "^10.0.1",
     "@stylistic/eslint-plugin": "^5.10.0",
-    "@types/node": "^25.5.0",
+    "@types/node": "^24.12.0",
     "@vercel/ncc": "^0.38.4",
     "@vitest/coverage-v8": "^4.1.2",
     "eslint": "^10.1.0",
-    "eslint-config-prettier": "^10.1.8",
     "eslint-import-resolver-typescript": "^4.4.4",
-    "eslint-plugin-flowtype": "^8.0.3",
-    "eslint-plugin-import": "^2.32.0",
-    "eslint-plugin-jest": "^29.15.1",
-    "eslint-plugin-prettier": "^5.5.5",
+    "eslint-plugin-import-x": "^4.16.2",
     "eslint-plugin-promise": "^7.2.1",
     "jiti": "^2.6.1",
-    "prettier": "^3.8.1",
     "tsx": "^4.21.0",
     "typescript": "^6.0.2",
     "typescript-eslint": "^8.57.2",