Merge 200da12 into 8316f41

ota-meshi · Feb 20, 2021 · 05355cd · 05355cd
2 parents 8316f41 + 200da12
commit 05355cd
Show file tree

Hide file tree

Showing 8 changed files with 131 additions and 119 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -0,0 +1,5 @@
+/.nyc_output
+/coverage
+/lib
+/node_modules
+/tests/fixtures/**/*.json
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -3,7 +3,9 @@
     "javascript",
     "javascriptreact",
     "vue",
-    "typescript"
+    "typescript",
+    "json",
+    "jsonc"
   ],
   "typescript.validate.enable": true,
   "javascript.validate.enable": false,

diff --git a/explorer/.eslintrc.js b/explorer/.eslintrc.js
@@ -3,7 +3,11 @@ module.exports = {
         sourceType: "module",
         ecmaVersion: 2020,
     },
-    extends: ["plugin:@ota-meshi/+vue3", "plugin:@ota-meshi/+prettier"],
+    extends: [
+        "plugin:@ota-meshi/+vue3",
+        "plugin:@ota-meshi/+prettier",
+        "plugin:@ota-meshi/+json",
+    ],
     rules: {
         "node/no-unsupported-features/es-syntax": "off",
     },

diff --git a/explorer/package.json b/explorer/package.json
@@ -1,23 +1,23 @@
 {
-  "name": "yaml-eslint-parser-ast-explorer",
-  "version": "0.1.0",
-  "private": true,
-  "scripts": {
-    "serve": "vue-cli-service serve",
-    "build": "vue-cli-service build"
-  },
-  "dependencies": {
-    "core-js": "^3.6.5",
-    "vue": "^3.0.0"
-  },
-  "devDependencies": {
-    "@vue/cli-plugin-babel": "~4.5.0",
-    "@vue/cli-service": "~4.5.0",
-    "@vue/compiler-sfc": "^3.0.0"
-  },
-  "browserslist": [
-    "> 1%",
-    "last 2 versions",
-    "not dead"
-  ]
+    "name": "yaml-eslint-parser-ast-explorer",
+    "version": "0.1.0",
+    "private": true,
+    "scripts": {
+        "serve": "vue-cli-service serve",
+        "build": "vue-cli-service build"
+    },
+    "dependencies": {
+        "core-js": "^3.6.5",
+        "vue": "^3.0.0"
+    },
+    "devDependencies": {
+        "@vue/cli-plugin-babel": "~4.5.0",
+        "@vue/cli-service": "~4.5.0",
+        "@vue/compiler-sfc": "^3.0.0"
+    },
+    "browserslist": [
+        "> 1%",
+        "last 2 versions",
+        "not dead"
+    ]
 }
