diff --git a/.github/actions/lint-lua-ls/action.yml b/.github/actions/lint-lua-ls/action.yml index ed4edf8b3f..46c392ad8c 100644 --- a/.github/actions/lint-lua-ls/action.yml +++ b/.github/actions/lint-lua-ls/action.yml @@ -6,7 +6,7 @@ runs: - uses: cachix/install-nix-action@v31 with: nix_path: nixpkgs=channel:nixos-unstable - - uses: DeterminateSystems/magic-nix-cache-action@v2 + - uses: DeterminateSystems/magic-nix-cache-action@v13 - run: nix profile add --accept-flake-config .#lua-language-server shell: bash - run: resources/scripts/lint-lua-ls.sh diff --git a/.github/actions/test-neovim-lua/action.yml b/.github/actions/test-neovim-lua/action.yml index c07152b378..7deda5dc46 100644 --- a/.github/actions/test-neovim-lua/action.yml +++ b/.github/actions/test-neovim-lua/action.yml @@ -3,10 +3,10 @@ description: "Set up Neovim Lua environment and run Busted tests" runs: using: "composite" steps: - - uses: leafo/gh-actions-lua@v11 + - uses: leafo/gh-actions-lua@v12 with: luaVersion: "luajit-openresty" - - uses: leafo/gh-actions-luarocks@v5 + - uses: leafo/gh-actions-luarocks@v6 with: luarocksVersion: "3.12.0" - shell: bash diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index 3724bebe9f..869bafd91c 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -27,7 +27,8 @@ jobs: with: python-version-file: "pyproject.toml" - - uses: ./.github/actions/setup-node + - name: Set up Node.js + uses: ./.github/actions/setup-node - name: Install lua uses: leafo/gh-actions-lua@v12 diff --git a/.luarc.json b/.luarc.json index 2183fa73da..12255d36cd 100644 --- a/.luarc.json +++ b/.luarc.json @@ -3,7 +3,7 @@ "diagnostics.ignoredFiles": "Disable", "diagnostics.globals": ["vim", "talon", "it", "describe"], "workspace.ignoreDir": [ - "resources/playground/lua/", + "resources/playground/lua", ".luarocks", ".lua", "dist" diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 9a2f4d4c89..f6dcf56c07 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,7 +1,14 @@ minimum_pre_commit_version: "3.2.0" ci: autoupdate_schedule: monthly -exclude: /vendor/|^resources/playground/ +exclude: | + (?x)( + ^resources/patches/| + ^resources/playground/| + /generated/| + /vendor/ + ) + repos: - repo: meta hooks: @@ -26,6 +33,7 @@ repos: hooks: - id: check-added-large-files - id: check-case-conflict + - id: check-illegal-windows-names - id: check-executables-have-shebangs - id: check-merge-conflict - id: check-shebang-scripts-are-executable @@ -33,7 +41,6 @@ repos: - id: detect-private-key - id: end-of-file-fixer exclude_types: [svg] - exclude: ^resources/patches/.*\.patch$|\.scope$ - id: fix-byte-order-marker - id: forbid-submodules - id: mixed-line-ending @@ -43,7 +50,11 @@ repos: # tests use strings with trailing white space to represent the final # document contents. For example # resources/fixtures/recorded/languages/ruby/changeCondition.yml - exclude: ^resources/fixtures/recorded/.*/[^/]*\.yml$|\.scope$|/generated/|^resources/patches/ + exclude: | + (?x)( + ^resources/fixtures/recorded/.*/[^/]*\.yml$| + ^resources/fixtures/scopes/.*/[^/]*\.scope$ + ) - repo: local hooks: @@ -80,14 +91,14 @@ repos: entry: pnpm transform-recorded-tests --check-marks - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.15.5 + rev: v0.15.7 hooks: - id: ruff-check - args: [--fix, --exit-non-zero-on-fix] + args: [--fix] - id: ruff-format - repo: https://github.com/cursorless-dev/talon-tools - rev: v0.2.0 + rev: v0.8.0 hooks: - id: talon-fmt - id: tree-sitter-fmt @@ -98,7 +109,7 @@ repos: - id: luacheck - repo: https://github.com/JohnnyMorganz/StyLua - rev: v0.20.0 + rev: v2.4.0 hooks: - id: stylua diff --git a/eslint.config.mts b/eslint.config.mts index 0715d67d86..192f24b1e6 100644 --- a/eslint.config.mts +++ b/eslint.config.mts @@ -138,16 +138,15 @@ const tsxConfig: ConfigWithExtends = { const disabledTypeCheckConfig: ConfigWithExtends = { files: [ - "**/jest.config.ts", - "**/docusaurus.config.mts", - "**/mdx-components.tsx", - "**/eslintConfig.ts", - "**/vite.config.ts", + // Workspace "eslint.config.mts", - "prettier.config.cjs", - "resources/typings/**", + // Packages + "packages/*/vite.config.ts", + "packages/*/eslintConfig.ts", + "packages/*/jest.config.ts", + "packages/app-web-docs/docusaurus.config.mts", + // Anywhere "**/*.js", - "**/*.mjs", ], extends: [tsEslint.configs.disableTypeChecked], };