Skip to content

Commit 236948b

Browse files
atharvadeosthaleatharvadeosthale
committed
merge conflicts
2 parents b9dc0be + b9bea2c commit 236948b

File tree

164 files changed

+10100
-14176
lines changed

Some content is hidden

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

164 files changed

+10100
-14176
lines changed

‎.github/workflows/tests.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ jobs:
1818
run: bun install --frozen-lockfile
1919
- name: Check diagnostics
2020
env:
21-
PUBLIC_APPWRITE_ENDPOINT: ${{ vars.PUBLIC_APPWRITE_ENDPOINT }}
22-
PUBLIC_APPWRITE_DASHBOARD: ${{ vars.PUBLIC_APPWRITE_DASHBOARD }}
21+
PUBLIC_APPWRITE_ENDPOINT: ${{ vars.PUBLIC_APPWRITE_ENDPOINT || 'http://appwrite.test/v1' }}
22+
PUBLIC_APPWRITE_DASHBOARD: ${{ vars.PUBLIC_APPWRITE_DASHBOARD || 'http://appwrite.test' }}
2323
PUBLIC_APPWRITE_PROJECT_ID: ${{ vars.PUBLIC_APPWRITE_PROJECT_ID }}
2424
PUBLIC_APPWRITE_DB_MAIN_ID: ${{ vars.PUBLIC_APPWRITE_DB_MAIN_ID }}
2525
PUBLIC_APPWRITE_COL_THREADS_ID: ${{ vars.PUBLIC_APPWRITE_COL_THREADS_ID }}
@@ -61,8 +61,8 @@ jobs:
6161
run: bunx playwright install --with-deps chromium
6262
- name: Run tests
6363
env:
64-
PUBLIC_APPWRITE_ENDPOINT: ${{ vars.PUBLIC_APPWRITE_ENDPOINT }}
65-
PUBLIC_APPWRITE_DASHBOARD: ${{ vars.PUBLIC_APPWRITE_DASHBOARD }}
64+
PUBLIC_APPWRITE_ENDPOINT: ${{ vars.PUBLIC_APPWRITE_ENDPOINT || 'http://appwrite.test/v1' }}
65+
PUBLIC_APPWRITE_DASHBOARD: ${{ vars.PUBLIC_APPWRITE_DASHBOARD || 'http://appwrite.test' }}
6666
PUBLIC_APPWRITE_PROJECT_ID: ${{ vars.PUBLIC_APPWRITE_PROJECT_ID }}
6767
PUBLIC_APPWRITE_DB_MAIN_ID: ${{ vars.PUBLIC_APPWRITE_DB_MAIN_ID }}
6868
PUBLIC_APPWRITE_COL_THREADS_ID: ${{ vars.PUBLIC_APPWRITE_COL_THREADS_ID }}
@@ -90,8 +90,8 @@ jobs:
9090
- name: Build Website
9191
env:
9292
NODE_OPTIONS: '--max_old_space_size=16384'
93-
PUBLIC_APPWRITE_ENDPOINT: ${{ vars.PUBLIC_APPWRITE_ENDPOINT }}
94-
PUBLIC_APPWRITE_DASHBOARD: ${{ vars.PUBLIC_APPWRITE_DASHBOARD }}
93+
PUBLIC_APPWRITE_ENDPOINT: ${{ vars.PUBLIC_APPWRITE_ENDPOINT || 'http://appwrite.test/v1' }}
94+
PUBLIC_APPWRITE_DASHBOARD: ${{ vars.PUBLIC_APPWRITE_DASHBOARD || 'http://appwrite.test' }}
9595
PUBLIC_APPWRITE_PROJECT_ID: ${{ vars.PUBLIC_APPWRITE_PROJECT_ID }}
9696
PUBLIC_APPWRITE_DB_MAIN_ID: ${{ vars.PUBLIC_APPWRITE_DB_MAIN_ID }}
9797
PUBLIC_APPWRITE_COL_THREADS_ID: ${{ vars.PUBLIC_APPWRITE_COL_THREADS_ID }}
@@ -113,7 +113,7 @@ jobs:
113113
ref: ${{ github.event.pull_request.head.sha }}
114114
- uses: oven-sh/setup-bun@v2
115115
with:
116-
bun-version: 1.3
116+
bun-version: 1.3.6
117117
- name: Install dependencies
118118
run: bun install --frozen-lockfile
119119
- name: Optimize assets

