kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Resolve "Harmonize prettier and eslint configs"

Browse source
This commit is contained in:
Mike Greiling 2018-10-09 15:25:53 +00:00 committed by Fatih Acet
parent b46894b15b
commit d76190371c
66 changed files with 93 additions and 115 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
.eslintrc.yml
View file

@ -1,9 +1,9 @@
---
env:
browser: true
es6: true
extends:
- airbnb-base
- prettier
- plugin:vue/recommended
globals:
__webpack_public_path__: true
@ -19,34 +19,31 @@ plugins:
- promise
settings:
html/html-extensions:
- ".html"
- ".html.raw"
- '.html'
- '.html.raw'
import/resolver:
webpack:
config: "./config/webpack.config.js"
config: './config/webpack.config.js'
rules:
filenames/match-regex:
- error
- "^[a-z0-9_]+$"
- '^[a-z0-9_]+$'
import/no-commonjs: error
no-multiple-empty-lines:
- error
- max: 1
promise/catch-or-return: error
no-param-reassign:
- error
- props: true
ignorePropertyModificationsFor:
- "acc" # for reduce accumulators
- "accumulator" # for reduce accumulators
- "el" # for DOM elements
- "element" # for DOM elements
- "state" # for Vuex mutations
- 'acc' # for reduce accumulators
- 'accumulator' # for reduce accumulators
- 'el' # for DOM elements
- 'element' # for DOM elements
- 'state' # for Vuex mutations
no-underscore-dangle:
- error
- allow:
- __
- _links
- __
- _links
no-mixed-operators: off
vue/html-self-closing:
- error
@ -60,31 +57,7 @@ rules:
- error
- properties: never
ignoreDestructuring: true
## Conflicting rules with prettier:
space-before-function-paren: off
curly: off
arrow-parens: off
function-paren-newline: off
object-curly-newline: off
padded-blocks: off
# Disabled for now, to make the eslint 3 -> eslint 5 update smoother
## Indent rule. We are using the old for now: https://eslint.org/docs/user-guide/migrating-to-4.0.0#indent-rewrite
indent: off
indent-legacy:
- error
- 2
- SwitchCase: 1
VariableDeclarator: 1
outerIIFEBody: 1
FunctionDeclaration:
parameters: 1
body: 1
FunctionExpression:
parameters: 1
body: 1
# Disabled for now, to make the airbnb-base 12.1.0 -> 13.1.0 update smoother
operator-linebreak: off
implicit-arrow-linebreak: off
no-else-return:
- error
- allowElseIf: true

2
app/assets/javascripts/behaviors/markdown/copy_as_gfm.js
View file

@ -1,4 +1,4 @@
/* eslint-disable object-shorthand, no-unused-vars, no-use-before-define, max-len, no-restricted-syntax, guard-for-in, no-continue */
/* eslint-disable object-shorthand, no-unused-vars, no-use-before-define, no-restricted-syntax, guard-for-in, no-continue */
import $ from 'jquery';
import _ from 'underscore';

2
app/assets/javascripts/boards/components/board.js
View file

@ -1,5 +1,3 @@
/* eslint-disable comma-dangle */
import Sortable from 'sortablejs';
import Vue from 'vue';
import { n__ } from '~/locale';

2
app/assets/javascripts/boards/components/board_delete.js
View file

@ -1,4 +1,4 @@
/* eslint-disable comma-dangle, no-alert */
/* eslint-disable no-alert */
import $ from 'jquery';
import Vue from 'vue';

2
app/assets/javascripts/boards/components/board_sidebar.js
View file

@ -1,4 +1,4 @@
/* eslint-disable comma-dangle, no-new */
/* eslint-disable no-new */
import $ from 'jquery';
import Vue from 'vue';

2
app/assets/javascripts/boards/models/issue.js
View file

@ -1,4 +1,4 @@
/* eslint-disable no-unused-vars, comma-dangle */
/* eslint-disable no-unused-vars */
/* global ListLabel */
/* global ListMilestone */
/* global ListAssignee */

2
app/assets/javascripts/boards/models/list.js
View file

@ -1,4 +1,4 @@
/* eslint-disable no-underscore-dangle, class-methods-use-this, consistent-return, no-shadow, no-param-reassign, max-len */
/* eslint-disable no-underscore-dangle, class-methods-use-this, consistent-return, no-shadow, no-param-reassign */
/* global ListIssue */
import { __ } from '~/locale';

