upgrade to @epic-web/config

epicweb-dev · May 25, 2024 · 8c69039 · 8c69039
1 parent d5669e7
commit 8c69039
Show file tree

Hide file tree

Showing 14 changed files with 15,009 additions and 12,792 deletions.
diff --git a/epicshop/package-lock.json b/epicshop/package-lock.json
diff --git a/epicshop/package.json b/epicshop/package.json
@@ -1,6 +1,7 @@
 {
   "type": "module",
   "dependencies": {
+    "@epic-web/config": "^1.5.3",
     "@epic-web/workshop-app": "^4.5.0"
   }
 }
diff --git a/epicshop/tsconfig.json b/epicshop/tsconfig.json
@@ -1,19 +1,9 @@
 {
-  "include": ["**/*.ts", "**/*.tsx", "**/*.js"],
-  "compilerOptions": {
-    "lib": ["ES2023"],
-    "isolatedModules": true,
-    "esModuleInterop": true,
-    "module": "ES2022",
-    "moduleResolution": "Bundler",
-    "resolveJsonModule": true,
-    "target": "ES2022",
-    "strict": true,
-    "noImplicitAny": true,
-    "allowJs": true,
-    "forceConsistentCasingInFileNames": true,
-    "skipLibCheck": true,
-    "allowImportingTsExtensions": true,
-    "noEmit": true
-  }
-}
+	"include": ["**/*.ts", "**/*.tsx", "**/*.js"],
+	"extends": ["@epic-web/config/typescript"],
+	"compilerOptions": {
+		"paths": {
+			"#*": ["./*"]
+		}
+	}
+}
diff --git a/eslint.config.js b/eslint.config.js
@@ -1,40 +1,14 @@
-/** @type {import('@types/eslint').Linter.Config} */
-export default {
-	files: ['**/*.js', '**/*.ts', '**/*.tsx'],
-	languageOptions: { parser: await import('@typescript-eslint/parser') },
-	plugins: {
-		'@typescript-eslint': (await import('@typescript-eslint/eslint-plugin'))
-			.default,
-		'react-hooks': (await import('eslint-plugin-react-hooks')).default,
-		import: (await import('eslint-plugin-import')).default,
-	},
-	rules: {
-		'react-hooks/rules-of-hooks': 'error',
-		'react-hooks/exhaustive-deps': 'warn',
+import defaultConfig from '@epic-web/config/eslint'
 
-		'@typescript-eslint/consistent-type-imports': [
-			'warn',
-			{
-				prefer: 'type-imports',
-				disallowTypeAnnotations: true,
-				fixStyle: 'inline-type-imports',
-			},
-		],
-		'import/no-duplicates': ['warn', { 'prefer-inline': true }],
-		'import/consistent-type-specifier-style': ['warn', 'prefer-inline'],
-		'import/order': [
-			'warn',
-			{
-				alphabetize: { order: 'asc', caseInsensitive: true },
-				groups: [
-					'builtin',
-					'external',
-					'internal',
-					'parent',
-					'sibling',
-					'index',
-				],
-			},
-		],
+/** @type {import("eslint").Linter.Config} */
+export default [
+	{ ignores: ['**/babel-standalone.js'] },
+	...defaultConfig,
+	{
+		rules: {
+			// we leave unused vars around for the exercises
+			'no-unused-vars': 'off',
+			'@typescript-eslint/no-unused-vars': 'off',
+		},
 	},
-}
+]
diff --git a/exercises/02.state-optimization/01.problem.optimize/README.mdx b/exercises/02.state-optimization/01.problem.optimize/README.mdx
@@ -3,6 +3,7 @@
 {/* prettier-ignore */}
 <callout-info>
 We're going to be working with the URL, so you'll want to pull this one up in
+
 <a target="_blank" href="/app/playground">a separate tab</a>.
 </callout-info>
 

diff --git a/exercises/02.state-optimization/README.mdx b/exercises/02.state-optimization/README.mdx
@@ -19,7 +19,7 @@ const [state, setState] = useState({ count: 0 })
 // ...
 setState({ count: 0 }) // <-- will trigger a rerender
 setState(previousState => ({
-	count: previousState.count
+	count: previousState.count,
 })) // <-- will trigger a rerender
 setState(previousState => previousState) // <-- will not trigger a rerender
 ```

diff --git a/exercises/05.portals/01.problem.create/posts.tsx b/exercises/05.portals/01.problem.create/posts.tsx
@@ -1,11 +1,11 @@
 import { useState } from 'react'
-import { getQueryParam, useSearchParams } from './params'
-import { ButtonWithTooltip } from './tooltip'
 import {
 	type BlogPost,
 	generateGradient,
 	getMatchingPosts,
 } from '#shared/blog-posts'
+import { getQueryParam, useSearchParams } from './params'
+import { ButtonWithTooltip } from './tooltip'
 
 export function MatchingPosts() {
 	const [searchParams] = useSearchParams()

diff --git a/exercises/05.portals/01.solution.create/posts.tsx b/exercises/05.portals/01.solution.create/posts.tsx
@@ -1,11 +1,11 @@
 import { useState } from 'react'
-import { getQueryParam, useSearchParams } from './params'
-import { ButtonWithTooltip } from './tooltip'
 import {
 	type BlogPost,
 	generateGradient,
 	getMatchingPosts,
 } from '#shared/blog-posts'
+import { getQueryParam, useSearchParams } from './params'
+import { ButtonWithTooltip } from './tooltip'
 
 export function MatchingPosts() {
 	const [searchParams] = useSearchParams()

diff --git a/exercises/06.layout-computation/01.problem.layout-effect/posts.tsx b/exercises/06.layout-computation/01.problem.layout-effect/posts.tsx
@@ -1,11 +1,11 @@
 import { useState } from 'react'
-import { getQueryParam, useSearchParams } from './params'
-import { ButtonWithTooltip } from './tooltip'
 import {
 	type BlogPost,
 	generateGradient,
 	getMatchingPosts,
 } from '#shared/blog-posts'
+import { getQueryParam, useSearchParams } from './params'
+import { ButtonWithTooltip } from './tooltip'
 
 export function MatchingPosts() {
 	const [searchParams] = useSearchParams()

diff --git a/exercises/06.layout-computation/01.solution.layout-effect/posts.tsx b/exercises/06.layout-computation/01.solution.layout-effect/posts.tsx
@@ -1,11 +1,11 @@
 import { useState } from 'react'
-import { getQueryParam, useSearchParams } from './params'
-import { ButtonWithTooltip } from './tooltip'
 import {
 	type BlogPost,
 	generateGradient,
 	getMatchingPosts,
 } from '#shared/blog-posts'
+import { getQueryParam, useSearchParams } from './params'
+import { ButtonWithTooltip } from './tooltip'
 
 export function MatchingPosts() {
 	const [searchParams] = useSearchParams()