Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 0 additions & 24 deletions .eslintrc.json

This file was deleted.

3 changes: 1 addition & 2 deletions .fantasticonrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
// `contributes.icons` manifest entry (status bar `$(comline-mark)` glyph).
// Regenerate with `yarn build:icon-font` whenever the source SVG changes —
// needs Node >=22 (fantasticon's own requirement; fetched on demand via
// `npx`, not a project dependency, since it's otherwise unused and CI runs
// Node 20).
// `npx`, not a project dependency, since it's otherwise unused).
module.exports = {
inputDir: './assets/icon-font-src',
outputDir: './fonts',
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
- name: Setup Node.js
uses: actions/setup-node@949feb2413d6458794dcd2491c4babbbce0c15c1 # v7.1.0
with:
node-version: 20.20.2
node-version: 22.23.5
cache: yarn

- name: Install dependencies
Expand Down Expand Up @@ -150,7 +150,7 @@ jobs:
- name: Setup Node.js
uses: actions/setup-node@949feb2413d6458794dcd2491c4babbbce0c15c1 # v7.1.0
with:
node-version: 20.20.2
node-version: 22.23.5

- name: The committed schema must be core's at the pinned rev
run: node scripts/sync-idp-schema.mjs
Expand Down Expand Up @@ -189,7 +189,7 @@ jobs:
- name: Setup Node.js
uses: actions/setup-node@949feb2413d6458794dcd2491c4babbbce0c15c1 # v7.1.0
with:
node-version: 20.20.2
node-version: 22.23.5
cache: yarn

- name: Install dependencies
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/flatpak.yml
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ jobs:
- name: Setup Node.js
uses: actions/setup-node@949feb2413d6458794dcd2491c4babbbce0c15c1 # v7.1.0
with:
node-version: 20.20.2
node-version: 22.23.5
cache: yarn

- name: Install dependencies
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ jobs:

- uses: actions/setup-node@949feb2413d6458794dcd2491c4babbbce0c15c1 # v7.1.0
with:
node-version: 20.20.2
node-version: 22.23.5

- name: Rosetta
if: matrix.rosetta
Expand Down Expand Up @@ -258,7 +258,7 @@ jobs:

- uses: actions/setup-node@949feb2413d6458794dcd2491c4babbbce0c15c1 # v7.1.0
with:
node-version: 20.20.2
node-version: 22.23.5
cache: yarn

- run: yarn install --frozen-lockfile
Expand Down Expand Up @@ -415,7 +415,7 @@ jobs:

- uses: actions/setup-node@949feb2413d6458794dcd2491c4babbbce0c15c1 # v7.1.0
with:
node-version: 20.20.2
node-version: 22.23.5

# Fetched without the token in reach, and without install scripts.
- name: Install ovsx
Expand Down
2 changes: 1 addition & 1 deletion .vscodeignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ src/**
tsconfig.json
**/*.map
**/*.ts
.eslintrc.json
eslint.config.mjs
assets/icon-font-src/**
.fantasticonrc.js
fonts/*.json
Expand Down
21 changes: 21 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,27 @@ All notable changes to the "comline-vscode" extension will be documented in this
- Generate runs `comline generation` and Clean runs `comline generation clean`,
as cli#153 renamed them; they need a CLI with those commands. The command
ids (`comline.generate`, `comline.clean`) and titles are unchanged.
- The locked versions of the packages with open security advisories are raised
within the ranges `package.json` and their dependents already allow (no range
changed). The packaged extension's own dependencies move off the advisories
open against them: `minimatch` 5.1.6 to 5.1.9 and `brace-expansion` 2.0.2 to
2.1.8, both pulled in by `vscode-languageclient`. The rest is development
tooling (`undici`, `qs`, `js-yaml`, `tmp`, `flatted`, `form-data`,
`picomatch`, and eslint 8's `minimatch` 3 and `brace-expansion` 1), which the
`.vsix` does not contain.
- Development tooling moves to Node 22 (22.23.5 in every workflow; Node 20 reached
end of life in April 2026) and `@vscode/vsce` 2 to 4, which needs it. The
`vsce package` and `ovsx publish` command lines are unchanged, and the packages
hold the same files and bundled dependencies. vsce 4 names the README and the
changelog in the `.vsix` `readme.md` and `changelog.md` (it was `README.md` and
`CHANGELOG.md`), and writes the `Comline Package` language alias as the
Marketplace tag `ComlinePackage`. It also takes the development-only advisories
held by vsce's old `markdown-it`, `linkify-it` and `uuid` with it.
- Linting moves to ESLint 10 with typescript-eslint 8. The configuration is now
the flat `eslint.config.mjs` (`.eslintrc.json` is gone) with the same rules as
before: `@typescript-eslint/naming-convention`, `curly`, `eqeqeq` and
`no-throw-literal`, all warnings. `@typescript-eslint/semi`, removed in
typescript-eslint 8, is `@stylistic/semi`. `yarn lint` is `eslint src`.

### Fixed
- `comline.server.mode: "path"` never worked: the extension passed the bare
Expand Down
31 changes: 31 additions & 0 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
// Flat config. It is .eslintrc.json translated rule for rule (no `extends`,
// so only the rules named here run), with `@typescript-eslint/semi`, which
// typescript-eslint 8 removed, replaced by `@stylistic/semi`.
import { defineConfig, globalIgnores } from 'eslint/config';
import tsPlugin from '@typescript-eslint/eslint-plugin';
import tsParser from '@typescript-eslint/parser';
import stylistic from '@stylistic/eslint-plugin';

export default defineConfig([
// node_modules is ignored by default.
globalIgnores(['out/**', '.vscode-test/**']),
{
files: ['**/*.ts'],
languageOptions: {
parser: tsParser,
ecmaVersion: 6,
sourceType: 'module',
},
plugins: {
'@typescript-eslint': tsPlugin,
'@stylistic': stylistic,
},
rules: {
'@typescript-eslint/naming-convention': 'warn',
'@stylistic/semi': 'warn',
curly: 'warn',
eqeqeq: 'warn',
'no-throw-literal': 'warn',
},
},
]);
11 changes: 6 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -272,18 +272,19 @@
"watch": "tsc -watch -p ./",
"pretest": "yarn compile",
"test": "node --test out/resolve.test.js out/coreRev.test.js out/idpSchema.test.js",
"lint": "eslint src --ext ts",
"lint": "eslint src",
"package": "bash scripts/package.sh",
"link-binary": "bash scripts/link-binary.sh",
"build:icon-font": "npx --yes fantasticon@^4.1.0"
},
"devDependencies": {
"@stylistic/eslint-plugin": "^6.0.0",
"@types/node": "^18.0.0",
"@types/vscode": "^1.75.0",
"@typescript-eslint/eslint-plugin": "^6.0.0",
"@typescript-eslint/parser": "^6.0.0",
"@vscode/vsce": "^2.22.0",
"eslint": "^8.0.0",
"@typescript-eslint/eslint-plugin": "^8.72.2",
"@typescript-eslint/parser": "^8.72.2",
"@vscode/vsce": "^4.1.1",
"eslint": "^10.15.0",
"typescript": "^5.0.0"
},
"dependencies": {
Expand Down
Loading
Loading