Fixes for eslint & precommit configuration (cvat-ai#2352)

* Fixed some codacy configs, fixed commiting with lint-stage * Improved code * Fixed header * Fixed headers * Removed extra dependencies * Updated some packages (fixed critical vulnerabilities)
coveraver · Oct 24, 2020 · 0576cb7 · 0576cb7
1 parent 7512fd6
commit 0576cb7
Show file tree

Hide file tree

Showing 42 changed files with 975 additions and 656 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -1,4 +1,4 @@
-// Copyright (C) 2020 Intel Corporation
+// Copyright (C) 2018-2020 Intel Corporation
 //
 // SPDX-License-Identifier: MIT
 
@@ -9,15 +9,16 @@ module.exports = {
         es6: true,
         jquery: true,
         qunit: true,
-        'jest/globals': true,
-        'cypress/globals': true,
     },
     parserOptions: {
         sourceType: 'script',
     },
-    plugins: ['requirejs', 'jest', 'cypress', 'eslint-plugin-header'],
-    extends: ['eslint:recommended', 'plugin:requirejs/recommended', 'prettier'],
+    plugins: ['eslint-plugin-header'],
+    extends: ['eslint:recommended', 'prettier'],
     rules: {
-        'header/header': [2, '.header.js'],
+        'header/header': [2, 'line', [{
+            pattern: ' {1}Copyright \\(C\\) (?:20\\d{2}-)?2020 Intel Corporation',
+            template: ' Copyright (C) 2020 Intel Corporation'
+        }, '', ' SPDX-License-Identifier: MIT']],
     },
 };
diff --git a/.header.js b/.header.js
diff --git a/cvat-canvas/.eslintrc.js b/cvat-canvas/.eslintrc.js
@@ -1,12 +1,10 @@
-// Copyright (C) 2020 Intel Corporation
+// Copyright (C) 2019-2020 Intel Corporation
 //
 // SPDX-License-Identifier: MIT
 
 module.exports = {
     env: {
         node: true,
-        browser: true,
-        es6: true,
     },
     parserOptions: {
         parser: '@typescript-eslint/parser',

diff --git a/cvat-canvas/postcss.config.js b/cvat-canvas/postcss.config.js
@@ -1,4 +1,4 @@
-// Copyright (C) 2020 Intel Corporation
+// Copyright (C) 2019-2020 Intel Corporation
 //
 // SPDX-License-Identifier: MIT
 

diff --git a/cvat-core/.eslintrc.js b/cvat-core/.eslintrc.js
@@ -1,4 +1,4 @@
-// Copyright (C) 2020 Intel Corporation
+// Copyright (C) 2018-2020 Intel Corporation
 //
 // SPDX-License-Identifier: MIT
 
@@ -9,13 +9,14 @@ module.exports = {
         es6: true,
         jquery: true,
         qunit: true,
+        'jest/globals': true,
     },
     parserOptions: {
         parser: 'babel-eslint',
         sourceType: 'module',
         ecmaVersion: 2018,
     },
-    plugins: ['security', 'no-unsanitized', 'no-unsafe-innerhtml'],
+    plugins: ['security', 'jest', 'no-unsanitized', 'no-unsafe-innerhtml'],
     extends: ['eslint:recommended', 'plugin:security/recommended', 'plugin:no-unsanitized/DOM', 'airbnb-base'],
     rules: {
         'no-await-in-loop': [0],

diff --git a/cvat-core/jest.config.js b/cvat-core/jest.config.js
@@ -1,4 +1,4 @@
-// Copyright (C) 2020 Intel Corporation
+// Copyright (C) 2019-2020 Intel Corporation
 //
 // SPDX-License-Identifier: MIT
 

diff --git a/cvat-core/jsdoc.config.js b/cvat-core/jsdoc.config.js
@@ -1,4 +1,4 @@
-// Copyright (C) 2020 Intel Corporation
+// Copyright (C) 2019-2020 Intel Corporation
 //
 // SPDX-License-Identifier: MIT