Skip to content

Commit b625b84

Browse files
committed
Merge branch 'main' of github.com:pingdotgg/t3code into feat/timeline-review-threads
# Conflicts: # apps/web/src/components/pullRequest/PullRequestTimelineTab.tsx
2 parents 74bc5d7 + b5b6c8c commit b625b84

269 files changed

Lines changed: 13652 additions & 11494 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/release.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -297,6 +297,10 @@ jobs:
297297
sudo sed -i 's|http://|https://|g' /etc/apt/blacksmith-ubuntu-mirrors.txt /etc/apt/sources.list.d/ubuntu.sources
298298
sudo apt-get update && sudo apt-get install -y libsecret-1-dev pkg-config build-essential
299299
300+
# The web package's browser project runs React tests in headless Chromium.
301+
- name: Install Chromium for web browser tests
302+
run: node apps/web/node_modules/playwright/cli.js install --with-deps --only-shell chromium
303+
300304
- name: Test
301305
run: vp run --parallel --concurrency-limit 4 --filter '!t3' --filter '!@t3tools/monorepo' test
302306

‎apps/desktop/src/window/DesktopApplicationMenu.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,10 @@ const handleCheckForUpdatesMenuClick = Effect.gen(function* () {
106106
return;
107107
}
108108

109+
// The result dialogs need no main window. Opening one before the backend
110+
// answers strands the renderer on a failed auth bootstrap.
109111
const desktopWindow = yield* DesktopWindow.DesktopWindow;
110-
yield* desktopWindow.ensureMain;
112+
yield* desktopWindow.activate;
111113
yield* checkForUpdatesFromMenu;
112114
}).pipe(Effect.withSpan("desktop.menu.handleCheckForUpdatesClick"));
113115

‎apps/mobile/app.config.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -489,6 +489,10 @@ const config: ExpoConfig = {
489489
},
490490
},
491491
owner: "pingdotgg",
492+
experiments: {
493+
// Metro only runs babel-plugin-react-compiler when this is set; see src/reactCompilerCoverage.test.ts.
494+
reactCompiler: true,
495+
},
492496
};
493497

494498
export default config;

‎apps/mobile/index.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// Must stay first: the render counter wraps the DevTools hook before any React commit.
2+
import "./src/features/development/render-counter-entry";
13
import { registerRootComponent } from "expo";
24
import "react-native-gesture-handler";
35
import { LogBox } from "react-native";

‎apps/mobile/modules/t3-native-controls/android/src/main/java/expo/modules/t3nativecontrols/T3WorkspaceNavigationModule.kt‎

