Skip to content

Commit

Permalink
chore(merge main): patched commit → 4e35f64 (#2474)
Browse files Browse the repository at this point in the history
  • Loading branch information
julien-deramond authored Feb 7, 2024
1 parent 29f1ad8 commit 9d3c554
Show file tree
Hide file tree
Showing 20 changed files with 1,191 additions and 983 deletions.
2 changes: 1 addition & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
/js/coverage/
/site/static/sw.js
/site/layouts/partials/
/stories/auto/
/stories/
22 changes: 2 additions & 20 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
"SwitchCase": 1
}
],
"logical-assignment-operators": "off",
"max-params": [
"warn",
5
Expand All @@ -75,6 +76,7 @@
"error",
"after"
],
"prefer-object-has-own": "off",
"prefer-template": "error",
"semi": [
"error",
Expand Down Expand Up @@ -195,26 +197,6 @@
"unicorn/no-array-for-each": "off"
}
},
{
"files": [
"stories/**"
],
"env": {
"browser": false,
"node": true
},
"parserOptions": {
"sourceType": "script"
},
"rules": {
"no-await-in-loop": "off",
"no-console": "off",
"no-multi-str": "off",
"strict": "error",
"unicorn/prefer-top-level-await": "off"
},
"extends": ["plugin:storybook/recommended"]
},
{
"files": [
"**/*.md"
Expand Down
4 changes: 3 additions & 1 deletion js/src/modal.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@ import SelectorEngine from './dom/selector-engine.js'
import Backdrop from './util/backdrop.js'
import { enableDismissTrigger } from './util/component-functions.js'
import FocusTrap from './util/focustrap.js'
import { defineJQueryPlugin, isRTL, isVisible, reflow } from './util/index.js'
import {
defineJQueryPlugin, isRTL, isVisible, reflow
} from './util/index.js'
import ScrollBarHelper from './util/scrollbar.js'

/**
Expand Down
4 changes: 3 additions & 1 deletion js/src/scrollspy.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@
import BaseComponent from './base-component.js'
import EventHandler from './dom/event-handler.js'
import SelectorEngine from './dom/selector-engine.js'
import { defineJQueryPlugin, getElement, isDisabled, isVisible } from './util/index.js'
import {
defineJQueryPlugin, getElement, isDisabled, isVisible
} from './util/index.js'

/**
* Constants
Expand Down
4 changes: 3 additions & 1 deletion js/src/tooltip.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ import * as Popper from '@popperjs/core'
import BaseComponent from './base-component.js'
import EventHandler from './dom/event-handler.js'
import Manipulator from './dom/manipulator.js'
import { defineJQueryPlugin, execute, findShadowRoot, getElement, getUID, isRTL, noop } from './util/index.js'
import {
defineJQueryPlugin, execute, findShadowRoot, getElement, getUID, isRTL, noop
} from './util/index.js'
import { DefaultAllowlist } from './util/sanitizer.js'
import TemplateFactory from './util/template-factory.js'

Expand Down
4 changes: 3 additions & 1 deletion js/src/util/backdrop.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@

import EventHandler from '../dom/event-handler.js'
import Config from './config.js'
import { execute, executeAfterTransition, getElement, reflow } from './index.js'
import {
execute, executeAfterTransition, getElement, reflow
} from './index.js'

/**
* Constants
Expand Down
4 changes: 3 additions & 1 deletion js/tests/unit/carousel.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ import Carousel from '../../src/carousel.js'
import EventHandler from '../../src/dom/event-handler.js'
import { isRTL, noop } from '../../src/util/index.js'
import Swipe from '../../src/util/swipe.js'
import { clearFixture, createEvent, getFixture, jQueryMock } from '../helpers/fixture.js'
import {
clearFixture, createEvent, getFixture, jQueryMock
} from '../helpers/fixture.js'

describe('Carousel', () => {
const { Simulator, PointerEvent } = window
Expand Down
4 changes: 3 additions & 1 deletion js/tests/unit/dropdown.spec.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import EventHandler from '../../src/dom/event-handler.js'
import Dropdown from '../../src/dropdown.js'
import { noop } from '../../src/util/index.js'
import { clearFixture, createEvent, getFixture, jQueryMock } from '../helpers/fixture.js'
import {
clearFixture, createEvent, getFixture, jQueryMock
} from '../helpers/fixture.js'

describe('Dropdown', () => {
let fixtureEl
Expand Down
4 changes: 3 additions & 1 deletion js/tests/unit/modal.spec.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import EventHandler from '../../src/dom/event-handler.js'
import Modal from '../../src/modal.js'
import ScrollBarHelper from '../../src/util/scrollbar.js'
import { clearBodyAndDocument, clearFixture, createEvent, getFixture, jQueryMock } from '../helpers/fixture.js'
import {
clearBodyAndDocument, clearFixture, createEvent, getFixture, jQueryMock
} from '../helpers/fixture.js'

describe('Modal', () => {
let fixtureEl
Expand Down
4 changes: 3 additions & 1 deletion js/tests/unit/offcanvas.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ import EventHandler from '../../src/dom/event-handler.js'
import Offcanvas from '../../src/offcanvas.js'
import { isVisible } from '../../src/util/index.js'
import ScrollBarHelper from '../../src/util/scrollbar.js'
import { clearBodyAndDocument, clearFixture, createEvent, getFixture, jQueryMock } from '../helpers/fixture.js'
import {
clearBodyAndDocument, clearFixture, createEvent, getFixture, jQueryMock
} from '../helpers/fixture.js'

describe('Offcanvas', () => {
let fixtureEl
Expand Down
4 changes: 3 additions & 1 deletion js/tests/unit/orange-navbar.spec.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import OrangeNavbar from '../../src/orange-navbar.js'
import { clearFixture, getFixture, createEvent, jQueryMock } from '../helpers/fixture.js'
import {
clearFixture, getFixture, createEvent, jQueryMock
} from '../helpers/fixture.js'

describe('OrangeNavbar', () => {
let fixtureEl
Expand Down
4 changes: 3 additions & 1 deletion js/tests/unit/quantity-selector.spec.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import QuantitySelector from '../../src/quantity-selector.js'
import { clearFixture, getFixture, createEvent, jQueryMock } from '../helpers/fixture.js'
import {
clearFixture, getFixture, createEvent, jQueryMock
} from '../helpers/fixture.js'

describe('QuantitySelector', () => {
let fixtureEl
Expand Down
4 changes: 3 additions & 1 deletion js/tests/unit/scrollspy.spec.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import EventHandler from '../../src/dom/event-handler.js'
import ScrollSpy from '../../src/scrollspy.js'
import { clearFixture, createEvent, getFixture, jQueryMock } from '../helpers/fixture.js'
import {
clearFixture, createEvent, getFixture, jQueryMock
} from '../helpers/fixture.js'

describe('ScrollSpy', () => {
let fixtureEl
Expand Down
4 changes: 3 additions & 1 deletion js/tests/unit/tab.spec.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import Tab from '../../src/tab.js'
import { clearFixture, createEvent, getFixture, jQueryMock } from '../helpers/fixture.js'
import {
clearFixture, createEvent, getFixture, jQueryMock
} from '../helpers/fixture.js'

describe('Tab', () => {
let fixtureEl
Expand Down
4 changes: 3 additions & 1 deletion js/tests/unit/toast.spec.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import Toast from '../../src/toast.js'
import { clearFixture, createEvent, getFixture, jQueryMock } from '../helpers/fixture.js'
import {
clearFixture, createEvent, getFixture, jQueryMock
} from '../helpers/fixture.js'

describe('Toast', () => {
let fixtureEl
Expand Down
4 changes: 3 additions & 1 deletion js/tests/unit/tooltip.spec.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import EventHandler from '../../src/dom/event-handler.js'
import Tooltip from '../../src/tooltip.js'
import { noop } from '../../src/util/index.js'
import { clearFixture, createEvent, getFixture, jQueryMock } from '../helpers/fixture.js'
import {
clearFixture, createEvent, getFixture, jQueryMock
} from '../helpers/fixture.js'

describe('Tooltip', () => {
let fixtureEl
Expand Down
Loading

0 comments on commit 9d3c554

Please sign in to comment.