diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3503bbb..5c36cac 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,10 +24,13 @@ jobs: - name: Get changed files in scope id: changed-files-specific - uses: tj-actions/changed-files@v46 + uses: tj-actions/changed-files@v47 with: files: | package.json + pnpm-lock.yaml + tsconfig.json + vite.config.ts assets/** build: @@ -36,7 +39,6 @@ jobs: name: Build (Hugo ${{ matrix.hugo-version }}) needs: [filter] if: | - github.ref == 'refs/heads/main' && github.event.repository.fork == false strategy: matrix: diff --git a/.github/workflows/eslint.yml b/.github/workflows/eslint.yml index ea77e40..75f7d85 100644 --- a/.github/workflows/eslint.yml +++ b/.github/workflows/eslint.yml @@ -34,7 +34,7 @@ jobs: uses: actions/cache@v4 with: path: ${{ steps.pnpm-cache.outputs.STORE_PATH }} - key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }} + key: ${{ runner.os }}-pnpm-store-${{ hashFiles('./pnpm-lock.yaml') }} restore-keys: ${{ runner.os }}-pnpm-store- - name: Install dependencies diff --git a/eslint.config.mjs b/eslint.config.mjs index ed1f684..87ca595 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -1,4 +1,4 @@ -import { default as eslint, default as js } from '@eslint/js' +import js from '@eslint/js' import tsParser from '@typescript-eslint/parser' import love from 'eslint-config-love' import importPlugin from 'eslint-plugin-import' @@ -9,7 +9,6 @@ import tseslint from 'typescript-eslint' export default defineConfig([ js.configs.recommended, - eslint.configs.recommended, tseslint.configs.recommended, importPlugin.flatConfigs.recommended, solid, diff --git a/package.json b/package.json index 5127116..02e7ae5 100644 --- a/package.json +++ b/package.json @@ -39,8 +39,8 @@ }, "homepage": "https://github.com/Sped0n/bridget#readme", "devDependencies": { + "@eslint/js": "^9.39.1", "@types/node": "^24.10.0", - "@typescript-eslint/eslint-plugin": "^8.46.4", "@typescript-eslint/parser": "^8.46.4", "eslint": "^9.39.1", "eslint-config-love": "^133.0.0", @@ -55,6 +55,7 @@ "prettier-plugin-organize-imports": "^4.3.0", "sass-embedded": "^1.93.3", "typescript": "^5.9.3", + "typescript-eslint": "^8.46.4", "vite": "^7.2.2", "vite-plugin-solid": "^2.11.10" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 442d17f..858891d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -21,12 +21,12 @@ importers: specifier: ^1.3.3 version: 1.3.3 devDependencies: + '@eslint/js': + specifier: ^9.39.1 + version: 9.39.1 '@types/node': specifier: ^24.10.0 version: 24.10.0 - '@typescript-eslint/eslint-plugin': - specifier: ^8.46.4 - version: 8.46.4(@typescript-eslint/parser@8.46.4(eslint@9.39.1)(typescript@5.9.3))(eslint@9.39.1)(typescript@5.9.3) '@typescript-eslint/parser': specifier: ^8.46.4 version: 8.46.4(eslint@9.39.1)(typescript@5.9.3) @@ -69,6 +69,9 @@ importers: typescript: specifier: ^5.9.3 version: 5.9.3 + typescript-eslint: + specifier: ^8.46.4 + version: 8.46.4(eslint@9.39.1)(typescript@5.9.3) vite: specifier: ^7.2.2 version: 7.2.2(@types/node@24.10.0)(sass-embedded@1.93.3)(sass@1.93.3)