Skip to content

Commit

Permalink
Use TSConfig base, fix CI and lints, rename ui dir
Browse files Browse the repository at this point in the history
  • Loading branch information
retrixe committed Nov 24, 2023
1 parent 4de6684 commit 7314628
Show file tree
Hide file tree
Showing 8 changed files with 17 additions and 19 deletions.
4 changes: 2 additions & 2 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module.exports = {
root: true,
env: {
es2024: true,
browser: true
browser: true,
},
extends: [
'plugin:react/recommended',
Expand All @@ -20,5 +20,5 @@ module.exports = {
'react/no-unknown-property': ['error', { ignore: ['css'] }],
// Make TypeScript ESLint less strict.
'@typescript-eslint/no-confusing-void-expression': 'off',
}
},
}
1 change: 1 addition & 0 deletions .github/workflows/go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ jobs:

- name: Get dependencies
run: |
corepack enable
yarn install --immutable
go get -v -t -d ./...
Expand Down
2 changes: 1 addition & 1 deletion .prettierrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ module.exports = {
singleQuote: true,
semi: false,
jsxSingleQuote: true,
};
}
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"build:go:default": "go build -ldflags=\"-s -w\" -o writer -v",
"build:go:windows": "go build -ldflags=\"-s -w -H windowsgui\" -o writer.exe -v",
"build:launcher": "go build -tags launcher -ldflags=\"-s -w\" -o launcher.exe -v launcher_windows.go",
"build:js": "parcel build ui/index.tsx"
"build:js": "parcel build renderer/index.tsx"
},
"packageManager": "[email protected]",
"dependencies": {
Expand All @@ -46,6 +46,7 @@
"devDependencies": {
"@babel/core": "^7.23.3",
"@emotion/babel-plugin": "^11.11.0",
"@tsconfig/vite-react": "^2.0.1",
"@types/react": "^18.2.38",
"@types/react-dom": "^18.2.17",
"@typescript-eslint/eslint-plugin": "^6.12.0",
Expand Down
File renamed without changes.
File renamed without changes.
18 changes: 3 additions & 15 deletions tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,19 +1,7 @@
{
"extends": "@tsconfig/vite-react",
"compilerOptions": {
"strict": true,
"skipLibCheck": true,
"isolatedModules": true,
"jsxImportSource": "@emotion/react",
"jsx": "react-jsx",
"lib": [
"ES5",
"ES2015",
"ES2020.BigInt",
"DOM",
],
"jsxImportSource": "@emotion/react"
},
"include": [
"ui/**/*",
"ui/index.d.ts"
],
"include": ["renderer/**/*", "renderer/index.d.ts"]
}
8 changes: 8 additions & 0 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2256,6 +2256,13 @@ __metadata:
languageName: node
linkType: hard

"@tsconfig/vite-react@npm:^2.0.1":
version: 2.0.1
resolution: "@tsconfig/vite-react@npm:2.0.1"
checksum: 5715563bf293484c8b5ad36a0328159b11de9bde507b96dcde1d72243d02dcd8eb0383c1676e319cfb03e8f79d96891103d480c7157177f4d7a0b368ede4a46d
languageName: node
linkType: hard

"@types/json-schema@npm:^7.0.12":
version: 7.0.15
resolution: "@types/json-schema@npm:7.0.15"
Expand Down Expand Up @@ -6824,6 +6831,7 @@ __metadata:
"@emotion/styled": "npm:^11.11.0"
"@mui/material": "npm:^5.14.18"
"@swc/helpers": "npm:^0.5.3"
"@tsconfig/vite-react": "npm:^2.0.1"
"@types/react": "npm:^18.2.38"
"@types/react-dom": "npm:^18.2.17"
"@typescript-eslint/eslint-plugin": "npm:^6.12.0"
Expand Down

0 comments on commit 7314628

Please sign in to comment.