Skip to content
Open
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
8 changes: 8 additions & 0 deletions config/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"private": true,
"name": "@remix-run/config",
Copy link
Member

Choose a reason for hiding this comment

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

Let's call this package @remix-run/tsconfig and keep it in the packages dir (even tho it's private) like everything else.

"devDependencies": {
"@tsconfig/node22": "^22.0.5",
"@tsconfig/node-ts": "^23.6.2"
}
}
6 changes: 6 additions & 0 deletions config/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"extends": ["@tsconfig/node22/tsconfig.json", "@tsconfig/node-ts/tsconfig.json"],
Copy link
Member

Choose a reason for hiding this comment

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

Unless you feel strongly about this, I don't see a ton of value in extending these configs. They are small, and we have gotten this far without them. Let's just copy out the pieces we need and own this piece ourselves. I think we already had most of them in our own tsconfigs.

"compilerOptions": {
"lib": ["ES2024", "DOM", "DOM.Iterable"]
}
}
1 change: 1 addition & 0 deletions packages/async-context-middleware/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
}
},
"devDependencies": {
"@remix-run/config": "workspace:*",
"@remix-run/fetch-router": "workspace:*",
"@types/node": "catalog:",
"@typescript/native-preview": "catalog:",
Expand Down
1 change: 0 additions & 1 deletion packages/async-context-middleware/tsconfig.build.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,3 @@
"include": ["src"],
"exclude": ["src/**/*.test.ts"]
}

12 changes: 1 addition & 11 deletions packages/async-context-middleware/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,3 @@
{
"compilerOptions": {
"strict": true,
"lib": ["ES2024", "DOM", "DOM.Iterable"],
"module": "ES2022",
"moduleResolution": "Bundler",
"target": "ESNext",
"allowImportingTsExtensions": true,
"rewriteRelativeImportExtensions": true,
"verbatimModuleSyntax": true
}
"extends": ["@remix-run/config/tsconfig.json"]
}

