Skip to content

Commit

Permalink
merge fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
dreamwasp committed Oct 31, 2024
2 parents a80b77c + 9759710 commit 514af38
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 12 deletions.
2 changes: 1 addition & 1 deletion packages/styleguide/tsconfig.storybook.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,5 @@
".storybook/*.js",
".storybook/*.ts",
"../../packages/gamut-styles/dist/typings/theme.d.ts"
]
]
}
7 changes: 1 addition & 6 deletions tsconfig.base.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"compileOnSave": false,
"compilerOptions": {
"allowSyntheticDefaultImports": true,
"baseUrl": ".",
"declaration": false,
"emitDecoratorMetadata": true,
"esModuleInterop": true,
Expand All @@ -20,9 +19,5 @@
"strict": true,
"target": "esnext"
},
"exclude": ["**/node_modules", "tmp"],
"paths": {
"@codecademy/variance": ["packages/variance/src/index.ts"],
"@codecademy/gamut-styles": ["packages/gamut-styles/src/index.ts"],
}
"exclude": ["**/node_modules", "tmp"]
}
5 changes: 0 additions & 5 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,5 @@
"jsx": "react-jsx",
"baseUrl": ".",
"paths": {}
},
"ts-node": {
"compilerOptions": {
"module": "commonjs"
}
}
}

0 comments on commit 514af38

Please sign in to comment.