upstream #1

Merged
jblu merged 1007 commits from upstream into main 2024-11-04 22:35:57 -06:00
5 changed files with 8 additions and 68 deletions
Showing only changes of commit a3085fbc06 - Show all commits

View File

@ -5,7 +5,6 @@
"@/components/*": ["components/*"], "@/components/*": ["components/*"],
"@/data/*": ["data/*"], "@/data/*": ["data/*"],
"@/layouts/*": ["layouts/*"], "@/layouts/*": ["layouts/*"],
"@/lib/*": ["lib/*"],
"@/css/*": ["css/*"], "@/css/*": ["css/*"],
"contentlayer/generated": ["./.contentlayer/generated"] "contentlayer/generated": ["./.contentlayer/generated"]
} }

View File

@ -63,7 +63,7 @@ module.exports = () => {
reactStrictMode: true, reactStrictMode: true,
pageExtensions: ['ts', 'tsx', 'js', 'jsx', 'md', 'mdx'], pageExtensions: ['ts', 'tsx', 'js', 'jsx', 'md', 'mdx'],
eslint: { eslint: {
dirs: ['pages', 'components', 'lib', 'layouts', 'scripts'], dirs: ['app', 'components', 'layouts', 'scripts'],
}, },
experimental: { experimental: {
appDir: true, appDir: true,

View File

@ -12,7 +12,6 @@ module.exports = {
'./pages/**/*.{js,ts,tsx}', './pages/**/*.{js,ts,tsx}',
'./components/**/*.{js,ts,tsx}', './components/**/*.{js,ts,tsx}',
'./layouts/**/*.{js,ts,tsx}', './layouts/**/*.{js,ts,tsx}',
'./lib/**/*.{js,ts,tsx}',
'./data/**/*.mdx', './data/**/*.mdx',
], ],
darkMode: 'class', darkMode: 'class',

View File

@ -2,11 +2,7 @@
"compilerOptions": { "compilerOptions": {
"incremental": true, "incremental": true,
"target": "ES6", "target": "ES6",
"lib": [ "lib": ["dom", "dom.iterable", "esnext"],
"dom",
"dom.iterable",
"esnext"
],
"allowJs": true, "allowJs": true,
"skipLibCheck": true, "skipLibCheck": true,
"strict": false, "strict": false,
@ -21,24 +17,11 @@
"jsx": "preserve", "jsx": "preserve",
"baseUrl": ".", "baseUrl": ".",
"paths": { "paths": {
"@/components/*": [ "@/components/*": ["components/*"],
"components/*" "@/data/*": ["data/*"],
], "@/layouts/*": ["layouts/*"],
"@/data/*": [ "@/css/*": ["css/*"],
"data/*" "contentlayer/generated": ["./.contentlayer/generated"]
],
"@/layouts/*": [
"layouts/*"
],
"@/lib/*": [
"lib/*"
],
"@/css/*": [
"css/*"
],
"contentlayer/generated": [
"./.contentlayer/generated"
]
}, },
"plugins": [ "plugins": [
{ {
@ -56,7 +39,5 @@
".contentlayer/generated/**/*.json", ".contentlayer/generated/**/*.json",
".next/types/**/*.ts" ".next/types/**/*.ts"
], ],
"exclude": [ "exclude": ["node_modules"]
"node_modules"
]
} }

View File

@ -1,39 +0,0 @@
// Needed to resolve path reference to type check recipes
// Can be deleted if you are cloning the app
{
"compilerOptions": {
"incremental": true,
"target": "ES6",
"lib": ["dom", "dom.iterable", "esnext"],
"allowJs": true,
"skipLibCheck": true,
"strict": false,
"forceConsistentCasingInFileNames": true,
"emitDeclarationOnly": true,
"composite": true,
"esModuleInterop": true,
"module": "esnext",
"moduleResolution": "node",
"resolveJsonModule": true,
"isolatedModules": true,
"jsx": "preserve",
"baseUrl": ".",
"paths": {
"@/components/*": ["components/*"],
"@/data/*": ["data/*"],
"@/layouts/*": ["layouts/*"],
"@/lib/*": ["lib/*"],
"@/css/*": ["css/*"],
"contentlayer/generated": ["./.contentlayer/generated"]
}
},
"include": [
"next-env.d.ts",
"**/*.js",
"**/*.ts",
"**/*.tsx",
".contentlayer/generated",
".contentlayer/generated/**/*.json"
],
"exclude": ["node_modules"]
}