Skip to content

Commit ee1b120

Browse files
committed
Merge upstream/feat/expo-wxt-companion into expo-one-off-links
Resolved conflicts by preserving logic from both branches: - event-types.tsx: Kept one-off meeting modal with Clear button from upstream - _layout.tsx: Combined both inline styles and Tailwind classes - content.ts: Kept transparent full-width sidebar container with 400px iframe from HEAD, updated to use double quotes from upstream - Deleted files removed by upstream: .output files, dev/entrypoints/content.ts, wxt.config.js
2 parents 0596d35 + f2da226 commit ee1b120

Some content is hidden

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

79 files changed

+4251
-4063
lines changed

companion/.gitignore

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
# dependencies
44
node_modules/
5+
.yarn/
6+
.pnp.*
57

68
# Expo
79
.expo/
@@ -25,17 +27,41 @@ expo-env.d.ts
2527
npm-debug.*
2628
yarn-debug.*
2729
yarn-error.*
30+
*.log
2831

2932
# macOS
3033
.DS_Store
3134
*.pem
3235

3336
# local env files
3437
.env*.local
38+
.env
3539

3640
# typescript
3741
*.tsbuildinfo
3842

3943
# generated native folders
4044
/ios
4145
/android
46+
47+
# WXT Chrome Extension build outputs
48+
.output/
49+
.wxt/
50+
dev/
51+
52+
# Extension builds (generated at build time)
53+
*.zip
54+
55+
# IDE
56+
.vscode/
57+
.idea/
58+
*.swp
59+
*.swo
60+
*~
61+
62+
# Testing
63+
coverage/
64+
.nyc_output/
65+
66+
# Misc
67+
*.code-workspace

companion/.husky/pre-commit

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#!/usr/bin/env sh
2+
. "$(dirname -- "$0")/_/husky.sh"
3+
4+
cd companion
5+
npx lint-staged
6+

companion/.output/chrome-mv3/background.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

companion/.output/chrome-mv3/content-scripts/content.js

Lines changed: 0 additions & 123 deletions
This file was deleted.
-11.1 KB
Binary file not shown.
-636 Bytes
Binary file not shown.
-2.47 KB
Binary file not shown.
-1.94 KB
Binary file not shown.

companion/.output/chrome-mv3/manifest.json

Lines changed: 0 additions & 1 deletion
This file was deleted.

companion/.prettierrc.js

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
module.exports = {
2+
semi: true,
3+
trailingComma: "es5",
4+
singleQuote: false,
5+
printWidth: 100,
6+
tabWidth: 2,
7+
useTabs: false,
8+
arrowParens: "always",
9+
plugins: ["prettier-plugin-tailwindcss"],
10+
};

0 commit comments

Comments
 (0)