From 9040a3dc7543bca960fed9a8904732cbd62a37ed Mon Sep 17 00:00:00 2001 From: Rhys Braunschweig Date: Tue, 29 May 2018 12:11:44 +0200 Subject: [PATCH] Normalize and enforce single quotes in scripts - Add quotes and semi rules to ESLint - Fix quotes and semicolons --- .eslintrc.js | 80 +++++++++++++------------ resources/assets/scripts/main.js | 2 +- resources/assets/scripts/util/Router.js | 2 +- 3 files changed, 43 insertions(+), 41 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index 62168f8..cce53e7 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -1,47 +1,49 @@ module.exports = { - "root": true, - "extends": "eslint:recommended", - "globals": { - "wp": true + 'root': true, + 'extends': 'eslint:recommended', + 'globals': { + 'wp': true, }, - "env": { - "node": true, - "es6": true, - "amd": true, - "browser": true, - "jquery": true + 'env': { + 'node': true, + 'es6': true, + 'amd': true, + 'browser': true, + 'jquery': true, }, - "parserOptions": { - "ecmaFeatures": { - "globalReturn": true, - "generators": false, - "objectLiteralDuplicateProperties": false, - "experimentalObjectRestSpread": true + 'parserOptions': { + 'ecmaFeatures': { + 'globalReturn': true, + 'generators': false, + 'objectLiteralDuplicateProperties': false, + 'experimentalObjectRestSpread': true, }, - "ecmaVersion": 2017, - "sourceType": "module" + 'ecmaVersion': 2017, + 'sourceType': 'module', }, - "plugins": [ - "import" + 'plugins': [ + 'import', ], - "settings": { - "import/core-modules": [], - "import/ignore": [ - "node_modules", - "\\.(coffee|scss|css|less|hbs|svg|json)$" - ] + 'settings': { + 'import/core-modules': [], + 'import/ignore': [ + 'node_modules', + '\\.(coffee|scss|css|less|hbs|svg|json)$', + ], }, - "rules": { - "no-console": process.env.NODE_ENV === 'production' ? 2 : 0, - "comma-dangle": [ - "error", + 'rules': { + 'no-console': process.env.NODE_ENV === 'production' ? 2 : 0, + 'quotes': ['error', 'single'], + 'semi': 'error', + 'comma-dangle': [ + 'error', { - "arrays": "always-multiline", - "objects": "always-multiline", - "imports": "always-multiline", - "exports": "always-multiline", - "functions": "ignore" - } - ] - } -} + 'arrays': 'always-multiline', + 'objects': 'always-multiline', + 'imports': 'always-multiline', + 'exports': 'always-multiline', + 'functions': 'ignore', + }, + ], + }, +}; diff --git a/resources/assets/scripts/main.js b/resources/assets/scripts/main.js index bcbfcf8..8065368 100644 --- a/resources/assets/scripts/main.js +++ b/resources/assets/scripts/main.js @@ -2,7 +2,7 @@ import 'jquery'; // Import everything from autoload -import "./autoload/**/*" +import './autoload/**/*'; // import local dependencies import Router from './util/Router'; diff --git a/resources/assets/scripts/util/Router.js b/resources/assets/scripts/util/Router.js index 372594e..2c98473 100644 --- a/resources/assets/scripts/util/Router.js +++ b/resources/assets/scripts/util/Router.js @@ -60,4 +60,4 @@ class Router { } } -export default Router +export default Router;