Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] chore(eslint): upgrade eslint to v9 #2716

Draft
wants to merge 13 commits into
base: main
Choose a base branch
from
+2,710 −2,087
Draft

[WIP] chore(eslint): upgrade eslint to v9 #2716

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
35fbdc1
chore(eslint): upgrade docs/preview to eslint@9
liady Jan 20, 2025
f677160
chore(eslint): upgrade examples/express to eslint@9
liady Jan 20, 2025
e501805
chore(eslint): upgrade templates/skeleton to eslint@9
liady Jan 20, 2025
d88c0c3
chore(eslint): upgrade root package.json to eslint@9
liady Jan 20, 2025
3f0f04d
chore(eslint): upgrade hyrogen-react to eslint@9
liady Jan 20, 2025
8f3f5ad
minor
liady Jan 20, 2025
5176700
minor fixes
liady Jan 20, 2025
c5fc0ef
remove unused flag
liady Jan 20, 2025
80e3856
change lint script
liady Jan 21, 2025
086ab9c
packages
liady Jan 21, 2025
4a2a258
chore(eslint): better v9 conversion - hydrogen-react
liady Jan 21, 2025
4d9a31d
chore(eslint): upgrade eslint in templates/skeleton
liady Jan 21, 2025
030f262
root config
liady Jan 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions .eslintignore
View file
Open in desktop

This file was deleted.

