Skip to content

Commit 9b1fce3

Browse files
committed
Merge branch 'main' into feat/dismiss-alerts-on-thread-visit
2 parents 9304576 + 9a067b2 commit 9b1fce3

451 files changed

Lines changed: 90526 additions & 9247 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.

‎.gitattributes‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,6 @@
33
# Batch files need CRLF for cmd.exe to parse them reliably.
44
*.cmd text eol=crlf
55
*.bat text eol=crlf
6+
# GitHub's GraphQL schema and the operations graphqlgen writes from it.
7+
packages/source-control-github/schema/** linguist-generated
8+
**/*.graphql.ts linguist-generated

‎.github/workflows/ci.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,9 @@ jobs:
5252
- name: Check unused code
5353
run: vp run knip:check
5454

55+
- name: Check generated GitHub GraphQL operations
56+
run: vp run --filter @t3tools/source-control-github generate --check
57+
5558
- name: Check
5659
run: vp check
5760

‎apps/desktop/src/shell/DesktopShellEnvironment.test.ts‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -486,6 +486,23 @@ describe("DesktopShellEnvironment", () => {
486486
}),
487487
);
488488

489+
it.effect("replaces a Path-spelled Windows PATH instead of adding a second key", () =>
490+
Effect.gen(function* () {
491+
const env: NodeJS.ProcessEnv = { Path: "C:\\Windows\\System32" };
492+
493+
yield* runShellEnvironment({
494+
env,
495+
platform: "win32",
496+
handler: (command) =>
497+
command._tag === "StandardCommand" && command.args.includes("-NoProfile")
498+
? envOutput({ PATH: "C:\\Shell\\Bin" })
499+
: "",
500+
});
501+
502+
assert.deepEqual(env, { PATH: "C:\\Shell\\Bin;C:\\Windows\\System32" });
503+
}),
504+
);
505+
489506
it.effect("prefers login-shell desktop session hints over inherited values on linux", () =>
490507
Effect.gen(function* () {
491508
const env: NodeJS.ProcessEnv = {

‎apps/desktop/src/shell/DesktopShellEnvironment.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { listLoginShellCandidates } from "@t3tools/shared/shell";
1+
import { listLoginShellCandidates, setWindowsPath } from "@t3tools/shared/shell";
22
import * as Context from "effect/Context";
33
import * as Duration from "effect/Duration";
44
import * as Effect from "effect/Effect";
@@ -386,7 +386,7 @@ const installWindowsEnvironment = Effect.fn("desktop.shellEnvironment.installWin
386386
]);
387387

388388
if (Option.isSome(mergedPath)) {
389-
config.env.PATH = mergedPath.value;
389+
setWindowsPath(config.env, mergedPath.value);
390390
}
391391
if (!config.env.FNM_DIR && profile.FNM_DIR) {
392392
config.env.FNM_DIR = profile.FNM_DIR;
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
3+
<path android:fillColor="#FFFFFFFF" android:fillType="evenOdd"
4+
android:pathData="M9,3 H15 V5 H21 V7 H19 V21 H5 V7 H3 V5 H9 Z M11,5 H13 V4.75 H11 Z M7,7 V19 H17 V7 Z M9,9 H11 V17 H9 Z M13,9 H15 V17 H13 Z" />
5+
</vector>

‎apps/mobile/package.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"@effect/atom-react": "catalog:",
5151
"@expo-google-fonts/dm-sans": "^0.4.2",
5252
"@expo/metro-runtime": "~58.0.10",
53-
"@expo/ui": "~58.0.11",
53+
"@expo/ui": "58.0.11",
5454
"@legendapp/list": "catalog:",
5555
"@material/material-color-utilities": "0.3.0",
5656
"@noble/curves": "catalog:",
@@ -164,6 +164,8 @@
164164
},
165165
"autolinking": {
166166
"buildFromSource": [
167+
"@expo/ui",
168+
"expo-ui",
167169
"expo-notifications",
168170
"react-native-screens",
169171
"react-native-reanimated",

‎apps/mobile/src/App.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { PermissionUpdateNotice } from "./components/PermissionUpdateNotice";
1+
import { PermissionUpdateNotice } from "./features/connection/PermissionUpdateNotice";
22
import * as Linking from "expo-linking";
33
import * as SplashScreen from "expo-splash-screen";
44
import { useEffect } from "react";
@@ -10,7 +10,7 @@ import { createStaticNavigation } from "@react-navigation/native";
1010

1111
import { RegistryContext } from "@effect/atom-react";
1212
import { ThreadArrangementHost } from "./features/threads/ThreadArrangementSheet";
13-
import { ConfirmDialogHost } from "./components/ConfirmDialogHost";
13+
import * as Dialog from "./components/ui/Dialog";
1414
import { CloudAuthProvider } from "./features/cloud/CloudAuthProvider";
1515
import { prepareNativeShowcaseCapture } from "./features/showcase/nativeShowcaseScene";
1616
import { IncomingShareProvider } from "./features/sharing/IncomingShareProvider";
@@ -20,7 +20,7 @@ import {
2020
} from "./features/settings/appearance/AppearancePreferencesProvider";
2121
import { RootStack } from "./Stack";
2222
import { appAtomRegistry } from "./state/atom-registry";
23-
import { OverlayPortalHost } from "./components/OverlayPortal";
23+
import { OverlayPortalHost } from "./components/ui/OverlayPortal";
2424
import { shouldHandleAppLink } from "./lib/appLinking";
2525
import { useMobileNavigationTheme } from "./lib/useMobileNavigationTheme";
2626
import { useUiRuntimeMemoryWarningGc } from "./lib/useUiRuntimeMemoryWarningGc";
@@ -96,7 +96,7 @@ function AppContent() {
9696
<IncomingShareProvider>
9797
<Navigation linking={appLinking} theme={navigationTheme} />
9898
</IncomingShareProvider>
99-
<ConfirmDialogHost />
99+
<Dialog.Host />
100100
<ThreadArrangementHost />
101101
</NativeLayoutMetricsProvider>
102102
</GlobalVoiceInputControl>

‎apps/mobile/src/Stack.tsx‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { ComponentCatalogScreen } from "./features/development/ComponentCatalogScreen";
12
import { PullRequestGuideStopScreen } from "./features/pull-requests/guide/PullRequestGuideScreen";
23
import { PullRequestInlineCommentScreen } from "./features/pull-requests/PullRequestInlineCommentScreen";
34
import { PullRequestDiscussionScreen } from "./features/pull-requests/PullRequestDiscussionScreen";
@@ -28,7 +29,7 @@ import {
2829
} from "react-native";
2930
import { useResolveClassNames } from "uniwind";
3031

31-
import { AppText as Text } from "./components/AppText";
32+
import { AppText as Text } from "./components/ui/AppText";
3233
import { getCompactBrandHeaderOptions } from "./components/CompactBrandTitle";
3334
import { WorkspaceRootScreen } from "./features/workspace/WorkspaceRootScreen";
3435
import { AndroidWorkspaceTabsProvider } from "./features/workspace/AndroidWorkspaceTabsProvider";
@@ -716,6 +717,15 @@ const RootStackConfig = createWorkspaceStackNavigator({
716717
headerShown: false,
717718
},
718719
screens: {
720+
...(__DEV__
721+
? {
722+
ComponentCatalog: createNativeStackScreen({
723+
screen: ComponentCatalogScreen,
724+
linking: "dev/components",
725+
options: { title: "UI components" },
726+
}),
727+
}
728+
: {}),
719729
Home: createNativeStackScreen({
720730
screen: WorkspaceRootScreen,
721731
linking: "",

‎apps/mobile/src/components/AndroidScreenHeader.tsx‎

Lines changed: 0 additions & 149 deletions
This file was deleted.

‎apps/mobile/src/components/AppSheet.tsx‎

Lines changed: 0 additions & 80 deletions
This file was deleted.

0 commit comments

Comments
 (0)