From 9040a3dc7543bca960fed9a8904732cbd62a37ed Mon Sep 17 00:00:00 2001 From: Rhys Braunschweig Date: Tue, 29 May 2018 12:11:44 +0200 Subject: [PATCH 1/3] 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; From 248c569bffd55144e2fa3b77883a0cf259172b26 Mon Sep 17 00:00:00 2001 From: Rhys Braunschweig Date: Tue, 29 May 2018 12:12:21 +0200 Subject: [PATCH 2/3] Normalize and enforce single quotes in styles - Replace stylelint property in package.json with .stylelintrc.js - Add string-quotes stylelint rule - Fix quotes --- .stylelintrc.js | 29 +++++++++++++++++++ package.json | 28 ------------------ .../assets/styles/autoload/_bootstrap.scss | 2 +- .../assets/styles/common/_variables.scss | 2 +- .../assets/styles/components/_comments.scss | 8 ++--- resources/assets/styles/main.scss | 28 +++++++++--------- 6 files changed, 49 insertions(+), 48 deletions(-) create mode 100644 .stylelintrc.js diff --git a/.stylelintrc.js b/.stylelintrc.js new file mode 100644 index 0000000..76db68b --- /dev/null +++ b/.stylelintrc.js @@ -0,0 +1,29 @@ +module.exports = { + 'extends': 'stylelint-config-standard', + 'rules': { + 'no-empty-source': null, + 'string-quotes': 'single', + 'at-rule-no-unknown': [ + true, + { + 'ignoreAtRules': [ + 'extend', + 'at-root', + 'debug', + 'warn', + 'error', + 'if', + 'else', + 'for', + 'each', + 'while', + 'mixin', + 'include', + 'content', + 'return', + 'function', + ], + }, + ], + }, +}; diff --git a/package.json b/package.json index 0ad4526..c884f3d 100644 --- a/package.json +++ b/package.json @@ -22,34 +22,6 @@ "android 4", "opera 12" ], - "stylelint": { - "extends": "stylelint-config-standard", - "rules": { - "no-empty-source": null, - "at-rule-no-unknown": [ - true, - { - "ignoreAtRules": [ - "extend", - "at-root", - "debug", - "warn", - "error", - "if", - "else", - "for", - "each", - "while", - "mixin", - "include", - "content", - "return", - "function" - ] - } - ] - } - }, "scripts": { "build": "webpack --progress --config resources/assets/build/webpack.config.js", "build:production": "webpack --progress -p --config resources/assets/build/webpack.config.js", diff --git a/resources/assets/styles/autoload/_bootstrap.scss b/resources/assets/styles/autoload/_bootstrap.scss index 19b0ca9..5de3350 100644 --- a/resources/assets/styles/autoload/_bootstrap.scss +++ b/resources/assets/styles/autoload/_bootstrap.scss @@ -1 +1 @@ -@import "~bootstrap/scss/bootstrap"; +@import '~bootstrap/scss/bootstrap'; diff --git a/resources/assets/styles/common/_variables.scss b/resources/assets/styles/common/_variables.scss index f28c669..fda9b34 100644 --- a/resources/assets/styles/common/_variables.scss +++ b/resources/assets/styles/common/_variables.scss @@ -1,5 +1,5 @@ /** Import Bootstrap functions */ -@import "~bootstrap/scss/functions"; +@import '~bootstrap/scss/functions'; $theme-colors: ( primary: #525ddc diff --git a/resources/assets/styles/components/_comments.scss b/resources/assets/styles/components/_comments.scss index baaff86..6c78459 100644 --- a/resources/assets/styles/components/_comments.scss +++ b/resources/assets/styles/components/_comments.scss @@ -10,14 +10,14 @@ @extend .form-group; } -.comment-form input[type="text"], -.comment-form input[type="email"], -.comment-form input[type="url"], +.comment-form input[type='text'], +.comment-form input[type='email'], +.comment-form input[type='url'], .comment-form textarea { @extend .form-control; } -.comment-form input[type="submit"] { +.comment-form input[type='submit'] { @extend .btn; @extend .btn-secondary; } diff --git a/resources/assets/styles/main.scss b/resources/assets/styles/main.scss index 2a01fd7..ac51a58 100644 --- a/resources/assets/styles/main.scss +++ b/resources/assets/styles/main.scss @@ -1,7 +1,7 @@ -@import "common/variables"; +@import 'common/variables'; /** Import everything from autoload */ -@import "./autoload/**/*"; +@import './autoload/**/*'; /** * Import npm dependencies @@ -9,17 +9,17 @@ * Prefix your imports with `~` to grab from node_modules/ * @see https://github.com/webpack-contrib/sass-loader#imports */ -// @import "~some-node-module"; +// @import '~some-node-module'; /** Import theme styles */ -@import "common/global"; -@import "components/buttons"; -@import "components/comments"; -@import "components/forms"; -@import "components/wp-classes"; -@import "layouts/header"; -@import "layouts/sidebar"; -@import "layouts/footer"; -@import "layouts/pages"; -@import "layouts/posts"; -@import "layouts/tinymce"; +@import 'common/global'; +@import 'components/buttons'; +@import 'components/comments'; +@import 'components/forms'; +@import 'components/wp-classes'; +@import 'layouts/header'; +@import 'layouts/sidebar'; +@import 'layouts/footer'; +@import 'layouts/pages'; +@import 'layouts/posts'; +@import 'layouts/tinymce'; From 7773e7db41535418162cc6632cd88ea88223211f Mon Sep 17 00:00:00 2001 From: Ben Word Date: Fri, 16 Nov 2018 11:39:07 -0700 Subject: [PATCH 3/3] Double quotes for styles --- .stylelintrc.js | 2 +- .../assets/styles/autoload/_bootstrap.scss | 2 +- .../assets/styles/common/_variables.scss | 2 +- .../assets/styles/components/_comments.scss | 8 +++--- resources/assets/styles/main.scss | 28 +++++++++---------- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/.stylelintrc.js b/.stylelintrc.js index 76db68b..78a3142 100644 --- a/.stylelintrc.js +++ b/.stylelintrc.js @@ -2,7 +2,7 @@ module.exports = { 'extends': 'stylelint-config-standard', 'rules': { 'no-empty-source': null, - 'string-quotes': 'single', + 'string-quotes': 'double', 'at-rule-no-unknown': [ true, { diff --git a/resources/assets/styles/autoload/_bootstrap.scss b/resources/assets/styles/autoload/_bootstrap.scss index 5de3350..19b0ca9 100644 --- a/resources/assets/styles/autoload/_bootstrap.scss +++ b/resources/assets/styles/autoload/_bootstrap.scss @@ -1 +1 @@ -@import '~bootstrap/scss/bootstrap'; +@import "~bootstrap/scss/bootstrap"; diff --git a/resources/assets/styles/common/_variables.scss b/resources/assets/styles/common/_variables.scss index cf3283f..d4dc296 100644 --- a/resources/assets/styles/common/_variables.scss +++ b/resources/assets/styles/common/_variables.scss @@ -1,5 +1,5 @@ /** Import Bootstrap functions */ -@import '~bootstrap/scss/functions'; +@import "~bootstrap/scss/functions"; $theme-colors: ( primary: #525ddc diff --git a/resources/assets/styles/components/_comments.scss b/resources/assets/styles/components/_comments.scss index 6c78459..baaff86 100644 --- a/resources/assets/styles/components/_comments.scss +++ b/resources/assets/styles/components/_comments.scss @@ -10,14 +10,14 @@ @extend .form-group; } -.comment-form input[type='text'], -.comment-form input[type='email'], -.comment-form input[type='url'], +.comment-form input[type="text"], +.comment-form input[type="email"], +.comment-form input[type="url"], .comment-form textarea { @extend .form-control; } -.comment-form input[type='submit'] { +.comment-form input[type="submit"] { @extend .btn; @extend .btn-secondary; } diff --git a/resources/assets/styles/main.scss b/resources/assets/styles/main.scss index ac51a58..2a01fd7 100644 --- a/resources/assets/styles/main.scss +++ b/resources/assets/styles/main.scss @@ -1,7 +1,7 @@ -@import 'common/variables'; +@import "common/variables"; /** Import everything from autoload */ -@import './autoload/**/*'; +@import "./autoload/**/*"; /** * Import npm dependencies @@ -9,17 +9,17 @@ * Prefix your imports with `~` to grab from node_modules/ * @see https://github.com/webpack-contrib/sass-loader#imports */ -// @import '~some-node-module'; +// @import "~some-node-module"; /** Import theme styles */ -@import 'common/global'; -@import 'components/buttons'; -@import 'components/comments'; -@import 'components/forms'; -@import 'components/wp-classes'; -@import 'layouts/header'; -@import 'layouts/sidebar'; -@import 'layouts/footer'; -@import 'layouts/pages'; -@import 'layouts/posts'; -@import 'layouts/tinymce'; +@import "common/global"; +@import "components/buttons"; +@import "components/comments"; +@import "components/forms"; +@import "components/wp-classes"; +@import "layouts/header"; +@import "layouts/sidebar"; +@import "layouts/footer"; +@import "layouts/pages"; +@import "layouts/posts"; +@import "layouts/tinymce";