Skip to content

Commit

Permalink
Merge branch 'dev' into logan/bump-esbuild-auto-jsx-transform
Browse files Browse the repository at this point in the history
  • Loading branch information
mcansh authored Aug 3, 2022
2 parents 11d7d72 + 9701077 commit 368752f
Show file tree
Hide file tree
Showing 14 changed files with 29 additions and 14 deletions.
3 changes: 2 additions & 1 deletion packages/create-remix/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"exclude": ["dist", "__tests__"],
"include": ["**/*.ts"],
"exclude": ["dist", "**/node_modules/**"],
"compilerOptions": {
"lib": ["ES2019"],
"target": "ES2019",
Expand Down
4 changes: 3 additions & 1 deletion packages/remix-architect/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
{
"exclude": ["dist", "__tests__"],
"include": ["**/*.ts"],
"exclude": ["dist", "__tests__", "node_modules"],
"compilerOptions": {
"lib": ["ES2019", "DOM.Iterable"],
"target": "ES2019",
"skipLibCheck": true,

"moduleResolution": "node",
"allowSyntheticDefaultImports": true,
Expand Down
2 changes: 1 addition & 1 deletion packages/remix-cloudflare-pages/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"include": ["**/*.ts"],
"exclude": ["dist", "__tests__"],
"exclude": ["dist", "__tests__", "node_modules"],
"compilerOptions": {
"lib": ["ES2019"],
"target": "ES2019",
Expand Down
2 changes: 1 addition & 1 deletion packages/remix-cloudflare-workers/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"include": ["**/*.ts"],
"exclude": ["dist", "__tests__"],
"exclude": ["dist", "__tests__", "node_modules"],
"compilerOptions": {
"lib": ["ES2019"],
"target": "ES2019",
Expand Down
2 changes: 1 addition & 1 deletion packages/remix-cloudflare/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"include": ["**/*.ts"],
"exclude": ["dist", "__tests__"],
"exclude": ["dist", "__tests__", "node_modules"],
"compilerOptions": {
"lib": ["ES2019"],
"target": "ES2019",
Expand Down
2 changes: 1 addition & 1 deletion packages/remix-dev/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"exclude": ["dist", "__tests__", "./compiler/shims"],
"exclude": ["dist", "__tests__", "node_modules", "./compiler/shims"],
"compilerOptions": {
"lib": ["ES2019", "DOM.Iterable"],
"target": "ES2019",
Expand Down
3 changes: 2 additions & 1 deletion packages/remix-express/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"exclude": ["dist", "__tests__"],
"include": ["**/*.ts"],
"exclude": ["dist", "__tests__", "node_modules"],
"compilerOptions": {
"lib": ["ES2019", "DOM.Iterable"],
"target": "ES2019",
Expand Down
3 changes: 2 additions & 1 deletion packages/remix-netlify/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
{
"exclude": ["dist", "__tests__"],
"exclude": ["dist", "__tests__", "node_modules"],
"compilerOptions": {
"lib": ["ES2019", "DOM.Iterable"],
"target": "ES2019",
"skipLibCheck": true,

"moduleResolution": "node",
"allowSyntheticDefaultImports": true,
Expand Down
3 changes: 2 additions & 1 deletion packages/remix-node/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"exclude": ["dist", "__tests__"],
"include": ["**/*.ts"],
"exclude": ["dist", "__tests__", "node_modules"],
"compilerOptions": {
"lib": ["ES2019", "DOM.Iterable"],
"target": "ES2019",
Expand Down
4 changes: 3 additions & 1 deletion packages/remix-react/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
{
"exclude": ["dist", "__tests__"],
"include": ["**/*.ts", "**/*.tsx"],
"exclude": ["dist", "__tests__", "node_modules"],
"compilerOptions": {
"lib": ["DOM", "DOM.Iterable", "ES2020"],
"target": "ES2020",
"module": "ES2020",
"skipLibCheck": true,

"moduleResolution": "node",
"allowSyntheticDefaultImports": true,
Expand Down
4 changes: 3 additions & 1 deletion packages/remix-serve/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
{
"exclude": ["dist", "__tests__"],
"include": ["**/*.ts"],
"exclude": ["dist", "__tests__", "node_modules"],
"compilerOptions": {
"lib": ["ES2019", "DOM.Iterable"],
"target": "ES2019",
"skipLibCheck": true,

"moduleResolution": "node",
"allowSyntheticDefaultImports": true,
Expand Down
3 changes: 2 additions & 1 deletion packages/remix-server-runtime/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"exclude": ["dist", "__tests__"],
"include": ["**/*.ts"],
"exclude": ["dist", "__tests__", "node_modules"],
"compilerOptions": {
"lib": ["ES2019", "DOM", "DOM.Iterable"],
"target": "ES2019",
Expand Down
4 changes: 3 additions & 1 deletion packages/remix-vercel/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
{
"exclude": ["dist", "__tests__"],
"include": ["**/*.ts"],
"exclude": ["dist", "__tests__", "node_modules"],
"compilerOptions": {
"lib": ["ES2019", "DOM.Iterable"],
"target": "ES2019",
"skipLibCheck": true,

"moduleResolution": "node",
"allowSyntheticDefaultImports": true,
Expand Down
4 changes: 3 additions & 1 deletion packages/remix/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
{
"exclude": ["dist", "__tests__"],
"include": ["**/*.ts"],
"exclude": ["dist", "__tests__", "node_modules"],
"compilerOptions": {
"lib": ["DOM", "DOM.Iterable", "ES2020"],
"target": "ES2020",
"module": "ES2020",
"skipLibCheck": true,

"jsx": "react",
"moduleResolution": "node",
Expand Down

0 comments on commit 368752f

Please sign in to comment.