From fef4242ea46aa963bb0348707dac37948e10af22 Mon Sep 17 00:00:00 2001 From: Antonette Caldwell Date: Sun, 10 Dec 2023 12:02:39 -0600 Subject: [PATCH] chore(repo): Remove tsconfig, and configure tsconfig in root fix #408 Signed-off-by: Antonette Caldwell --- package.json | 1 - packages/components/package.json | 1 - packages/components/tsconfig.json | 16 ++-------- packages/svg/package.json | 1 - packages/svg/tsconfig.json | 16 ++-------- packages/tsconfig/README.md | 1 - packages/tsconfig/base.json | 21 ------------- packages/tsconfig/package.json | 7 ----- packages/tsconfig/react-app.json | 18 ----------- packages/tsconfig/react-library.json | 12 -------- tsconfig.json | 45 ++++++++++++++++++++++++++++ yarn.lock | 9 ------ 12 files changed, 49 insertions(+), 99 deletions(-) delete mode 100644 packages/tsconfig/README.md delete mode 100644 packages/tsconfig/base.json delete mode 100644 packages/tsconfig/package.json delete mode 100644 packages/tsconfig/react-app.json delete mode 100644 packages/tsconfig/react-library.json create mode 100644 tsconfig.json diff --git a/package.json b/package.json index e6fe45dc..1cfa847e 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,6 @@ "lint-staged": "^14.0.1", "prettier": "^3.0.3", "prettier-plugin-organize-imports": "^3.2.3", - "tsconfig": "workspace:^", "typescript": "^5.2.2" }, "packageManager": "yarn@3.6.3" diff --git a/packages/components/package.json b/packages/components/package.json index 80bde82d..33307545 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -40,7 +40,6 @@ "eslint-plugin-react": "^7.33.2", "mui-datatables": "^4.3.0", "notistack": "^3.0.1", - "tsconfig": "workspace:^", "tsup": "^7.2.0", "typescript": "^5.0.2" }, diff --git a/packages/components/tsconfig.json b/packages/components/tsconfig.json index e441fd9f..2e67759a 100644 --- a/packages/components/tsconfig.json +++ b/packages/components/tsconfig.json @@ -1,15 +1,3 @@ { - "extends": "tsconfig/react-library.json", - "compilerOptions": { - "declarationMap": true, - "emitDeclarationOnly": true, - "typeRoots": ["./src/types"], - "types": ["react-error-boundary"], - "lib": ["es2020", "DOM"], - "target": "es2020", - "module": "esnext" - }, - "include": ["."], - "exclude": ["dist", "build", "node_modules", "**/*.d.ts", "tsup.config.ts"] - } - \ No newline at end of file + "extends": ["../../tsconfig.json"] +} \ No newline at end of file diff --git a/packages/svg/package.json b/packages/svg/package.json index 5ee3ffab..03ba1558 100644 --- a/packages/svg/package.json +++ b/packages/svg/package.json @@ -26,7 +26,6 @@ "eslint-plugin-react": "^7.33.2", "eslint-plugin-react-hooks": "^4.6.0", "eslint-plugin-react-refresh": "^0.4.3", - "tsconfig": "workspace:^", "tsup": "^7.2.0", "typescript": "^5.0.2" }, diff --git a/packages/svg/tsconfig.json b/packages/svg/tsconfig.json index 730b3775..2e67759a 100644 --- a/packages/svg/tsconfig.json +++ b/packages/svg/tsconfig.json @@ -1,15 +1,3 @@ { - "extends": "tsconfig/react-library.json", - "compilerOptions": { - "baseUrl": ".", - "paths": { - "base": ["src/base/*"], - "custom": ["src/custom/*"] - }, - "declarationMap": true, - "emitDeclarationOnly": true - }, - "include": ["."], - "exclude": ["dist", "build", "node_modules", "**/*.d.ts", "tsup.config.ts"] - } - \ No newline at end of file + "extends": ["../../tsconfig.json"] +} \ No newline at end of file diff --git a/packages/tsconfig/README.md b/packages/tsconfig/README.md deleted file mode 100644 index c953e068..00000000 --- a/packages/tsconfig/README.md +++ /dev/null @@ -1 +0,0 @@ -# tsconfig diff --git a/packages/tsconfig/base.json b/packages/tsconfig/base.json deleted file mode 100644 index 1c5c44b3..00000000 --- a/packages/tsconfig/base.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "$schema": "https://json.schemastore.org/tsconfig", - "display": "Default", - "compilerOptions": { - "composite": false, - "declaration": true, - "declarationMap": true, - "esModuleInterop": true, - "forceConsistentCasingInFileNames": true, - "inlineSources": false, - "isolatedModules": true, - "moduleResolution": "node", - "noUnusedLocals": false, - "noUnusedParameters": false, - "preserveWatchOutput": true, - "skipLibCheck": true, - "strict": true - }, - "exclude": ["node_modules"] - } - \ No newline at end of file diff --git a/packages/tsconfig/package.json b/packages/tsconfig/package.json deleted file mode 100644 index 9bd06bce..00000000 --- a/packages/tsconfig/package.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "tsconfig", - "version": "0.0.0", - "private": true, - "license": "MIT", - "packageManager": "yarn@3.6.3" -} diff --git a/packages/tsconfig/react-app.json b/packages/tsconfig/react-app.json deleted file mode 100644 index 032dbf2b..00000000 --- a/packages/tsconfig/react-app.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "$schema": "https://json.schemastore.org/tsconfig", - "display": "Next.js", - "extends": "./base.json", - "compilerOptions": { - "allowJs": true, - "declaration": false, - "declarationMap": false, - "incremental": true, - "jsx": "preserve", - "lib": ["dom", "dom.iterable", "esnext"], - "module": "esnext", - "noEmit": true, - "resolveJsonModule": true, - "target": "es5" - } - } - \ No newline at end of file diff --git a/packages/tsconfig/react-library.json b/packages/tsconfig/react-library.json deleted file mode 100644 index 2275c897..00000000 --- a/packages/tsconfig/react-library.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "$schema": "https://json.schemastore.org/tsconfig", - "display": "React Library", - "extends": "./base.json", - "compilerOptions": { - "jsx": "react-jsx", - "lib": ["dom", "ES2015"], - "module": "ESNext", - "target": "es6" - } - } - \ No newline at end of file diff --git a/tsconfig.json b/tsconfig.json new file mode 100644 index 00000000..bf4e6655 --- /dev/null +++ b/tsconfig.json @@ -0,0 +1,45 @@ +{ + "compilerOptions": { + "target": "ESNext", + "module": "ESNext", + "lib": [ + "DOM", + "ESNext" + ], + "declaration": true, + "sourceMap": true, + "moduleResolution": "Node", + "experimentalDecorators": true, + "skipLibCheck": true, + "strict": true, + "isolatedModules": true, + "noFallthroughCasesInSwitch": true, + "jsx": "react-jsx", + "esModuleInterop": true, + "resolveJsonModule": true, + "allowSyntheticDefaultImports": true, + "importHelpers": true, + "baseUrl": ".", + "paths": { + "@layer5/sistent-components": [ + "packages/components" + ], + "@layer5/eslint-config-sistent": [ + "packages/eslint-config-sistent" + ], + "@layer5/rtk-query-codegen": [ + "rtk-query-codegen" + ], + "@layer5/sistent-svg": [ + "packages/svg" + ], + } + }, + "include": [ + "." + ], + "exclude": [ + "**/node_modules", + "**/dist" + ] +} \ No newline at end of file diff --git a/yarn.lock b/yarn.lock index 02e2b784..6386f55b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -954,7 +954,6 @@ __metadata: notistack: ^3.0.1 react: ^17.0.0 || ^18.0.0 react-dom: ^17.0.0 || ^18.0.0 - tsconfig: "workspace:^" tsup: ^7.2.0 typescript: ^5.0.2 peerDependencies: @@ -1025,7 +1024,6 @@ __metadata: eslint-plugin-react-refresh: ^0.4.3 react: ^17.0.0 || ^18.0.0 react-dom: ^17.0.0 || ^18.0.0 - tsconfig: "workspace:^" tsup: ^7.2.0 typescript: ^5.0.2 peerDependencies: @@ -9694,7 +9692,6 @@ __metadata: lint-staged: ^14.0.1 prettier: ^3.0.3 prettier-plugin-organize-imports: ^3.2.3 - tsconfig: "workspace:^" typescript: ^5.2.2 languageName: unknown linkType: soft @@ -10379,12 +10376,6 @@ __metadata: languageName: node linkType: hard -"tsconfig@workspace:^, tsconfig@workspace:packages/tsconfig": - version: 0.0.0-use.local - resolution: "tsconfig@workspace:packages/tsconfig" - languageName: unknown - linkType: soft - "tslib@npm:^1.8.1": version: 1.14.1 resolution: "tslib@npm:1.14.1"