From 076af07fc025df011b11c2ad6bc4168cb614f070 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Thu, 26 Aug 2021 19:12:28 +0300 Subject: [PATCH] Fix new lint issues --- build/banner.js | 1 + build/build-plugins.js | 3 ++- build/change-version.js | 1 + build/rollup.config.js | 1 + build/vnu-jar.js | 1 + js/index.umd.js | 1 + js/src/dom/data.js | 1 + js/src/scrollspy.js | 4 ++-- js/src/util/template-factory.js | 2 +- js/tests/integration/bundle-modularity.js | 2 +- js/tests/karma.conf.js | 3 ++- 11 files changed, 14 insertions(+), 6 deletions(-) diff --git a/build/banner.js b/build/banner.js index df82ff32e..a022f1c48 100644 --- a/build/banner.js +++ b/build/banner.js @@ -1,6 +1,7 @@ 'use strict' const pkg = require('../package.json') + const year = new Date().getFullYear() function getBanner(pluginFilename) { diff --git a/build/build-plugins.js b/build/build-plugins.js index 044344743..3ddeb9f95 100644 --- a/build/build-plugins.js +++ b/build/build-plugins.js @@ -10,13 +10,14 @@ 'use strict' const path = require('path') +const process = require('process') const rollup = require('rollup') const glob = require('glob') const { babel } = require('@rollup/plugin-babel') const banner = require('./banner.js') const srcPath = path.resolve(__dirname, '../js/src/') -const jsFiles = glob.sync(srcPath + '/**/*.js') +const jsFiles = glob.sync(`${srcPath}/**/*.js`) // Array which holds the resolved plugins const resolvedPlugins = [] diff --git a/build/change-version.js b/build/change-version.js index 22a169db9..6289cf378 100644 --- a/build/change-version.js +++ b/build/change-version.js @@ -11,6 +11,7 @@ const fs = require('fs').promises const path = require('path') +const process = require('process') const globby = require('globby') const VERBOSE = process.argv.includes('--verbose') diff --git a/build/rollup.config.js b/build/rollup.config.js index c00438de2..c16967fe9 100644 --- a/build/rollup.config.js +++ b/build/rollup.config.js @@ -1,6 +1,7 @@ 'use strict' const path = require('path') +const process = require('process') const { babel } = require('@rollup/plugin-babel') const { nodeResolve } = require('@rollup/plugin-node-resolve') const replace = require('@rollup/plugin-replace') diff --git a/build/vnu-jar.js b/build/vnu-jar.js index 2d5cc8b55..5f5f00b36 100644 --- a/build/vnu-jar.js +++ b/build/vnu-jar.js @@ -10,6 +10,7 @@ 'use strict' const { execFile, spawn } = require('child_process') +const process = require('process') const vnu = require('vnu-jar') execFile('java', ['-version'], (error, stdout, stderr) => { diff --git a/js/index.umd.js b/js/index.umd.js index d6e587fb1..4d15d6d64 100644 --- a/js/index.umd.js +++ b/js/index.umd.js @@ -18,6 +18,7 @@ import Tab from './src/tab' import Toast from './src/toast' import Tooltip from './src/tooltip' +// eslint-disable-next-line import/no-anonymous-default-export export default { Alert, Button, diff --git a/js/src/dom/data.js b/js/src/dom/data.js index 4209f3188..b96cf3384 100644 --- a/js/src/dom/data.js +++ b/js/src/dom/data.js @@ -11,6 +11,7 @@ const elementMap = new Map() +// eslint-disable-next-line import/no-anonymous-default-export export default { set(element, key, instance) { if (!elementMap.has(element)) { diff --git a/js/src/scrollspy.js b/js/src/scrollspy.js index 27bc0cd87..e2fa76c7f 100644 --- a/js/src/scrollspy.js +++ b/js/src/scrollspy.js @@ -120,8 +120,8 @@ class ScrollSpy extends BaseComponent { return null }) - .filter(item => item) - .sort((a, b) => a[0] - b[0]) + .filter(item => item) + .sort((a, b) => a[0] - b[0]) for (const item of targets) { this._offsets.push(item[0]) diff --git a/js/src/util/template-factory.js b/js/src/util/template-factory.js index a9cee1086..25ceeb274 100644 --- a/js/src/util/template-factory.js +++ b/js/src/util/template-factory.js @@ -5,9 +5,9 @@ * -------------------------------------------------------------------------- */ -import { DefaultAllowlist, sanitizeHtml } from './sanitizer' import { getElement, isElement, typeCheckConfig } from '../util/index' import SelectorEngine from '../dom/selector-engine' +import { DefaultAllowlist, sanitizeHtml } from './sanitizer' /** * Constants diff --git a/js/tests/integration/bundle-modularity.js b/js/tests/integration/bundle-modularity.js index 8546141b1..80761d64a 100644 --- a/js/tests/integration/bundle-modularity.js +++ b/js/tests/integration/bundle-modularity.js @@ -1,5 +1,5 @@ import Tooltip from '../../dist/tooltip' -import '../../dist/carousel' +import '../../dist/carousel' // eslint-disable-line import/no-unassigned-import window.addEventListener('load', () => { [].concat(...document.querySelectorAll('[data-bs-toggle="tooltip"]')) diff --git a/js/tests/karma.conf.js b/js/tests/karma.conf.js index 8d29dad63..dbf417bfb 100644 --- a/js/tests/karma.conf.js +++ b/js/tests/karma.conf.js @@ -3,6 +3,7 @@ 'use strict' const path = require('path') +const process = require('process') const ip = require('ip') const { babel } = require('@rollup/plugin-babel') const istanbul = require('rollup-plugin-istanbul') @@ -105,7 +106,7 @@ if (BROWSERSTACK) { conf.browserStack = { username: ENV.BROWSER_STACK_USERNAME, accessKey: ENV.BROWSER_STACK_ACCESS_KEY, - build: `bootstrap-${ENV.GITHUB_SHA ? ENV.GITHUB_SHA.slice(0, 7) + '-' : ''}${new Date().toISOString()}`, + build: `bootstrap-${ENV.GITHUB_SHA ? `${ENV.GITHUB_SHA.slice(0, 7)}-` : ''}${new Date().toISOString()}`, project: 'Bootstrap', retryLimit: 2 }