2
app/assets/javascripts/boards/stores/boards_store.js
View file

@ -1,4 +1,4 @@
/* eslint-disable comma-dangle, no-shadow */
/* eslint-disable no-shadow */
/* global List */
import $ from 'jquery';

2
app/assets/javascripts/commit/image_file.js
View file

@ -1,4 +1,4 @@
/* eslint-disable func-names, wrap-iife, no-var, prefer-arrow-callback, no-else-return, consistent-return, prefer-template, quotes, one-var, one-var-declaration-per-line, no-unused-vars, no-return-assign, comma-dangle, quote-props, no-unused-expressions, no-sequences, max-len */
/* eslint-disable func-names, no-var, prefer-arrow-callback, no-else-return, consistent-return, prefer-template, one-var, no-unused-vars, no-return-assign, no-unused-expressions, no-sequences */
import $ from 'jquery';

2
app/assets/javascripts/compare_autocomplete.js
View file

@ -1,4 +1,4 @@
/* eslint-disable func-names, one-var, no-var, one-var-declaration-per-line, object-shorthand, no-else-return, max-len */
/* eslint-disable func-names, one-var, no-var, object-shorthand, no-else-return */
import $ from 'jquery';
import { __ } from './locale';

2
app/assets/javascripts/diff_notes/components/comment_resolve_btn.js
View file

@ -1,4 +1,4 @@
/* eslint-disable comma-dangle, object-shorthand, func-names, no-else-return, quotes, no-lonely-if, max-len */
/* eslint-disable object-shorthand, func-names, no-else-return, no-lonely-if */
/* global CommentsStore */
import $ from 'jquery';

2
app/assets/javascripts/diff_notes/components/jump_to_discussion.js
View file

@ -1,4 +1,4 @@
/* eslint-disable comma-dangle, object-shorthand, func-names, no-else-return, guard-for-in, no-restricted-syntax, no-lonely-if, no-continue, brace-style, max-len, quotes */
/* eslint-disable object-shorthand, func-names, no-else-return, guard-for-in, no-restricted-syntax, no-lonely-if, no-continue */
/* global CommentsStore */
import $ from 'jquery';

2
app/assets/javascripts/diff_notes/components/resolve_count.js
View file

@ -1,4 +1,4 @@
/* eslint-disable comma-dangle, object-shorthand, func-names */
/* eslint-disable object-shorthand, func-names */
/* global CommentsStore */
import Vue from 'vue';

2
app/assets/javascripts/diff_notes/mixins/discussion.js
View file

