Skip to content

Commit

Permalink
Fix tsconfig in and eslint in basic
Browse files Browse the repository at this point in the history
  • Loading branch information
jaredpalmer committed Dec 7, 2021
1 parent e9c7139 commit 3afd631
Show file tree
Hide file tree
Showing 9 changed files with 23 additions and 59 deletions.
3 changes: 2 additions & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,5 @@ dist
*.npmignore
apps/docs/nextra-theme-turbo/
app/node_modules/
data
data
examples
2 changes: 1 addition & 1 deletion examples/basic/config/eslint-preset.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module.exports = {
extends: ["next", "prettier"],
settings: {
next: {
rootDir: ["docs/", "ui/", "web/", "config/"],
rootDir: ["docs/", "ui/", "web/", "config/", "tsconfig/"],
},
},
};
3 changes: 2 additions & 1 deletion examples/basic/docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,9 @@
},
"devDependencies": {
"eslint": "7.32.0",
"tsconfig": "*",
"config": "*",
"next-transpile-modules": "^9.0.0",
"typescript": "^4.4.4"
"typescript": "^4.5.2"
}
}
31 changes: 3 additions & 28 deletions examples/basic/docs/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,30 +1,5 @@
{
"compilerOptions": {
"target": "es5",
"lib": [
"dom",
"dom.iterable",
"esnext"
],
"allowJs": true,
"skipLibCheck": true,
"strict": false,
"forceConsistentCasingInFileNames": true,
"noEmit": true,
"incremental": true,
"esModuleInterop": true,
"module": "esnext",
"moduleResolution": "node",
"resolveJsonModule": true,
"isolatedModules": true,
"jsx": "preserve"
},
"include": [
"next-env.d.ts",
"**/*.ts",
"**/*.tsx"
],
"exclude": [
"node_modules"
]
"extends": "tsconfig/nextjs.json",
"include": ["next-env.d.ts", "**/*.ts", "**/*.tsx"],
"exclude": ["node_modules"]
}
4 changes: 3 additions & 1 deletion examples/basic/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,11 @@
"docs",
"web",
"ui",
"config"
"config",
"tsconfig"
],
"devDependencies": {
"prettier": "^2.5.1",
"turbo": "latest"
},
"turbo": {
Expand Down
7 changes: 5 additions & 2 deletions examples/basic/tsconfig/nextjs.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,16 @@
"lib": ["dom", "dom.iterable", "esnext"],
"allowJs": true,
"skipLibCheck": true,
"strict": false,
"forceConsistentCasingInFileNames": true,
"noEmit": true,
"incremental": true,
"esModuleInterop": true,
"module": "esnext",
"moduleResolution": "node",
"resolveJsonModule": true,
"isolatedModules": true,
"jsx": "preserve",
"rootDir": "src"
"jsx": "preserve"
},
"include": ["src", "next-env.d.ts"],
"exclude": ["node_modules"]
Expand Down
8 changes: 3 additions & 5 deletions examples/basic/tsconfig/package.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
{
"name": "tsconfig",
"version": "0.0.0",
"license": "BUSL-1.1",
"private": true,
"main": "index.js",
"publishConfig": {
"access": "public"
},
"files": [
"base.json",
"nextjs.json"
"nextjs.json",
"react-library.json"
]
}
6 changes: 3 additions & 3 deletions examples/basic/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
"react-dom": "17.0.2"
},
"devDependencies": {
"eslint": "7.32.0",
"config": "*",
"tsconfig": "*",
"eslint": "7.32.0",
"next-transpile-modules": "^9.0.0",
"typescript": "^4.4.4"
"tsconfig": "*",
"typescript": "^4.5.2"
}
}
18 changes: 1 addition & 17 deletions examples/basic/web/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,21 +1,5 @@
{
"extends": "tsconfig/next.json",
"compilerOptions": {
"target": "es5",
"lib": ["dom", "dom.iterable", "esnext"],
"allowJs": true,
"skipLibCheck": true,
"strict": false,
"forceConsistentCasingInFileNames": true,
"noEmit": true,
"incremental": true,
"esModuleInterop": true,
"module": "esnext",
"moduleResolution": "node",
"resolveJsonModule": true,
"isolatedModules": true,
"jsx": "preserve"
},
"extends": "tsconfig/nextjs.json",
"include": ["next-env.d.ts", "**/*.ts", "**/*.tsx"],
"exclude": ["node_modules"]
}

0 comments on commit 3afd631

Please sign in to comment.