Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor: update laravel-mix and peer dependencies #5094

Merged
merged 3 commits into from
Apr 24, 2021
Merged

refactor: update laravel-mix and peer dependencies #5094

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9e3986b
refactor: update laravel-mix and peer dependencies
asbiin Apr 23, 2021
b32b876
fix marked
asbiin Apr 24, 2021
62b119e
update
asbiin Apr 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
126 changes: 63 additions & 63 deletions .eslintrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,94 +1,94 @@
module.exports = {
"env": {
"browser": true,
"es6": true,
"cypress/globals": true
'env': {
'browser': true,
'es6': true,
'cypress/globals': true
},
"extends": [
"plugin:vue/recommended"
'extends': [
'plugin:vue/recommended'
],
"parserOptions": {
"ecmaVersion": 2017,
"sourceType": "module"
'parserOptions': {
'ecmaVersion': 12,
'sourceType': 'module'
},
"plugins": [
"vue",
"cypress"
'plugins': [
'vue',
'cypress'
],
"rules": {
"array-bracket-spacing": [
"error",
"never"
'rules': {
'array-bracket-spacing': [
'error',
'never'
],
"indent": [
"error",
'indent': [
'error',
2
],
"linebreak-style": [
"error",
"unix"
'linebreak-style': [
'error',
'unix'
],
"no-trailing-spaces": [
"error",
'no-trailing-spaces': [
'error',
{
"ignoreComments": true,
"skipBlankLines": true
'ignoreComments': true,
'skipBlankLines': true
}
],
"quotes": [
"error",
"single"
'quotes': [
'error',
'single'
],
"semi": [
"error",
"always"
'semi': [
'error',
'always'
],
"semi-spacing": [
"error",
'semi-spacing': [
'error',
{
"after": true,
"before": false
'after': true,
'before': false
}
],
"semi-style": [
"error",
"last"
'semi-style': [
'error',
'last'
],

// strongly recommended
"vue/component-name-in-template-casing": [
"error",
"kebab-case"
'vue/component-name-in-template-casing': [
'error',
'kebab-case'
],
"vue/component-tags-order": [
"error", {
"order": [
"style",
[
"template",
"script"
'vue/component-tags-order': [
'error', {
'order': [
'style',
[
'template',
'script'
]
]
]
}],
"vue/html-end-tags" : "error",
"vue/html-self-closing": [
"error",
}],
'vue/html-end-tags' : 'error',
'vue/html-self-closing': [
'error',
{
"html": {
"normal": "never",
"void": "always"
'html': {
'normal': 'never',
'void': 'always'
}
}
],
"vue/no-v-html" : 0,
"vue/max-attributes-per-line": [
'vue/no-v-html' : 0,
'vue/max-attributes-per-line': [
// https://vuejs.org/v2/style-guide/#Multi-attribute-elements-strongly-recommended
"error",
'error',
{
"singleline": 5,
"multiline": {
"max": 5,
"allowFirstLine": true
'singleline': 5,
'multiline': {
'max': 5,
'allowFirstLine': true
}
}
],
Expand Down
2 changes: 1 addition & 1 deletion app/Http/Controllers/ContactsController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -590,7 +590,7 @@ public function search(Request $request)
*/
public function vCard(Contact $contact)
{
if (config('app.debug')) {
if (config('app.debug') && class_exists('\Barryvdh\Debugbar\Facade')) {
Debugbar::disable();
}

Expand Down
Loading