Skip to content
Merged
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
5 changes: 5 additions & 0 deletions .changeset/giant-dragons-help.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"eslint-plugin-jsonc": patch
---

fix(deps): update dependency synckit to `^0.6.2 || ^0.7.3 || ^0.11.5`
6 changes: 5 additions & 1 deletion .env-cmdrc
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
{
"test": {
"SYNCKIT_TS_RUNNER": "swc"
},
"version": {
"IN_VERSION_SCRIPT": "true"
"IN_VERSION_SCRIPT": "true",
"SYNCKIT_TS_RUNNER": "swc"
},
"version-ci": {
"IN_VERSION_CI_SCRIPT": "true"
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/NodeCI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ jobs:
- name: Install Packages
run: npm install
- name: Test
run: npm run test:transpile-only
run: npm run test
test-with-eslint6:
runs-on: ubuntu-latest
strategy:
Expand All @@ -100,7 +100,7 @@ jobs:
npx rimraf node_modules
npm install
- name: Test
run: npm run test:transpile-only
run: npm run test
test-with-eslint7:
runs-on: ubuntu-latest
strategy:
Expand All @@ -118,7 +118,7 @@ jobs:
npx rimraf node_modules
npm install
- name: Test
run: npm run test:transpile-only
run: npm run test
test-and-coverage:
runs-on: ubuntu-latest
steps:
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ dist
# TernJS port file
.tern-port

/yarn.lock
/typings/eslint/lib
/dist-ts
/index.d.ts
Expand Down
4 changes: 2 additions & 2 deletions lib/meta.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// IMPORTANT!
// This file has been automatically generated,
// in order to update its content execute "npm run update"
export const name = "eslint-plugin-jsonc";
export const version = "2.20.0";
export const name = "eslint-plugin-jsonc" as const;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure why there is no issue before.

export const version = "2.20.0" as const;
18 changes: 9 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,23 +18,22 @@
"scripts": {
"prebuild": "npm run -s clean",
"build": "npm run build:meta && npm run build:ts && npm run build:dts",
"build:meta": "ts-node --transpile-only ./tools/update-meta.ts",
"build:meta": "node -r @swc-node/register ./tools/update-meta.ts",
"build:ts": "tsc --project ./tsconfig.build.json",
"build:dts": "npm run build:dts-step1 && npm run build:dts-step2",
"build:dts-step1": "tsc --declaration --outDir dist-ts --project ./tsconfig.build.json",
"build:dts-step2": "dts-bundle --name eslint-plugin-jsonc --main ./dist-ts/index.d.ts --out ../index.d.ts",
"clean": "rimraf .nyc_output dist coverage",
"lint": "eslint .",
"eslint-fix": "eslint . --fix",
"test:base": "mocha --require ts-node/register \"tests/lib/**/*.ts\" --reporter dot --timeout 60000",
"test:base": "env-cmd -e test mocha --require @swc-node/register \"tests/lib/**/*.ts\" --reporter dot --timeout 60000",
"test": "npm run test:base",
"test:nyc": "nyc --reporter=lcov npm run test:base",
"test:transpile-only": "mocha --require ts-node/register/transpile-only \"tests/lib/**/*.ts\" --reporter dot --timeout 60000",
"pretest:integrations": "npm run build:ts && npm pack",
"test:integrations": "mocha --require ts-node/register \"tests-integrations/lib/**/*.ts\" --reporter dot --timeout 120000",
"update": "ts-node --transpile-only ./tools/update.ts && npm run eslint-fix && npm run test:nyc",
"update-only": "ts-node --transpile-only ./tools/update.ts",
"new": "ts-node ./tools/new-rule.ts",
"test:integrations": "mocha --require @swc-node/register \"tests-integrations/lib/**/*.ts\" --reporter dot --timeout 120000",
"update": "node -r @swc-node/register ./tools/update.ts && npm run eslint-fix && npm run test:nyc",
"update-only": "node -r @swc-node/register ./tools/update.ts",
"new": "node -r @swc-node/register ./tools/new-rule.ts",
"predocs:watch": "npm run build:ts",
"docs:watch": "vitepress dev docs",
"docs:build": "npm run build:ts && vitepress build docs",
Expand Down Expand Up @@ -73,7 +72,7 @@
"graphemer": "^1.4.0",
"jsonc-eslint-parser": "^2.4.0",
"natural-compare": "^1.4.0",
"synckit": "^0.6.2 || ^0.7.3 || ^0.10.3"
"synckit": "^0.6.2 || ^0.7.3 || ^0.11.5"
},
"peerDependencies": {
"eslint": ">=6.0.0"
Expand All @@ -86,6 +85,8 @@
"@eslint/json": "^0.11.0",
"@ota-meshi/eslint-plugin": "^0.17.6",
"@ota-meshi/site-kit-eslint-editor-vue": "^0.2.4",
"@swc-node/register": "^1.10.10",
"@swc/core": "^1.11.24",
"@types/eslint-scope": "^3.7.7",
"@types/mocha": "^10.0.10",
"@types/natural-compare": "^1.4.3",
Expand Down Expand Up @@ -122,7 +123,6 @@
"stylelint-config-standard": "^37.0.0",
"stylelint-config-standard-vue": "^1.0.0",
"stylelint-stylus": "^1.0.0",
"ts-node": "^10.9.2",
"typescript": "^5.8.2",
"typescript-eslint": "^8.28.0",
"vite-plugin-eslint4b": "^0.5.1",
Expand Down
1 change: 0 additions & 1 deletion tests/lib/as-parser.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ describe("eslint-plugin-jsonc as parser", () => {
it("should parse '.json6'", async () => {
const engine = new ESLint({
cwd: TEST_CWD,
// @ts-expect-error -- old ESLint
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

extensions: [".js", ".json6"],
plugins: {
"eslint-plugin-jsonc": plugin as never,
Expand Down
2 changes: 0 additions & 2 deletions tests/lib/auto-rule.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,13 @@ describe("auto rule", () => {

const engine = new ESLint({
cwd: TEST_CWD,
// @ts-expect-error -- old ESLint
extensions: [".js", ".json"],
plugins: {
"eslint-plugin-jsonc": plugin as never,
},
});
const fixEngine = new ESLint({
cwd: TEST_CWD,
// @ts-expect-error -- old ESLint
extensions: [".js", ".json"],
plugins: {
"eslint-plugin-jsonc": plugin as never,
Expand Down
1 change: 0 additions & 1 deletion tests/lib/configs/recommended-with-json.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ describe("`recommended-with-json` config", () => {
svelte: plugin as never,
},
baseConfig: {
// @ts-expect-error -- old ESLint
parserOptions: {
ecmaVersion: 2020,
},
Expand Down
1 change: 0 additions & 1 deletion tests/lib/eslint-plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ describe("Integration with eslint-plugin-jsonc", () => {
it("should lint without errors", async () => {
const engine = new ESLint({
cwd: TEST_CWD,
// @ts-expect-error -- old ESLint
extensions: [".js", ".json"],
plugins: {
"eslint-plugin-jsonc": plugin as never,
Expand Down
2 changes: 0 additions & 2 deletions tests/lib/rules/auto.ts
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ function run(tests: {
plugins: {
"eslint-plugin-jsonc": plugin as any,
},
// @ts-expect-error -- old ESLint
overrideConfig: parser
? {
...config,
Expand All @@ -87,7 +86,6 @@ function run(tests: {
"eslint-plugin-jsonc": plugin as any,
},
fix: true,
// @ts-expect-error -- old ESLint
overrideConfig: parser
? {
...config,
Expand Down
Loading