diff --git a/.changeset/blue-hairs-prove.md b/.changeset/blue-hairs-prove.md
new file mode 100644
index 0000000000..7812825da6
--- /dev/null
+++ b/.changeset/blue-hairs-prove.md
@@ -0,0 +1,5 @@
+---
+'@backstage/cli': patch
+---
+
+Linting is now ignored for any `.eslintrc.*` files, not just `.eslintrc.js`.
diff --git a/.changeset/late-dolphins-leave.md b/.changeset/late-dolphins-leave.md
new file mode 100644
index 0000000000..796b9a7a21
--- /dev/null
+++ b/.changeset/late-dolphins-leave.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-graphiql': patch
+---
+
+Minor internal tweak to lazy loading in order to improve module compatibility.
diff --git a/packages/cli/config/eslint-factory.js b/packages/cli/config/eslint-factory.js
index e86146048e..6e2a510c4a 100644
--- a/packages/cli/config/eslint-factory.js
+++ b/packages/cli/config/eslint-factory.js
@@ -76,7 +76,7 @@ function createConfig(dir, extraConfig = {}) {
       ...parserOptions,
     },
     ignorePatterns: [
-      '.eslintrc.js',
+      '.eslintrc.*',
       '**/dist/**',
       '**/dist-types/**',
       ...(ignorePatterns ?? []),
diff --git a/packages/core-app-api/src/apis/implementations/IdentityApi/AppIdentityProxy.test.ts b/packages/core-app-api/src/apis/implementations/IdentityApi/AppIdentityProxy.test.ts
index 3d4f83b05d..6fa46db7c9 100644
--- a/packages/core-app-api/src/apis/implementations/IdentityApi/AppIdentityProxy.test.ts
+++ b/packages/core-app-api/src/apis/implementations/IdentityApi/AppIdentityProxy.test.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { withLogCollector } from '@backstage//test-utils';
+import { withLogCollector } from '@backstage/test-utils';
 import { AppIdentityProxy } from './AppIdentityProxy';
 
 describe('AppIdentityProxy', () => {
diff --git a/plugins/graphiql/src/components/GraphiQLBrowser/GraphiQLBrowser.tsx b/plugins/graphiql/src/components/GraphiQLBrowser/GraphiQLBrowser.tsx
index 87419aec94..dd38f513be 100644
--- a/plugins/graphiql/src/components/GraphiQLBrowser/GraphiQLBrowser.tsx
+++ b/plugins/graphiql/src/components/GraphiQLBrowser/GraphiQLBrowser.tsx
@@ -22,7 +22,9 @@ import { GraphQLEndpoint } from '../../lib/api';
 import { BackstageTheme } from '@backstage/theme';
 import { Progress } from '@backstage/core-components';
 
-const GraphiQL = React.lazy(() => import('graphiql'));
+const GraphiQL = React.lazy(() =>
+  import('graphiql').then(m => ({ default: m.GraphiQL })),
+);
 
 const useStyles = makeStyles<BackstageTheme>(theme => ({
   root: {