1 change: 1 addition & 0 deletions packages/compression-middleware/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
}
},
"devDependencies": {
"@remix-run/config": "workspace:*",
"@remix-run/fetch-router": "workspace:*",
"@remix-run/mime": "workspace:*",
"@remix-run/response": "workspace:*",
Expand Down
11 changes: 1 addition & 10 deletions packages/compression-middleware/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,3 @@
{
"compilerOptions": {
"strict": true,
"lib": ["ES2024", "DOM", "DOM.Iterable"],
"module": "ES2022",
"moduleResolution": "Bundler",
"target": "ESNext",
"allowImportingTsExtensions": true,
"rewriteRelativeImportExtensions": true,
"verbatimModuleSyntax": true
}
"extends": ["@remix-run/config/tsconfig.json"]
}
1 change: 1 addition & 0 deletions packages/cookie/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
}
},
"devDependencies": {
"@remix-run/config": "workspace:*",
"@types/node": "catalog:",
"@typescript/native-preview": "catalog:",
"typescript": "catalog:"
Expand Down
11 changes: 1 addition & 10 deletions packages/cookie/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,3 @@
{
"compilerOptions": {
"strict": true,
"lib": ["ES2024", "DOM", "DOM.Iterable"],
"module": "ES2022",
"moduleResolution": "Bundler",
"target": "ESNext",
"allowImportingTsExtensions": true,
"rewriteRelativeImportExtensions": true,
"verbatimModuleSyntax": true
}
"extends": ["@remix-run/config/tsconfig.json"]
}
1 change: 1 addition & 0 deletions packages/fetch-proxy/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
"@remix-run/headers": "workspace:^"
},
"devDependencies": {
"@remix-run/config": "workspace:*",
"@types/node": "catalog:",
"@typescript/native-preview": "catalog:",
"typescript": "catalog:"
Expand Down
11 changes: 1 addition & 10 deletions packages/fetch-proxy/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,3 @@
{
"compilerOptions": {
"strict": true,
"lib": ["ES2024", "DOM", "DOM.Iterable"],
"module": "ES2022",
"moduleResolution": "Bundler",
"target": "ESNext",
"allowImportingTsExtensions": true,
"rewriteRelativeImportExtensions": true,
"verbatimModuleSyntax": true
}
"extends": ["@remix-run/config/tsconfig.json"]
}
2 changes: 1 addition & 1 deletion packages/fetch-router/demos/bun/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"include": ["index.ts", "../../global.d.ts"],
"include": ["index.ts"],
"compilerOptions": {
"strict": true,
"lib": ["ES2024", "DOM", "DOM.Iterable"],
Expand Down
1 change: 1 addition & 0 deletions packages/fetch-router/demos/node/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"private": true,
"type": "module",
"dependencies": {
"@remix-run/config": "workspace:*",
"@remix-run/cookie": "workspace:*",
"@remix-run/fetch-router": "workspace:*",
"@remix-run/form-data-middleware": "workspace:*",
Expand Down
14 changes: 2 additions & 12 deletions packages/fetch-router/demos/node/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,4 @@
{
"include": ["server.ts", "../../global.d.ts"],
"compilerOptions": {
"strict": true,
"lib": ["ES2024", "DOM", "DOM.Iterable"],
"module": "ES2022",
"moduleResolution": "Bundler",
"target": "ESNext",
"allowImportingTsExtensions": true,
"rewriteRelativeImportExtensions": true,
"verbatimModuleSyntax": true,
"skipLibCheck": true
}
"extends": ["@remix-run/config/tsconfig.json"],
"include": ["server.ts"]
}
1 change: 1 addition & 0 deletions packages/fetch-router/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
}
},
"devDependencies": {
"@remix-run/config": "workspace:*",
"@remix-run/session": "workspace:*",
"@types/node": "catalog:",
"@typescript/native-preview": "catalog:",
Expand Down
11 changes: 1 addition & 10 deletions packages/fetch-router/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,4 @@
{
"compilerOptions": {
"strict": true,
"lib": ["ES2024", "DOM", "DOM.Iterable"],
"module": "ES2022",
"moduleResolution": "Bundler",
"target": "ESNext",
"allowImportingTsExtensions": true,
"rewriteRelativeImportExtensions": true,
"verbatimModuleSyntax": true
},
"extends": ["@remix-run/config/tsconfig.json"],
"exclude": ["demos"]
}
1 change: 1 addition & 0 deletions packages/file-storage/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
"@remix-run/lazy-file": "workspace:^"
},
"devDependencies": {
"@remix-run/config": "workspace:*",
"@remix-run/form-data-parser": "workspace:*",
"@types/node": "catalog:",
"@typescript/native-preview": "catalog:",
Expand Down
11 changes: 1 addition & 10 deletions packages/file-storage/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,3 @@
{
"compilerOptions": {
"strict": true,
"lib": ["ES2024", "DOM", "DOM.Iterable"],
"module": "ES2022",
"moduleResolution": "Bundler",
"target": "ESNext",
"allowImportingTsExtensions": true,
"rewriteRelativeImportExtensions": true,
"verbatimModuleSyntax": true
}
"extends": ["@remix-run/config/tsconfig.json"]
}
1 change: 1 addition & 0 deletions packages/form-data-middleware/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
}
},
"devDependencies": {
"@remix-run/config": "workspace:*",
"@remix-run/fetch-router": "workspace:*",
"@remix-run/form-data-parser": "workspace:*",
"@types/node": "catalog:",
Expand Down
12 changes: 1 addition & 11 deletions packages/form-data-middleware/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,3 @@
{
"compilerOptions": {
"strict": true,
"lib": ["ES2024", "DOM", "DOM.Iterable"],
"module": "ES2022",
"moduleResolution": "Bundler",
"target": "ESNext",
"allowImportingTsExtensions": true,
"rewriteRelativeImportExtensions": true,
"verbatimModuleSyntax": true
}
"extends": ["@remix-run/config/tsconfig.json"]
}

1 change: 1 addition & 0 deletions packages/form-data-parser/demos/node/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"private": true,
"type": "module",
"dependencies": {
"@remix-run/config": "workspace:*",
"@remix-run/file-storage": "workspace:^",
"@remix-run/form-data-parser": "workspace:^",
"@remix-run/multipart-parser": "workspace:^",
Expand Down
4 changes: 2 additions & 2 deletions packages/form-data-parser/demos/node/server.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import * as http from 'node:http'
import * as os from 'node:os'
import * as path from 'node:path'

import { LocalFileStorage } from '@remix-run/file-storage/local'
import { createFsFileStorage } from '@remix-run/file-storage/fs'
import {
MultipartParseError,
MaxFileSizeExceededError,
Expand All @@ -16,7 +16,7 @@ const PORT = 44100
const oneMb = 1024 * 1024
const maxFileSize = 10 * oneMb

const fileStorage = new LocalFileStorage(await fsp.mkdtemp(path.join(os.tmpdir(), 'uploads-')))
const fileStorage = createFsFileStorage(await fsp.mkdtemp(path.join(os.tmpdir(), 'uploads-')))

/** @type (file: File) => Promise<string> */
async function getDataUrl(file) {
Expand Down
7 changes: 2 additions & 5 deletions packages/form-data-parser/demos/node/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
{
"extends": ["@remix-run/config/tsconfig.json"],
"include": ["server.js"],
"compilerOptions": {
"allowJs": true,
"checkJs": true,
"module": "NodeNext",
"moduleResolution": "NodeNext",
"types": ["node"],
"noEmit": true,
"strict": true
"noEmit": true
}
}
1 change: 1 addition & 0 deletions packages/form-data-parser/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
"@remix-run/multipart-parser": "workspace:^"
},
"devDependencies": {
"@remix-run/config": "workspace:*",
"@types/node": "catalog:",
"@typescript/native-preview": "catalog:",
"typescript": "catalog:"
Expand Down
11 changes: 1 addition & 10 deletions packages/form-data-parser/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,4 @@
{
"compilerOptions": {
"strict": true,
"lib": ["ES2024", "DOM", "DOM.Iterable"],
"module": "ES2022",
"moduleResolution": "Bundler",
"target": "ESNext",
"allowImportingTsExtensions": true,
"rewriteRelativeImportExtensions": true,
"verbatimModuleSyntax": true
},
"extends": ["@remix-run/config/tsconfig.json"],
"exclude": ["demos"]
}
1 change: 1 addition & 0 deletions packages/fs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
"@remix-run/mime": "workspace:^"
},
"devDependencies": {
"@remix-run/config": "workspace:*",
"@types/node": "catalog:",
"@typescript/native-preview": "catalog:",
"typescript": "catalog:"
Expand Down
12 changes: 1 addition & 11 deletions packages/fs/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,3 @@
{
"compilerOptions": {
"strict": true,
"lib": ["ES2024", "DOM", "DOM.Iterable"],
"module": "ES2022",
"moduleResolution": "Bundler",
"target": "ESNext",
"allowImportingTsExtensions": true,
"rewriteRelativeImportExtensions": true,
"verbatimModuleSyntax": true
}
"extends": ["@remix-run/config/tsconfig.json"]
}

1 change: 1 addition & 0 deletions packages/headers/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
}
},
"devDependencies": {
"@remix-run/config": "workspace:*",
"@types/node": "catalog:",
"@typescript/native-preview": "catalog:",
"typescript": "catalog:"
Expand Down
11 changes: 1 addition & 10 deletions packages/headers/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,3 @@
{
"compilerOptions": {
"strict": true,
"lib": ["ES2024", "DOM", "DOM.Iterable"],
"module": "ES2022",
"moduleResolution": "Bundler",
"target": "ESNext",
"allowImportingTsExtensions": true,
"rewriteRelativeImportExtensions": true,
"verbatimModuleSyntax": true
}
"extends": ["@remix-run/config/tsconfig.json"]
}
1 change: 1 addition & 0 deletions packages/html-template/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
}
},
"devDependencies": {
"@remix-run/config": "workspace:*",
"@types/node": "catalog:",
"@typescript/native-preview": "catalog:",
"typescript": "catalog:"
Expand Down
11 changes: 1 addition & 10 deletions packages/html-template/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,3 @@
{
"compilerOptions": {
"strict": true,
"lib": ["ES2024", "DOM", "DOM.Iterable"],
"module": "ES2022",
"moduleResolution": "Bundler",
"target": "ESNext",
"allowImportingTsExtensions": true,
"rewriteRelativeImportExtensions": true,
"verbatimModuleSyntax": true
}
"extends": ["@remix-run/config/tsconfig.json"]
}
2 changes: 2 additions & 0 deletions packages/interaction/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@
"prepublishOnly": "pnpm build"
},
"devDependencies": {
"@remix-run/config": "workspace:*",
"@types/node": "catalog:",
"@typescript/native-preview": "catalog:",
"@vitest/browser": "^3.2.4",
"esbuild": "^0.25.5",
Expand Down
2 changes: 1 addition & 1 deletion packages/interaction/src/lib/interactions/popover.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { defineInteraction, type Interaction } from '../interaction'
import { defineInteraction, type Interaction } from '../interaction.ts'

/**
* ### Description
Expand Down
12 changes: 1 addition & 11 deletions packages/interaction/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,3 @@
{
"compilerOptions": {
"strict": true,
"lib": ["ES2024", "DOM", "DOM.Iterable"],
"module": "ES2022",
"moduleResolution": "Bundler",
"target": "ESNext",
"allowImportingTsExtensions": true,
"rewriteRelativeImportExtensions": true,
"verbatimModuleSyntax": true,
"skipLibCheck": true
}
"extends": ["@remix-run/config/tsconfig.json"]
}
1 change: 1 addition & 0 deletions packages/lazy-file/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
"@remix-run/mime": "workspace:^"
},
"devDependencies": {
"@remix-run/config": "workspace:*",
"@types/node": "catalog:",
"@typescript/native-preview": "catalog:",
"typescript": "catalog:"
Expand Down
11 changes: 1 addition & 10 deletions packages/lazy-file/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,3 @@
{
"compilerOptions": {
"strict": true,
"lib": ["ES2024", "DOM", "DOM.Iterable"],
"module": "ES2022",
"moduleResolution": "Bundler",
"target": "ESNext",
"allowImportingTsExtensions": true,
"rewriteRelativeImportExtensions": true,
"verbatimModuleSyntax": true
}
"extends": ["@remix-run/config/tsconfig.json"]
}
Loading