From 3697ee1f2ad9c46325c0a830a41b1317122a4502 Mon Sep 17 00:00:00 2001
From: LB <mail@lb.ee>
Date: Tue, 5 Nov 2024 17:50:47 +1000
Subject: [PATCH] Eslint - fix location of storybook folder & remove eslint
ignore
---
.eslintrc.js | 10 +++++-----
CHANGELOG.txt | 1 +
client/storybook/middleware.js | 1 -
docs/releases/6.4.md | 1 +
4 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/.eslintrc.js b/.eslintrc.js
index c80413f60e..46e9e46071 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -132,14 +132,14 @@ module.exports = {
files: [
'client/extract-translatable-strings.js',
'client/tests/**',
- 'webpack.config.js',
'tailwind.config.js',
- 'storybook/**/*',
- '*.test.ts',
- '*.test.tsx',
- '*.test.js',
+ 'webpack.config.js',
'*.stories.js',
'*.stories.tsx',
+ '*.test.js',
+ '*.test.ts',
+ '*.test.tsx',
+ '**/storybook/**',
],
rules: {
'@typescript-eslint/no-empty-function': 'off',
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 8ab3f5bd86..f0d54678e0 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -50,6 +50,7 @@ Changelog
* Maintenance: Update `PreviewController` usage to leverage Stimulus actions instead of calling `preventDefault` manually (Ayaan Qadri)
* Maintenance: Various performance optimizations to page publishing (Jake Howard)
* Maintenance: Remove unnecessary DOM canvas.toBlob polyfill (LB (Ben) Johnston)
+ * Maintenance: Ensure Storybook core files are correctly running through Eslint (LB (Ben) Johnston)
6.3.1 (19.11.2024)
diff --git a/client/storybook/middleware.js b/client/storybook/middleware.js
index ad64a5ff6f..9d608718fc 100644
--- a/client/storybook/middleware.js
+++ b/client/storybook/middleware.js
@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/no-var-requires, import/no-extraneous-dependencies */
const middleware = require('storybook-django/src/middleware');
// Target the Django server with IPV4 address explicitly to avoid DNS resolution of localhost to IPV6.
diff --git a/docs/releases/6.4.md b/docs/releases/6.4.md
index 2001b88c9c..57cbb39520 100644
--- a/docs/releases/6.4.md
+++ b/docs/releases/6.4.md
@@ -69,6 +69,7 @@ depth: 1
* Update `PreviewController` usage to leverage Stimulus actions instead of calling `preventDefault` manually (Ayaan Qadri)
* Various performance optimizations to page publishing (Jake Howard)
* Remove unnecessary DOM canvas.toBlob polyfill (LB (Ben) Johnston)
+ * Ensure Storybook core files are correctly running through Eslint (LB (Ben) Johnston)
## Upgrade considerations - changes affecting all projects