Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
254 changes: 0 additions & 254 deletions .eslintrc.json

This file was deleted.

21 changes: 6 additions & 15 deletions eslint.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -95,12 +95,12 @@ const localRules = {
'unicorn/no-unused-properties': 'error',
'unicorn/numeric-separators-style': 'off',
'unicorn/prefer-array-flat': 'off',
'unicorn/prefer-at': 'off',
'unicorn/prefer-at': 'error',
'unicorn/prefer-dom-node-dataset': 'off',
'unicorn/prefer-global-this': 'off',
'unicorn/prefer-module': 'off',
'unicorn/prefer-query-selector': 'off',
'unicorn/prefer-spread': 'off',
'unicorn/prefer-spread': 'error',
'unicorn/prefer-string-raw': 'off',
'unicorn/prefer-string-replace-all': 'off',
'unicorn/prefer-structured-clone': 'off',
Expand Down Expand Up @@ -266,17 +266,14 @@ const eslintConfig = [
}
},

// site/** — browser, script mode, older ecmaVersion
// site/** — browser, script mode
{
files: ['site/**'],
languageOptions: {
globals: {
...globals.browser
},
sourceType: 'script',
parserOptions: {
ecmaVersion: 2019
}
sourceType: 'script'
},
rules: {
'no-new': 'off',
Expand All @@ -296,10 +293,7 @@ const eslintConfig = [
'site/src/plugins/*.js'
],
languageOptions: {
sourceType: 'module',
parserOptions: {
ecmaVersion: 2020
}
sourceType: 'module'
},
// These files may have eslint-disable directives for the old import plugin
linterOptions: {
Expand All @@ -322,10 +316,7 @@ const eslintConfig = [
'site/src/assets/examples/sidebars/sidebars.js'
],
languageOptions: {
sourceType: 'module',
parserOptions: {
ecmaVersion: 2020
}
sourceType: 'module'
},
rules: {
'import/no-unresolved': 'off'
Expand Down
4 changes: 2 additions & 2 deletions js/src/combobox.js
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@ class Combobox extends BaseComponent {

const items = this._getVisibleItems()
if (items.length > 0) {
const target = key === ARROW_DOWN_KEY ? items[0] : items[items.length - 1]
const target = key === ARROW_DOWN_KEY ? items[0] : items.at(-1)
target.focus()
}

Expand Down Expand Up @@ -404,7 +404,7 @@ class Combobox extends BaseComponent {
event.preventDefault()
const items = this._getVisibleItems()
if (items.length > 0) {
const targetItem = key === HOME_KEY ? items[0] : items[items.length - 1]
const targetItem = key === HOME_KEY ? items[0] : items.at(-1)
targetItem.focus()
}

Expand Down
2 changes: 1 addition & 1 deletion js/src/dom/data.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export default {
// can be removed later when multiple key/instances are fine to be used
if (!instanceMap.has(key) && instanceMap.size !== 0) {
// eslint-disable-next-line no-console
console.error(`Bootstrap doesn't allow more than one instance per element. Bound instance: ${Array.from(instanceMap.keys())[0]}.`)
console.error(`Bootstrap doesn't allow more than one instance per element. Bound instance: ${[...instanceMap.keys()][0]}.`)
return
}

Expand Down
4 changes: 2 additions & 2 deletions js/src/dom/selector-engine.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,15 @@ const getSelector = element => {

const SelectorEngine = {
find(selector, element = document.documentElement) {
return [].concat(...Element.prototype.querySelectorAll.call(element, selector))
return [...Element.prototype.querySelectorAll.call(element, selector)]
},

findOne(selector, element = document.documentElement) {
return Element.prototype.querySelector.call(element, selector)
},

children(element, selector) {
return [].concat(...element.children).filter(child => child.matches(selector))
return [...element.children].filter(child => child.matches(selector))
},

parents(element, selector) {
Expand Down
6 changes: 3 additions & 3 deletions js/src/menu.js
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ class Menu extends BaseComponent {
this._createFloating()

if ('ontouchstart' in document.documentElement && !this._parent.closest(SELECTOR_NAVBAR_NAV)) {
for (const element of [].concat(...document.body.children)) {
for (const element of document.body.children) {
EventHandler.on(element, 'mouseover', noop)
}
}
Expand Down Expand Up @@ -249,7 +249,7 @@ class Menu extends BaseComponent {
this._closeAllSubmenus()

if ('ontouchstart' in document.documentElement) {
for (const element of [].concat(...document.body.children)) {
for (const element of document.body.children) {
EventHandler.off(element, 'mouseover', noop)
}
}
Expand Down Expand Up @@ -837,7 +837,7 @@ class Menu extends BaseComponent {
.filter(element => isVisible(element))

if (items.length) {
const targetItem = key === HOME_KEY ? items[0] : items[items.length - 1]
const targetItem = key === HOME_KEY ? items[0] : items.at(-1)
targetItem.focus()
}

Expand Down
Loading
Loading