14 changes: 0 additions & 14 deletions .eslintrc.js
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions docs/preview/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,12 @@
},
"devDependencies": {
"@remix-run/dev": "^2.15.2",
"@remix-run/eslint-config": "^2.15.2",
"@tailwindcss/vite": "4.0.0-beta.8",
"@types/he": "^1.2.1",
"@types/react": "^18.2.20",
"@types/react-dom": "^18.2.7",
"@types/react-syntax-highlighter": "^15.5.7",
"eslint": "^8.38.0",
"eslint": "^9.18.0",
"typescript": "^5.2.2",
"vite": "^5.1.8",
"vite-tsconfig-paths": "^4.3.1"
Expand Down
332 changes: 332 additions & 0 deletions eslint.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,332 @@
const {fixupConfigRules, fixupPluginRules} = require('@eslint/compat');
const eslintComments = require('eslint-plugin-eslint-comments');
const react = require('eslint-plugin-react');
const reactHooks = require('eslint-plugin-react-hooks');
const jsxA11Y = require('eslint-plugin-jsx-a11y');
const tsdoc = require('eslint-plugin-tsdoc');
const globals = require('globals');
const tsParser = require('@typescript-eslint/parser');
const jest = require('eslint-plugin-jest');
const simpleImportSort = require('eslint-plugin-simple-import-sort');
const js = require('@eslint/js');
const {FlatCompat} = require('@eslint/eslintrc');

const compat = new FlatCompat({
baseDirectory: __dirname,
recommendedConfig: js.configs.recommended,
allConfig: js.configs.all,
});

module.exports = [
{
ignores: [
'**/node_modules/',
'**/build/',
'**/*.graphql.d.ts',
'**/*.graphql.ts',
'**/storefront-api-types.d.ts',
'**/customer-account-api-types.d.ts',
'**/codegen.ts',
'**/dist/**/*',
'**/coverage/**/*',
'**/docs/**/*',
'**/.eslintrc.cjs',
'**/src/*.example.tsx',
'**/src/*.example.ts',
'**/src/*.example.jsx',
'**/src/*.example.js',
'**/eslint.config.cjs',
'**/scripts/**/*',
'bin/',
'*.d.ts',
'packages/hydrogen-react/codegen.ts',
'packages/hydrogen-react/vite.config.ts',
'packages/hydrogen-react/vitest.setup.ts',
],
},
...fixupConfigRules(
compat.extends(
'plugin:node/recommended',
'plugin:import/recommended',
'plugin:import/typescript',
'eslint:recommended',
'plugin:eslint-comments/recommended',
'plugin:react/recommended',
'plugin:react-hooks/recommended',
'plugin:jsx-a11y/recommended',
),
),
{
plugins: {
'eslint-comments': fixupPluginRules(eslintComments),
react: fixupPluginRules(react),
'react-hooks': fixupPluginRules(reactHooks),
'jsx-a11y': fixupPluginRules(jsxA11Y),
tsdoc,
},
settings: {
'import/resolvers': {
typescript: {
project: [
'packages/*/tsconfig.json',
'templates/*/tsconfig.json',
'examples/*/tsconfig.json',
'docs/*/tsconfig.json',
],
},
},
},
languageOptions: {
parser: tsParser,
parserOptions: {
projectService: {
allowDefaultProject: ['vite.config.ts', 'vitest.setup.ts'],
},
tsconfigRootDir: __dirname,
ecmaFeatures: {
jsx: true,
},
},
globals: {
...globals.browser,
...globals.node,
},
ecmaVersion: 2020,
sourceType: 'module',
},
linterOptions: {
reportUnusedDisableDirectives: false,
},
settings: {
react: {
version: 'detect',
},
jest: {
version: 28,
},
},
rules: {
'@shopify/jsx-no-complex-expressions': 'off',
'@shopify/jsx-no-hardcoded-content': 'off',
'jsx-a11y/control-has-associated-label': 'off',
'jsx-a11y/label-has-for': 'off',
'no-use-before-define': 'off',
'no-warning-comments': 'off',
'react/no-children-prop': 'off',
'object-shorthand': [
'error',
'always',
{
avoidQuotes: true,
},
],
'react/display-name': 'off',
'react/no-array-index-key': 'warn',
'react/prop-types': 'off',
'react/react-in-jsx-scope': 'off',
'eslint-comments/no-unused-disable': 'off',
'jest/no-disabled-tests': 'off',
'jest/no-export': 'off',
'no-console': 'off',
'no-constant-condition': 'off',
'tsdoc/syntax': 'error',
'node/no-extraneous-import': [
'error',
{
allowModules: ['@shopify/hydrogen', '@shopify/react-testing'],
},
],
'node/no-extraneous-require': [
'error',
{
allowModules: ['@shopify/hydrogen'],
},
],
'node/no-unsupported-features/es-syntax': 'off',
'node/no-unsupported-features/es-builtins': [
'error',
{
version: '>=14.0.0',
ignores: [],
},
],
'node/no-unsupported-features/node-builtins': [
'error',
{
version: '>=14.0.0',
ignores: [],
},
],
'prefer-const': [
'warn',
{
destructuring: 'all',
},
],
'@typescript-eslint/ban-ts-comment': 'off',
'@typescript-eslint/no-non-null-asserted-optional-chain': 'off',
'no-useless-escape': 'off',
'no-case-declarations': 'off',
'import/extensions': 'off',
'import/no-unresolved': 'off',
'node/no-missing-import': 'off',
'react-hooks/exhaustive-deps': 'error',
},
},
...compat.extends('plugin:jest/recommended').map((config) => ({
...config,
files: ['**/*.test.*'],
})),
{
files: ['**/*.test.*'],
plugins: {
jest,
},
languageOptions: {
globals: {
...globals.node,
...globals.jest,
},
},
},
{
files: ['**/*.server.*'],
rules: {
'react-hooks/rules-of-hooks': 'off',
},
},
...fixupConfigRules(
compat.extends(
'plugin:@typescript-eslint/eslint-recommended',
'plugin:@typescript-eslint/recommended',
'plugin:@typescript-eslint/recommended-requiring-type-checking',
),
).map((config) => ({
...config,
files: [
'packages/hydrogen-react/**/*.ts',
'packages/hydrogen-react/**/*.tsx',
'examples/express/**/*.ts',
'examples/express/**/*.tsx',
'templates/skeleton/**/*.ts',
'templates/skeleton/**/*.tsx',
'docs/previews/**/*.ts',
'docs/previews/**/*.tsx',
],
languageOptions: {
parser: tsParser,
parserOptions: {
tsconfigRootDir: __dirname,
ecmaFeatures: {
jsx: true,
},
},
},
rules: {
'@typescript-eslint/explicit-function-return-type': 'error',
// handled by @typescript-eslint
'no-unused-vars': 'off',
'no-undef': 'off',
},
})),
// {
// files: ['**/*.ts', '**/*.tsx'],
// languageOptions: {
// parser: tsParser,
// parserOptions: {
// tsconfigRootDir: __dirname,
// ecmaFeatures: {
// jsx: true,
// },
// },
// },
// rules: {
// '@typescript-eslint/explicit-module-boundary-types': 'off',
// '@typescript-eslint/prefer-promise-reject-errors': 'off',
// '@typescript-eslint/naming-convention': [
// 'error',
// {
// selector: 'default',
// format: ['camelCase', 'PascalCase', 'UPPER_CASE'],
// leadingUnderscore: 'allowSingleOrDouble',
// trailingUnderscore: 'allowSingleOrDouble',
// },
// {
// selector: 'typeLike',
// format: ['PascalCase'],
// },
// {
// selector: 'typeParameter',
// format: ['PascalCase'],
// leadingUnderscore: 'allow',
// },
// {
// selector: 'interface',
// format: ['PascalCase'],
// },
// {
// selector: 'property',
// format: null,
// },
// ],
// '@typescript-eslint/no-empty-function': 'off',
// '@typescript-eslint/no-empty-interface': 'off',
// '@typescript-eslint/no-explicit-any': 'off',
// '@typescript-eslint/no-non-null-assertion': 'off',
// '@typescript-eslint/no-unused-vars': 'off',
// 'react/prop-types': 'off',
// 'react/no-children-prop': 'off',
// '@typescript-eslint/no-redundant-type-constituents': 'off',
// '@typescript-eslint/no-unsafe-assignment': 'off',
// '@typescript-eslint/no-unsafe-return': 'off',
// '@typescript-eslint/no-unsafe-argument': 'off',
// '@typescript-eslint/no-unsafe-member-access': 'off',
// '@typescript-eslint/require-await': 'off',
// '@typescript-eslint/only-throw-error': 'off',
// '@typescript-eslint/await-thenable': 'off',
// '@typescript-eslint/no-unsafe-call': 'off',
// },
// },
// {
// files: [
// 'packages/hydrogen-react/**/*.(ts|tsx)',
// 'examples/express/**/*.(ts|tsx)',
// 'templates/skeleton/**/*.(ts|tsx)',
// 'docs/previews/**/*.(ts|tsx)',
// ],
// rules: {
// '@typescript-eslint/no-redundant-type-constituents': 'error',
// '@typescript-eslint/no-unsafe-assignment': 'error',
// '@typescript-eslint/no-unsafe-return': 'error',
// '@typescript-eslint/no-unsafe-argument': 'error',
// '@typescript-eslint/no-unsafe-member-access': 'error',
// '@typescript-eslint/require-await': 'error',
// '@typescript-eslint/only-throw-error': 'error',
// '@typescript-eslint/await-thenable': 'error',
// '@typescript-eslint/no-unsafe-call': 'error',
// },
// },
{
files: [
'**/*.example.ts',
'**/*.example.js',
'**/*.example.tsx',
'**/*.example.jsx',
],
rules: {
'node/no-extraneous-import': 'off',
'node/no-extraneous-require': 'off',
'no-unused-vars': 'off',
'no-undef': 'off',
},
},
{
files: ['**/src/index.ts'],
plugins: {
'simple-import-sort': simpleImportSort,
},
rules: {
'simple-import-sort/exports': 'error',
},
},
];
4 changes: 0 additions & 4 deletions examples/express/.eslintrc.cjs
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions examples/express/app/entry.server.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {PassThrough} from 'node:stream';
import type {AppLoadContext, EntryContext} from '@remix-run/node';
import {Response} from '@remix-run/web-fetch';
import {RemixServer} from '@remix-run/react';
import isbot from 'isbot';
import isbotua from 'isbot';
import {renderToPipeableStream} from 'react-dom/server';
import {createContentSecurityPolicy} from '@shopify/hydrogen';

Expand All @@ -22,7 +22,7 @@ export default function handleRequest(
remixContext: EntryContext,
loadContext: AppLoadContext,
) {
return isbot(request.headers.get('user-agent'))
return isbotua(request.headers.get('user-agent'))
? handleBotRequest(
request,
responseStatusCode,
Expand Down
Loading
Loading