@ -1,4 +1,4 @@
/* eslint-disable object-shorthand, func-names, guard-for-in, no-restricted-syntax, comma-dangle, */
/* eslint-disable object-shorthand, func-names, guard-for-in, no-restricted-syntax, */
const DiscussionMixins = {
computed: {

2
app/assets/javascripts/diff_notes/stores/comments.js
View file

@ -1,4 +1,4 @@
/* eslint-disable object-shorthand, func-names, camelcase, no-restricted-syntax, guard-for-in, comma-dangle, max-len */
/* eslint-disable object-shorthand, func-names, camelcase, no-restricted-syntax, guard-for-in */
/* global DiscussionModel */
import Vue from 'vue';

2
app/assets/javascripts/gl_dropdown.js
View file

@ -1,4 +1,4 @@
/* eslint-disable func-names, no-underscore-dangle, no-var, one-var, one-var-declaration-per-line, max-len, vars-on-top, wrap-iife, no-unused-vars, no-shadow, no-cond-assign, prefer-arrow-callback, no-return-assign, no-else-return, camelcase, no-lonely-if, guard-for-in, no-restricted-syntax, consistent-return, prefer-template, no-param-reassign, no-loop-func */
/* eslint-disable func-names, no-underscore-dangle, no-var, one-var, vars-on-top, no-unused-vars, no-shadow, no-cond-assign, prefer-arrow-callback, no-return-assign, no-else-return, camelcase, no-lonely-if, guard-for-in, no-restricted-syntax, consistent-return, prefer-template, no-param-reassign, no-loop-func */
/* global fuzzaldrinPlus */
import $ from 'jquery';

6
app/assets/javascripts/ide/stores/modules/commit/actions.js
View file

@ -30,9 +30,9 @@ export const setLastCommitMessage = ({ rootState, commit }, data) => {
const currentProject = rootState.projects[rootState.currentProjectId];
const commitStats = data.stats
? sprintf(__('with %{additions} additions, %{deletions} deletions.'), {
additions: data.stats.additions, // eslint-disable-line indent-legacy
deletions: data.stats.deletions, // eslint-disable-line indent-legacy
}) // eslint-disable-line indent-legacy
additions: data.stats.additions,
deletions: data.stats.deletions,
})
: '';
const commitMsg = sprintf(
__('Your changes have been committed. Commit %{commitId} %{commitStats}'),

2
app/assets/javascripts/issuable_bulk_update_actions.js
View file

@ -1,4 +1,4 @@
/* eslint-disable comma-dangle, quotes, consistent-return, func-names, array-callback-return, prefer-arrow-callback, max-len, no-unused-vars */
/* eslint-disable consistent-return, func-names, array-callback-return, prefer-arrow-callback, no-unused-vars */
import $ from 'jquery';
import _ from 'underscore';

2
app/assets/javascripts/issue.js
View file

@ -1,4 +1,4 @@
/* eslint-disable no-var, one-var, one-var-declaration-per-line, no-unused-vars, consistent-return, quotes, max-len */
/* eslint-disable no-var, one-var, no-unused-vars, consistent-return */
import $ from 'jquery';
import axios from './lib/utils/axios_utils';

2
app/assets/javascripts/label_manager.js
View file

@ -1,4 +1,4 @@
/* eslint-disable class-methods-use-this, no-underscore-dangle, no-param-reassign, no-unused-vars, func-names, max-len */
/* eslint-disable class-methods-use-this, no-underscore-dangle, no-param-reassign, no-unused-vars, func-names */
import $ from 'jquery';
import Sortable from 'sortablejs';

2
app/assets/javascripts/labels_select.js
View file

@ -1,4 +1,4 @@
/* eslint-disable no-useless-return, func-names, no-var, no-underscore-dangle, prefer-arrow-callback, max-len, one-var, no-unused-vars, one-var-declaration-per-line, prefer-template, no-new, consistent-return, object-shorthand, comma-dangle, no-shadow, no-param-reassign, brace-style, vars-on-top, quotes, no-lonely-if, no-else-return, dot-notation, no-empty */
/* eslint-disable no-useless-return, func-names, no-var, no-underscore-dangle, prefer-arrow-callback, one-var, no-unused-vars, prefer-template, no-new, consistent-return, object-shorthand, no-shadow, no-param-reassign, vars-on-top, no-lonely-if, no-else-return, dot-notation, no-empty */
/* global Issuable */
/* global ListLabel */

2
app/assets/javascripts/lib/utils/notify.js
View file

@ -1,4 +1,4 @@
/* eslint-disable func-names, no-var, consistent-return, prefer-arrow-callback, no-return-assign, object-shorthand, comma-dangle, max-len */
/* eslint-disable func-names, no-var, consistent-return, prefer-arrow-callback, no-return-assign, object-shorthand */
function notificationGranted(message, opts, onclick) {
var notification;

2
app/assets/javascripts/lib/utils/text_markdown.js
View file

@ -1,4 +1,4 @@
/* eslint-disable func-names, no-var, no-param-reassign, quotes, one-var, one-var-declaration-per-line, operator-assignment, no-else-return, prefer-template, prefer-arrow-callback, max-len, consistent-return, no-unused-vars, max-len */
/* eslint-disable func-names, no-var, no-param-reassign, one-var, operator-assignment, no-else-return, prefer-template, prefer-arrow-callback, consistent-return, no-unused-vars */
import $ from 'jquery';
import { insertText } from '~/lib/utils/common_utils';

2
app/assets/javascripts/line_highlighter.js
View file

@ -1,4 +1,4 @@
/* eslint-disable func-names, no-var, no-underscore-dangle, no-param-reassign, prefer-template, quotes, comma-dangle, consistent-return, one-var, one-var-declaration-per-line, no-else-return, max-len */
/* eslint-disable func-names, no-var, no-underscore-dangle, no-param-reassign, prefer-template, consistent-return, one-var, no-else-return */
import $ from 'jquery';

2
app/assets/javascripts/merge_conflicts/components/diff_file_editor.js
View file

@ -1,4 +1,4 @@
/* eslint-disable comma-dangle, quote-props, no-useless-computed-key, object-shorthand, no-param-reassign, max-len */
/* eslint-disable no-useless-computed-key, object-shorthand, no-param-reassign */
/* global ace */
import Vue from 'vue';

2
app/assets/javascripts/merge_conflicts/merge_conflict_store.js
View file

@ -1,4 +1,4 @@
/* eslint-disable comma-dangle, object-shorthand, no-param-reassign, camelcase, no-nested-ternary, no-continue, max-len */
/* eslint-disable object-shorthand, no-param-reassign, camelcase, no-nested-ternary, no-continue */
import $ from 'jquery';
import Vue from 'vue';

2
app/assets/javascripts/merge_request.js
View file

@ -1,4 +1,4 @@
/* eslint-disable func-names, no-var, wrap-iife, quotes, no-underscore-dangle, one-var, one-var-declaration-per-line, consistent-return, comma-dangle, max-len, prefer-arrow-callback */
/* eslint-disable func-names, no-var, no-underscore-dangle, one-var, consistent-return, prefer-arrow-callback */
import $ from 'jquery';
import { __ } from '~/locale';

2
app/assets/javascripts/merge_request_tabs.js
View file

@ -18,7 +18,6 @@ import syntaxHighlight from './syntax_highlight';
import Notes from './notes';
import { polyfillSticky } from './lib/utils/sticky';
/* eslint-disable max-len */
// MergeRequestTabs
//
// Handles persisting and restoring the current tab selection and lazily-loading
@ -62,7 +61,6 @@ import { polyfillSticky } from './lib/utils/sticky';
// </div>
// </div>
//
/* eslint-enable max-len */
// Store the `location` object, allowing for easier stubbing in tests
let { location } = window;

2
app/assets/javascripts/milestone_select.js
View file

@ -1,4 +1,4 @@
/* eslint-disable max-len, one-var, one-var-declaration-per-line, no-unused-vars, object-shorthand, no-else-return, no-self-compare, consistent-return, no-param-reassign, no-shadow */
/* eslint-disable one-var, no-unused-vars, object-shorthand, no-else-return, no-self-compare, consistent-return, no-param-reassign, no-shadow */
/* global Issuable */
/* global ListMilestone */

2
app/assets/javascripts/namespace_select.js
View file

@ -1,4 +1,4 @@
/* eslint-disable func-names, comma-dangle, object-shorthand, no-else-return, prefer-template, quotes, prefer-arrow-callback, max-len */
/* eslint-disable func-names, object-shorthand, no-else-return, prefer-template, prefer-arrow-callback */
import $ from 'jquery';
import Api from './api';

2
app/assets/javascripts/network/branch_graph.js
View file

@ -1,4 +1,4 @@
/* eslint-disable func-names, no-var, wrap-iife, quotes, comma-dangle, one-var, one-var-declaration-per-line, no-loop-func, no-floating-decimal, consistent-return, no-unused-vars, prefer-template, prefer-arrow-callback, camelcase, max-len */
/* eslint-disable func-names, no-var, one-var, no-loop-func, consistent-return, no-unused-vars, prefer-template, prefer-arrow-callback, camelcase */
import $ from 'jquery';
import { __ } from '../locale';

2
app/assets/javascripts/new_branch_form.js
View file

@ -1,4 +1,4 @@
/* eslint-disable func-names, no-var, one-var, max-len, wrap-iife, consistent-return, comma-dangle, one-var-declaration-per-line, quotes, no-return-assign, prefer-arrow-callback, prefer-template, no-shadow, no-else-return, max-len */
/* eslint-disable func-names, no-var, one-var, consistent-return, no-return-assign, prefer-arrow-callback, prefer-template, no-shadow, no-else-return */
import $ from 'jquery';
import RefSelectDropdown from './ref_select_dropdown';

4
app/assets/javascripts/notes.js
View file

@ -1,5 +1,5 @@
/* eslint-disable no-restricted-properties, func-names, no-var, wrap-iife, camelcase,
no-unused-expressions, max-len, one-var, one-var-declaration-per-line, default-case,
/* eslint-disable no-restricted-properties, func-names, no-var, camelcase,
no-unused-expressions, one-var, default-case,
prefer-template, consistent-return, no-alert, no-return-assign,
no-param-reassign, prefer-arrow-callback, no-else-return, vars-on-top,
no-unused-vars, no-shadow, no-useless-escape, class-methods-use-this */

2
app/assets/javascripts/pages/projects/graphs/show/stat_graph_contributors.js
View file

@ -1,4 +1,4 @@
/* eslint-disable func-names, wrap-iife, no-var, one-var, camelcase, one-var-declaration-per-line, quotes, no-param-reassign, quote-props, comma-dangle, prefer-template, max-len, no-return-assign */
/* eslint-disable func-names, no-var, one-var, camelcase, no-param-reassign, prefer-template, no-return-assign */
import $ from 'jquery';
import _ from 'underscore';

2
app/assets/javascripts/pages/projects/graphs/show/stat_graph_contributors_graph.js
View file

@ -1,4 +1,4 @@
/* eslint-disable func-names, max-len, no-restricted-syntax, no-use-before-define, no-param-reassign, new-cap, no-underscore-dangle, wrap-iife, comma-dangle, no-return-assign, prefer-arrow-callback, quotes, prefer-template, newline-per-chained-call, no-else-return, no-shadow */
/* eslint-disable func-names, no-restricted-syntax, no-use-before-define, no-param-reassign, new-cap, no-underscore-dangle, no-return-assign, prefer-arrow-callback, prefer-template, no-else-return, no-shadow */
import $ from 'jquery';
import _ from 'underscore';

2
app/assets/javascripts/pages/projects/graphs/show/stat_graph_contributors_util.js
View file

@ -1,4 +1,4 @@
/* eslint-disable func-names, object-shorthand, no-var, one-var, camelcase, one-var-declaration-per-line, comma-dangle, no-param-reassign, no-return-assign, quotes, prefer-arrow-callback, wrap-iife, consistent-return, no-unused-vars, max-len, no-cond-assign, no-else-return, max-len */
/* eslint-disable func-names, object-shorthand, no-var, one-var, camelcase, no-param-reassign, no-return-assign, prefer-arrow-callback, consistent-return, no-unused-vars, no-cond-assign, no-else-return */
import _ from 'underscore';
export default {

2
app/assets/javascripts/pages/projects/network/network.js
View file

@ -1,4 +1,4 @@
/* eslint-disable func-names, wrap-iife, no-var, quotes, quote-props, prefer-template, comma-dangle, max-len */
/* eslint-disable func-names, no-var, prefer-template */
import $ from 'jquery';
import BranchGraph from '../../../network/branch_graph';

3
app/assets/javascripts/pages/projects/project.js
View file

@ -1,5 +1,4 @@
/* eslint-disable func-names, no-var, no-return-assign, one-var,
one-var-declaration-per-line, object-shorthand, vars-on-top */
/* eslint-disable func-names, no-var, no-return-assign, one-var, object-shorthand, vars-on-top */
import $ from 'jquery';
import Cookies from 'js-cookie';

2
app/assets/javascripts/pages/sessions/new/username_validator.js
View file

@ -1,4 +1,4 @@
/* eslint-disable comma-dangle, consistent-return, class-methods-use-this */
/* eslint-disable consistent-return, class-methods-use-this */
import $ from 'jquery';
import _ from 'underscore';

2
app/assets/javascripts/profile/gl_crop.js
View file

@ -1,4 +1,4 @@
/* eslint-disable no-useless-escape, max-len, no-var, no-underscore-dangle, func-names, no-unused-vars, no-return-assign, object-shorthand, one-var, one-var-declaration-per-line, comma-dangle, consistent-return, class-methods-use-this, new-parens */
/* eslint-disable no-useless-escape, no-var, no-underscore-dangle, func-names, no-unused-vars, no-return-assign, object-shorthand, one-var, consistent-return, class-methods-use-this */
import $ from 'jquery';
import 'cropper';

2
app/assets/javascripts/project_find_file.js
View file

@ -1,4 +1,4 @@
/* eslint-disable func-names, no-var, wrap-iife, quotes, consistent-return, one-var, one-var-declaration-per-line, no-cond-assign, max-len, prefer-template, no-unused-vars, no-return-assign */
/* eslint-disable func-names, no-var, consistent-return, one-var, no-cond-assign, prefer-template, no-unused-vars, no-return-assign */
import $ from 'jquery';
import fuzzaldrinPlus from 'fuzzaldrin-plus';

2
app/assets/javascripts/project_select.js
View file

@ -1,4 +1,4 @@
/* eslint-disable func-names, wrap-iife, no-var, comma-dangle, object-shorthand, one-var, one-var-declaration-per-line, no-else-return, quotes, max-len */
/* eslint-disable func-names, no-var, object-shorthand, one-var, no-else-return */
import $ from 'jquery';
import Api from './api';

2
app/assets/javascripts/right_sidebar.js
View file

@ -1,4 +1,4 @@
/* eslint-disable func-names, no-var, no-unused-vars, consistent-return, one-var, one-var-declaration-per-line, quotes, prefer-template, no-else-return, no-param-reassign, max-len */
/* eslint-disable func-names, no-var, no-unused-vars, consistent-return, one-var, prefer-template, no-else-return, no-param-reassign */
import $ from 'jquery';
import _ from 'underscore';

2
app/assets/javascripts/search_autocomplete.js
View file

@ -1,4 +1,4 @@
/* eslint-disable no-return-assign, one-var, no-var, one-var-declaration-per-line, no-unused-vars, consistent-return, object-shorthand, prefer-template, class-methods-use-this, no-lonely-if, vars-on-top, max-len */
/* eslint-disable no-return-assign, one-var, no-var, no-unused-vars, consistent-return, object-shorthand, prefer-template, class-methods-use-this, no-lonely-if, vars-on-top */
import $ from 'jquery';
import { escape, throttle } from 'underscore';

2
app/assets/javascripts/templates/issuable_template_selector.js
View file

@ -1,4 +1,4 @@
/* eslint-disable no-useless-return, max-len */
/* eslint-disable no-useless-return */
import $ from 'jquery';
import Api from '../api';

2
app/assets/javascripts/tree.js
View file

@ -1,4 +1,4 @@
/* eslint-disable func-names, max-len, quotes, consistent-return, no-var, one-var, one-var-declaration-per-line, no-else-return, prefer-arrow-callback, class-methods-use-this */
/* eslint-disable func-names, consistent-return, no-var, one-var, no-else-return, prefer-arrow-callback, class-methods-use-this */
import $ from 'jquery';
import { visitUrl } from './lib/utils/url_utility';

2
app/assets/javascripts/users_select.js
View file

@ -1,4 +1,4 @@
/* eslint-disable func-names, one-var, no-var, prefer-rest-params, quotes, max-len, one-var-declaration-per-line, vars-on-top, prefer-arrow-callback, consistent-return, comma-dangle, object-shorthand, no-shadow, no-unused-vars, no-else-return, no-self-compare, prefer-template, no-unused-expressions, yoda, prefer-spread, no-void, camelcase, no-param-reassign */
/* eslint-disable func-names, one-var, no-var, prefer-rest-params, vars-on-top, prefer-arrow-callback, consistent-return, object-shorthand, no-shadow, no-unused-vars, no-else-return, no-self-compare, prefer-template, no-unused-expressions, yoda, prefer-spread, no-void, camelcase, no-param-reassign */
/* global Issuable */
/* global emitSidebarEvent */

2
app/assets/javascripts/zen_mode.js
View file

@ -1,4 +1,4 @@
/* eslint-disable func-names, wrap-iife, prefer-arrow-callback, no-unused-vars, consistent-return, camelcase, comma-dangle, max-len, class-methods-use-this */
/* eslint-disable func-names, prefer-arrow-callback, no-unused-vars, consistent-return, camelcase, class-methods-use-this */
// Zen Mode (full screen) textarea
//

3
package.json
View file

@ -121,6 +121,7 @@
"commander": "^2.18.0",
"eslint": "~5.6.0",
"eslint-config-airbnb-base": "^13.1.0",
"eslint-config-prettier": "^3.1.0",
"eslint-import-resolver-webpack": "^0.10.1",
"eslint-plugin-filenames": "^1.3.2",
"eslint-plugin-html": "4.0.5",
@ -144,7 +145,7 @@
"karma-sourcemap-loader": "^0.3.7",
"karma-webpack": "^4.0.0-beta.0",
"nodemon": "^1.18.4",
"prettier": "1.12.1",
"prettier": "1.14.3",
"webpack-dev-server": "^3.1.8"
}
}

2
spec/javascripts/awards_handler_spec.js
View file

@ -1,4 +1,4 @@
/* eslint-disable no-var, one-var, one-var-declaration-per-line, no-unused-expressions, no-unused-vars, prefer-template, max-len */
/* eslint-disable no-var, one-var, no-unused-expressions, no-unused-vars, prefer-template */
import $ from 'jquery';
import Cookies from 'js-cookie';

2
spec/javascripts/boards/boards_store_spec.js
View file

@ -1,4 +1,4 @@
/* eslint-disable comma-dangle, no-unused-vars */
/* eslint-disable no-unused-vars */
/* global ListIssue */
import Vue from 'vue';

1
spec/javascripts/boards/issue_spec.js
View file

@ -1,4 +1,3 @@
/* eslint-disable comma-dangle */
/* global ListIssue */
import Vue from 'vue';

1
spec/javascripts/boards/list_spec.js
View file

@ -1,4 +1,3 @@
/* eslint-disable comma-dangle */
/* global List */
/* global ListIssue */

2
spec/javascripts/diff_comments_store_spec.js
View file

@ -1,4 +1,4 @@
/* eslint-disable jasmine/no-global-setup, dot-notation, jasmine/no-expect-in-setup-teardown, max-len */
/* eslint-disable jasmine/no-global-setup, dot-notation, jasmine/no-expect-in-setup-teardown */
/* global CommentsStore */
import '~/diff_notes/models/discussion';

2
spec/javascripts/droplab/plugins/input_setter_spec.js
View file

@ -1,5 +1,3 @@
/* eslint-disable */
import InputSetter from '~/droplab/plugins/input_setter';
describe('InputSetter', function () {

2
spec/javascripts/gl_dropdown_spec.js
View file

@ -1,4 +1,4 @@
/* eslint-disable comma-dangle, no-param-reassign */
/* eslint-disable no-param-reassign */
import $ from 'jquery';
import GLDropdown from '~/gl_dropdown';

3
spec/javascripts/graphs/stat_graph_contributors_graph_spec.js
View file

@ -1,4 +1,5 @@
/* eslint-disable quotes, jasmine/no-suite-dupes, vars-on-top, no-var */
/* eslint-disable jasmine/no-suite-dupes, vars-on-top, no-var */
import { scaleLinear, scaleTime } from 'd3-scale';
import { timeParse } from 'd3-time-format';
import { ContributorsGraph, ContributorsMasterGraph } from '~/pages/projects/graphs/show/stat_graph_contributors_graph';

2
spec/javascripts/graphs/stat_graph_contributors_util_spec.js
View file

@ -1,4 +1,4 @@
/* eslint-disable quotes, no-var, camelcase, object-property-newline, comma-dangle, max-len, vars-on-top, quote-props */
/* eslint-disable no-var, camelcase, vars-on-top */
import ContributorsStatGraphUtil from '~/pages/projects/graphs/show/stat_graph_contributors_util';

2
spec/javascripts/issue_spec.js
View file

@ -1,4 +1,4 @@
/* eslint-disable one-var, one-var-declaration-per-line, no-use-before-define, comma-dangle */
/* eslint-disable one-var, no-use-before-define */
import $ from 'jquery';
import MockAdapter from 'axios-mock-adapter';

2
spec/javascripts/line_highlighter_spec.js
View file

@ -1,4 +1,4 @@
/* eslint-disable no-var, quotes, prefer-template, no-else-return, dot-notation, no-return-assign, comma-dangle, no-new, one-var, one-var-declaration-per-line, no-underscore-dangle, max-len */
/* eslint-disable no-var, prefer-template, no-else-return, dot-notation, no-return-assign, no-new, one-var, no-underscore-dangle */
import $ from 'jquery';
import LineHighlighter from '~/line_highlighter';

2
spec/javascripts/new_branch_spec.js
View file

@ -1,4 +1,4 @@
/* eslint-disable one-var, no-var, one-var-declaration-per-line, no-return-assign, quotes, max-len */
/* eslint-disable one-var, no-var, no-return-assign */
import $ from 'jquery';
import NewBranchForm from '~/new_branch_form';

2
spec/javascripts/right_sidebar_spec.js
View file

@ -1,4 +1,4 @@
/* eslint-disable no-var, one-var, one-var-declaration-per-line, no-return-assign, vars-on-top, jasmine/no-unsafe-spy, max-len */
/* eslint-disable no-var, one-var, no-return-assign, vars-on-top, jasmine/no-unsafe-spy */
import $ from 'jquery';
import MockAdapter from 'axios-mock-adapter';

2
spec/javascripts/search_autocomplete_spec.js
View file

@ -1,4 +1,4 @@
/* eslint-disable max-len, no-var, one-var, one-var-declaration-per-line, no-unused-expressions, consistent-return, no-param-reassign, default-case, no-return-assign, object-shorthand, prefer-template, vars-on-top, max-len */
/* eslint-disable no-var, one-var, no-unused-expressions, consistent-return, no-param-reassign, default-case, no-return-assign, object-shorthand, prefer-template, vars-on-top */
import $ from 'jquery';
import '~/gl_dropdown';

2
spec/javascripts/syntax_highlight_spec.js
View file

@ -1,4 +1,4 @@
/* eslint-disable no-var, no-return-assign, quotes */
/* eslint-disable no-var, no-return-assign */
import $ from 'jquery';
import syntaxHighlight from '~/syntax_highlight';

2
spec/javascripts/u2f/mock_u2f_device.js
View file

@ -1,4 +1,4 @@
/* eslint-disable wrap-iife, no-unused-expressions, no-return-assign, no-param-reassign */
/* eslint-disable no-unused-expressions, no-return-assign, no-param-reassign */
export default class MockU2FDevice {
constructor() {

22
yarn.lock
View file

@ -3012,6 +3012,13 @@ eslint-config-airbnb-base@^13.1.0:
object.assign "^4.1.0"
object.entries "^1.0.4"
eslint-config-prettier@^3.1.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-3.1.0.tgz#2c26d2cdcfa3a05f0642cd7e6e4ef3316cdabfa2"
integrity sha512-QYGfmzuc4q4J6XIhlp8vRKdI/fI0tQfQPy1dME3UOLprE+v4ssH/3W9LM2Q7h5qBcy5m0ehCrBDU2YF8q6OY8w==
dependencies:
get-stdin "^6.0.0"
eslint-import-resolver-node@^0.3.1:
version "0.3.2"
resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.2.tgz#58f15fb839b8d0576ca980413476aab2472db66a"
@ -3708,6 +3715,11 @@ get-caller-file@^1.0.1:
resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.2.tgz#f702e63127e7e231c160a80c1554acb70d5047e5"
integrity sha1-9wLmMSfn4jHBYKgMFVSstw1QR+U=
get-stdin@^6.0.0:
version "6.0.0"
resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-6.0.0.tgz#9e09bf712b360ab9225e812048f71fde9c89657b"
integrity sha512-jp4tHawyV7+fkkSKyvjuLZswblUtz+SQKzSWnBbii16BuZksJlU1wuBYXY75r+duh/llF1ur6oNwi+2ZzjKZ7g==
get-stream@3.0.0, get-stream@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
@ -6271,16 +6283,16 @@ prepend-http@^2.0.0:
resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897"
integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=
prettier@1.12.1:
version "1.12.1"
resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.12.1.tgz#c1ad20e803e7749faf905a409d2367e06bbe7325"
integrity sha1-wa0g6APndJ+vkFpAnSNn4Gu+cyU=
prettier@1.13.7:
version "1.13.7"
resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.13.7.tgz#850f3b8af784a49a6ea2d2eaa7ed1428a34b7281"
integrity sha512-KIU72UmYPGk4MujZGYMFwinB7lOf2LsDNGSOC8ufevsrPLISrZbNJlWstRi3m0AMuszbH+EFSQ/r6w56RSPK6w==
prettier@1.14.3:
version "1.14.3"
resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.14.3.tgz#90238dd4c0684b7edce5f83b0fb7328e48bd0895"
integrity sha512-qZDVnCrnpsRJJq5nSsiHCE3BYMED2OtsI+cmzIzF1QIfqm5ALf8tEJcO27zV1gKNKRPdhjO0dNWnrzssDQ1tFg==
prismjs@^1.6.0:
version "1.6.0"
resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.6.0.tgz#118d95fb7a66dba2272e343b345f5236659db365"