Skip to content

Commit 04f51b9

Browse files
committed
Merge branch 'dev' into feat/boxes-data
2 parents 55f179e + c5b55c9 commit 04f51b9

File tree

5 files changed

+28914
-27071
lines changed

5 files changed

+28914
-27071
lines changed

app/env.ts

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,21 @@
1-
declare module "react-router" {
2-
// Your AppLoadContext used in v2
3-
interface AppLoadContext {
4-
cspNonce: any;
5-
serverBuild: any;
6-
}
1+
declare module 'react-router' {
2+
// Your AppLoadContext used in v2
3+
interface AppLoadContext {
4+
cspNonce: any
5+
serverBuild: any
6+
}
77

8-
// TODO: remove this once we've migrated to `Route.LoaderArgs` instead for our loaders
9-
interface LoaderFunctionArgs {
10-
context: AppLoadContext;
11-
}
8+
// TODO: remove this once we've migrated to `Route.LoaderArgs` instead for our loaders
9+
interface LoaderFunctionArgs {
10+
context: AppLoadContext
11+
unstable_pattern?: string | undefined
12+
}
1213

13-
// TODO: remove this once we've migrated to `Route.ActionArgs` instead for our actions
14-
interface ActionFunctionArgs {
15-
context: AppLoadContext;
16-
}
14+
// TODO: remove this once we've migrated to `Route.ActionArgs` instead for our actions
15+
interface ActionFunctionArgs {
16+
context: AppLoadContext
17+
unstable_pattern?: string | undefined
18+
}
1719
}
1820

19-
export {}; // necessary for TS to treat this as a module
21+
export {} // necessary for TS to treat this as a module

0 commit comments

Comments
 (0)