Lines changed: 24 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,12 @@ package expo.modules.t3nativecontrols
33
import android.content.Context
44
import android.view.ViewGroup
55
import androidx.compose.foundation.layout.WindowInsets
6-
import androidx.compose.foundation.layout.Spacer
76
import androidx.compose.foundation.layout.fillMaxSize
87
import androidx.compose.material3.Icon
98
import androidx.compose.material3.MaterialTheme
109
import androidx.compose.material3.NavigationBar
1110
import androidx.compose.material3.NavigationBarItem
1211
import androidx.compose.material3.NavigationBarItemDefaults
13-
import androidx.compose.material3.NavigationRail
14-
import androidx.compose.material3.NavigationRailItem
15-
import androidx.compose.material3.NavigationRailItemDefaults
1612
import androidx.compose.material3.Text
1713
import androidx.compose.material3.darkColorScheme
1814
import androidx.compose.material3.lightColorScheme
@@ -39,7 +35,6 @@ class T3WorkspaceNavigationModule : Module() {
3935
Prop("selectedTab") { view: T3WorkspaceNavigationView, value: String ->
4036
view.selectedTab = value
4137
}
42-
Prop("rail") { view: T3WorkspaceNavigationView, value: Boolean -> view.rail = value }
4338
Prop("dark") { view: T3WorkspaceNavigationView, value: Boolean -> view.dark = value }
4439
Prop("textScale") { view: T3WorkspaceNavigationView, value: Float -> view.textScale = value }
4540
Prop("containerColor") { view: T3WorkspaceNavigationView, value: Int ->
@@ -59,7 +54,7 @@ class T3WorkspaceNavigationModule : Module() {
5954
}
6055
}
6156

62-
/** One Material3 selection surface moves from below the list to its leading edge. */
57+
/** Material3 bottom navigation for the compact workspace. */
6358
class T3WorkspaceNavigationView(
6459
context: Context,
6560
appContext: AppContext
@@ -69,7 +64,6 @@ class T3WorkspaceNavigationView(
6964

7065
private val onTabSelected by EventDispatcher()
7166
var selectedTab by mutableStateOf("threads")
72-
var rail by mutableStateOf(false)
7367
var dark by mutableStateOf(false)
7468
var textScale by mutableStateOf(1f)
7569
var containerColor by mutableStateOf(0)
@@ -108,58 +102,29 @@ class T3WorkspaceNavigationView(
108102
setContent {
109103
MaterialTheme(colorScheme = if (dark) darkColorScheme() else lightColorScheme()) {
110104
val tabs = listOf("threads", "pullRequests")
111-
if (rail) {
112-
NavigationRail(
113-
modifier = Modifier.fillMaxSize(),
114-
containerColor = Color(containerColor),
115-
windowInsets = WindowInsets(0),
116-
) {
117-
Spacer(Modifier.weight(1f))
118-
tabs.forEach { tab ->
119-
NavigationRailItem(
120-
selected = selectedTab == tab,
121-
onClick = { onTabSelected(mapOf("tab" to tab)) },
122-
icon = { tabIcon(tab) },
123-
label = {
124-
val title = if (tab == "threads") "Chats" else "PRs"
125-
Text(title, fontSize = (12 * textScale).sp)
126-
},
127-
colors = NavigationRailItemDefaults.colors(
128-
selectedIconColor = Color(selectedColor),
129-
selectedTextColor = Color(selectedColor),
130-
indicatorColor = Color(indicatorColor),
131-
unselectedIconColor = Color(unselectedColor),
132-
unselectedTextColor = Color(unselectedColor),
133-
),
134-
)
135-
}
136-
Spacer(Modifier.weight(1f))
137-
}
138-
} else {
139-
NavigationBar(
140-
modifier = Modifier.fillMaxSize(),
141-
containerColor = Color(containerColor),
142-
tonalElevation = androidx.compose.ui.unit.Dp(0f),
143-
windowInsets = WindowInsets(0),
144-
) {
145-
tabs.forEach { tab ->
146-
NavigationBarItem(
147-
selected = selectedTab == tab,
148-
onClick = { onTabSelected(mapOf("tab" to tab)) },
149-
icon = { tabIcon(tab) },
150-
label = {
151-
val title = if (tab == "threads") "Chats" else "Pull requests"
152-
Text(title, fontSize = (12 * textScale).sp)
153-
},
154-
colors = NavigationBarItemDefaults.colors(
155-
selectedIconColor = Color(selectedColor),
156-
selectedTextColor = Color(selectedColor),
157-
indicatorColor = Color(indicatorColor),
158-
unselectedIconColor = Color(unselectedColor),
159-
unselectedTextColor = Color(unselectedColor),
160-
),
161-
)
162-
}
105+
NavigationBar(
106+
modifier = Modifier.fillMaxSize(),
107+
containerColor = Color(containerColor),
108+
tonalElevation = androidx.compose.ui.unit.Dp(0f),
109+
windowInsets = WindowInsets(0),
110+
) {
111+
tabs.forEach { tab ->
112+
NavigationBarItem(
113+
selected = selectedTab == tab,
114+
onClick = { onTabSelected(mapOf("tab" to tab)) },
115+
icon = { tabIcon(tab) },
116+
label = {
117+
val title = if (tab == "threads") "Chats" else "Pull requests"
118+
Text(title, fontSize = (12 * textScale).sp)
119+
},
120+
colors = NavigationBarItemDefaults.colors(
121+
selectedIconColor = Color(selectedColor),
122+
selectedTextColor = Color(selectedColor),
123+
indicatorColor = Color(indicatorColor),
124+
unselectedIconColor = Color(unselectedColor),
125+
unselectedTextColor = Color(unselectedColor),
126+
),
127+
)
163128
}
164129
}
165130
}

‎apps/mobile/package.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
"config:prod": "APP_VARIANT=production expo config",
4242
"profile:android:hermes": "mkdir -p profiles/review && react-native profile-hermes profiles/review",
4343
"sync:pierre-icons": "node scripts/sync-pierre-file-icons.mjs",
44+
"measure-renders": "node scripts/measure-renders.mts",
4445
"generate": "node --disable-warning=MODULE_TYPELESS_PACKAGE_JSON scripts/generate-uniwind-themes.mts",
4546
"test": "vp test run --config ../../vite.config.ts --dir .",
4647
"typecheck": "tsc-rs --noEmit"
@@ -140,6 +141,8 @@
140141
"uniwind": "1.12.1"
141142
},
142143
"devDependencies": {
144+
"@babel/core": "^7.29.7",
145+
"@effect/platform-node": "catalog:",
143146
"@effect/vitest": "catalog:",
144147
"@pierre/trees": "1.0.0-beta.6",
145148
"@types/mdast": "^4.0.4",

0 commit comments

Comments
 (0)