Skip to content

Commit

Permalink
Merge pull request #2076 from rbraunschweig/normalize-quotes
Browse files Browse the repository at this point in the history
Normalize and enforce single quotes
  • Loading branch information
retlehs authored Nov 16, 2018
2 parents 93ee95d + 7773e7d commit 517b7ff
Show file tree
Hide file tree
Showing 5 changed files with 71 additions and 69 deletions.
79 changes: 40 additions & 39 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,47 +1,48 @@
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": 0,
"comma-dangle": [
"error",
'rules': {
'no-console': 0,
'quotes': ['error', 'single'],
'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',
},
],
},
};
29 changes: 29 additions & 0 deletions .stylelintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
module.exports = {
'extends': 'stylelint-config-standard',
'rules': {
'no-empty-source': null,
'string-quotes': 'double',
'at-rule-no-unknown': [
true,
{
'ignoreAtRules': [
'extend',
'at-root',
'debug',
'warn',
'error',
'if',
'else',
'for',
'each',
'while',
'mixin',
'include',
'content',
'return',
'function',
],
},
],
},
};
28 changes: 0 additions & 28 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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 --env.production --progress --config resources/assets/build/webpack.config.js",
Expand Down
2 changes: 1 addition & 1 deletion resources/assets/scripts/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import 'jquery';

// Import everything from autoload
import "./autoload/**/*"
import './autoload/**/*';

// import local dependencies
import Router from './util/Router';
Expand Down
2 changes: 1 addition & 1 deletion resources/assets/scripts/util/Router.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,4 @@ class Router {
}
}

export default Router
export default Router;

0 comments on commit 517b7ff

Please sign in to comment.