‎.optimize-cache.json‎

Lines changed: 1813 additions & 0 deletions
Large diffs are not rendered by default.

‎.prettierignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,5 @@ bun.lock
2424
*.wav
2525
*.mp4
2626
*.mpv
27+
28+
.optimize-cache.json

‎Dockerfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ RUN fc-cache -f -v
7878

7979
COPY --from=build /app/build/ build
8080
COPY --from=build /app/server/ server
81+
COPY --from=build /app/src/routes/ src/routes
8182
COPY --from=prod-deps /app/node_modules/ node_modules
8283

8384
CMD ["node", "server/main.js"]

‎bun.lock‎

Lines changed: 434 additions & 246 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎eslint.config.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ export default defineConfig(
2424
rules: {
2525
// typescript-eslint strongly recommend that you do not use the no-undef lint rule on TypeScript projects.
2626
// see: https://typescript-eslint.io/troubleshooting/faqs/eslint/#i-get-errors-from-the-no-undef-rule-about-global-variables-not-being-defined-even-though-there-are-no-typescript-errors
27-
'no-undef': 'off'
27+
'no-undef': 'off',
28+
'svelte/no-navigation-without-resolve': 'off'
2829
}
2930
},
3031
{

‎package.json‎

Lines changed: 32 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch",
1010
"clean": "rm -rf node_modules && rm -rf .svelte_kit && bun install",
1111
"dev": "vite dev",
12-
"format": "prettier --write .",
12+
"format": "prettier --write --cache .",
1313
"format:check": "prettier --check .",
1414
"generate:icons": "bun ./src/icons/optimize.js",
1515
"icons:build": "bun ./src/icons/build.js",
@@ -24,36 +24,39 @@
2424
"optimize:all": "bun ./scripts/optimize-all.js"
2525
},
2626
"dependencies": {
27-
"@sentry/sveltekit": "^10.22.0",
27+
"@sentry/sveltekit": "^10.28.0",
2828
"h3": "^1.15.4",
29-
"sharp": "^0.34.4"
29+
"sharp": "^0.34.5"
3030
},
3131
"devDependencies": {
3232
"@appwrite.io/console": "^0.6.4",
3333
"@appwrite.io/pink": "~0.26.0",
3434
"@appwrite.io/pink-icons": "~0.26.0",
35-
"@appwrite.io/repo": "github:appwrite/appwrite#4f905e06e2e4090d38521da9c4e391553e7ac57f",
36-
"@eslint/compat": "^1.4.0",
37-
"@eslint/js": "^9.36.0",
35+
"@appwrite.io/repo": "github:appwrite/appwrite#31b5a1cb360b1350dd1b887e01179bce171c34bc",
36+
"@eslint/compat": "^1.4.1",
37+
"@eslint/js": "^9.39.1",
3838
"@fingerprintjs/fingerprintjs": "^4.6.2",
3939
"@internationalized/date": "3.5.0",
4040
"@melt-ui/pp": "^0.3.2",
4141
"@melt-ui/svelte": "^0.86.6",
4242
"@number-flow/svelte": "^0.3.9",
43-
"@playwright/test": "^1.56.1",
43+
"@playwright/test": "^1.57.0",
4444
"@sveltejs/adapter-node": "^5.3.3",
45-
"@sveltejs/enhanced-img": "^0.8.4",
46-
"@sveltejs/kit": "^2.48.0",
45+
"@sveltejs/enhanced-img": "^0.8.5",
46+
"@sveltejs/kit": "^2.49.1",
4747
"@sveltejs/vite-plugin-svelte": "^6.2.1",
48-
"@tailwindcss/postcss": "^4.1.16",
49-
"@turf/boolean-point-in-polygon": "^7.2.0",
50-
"@types/bun": "^1.3.1",
48+
"@tailwindcss/postcss": "^4.1.17",
49+
"@threlte/core": "^8.3.1",
50+
"@threlte/extras": "^9.7.1",
51+
"@turf/boolean-point-in-polygon": "^7.3.1",
52+
"@types/bun": "^1.3.3",
5153
"@types/compression": "^1.8.1",
5254
"@types/glob": "^8.1.0",
5355
"@types/jsdom": "^21.1.7",
5456
"@types/markdown-it": "^13.0.9",
5557
"@types/morgan": "^1.9.10",
5658
"@types/proj4": "^2.19.0",
59+
"@types/three": "^0.176.0",
5760
"analytics": "^0.8.19",
5861
"appwrite": "^17.0.2",
5962
"bits-ui": "^1.8.0",
@@ -65,17 +68,17 @@
6568
"embla-carousel-auto-scroll": "^8.6.0",
6669
"embla-carousel-svelte": "^8.6.0",
6770
"embla-carousel-wheel-gestures": "^8.1.0",
68-
"eslint": "^9.36.0",
71+
"eslint": "^9.39.1",
6972
"eslint-config-prettier": "^10.1.8",
70-
"eslint-plugin-svelte": "^3.12.4",
73+
"eslint-plugin-svelte": "^3.13.0",
7174
"fuse.js": "^7.1.0",
72-
"globals": "^16.4.0",
75+
"globals": "^16.5.0",
7376
"highlight.js": "^11.11.1",
7477
"linkedom": "^0.18.12",
7578
"markdown-it": "^14.1.0",
7679
"meilisearch": "^0.37.0",
7780
"melt": "^0.29.3",
78-
"motion": "^12.23.24",
81+
"motion": "^12.23.25",
7982
"motion-legacy": "npm:motion@^10.18.0",
8083
"node-appwrite": "^16.0.0",
8184
"node-fetch": "^3.3.2",
@@ -84,30 +87,31 @@
8487
"oslllo-svg-fixer": "^3.0.0",
8588
"plausible-tracker": "^0.3.9",
8689
"postcss": "^8.5.6",
87-
"posthog-js": "^1.280.1",
90+
"posthog-js": "^1.301.1",
8891
"posthog-node": "^4.18.0",
89-
"prettier": "^3.6.2",
92+
"prettier": "^3.7.4",
9093
"prettier-plugin-svelte": "^3.4.0",
91-
"prettier-plugin-tailwindcss": "^0.7.1",
92-
"proj4": "^2.19.10",
94+
"prettier-plugin-tailwindcss": "^0.7.2",
95+
"proj4": "^2.20.2",
9396
"remeda": "^2.32.0",
9497
"reodotdev": "^1.0.0",
95-
"sass": "^1.93.2",
96-
"svelte": "^5.42.2",
97-
"svelte-check": "^4.3.3",
98+
"sass": "^1.94.2",
99+
"svelte": "^5.45.5",
100+
"svelte-check": "^4.3.4",
98101
"svelte-markdoc-preprocess": "3.0.0",
99102
"svelte-markdown": "^0.4.1",
100103
"svg-dotted-map": "^2.0.1",
101104
"svgtofont": "^4.2.3",
102-
"tailwind-merge": "^3.3.1",
103-
"tailwindcss": "^4.1.16",
105+
"tailwind-merge": "^3.4.0",
106+
"tailwindcss": "^4.1.17",
107+
"three": "^0.176.0",
104108
"tslib": "^2.8.1",
105109
"typescript": "^5.9.3",
106-
"typescript-eslint": "^8.46.2",
110+
"typescript-eslint": "^8.48.1",
107111
"vaul-svelte": "1.0.0-next.7",
108-
"vite": "^7.1.19",
112+
"vite": "^7.2.7",
109113
"vite-plugin-dynamic-import": "^1.6.0",
110-
"vite-plugin-image-optimizer": "^2.0.2",
114+
"vite-plugin-image-optimizer": "^2.0.3",
111115
"vite-plugin-manifest-sri": "^0.2.0",
112116
"vitest": "^3.2.4",
113117
"zod": "^3.25.76"

0 commit comments

Comments
 (0)