Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,7 @@
"editor.formatOnSave": true,
"prettier.requireConfig": true,
"prettier.prettierPath": "./node_modules/prettier",
"editor.defaultFormatter": "esbenp.prettier-vscode"
"editor.defaultFormatter": "esbenp.prettier-vscode",
"eslint.useFlatConfig": true,
"eslint.workingDirectories": [{ "mode": "auto" }]
}
16 changes: 16 additions & 0 deletions apps/obsidian/eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import { config } from "@repo/eslint-config/react-internal";

export default [
...config,
{
languageOptions: {
parserOptions: {
tsconfigRootDir: ".",
project: true,
ecmaFeatures: {
jsx: true,
},
},
},
},
];
12 changes: 6 additions & 6 deletions apps/obsidian/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,30 +7,30 @@
"scripts": {
"dev": "tsx scripts/dev.ts",
"build": "tsx scripts/build.ts",
"lint": "eslint .",
"lint:fix": "eslint . --fix",
"publish": "tsx scripts/publish-obsidian.ts"
},
"keywords": [],
"author": "",
"license": "Apache-2.0",
"devDependencies": {
"@octokit/core": "^6.1.2",
"@types/node": "^16.11.6",
"@typescript-eslint/eslint-plugin": "5.29.0",
"@typescript-eslint/parser": "5.29.0",
"@types/node": "^20",
"autoprefixer": "^10.4.21",
"builtin-modules": "3.3.0",
"dotenv": "^16.4.5",
"esbuild": "0.17.3",
"obsidian": "^1.7.2",
"postcss": "^8.5.3",
"tailwindcss": "^3.4.17",
"tslib": "2.4.0",
"tslib": "2.5.1",
"tsx": "^4.19.2",
"typescript": "4.7.4"
"typescript": "5.5.4"
},
"dependencies": {
"react": "^19.0.0",
"react-dom": "^19.0.0",
"tailwindcss-animate": "^1.0.7"
}
}
}
8 changes: 3 additions & 5 deletions apps/obsidian/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,18 +1,16 @@
{
"extends": "@repo/typescript-config/react-library.json",
"include": ["**/*.ts"],
"compilerOptions": {
"baseUrl": ".",
"rootDir": ".",
"inlineSourceMap": true,
"inlineSources": true,
"module": "ESNext",
"target": "ES6",
"allowJs": true,
"noImplicitAny": true,
"moduleResolution": "node",
"importHelpers": true,
"isolatedModules": true,
"strictNullChecks": true,
"lib": ["DOM", "ES5", "ES6", "ES7"]
},
"include": ["**/*.ts"]
}
}
18 changes: 18 additions & 0 deletions apps/roam/eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import { config } from "@repo/eslint-config/react-internal";

// console.log(config.map((x)=>(x.languageOptions || {}).parserOptions));

export default [
...config,
{
languageOptions: {
parserOptions: {
tsconfigRootDir: ".",
project: true,
ecmaFeatures: {
jsx: true,
},
},
},
},
];
2 changes: 2 additions & 0 deletions apps/roam/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
"dev": "tsx scripts/dev.ts",
"build": "tsx scripts/build.ts",
"deploy": "tsx scripts/deploy.ts",
"lint": "eslint .",
"lint:fix": "eslint . --fix",
"publish": "tsx scripts/publish.ts"
},
"license": "Apache-2.0",
Expand Down
7 changes: 1 addition & 6 deletions apps/roam/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,11 @@
{
"include": ["src", "src/types.d.ts", "tailwind.config.ts", "tests"],
"exclude": ["node_modules"],
"extends": "@repo/typescript-config/react-library.json",
"include": ["src", "src/types.d.ts", "tailwind.config.ts", "tests", "scripts"],
"compilerOptions": {
"baseUrl": ".",
"outDir": "dist",
"target": "ESNext",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am nervous about removing these settings as they were inherited from the original Query Builder and have sweeping ramifications to compile, build, and dev.

I ran a few local and manual tests, so far everything seems to check out, so I won't block on this.

"lib": ["DOM", "DOM.Iterable", "ESNext"],
"allowJs": false,
"esModuleInterop": false,
"module": "ESNext",
"moduleResolution": "Node",
"forceConsistentCasingInFileNames": true,
"jsx": "react",
"noUncheckedIndexedAccess": false
Expand Down
9 changes: 0 additions & 9 deletions apps/website/.eslintrc.js

This file was deleted.

20 changes: 20 additions & 0 deletions apps/website/eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import { nextJsConfig } from "@repo/eslint-config/next-js";

export default [
...nextJsConfig,
// additions
{
languageOptions: {
parserOptions: {
tsconfigRootDir: ".",
project: true,
ecmaFeatures: {
jsx: true,
},
},
},
},
{
ignores: [".next/**"],
},
];
File renamed without changes.
10 changes: 6 additions & 4 deletions apps/website/package.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
{
"name": "website",
"version": "0.1.0",
"description": "https://discoursegraphs.com NextJs Website",
"private": true,
"description": "https://discoursegraphs.com NextJs Website",
"license": "Apache-2.0",
"scripts": {
"dev": "next dev",
"build": "next build",
"dev": "next dev --turbopack --port 3000",
"build": "next build --no-lint",
"start": "next start",
"lint": "next lint"
"lint": "eslint .",
"lint:fix": "eslint . --fix",
"check-types": "tsc --noEmit"
},
"dependencies": {
"@repo/types": "*",
Expand Down
10 changes: 3 additions & 7 deletions apps/website/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,18 @@
"extends": "@repo/typescript-config/nextjs.json",
"compilerOptions": {
"baseUrl": ".",
"rootDir": ".",
"paths": {
"~/*": ["./app/*"]
},
"plugins": [
{
"name": "next"
}
]
},
"include": [
"next-env.d.ts",
"next.config.mjs",
"next.config.ts",
"**/*.ts",
"**/*.tsx",
"scripts/*tx",
".next/types/**/*.ts",
"postcss.config.mjs"
],
"exclude": ["node_modules"]
}
29 changes: 29 additions & 0 deletions discourse-graph.code-workspace
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{
"folders": [
{
"path": ".",
},
{
"path": "./apps/obsidian",
},
{
"path": "./apps/roam",
},
{
"path": "./apps/website",
},
{
"path": "./packages/database",
},
{
"path": "./packages/ui",
},
],
"settings": {
"files.watcherExclude": {
"**/target": true,
"**/dist": true,
"**/next": true,
},
},
}
Loading