Skip to content

Commit

Permalink
Merge pull request #37 from hildjj/trailing-commas
Browse files Browse the repository at this point in the history
Allow trailing commas in JSONC
  • Loading branch information
hildjj authored Nov 9, 2024
2 parents c41e3ad + fd1a906 commit 7923d87
Show file tree
Hide file tree
Showing 9 changed files with 398 additions and 365 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/node.js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,15 @@ on:
branches:
- main
pull_request:
branches: ['*']
branches:
- main

jobs:
build:

strategy:
matrix:
node-version: [18.x, 20.x, 22.x]
node-version: [18.x, 20.x, 22.x, 23.x]
os: [ubuntu-latest]

runs-on: ${{ matrix.os }}
Expand Down
7 changes: 6 additions & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@ name: Publish Package to npmjs
on:
release:
types: [published]
workflow_call:
secrets:
NPM_TOKEN:
required: true

jobs:
build:
runs-on: ubuntu-latest
Expand All @@ -13,7 +18,7 @@ jobs:
- run: corepack enable
- uses: actions/setup-node@v4
with:
node-version: '20.x'
node-version: '22.x'
registry-url: 'https://registry.npmjs.org'
cache: pnpm
- run: pnpm i -r
Expand Down
3 changes: 3 additions & 0 deletions json.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ export default [{
],
plugins: { json },
language: "json/jsonc",
languageOptions: {
allowTrailingCommas: true,
},
rules,
},
{
Expand Down
14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,18 @@
},
"devDependencies": {
"@cto.af/eslint-plugin-meta": "1.1.1",
"eslint": "^9.12.0",
"eslint": "^9.14.0",
"eslint-plugin-mocha": "10.5.0",
"typescript": "^5.6.3",
"typescript-eslint": "8.8.1"
"typescript-eslint": "8.13.0"
},
"dependencies": {
"@eslint/json": "0.5.0",
"@eslint/markdown": "6.2.0",
"@stylistic/eslint-plugin": "2.9.0",
"globals": "15.11.0"
"@eslint/json": "0.6.0",
"@eslint/markdown": "6.2.1",
"@stylistic/eslint-plugin": "2.10.1",
"globals": "15.12.0"
},
"packageManager": "[email protected].1",
"packageManager": "[email protected].3",
"engines": {
"node": ">=18"
}
Expand Down
Loading

0 comments on commit 7923d87

Please sign in to comment.