diff --git a/package.json b/package.json
@@ -1,65 +1,66 @@
 {
-  "name": "yaml-eslint-parser",
-  "version": "0.3.2",
-  "description": "A YAML parser that produces output compatible with ESLint",
-  "main": "lib/index.js",
-  "files": [
-    "lib"
-  ],
-  "scripts": {
-    "prebuild": "npm run -s clean",
-    "build": "tsc --project ./tsconfig.build.json",
-    "clean": "rimraf .nyc_output lib coverage",
-    "lint": "eslint \"tests\" \"src\" --ext .js,.ts",
-    "eslint-fix": "npm run lint -- --fix",
-    "test": "mocha --require ts-node/register \"tests/src/**/*.ts\" --reporter dot --timeout 60000",
-    "cover": "nyc --reporter=lcov npm run test",
-    "debug": "mocha --require ts-node/register/transpile-only --inspect \"tests/src/**/*.ts\" --reporter dot",
-    "preversion": "npm run lint && npm test",
-    "update-fixtures": "ts-node ./tools/update-fixtures.ts"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/ota-meshi/yaml-eslint-parser.git"
-  },
-  "keywords": [
-    "yaml",
-    "eslint",
-    "parser"
-  ],
-  "author": "Yosuke Ota",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/ota-meshi/yaml-eslint-parser/issues"
-  },
-  "homepage": "https://github.com/ota-meshi/yaml-eslint-parser#readme",
-  "dependencies": {
-    "eslint-visitor-keys": "^2.0.0",
-    "lodash": "^4.17.20",
-    "yaml": "^1.10.0"
-  },
-  "devDependencies": {
-    "@ota-meshi/eslint-plugin": "^0.0.12",
-    "@types/eslint": "^7.2.0",
-    "@types/eslint-visitor-keys": "^1.0.0",
-    "@types/lodash": "^4.14.167",
-    "@types/mocha": "^8.0.0",
-    "@types/node": "^14.0.13",
-    "@typescript-eslint/eslint-plugin": "^4.9.1",
-    "@typescript-eslint/parser": "^4.9.1",
-    "eslint": "^7.5.0",
-    "eslint-config-prettier": "^7.0.0",
-    "eslint-plugin-eslint-comments": "^3.2.0",
-    "eslint-plugin-jsonc": "^0.9.0",
-    "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-prettier": "^3.2.0",
-    "eslint-plugin-regexp": "^0.1.1",
-    "eslint-plugin-vue": "^7.2.0",
-    "mocha": "^8.0.0",
-    "nyc": "^15.1.0",
-    "prettier": "^2.0.5",
-    "ts-node": "^9.0.0",
-    "typescript": "^4.0.0",
-    "vue-eslint-parser": "^7.2.0"
-  }
+    "name": "yaml-eslint-parser",
+    "version": "0.3.2",
+    "description": "A YAML parser that produces output compatible with ESLint",
+    "main": "lib/index.js",
+    "files": [
+        "lib"
+    ],
+    "scripts": {
+        "prebuild": "npm run -s clean",
+        "build": "tsc --project ./tsconfig.build.json",
+        "clean": "rimraf .nyc_output lib coverage",
+        "lint": "eslint . --ext .js,.ts,.json",
+        "eslint-fix": "npm run lint -- --fix",
+        "test": "mocha --require ts-node/register \"tests/src/**/*.ts\" --reporter dot --timeout 60000",
+        "cover": "nyc --reporter=lcov npm run test",
+        "debug": "mocha --require ts-node/register/transpile-only --inspect \"tests/src/**/*.ts\" --reporter dot",
+        "preversion": "npm run lint && npm test",
+        "update-fixtures": "ts-node ./tools/update-fixtures.ts"
+    },
+    "repository": {
+        "type": "git",
+        "url": "git+https://github.com/ota-meshi/yaml-eslint-parser.git"
+    },
+    "keywords": [
+        "yaml",
+        "eslint",
+        "parser"
+    ],
+    "author": "Yosuke Ota",
+    "license": "MIT",
+    "bugs": {
+        "url": "https://github.com/ota-meshi/yaml-eslint-parser/issues"
+    },
+    "homepage": "https://github.com/ota-meshi/yaml-eslint-parser#readme",
+    "dependencies": {
+        "eslint-visitor-keys": "^2.0.0",
+        "lodash": "^4.17.20",
+        "yaml": "^1.10.0"
+    },
+    "devDependencies": {
+        "@ota-meshi/eslint-plugin": "^0.0.13",
+        "@types/eslint": "^7.2.0",
+        "@types/eslint-visitor-keys": "^1.0.0",
+        "@types/lodash": "^4.14.167",
+        "@types/mocha": "^8.0.0",
+        "@types/node": "^14.0.13",
+        "@typescript-eslint/eslint-plugin": "^4.9.1",
+        "@typescript-eslint/parser": "^4.9.1",
+        "eslint": "^7.5.0",
+        "eslint-config-prettier": "^7.0.0",
+        "eslint-plugin-eslint-comments": "^3.2.0",
+        "eslint-plugin-json-schema-validator": "^0.2.1",
+        "eslint-plugin-jsonc": "^0.9.0",
+        "eslint-plugin-node": "^11.1.0",
+        "eslint-plugin-prettier": "^3.2.0",
+        "eslint-plugin-regexp": "^0.1.1",
+        "eslint-plugin-vue": "^7.2.0",
+        "mocha": "^8.0.0",
+        "nyc": "^15.1.0",
+        "prettier": "^2.0.5",
+        "ts-node": "^9.0.0",
+        "typescript": "^4.0.0",
+        "vue-eslint-parser": "^7.2.0"
+    }
 }
diff --git a/renovate.json b/renovate.json
@@ -1,13 +1,13 @@
 {
-  "extends": ["config:base", ":preserveSemverRanges"],
-  "packageRules": [
-      {
-          "updateTypes": ["minor", "patch", "pin", "digest"],
-          "automerge": true
-      },
-      {
-          "depTypeList": ["devDependencies"],
-          "automerge": true
-      }
-  ]
+    "extends": ["config:base", ":preserveSemverRanges"],
+    "packageRules": [
+        {
+            "updateTypes": ["minor", "patch", "pin", "digest"],
+            "automerge": true
+        },
+        {
+            "depTypeList": ["devDependencies"],
+            "automerge": true
+        }
+    ]
 }
diff --git a/tsconfig.build.json b/tsconfig.build.json
@@ -1,8 +1,8 @@
 {
-  "extends": "./tsconfig.json",
-  "include": ["src/index.ts"],
-  "compilerOptions": {
-    "rootDir": "src",
-    "outDir": "lib"
-  }
-}
+    "extends": "./tsconfig.json",
+    "include": ["src/index.ts"],
+    "compilerOptions": {
+        "rootDir": "src",
+        "outDir": "lib"
+    }
+}
diff --git a/tsconfig.json b/tsconfig.json
@@ -1,16 +1,16 @@
 {
-  "compilerOptions": {
-    "target": "es2015",
-    "strict": true,
-    "lib": ["es2020"],
-    "module": "commonjs",
-    "declaration": true,
-    "noImplicitAny": true,
-    "noImplicitReturns": true,
-    "noFallthroughCasesInSwitch": true,
-    "noUnusedLocals": true,
-    "noUnusedParameters": true,
-    "esModuleInterop": true
-  },
-  "include": ["src/**/*.ts", "tests/**/*.ts", "tools/**/*.ts"]
-}
+    "compilerOptions": {
+        "target": "es2015",
+        "strict": true,
+        "lib": ["es2020"],
+        "module": "commonjs",
+        "declaration": true,
+        "noImplicitAny": true,
+        "noImplicitReturns": true,
+        "noFallthroughCasesInSwitch": true,
+        "noUnusedLocals": true,
+        "noUnusedParameters": true,
+        "esModuleInterop": true
+    },
+    "include": ["src/**/*.ts", "tests/**/*.ts", "tools/**/*.ts"]
+}