From 348b84f71f316f024cf97a39aa107c15f9cc28b1 Mon Sep 17 00:00:00 2001 From: Christian Paul Date: Thu, 10 Oct 2019 20:54:16 +0200 Subject: [PATCH] Make ESLint pass the current codebase --- .eslintrc.js | 13 +++++++--- package-lock.json | 62 +++++++++++++++++++++++++++++++++++++++++++++++ package.json | 2 ++ src/utils.spec.js | 2 +- 4 files changed, 75 insertions(+), 4 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index 5954c27..6982877 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -1,9 +1,16 @@ module.exports = { "env": { "es6": true, - "node": true + "node": true, + "jest": true }, - "extends": "eslint:recommended", + "parserOptions": { + "ecmaVersion": 2018 + }, + "extends": [ + "eslint:recommended", + "plugin:jest/recommended" + ], "rules": { "indent": [ "error", @@ -26,4 +33,4 @@ module.exports = { "always" ] } -}; \ No newline at end of file +}; diff --git a/package-lock.json b/package-lock.json index d84f33a..f20af4e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -445,6 +445,12 @@ "@types/istanbul-lib-report": "*" } }, + "@types/json-schema": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.3.tgz", + "integrity": "sha512-Il2DtDVRGDcqjDtE+rF8iqg1CArehSK84HZJCT7AMITlyXRBpuPhqGLDQMowraqqu1coEaimg4ZOqggt6L6L+A==", + "dev": true + }, "@types/stack-utils": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-1.0.1.tgz", @@ -466,6 +472,47 @@ "integrity": "sha512-gCubfBUZ6KxzoibJ+SCUc/57Ms1jz5NjHe4+dI2krNmU5zCPAphyLJYyTOg06ueIyfj+SaCUqmzun7ImlxDcKg==", "dev": true }, + "@typescript-eslint/experimental-utils": { + "version": "1.13.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-1.13.0.tgz", + "integrity": "sha512-zmpS6SyqG4ZF64ffaJ6uah6tWWWgZ8m+c54XXgwFtUv0jNz8aJAVx8chMCvnk7yl6xwn8d+d96+tWp7fXzTuDg==", + "dev": true, + "requires": { + "@types/json-schema": "^7.0.3", + "@typescript-eslint/typescript-estree": "1.13.0", + "eslint-scope": "^4.0.0" + }, + "dependencies": { + "eslint-scope": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz", + "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==", + "dev": true, + "requires": { + "esrecurse": "^4.1.0", + "estraverse": "^4.1.1" + } + } + } + }, + "@typescript-eslint/typescript-estree": { + "version": "1.13.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-1.13.0.tgz", + "integrity": "sha512-b5rCmd2e6DCC6tCTN9GSUAuxdYwCM/k/2wdjHGrIRGPSJotWMCe/dGpi66u42bhuh8q3QBzqM4TMA1GUUCJvdw==", + "dev": true, + "requires": { + "lodash.unescape": "4.0.1", + "semver": "5.5.0" + }, + "dependencies": { + "semver": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz", + "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", + "dev": true + } + } + }, "abab": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.2.tgz", @@ -1392,6 +1439,15 @@ "v8-compile-cache": "^2.0.3" } }, + "eslint-plugin-jest": { + "version": "22.17.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-22.17.0.tgz", + "integrity": "sha512-WT4DP4RoGBhIQjv+5D0FM20fAdAUstfYAf/mkufLNTojsfgzc5/IYW22cIg/Q4QBavAZsROQlqppiWDpFZDS8Q==", + "dev": true, + "requires": { + "@typescript-eslint/experimental-utils": "^1.13.0" + } + }, "eslint-scope": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.0.0.tgz", @@ -3565,6 +3621,12 @@ "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=", "dev": true }, + "lodash.unescape": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/lodash.unescape/-/lodash.unescape-4.0.1.tgz", + "integrity": "sha1-vyJJiGzlFM2hEvrpIYzcBlIR/Jw=", + "dev": true + }, "loose-envify": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", diff --git a/package.json b/package.json index e884990..1c83c6d 100644 --- a/package.json +++ b/package.json @@ -4,6 +4,7 @@ "description": "Map+Ascii -> MapSCII! Console Map Viewer.", "main": "main.js", "scripts": { + "lint": "eslint src", "start": "node main", "test": "jest" }, @@ -45,6 +46,7 @@ }, "devDependencies": { "eslint": "^6.5.1", + "eslint-plugin-jest": "^22.17.0", "jest": "^24.9.0" } } diff --git a/src/utils.spec.js b/src/utils.spec.js index c58016c..bf873cb 100644 --- a/src/utils.spec.js +++ b/src/utils.spec.js @@ -19,7 +19,7 @@ describe('utils', () => { function wrapper() { utils.hex2rgb('33'); } - expect(wrapper).toThrowError('isn\'t a supported hex color'); + expect(wrapper).toThrow('isn\'t a supported hex color'); }); }); });