Skip to content

Commit bccfd8c

Browse files
committed
refactor: update regression test dependencies
Also use ESLint from the root package
1 parent 0966e5e commit bccfd8c

13 files changed

Lines changed: 1295 additions & 5756 deletions

File tree

eslint.config.mjs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,9 @@ const finalConfig = tseslint.config(
8282
"/regression-test/**",
8383
"/coverage/**",
8484
"**/stylelint.config.js",
85-
"**/babel.config.js"
85+
"**/babel.config.js",
86+
"**/.next/**",
87+
"**/next-env.d.ts"
8688
]
8789
},
8890
eslint.configs.recommended,

packages/__docs__/buildScripts/samplemedia/placeholder-image.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import IconSVG from './placeholder.svg'
2626

2727
export default function placeholderImage(width = 512, height = 512) {
2828
// We need to base64 encode this because otherwise FF will add extra escape chars
29-
// eslint-disable-next-line no-undef
3029
const dataUri = Buffer.from(
3130
IconSVG.replace(/{{w}}/g, width).replace(/{{h}}/g, height).trim()
3231
).toString('base64')

packages/command-utils/lib/index.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import { sync, spawn } from 'cross-spawn'
3333
const require = createRequire(import.meta.url)
3434

3535
function info(...args) {
36-
console.info(chalk.blue(...args)) // eslint-disable-line no-console
36+
console.info(chalk.blue(...args))
3737
}
3838

3939
function warn(...args) {
@@ -163,6 +163,7 @@ function resolveBin(
163163
let pathFromWhich
164164
try {
165165
pathFromWhich = fs.realpathSync(which.sync(executable))
166+
// eslint-disable-next-line no-unused-vars
166167
} catch (_error) {
167168
// ignore _error
168169
}

packages/ui-alerts/src/Alert/v1/index.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,6 @@ class Alert extends Component<AlertProps, AlertState> {
263263

264264
renderAlert() {
265265
// prevent onDismiss from being passed to the View component
266-
// eslint-disable-next-line @typescript-eslint/no-unused-vars
267266
const {
268267
margin,
269268
styles,

packages/ui-alerts/src/Alert/v2/index.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,6 @@ class Alert extends Component<AlertProps, AlertState> {
262262

263263
renderAlert() {
264264
// prevent onDismiss from being passed to the View component
265-
// eslint-disable-next-line @typescript-eslint/no-unused-vars
266265
const {
267266
margin,
268267
styles,

packages/ui-react-utils/src/DeterministicIdContext/DeterministicIdContext.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import React from 'react'
2525
import type { DeterministicIdProviderValue } from './DeterministicIdContextProvider'
2626

2727
declare global {
28-
// eslint-disable-next-line no-var
2928
var __INSTUI_GLOBAL_INSTANCE_COUNTER__: Map<string, number>
3029
}
3130
const instUIInstanceCounter = '__INSTUI_GLOBAL_INSTANCE_COUNTER__'

packages/ui-scripts/lib/icons/build-icons.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,6 @@ export default {
138138
JSON.stringify(legacyIconsData, null, 2),
139139
'utf8'
140140
)
141-
// eslint-disable-next-line no-console
142141
console.log(
143142
`Generated ${legacyOutputPath} (${legacyIconsData.length} icons)`
144143
)

regression-test/.eslintignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

regression-test/.eslintrc.json

Lines changed: 0 additions & 3 deletions
This file was deleted.

regression-test/eslint.config.mjs

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
/*
2+
* The MIT License (MIT)
3+
*
4+
* Copyright (c) 2015 - present Instructure, Inc.
5+
*
6+
* Permission is hereby granted, free of charge, to any person obtaining a copy
7+
* of this software and associated documentation files (the "Software"), to deal
8+
* in the Software without restriction, including without limitation the rights
9+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
10+
* copies of the Software, and to permit persons to whom the Software is
11+
* furnished to do so, subject to the following conditions:
12+
*
13+
* The above copyright notice and this permission notice shall be included in all
14+
* copies or substantial portions of the Software.
15+
*
16+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
17+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
19+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
20+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
21+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
22+
* SOFTWARE.
23+
*/
24+
25+
// eslint-disable-next-line @instructure/no-relative-imports
26+
import cfg from '../eslint.config.mjs'
27+
28+
export default cfg

0 commit comments

Comments
 (0)