Skip to content

Commit 0d59d44

Browse files
authored
Merge branch 'main' into fix-SER-289-Improve-BackUp-ui-changes
2 parents c6351a2 + 14de55d commit 0d59d44

673 files changed

Lines changed: 17665 additions & 9813 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.

.env.example

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
PUBLIC_CONSOLE_MODE=self-hosted
2-
PUBLIC_CONSOLE_FEATURE_FLAGS=sites,index-lengths
2+
PUBLIC_CONSOLE_FEATURE_FLAGS=
33
PUBLIC_APPWRITE_MULTI_REGION=false
44
PUBLIC_APPWRITE_ENDPOINT=http://localhost/v1
55
PUBLIC_STRIPE_KEY=

.github/workflows/publish.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
labels: ${{ steps.meta.outputs.labels }}
4040
build-args: |
4141
"PUBLIC_CONSOLE_MODE=cloud"
42-
"PUBLIC_CONSOLE_FEATURE_FLAGS=sites"
42+
"PUBLIC_CONSOLE_FEATURE_FLAGS="
4343
"PUBLIC_APPWRITE_MULTI_REGION=true"
4444
"PUBLIC_GROWTH_ENDPOINT=${{ secrets.PUBLIC_GROWTH_ENDPOINT }}"
4545
"PUBLIC_STRIPE_KEY=${{ secrets.PUBLIC_STRIPE_KEY }}"
@@ -79,7 +79,7 @@ jobs:
7979
labels: ${{ steps.meta.outputs.labels }}
8080
build-args: |
8181
"PUBLIC_CONSOLE_MODE=cloud"
82-
"PUBLIC_CONSOLE_FEATURE_FLAGS=sites,index-lengths"
82+
"PUBLIC_CONSOLE_FEATURE_FLAGS="
8383
"PUBLIC_APPWRITE_MULTI_REGION=true"
8484
"PUBLIC_GROWTH_ENDPOINT=${{ secrets.PUBLIC_GROWTH_ENDPOINT }}"
8585
"PUBLIC_STRIPE_KEY=${{ secrets.PUBLIC_STRIPE_KEY_STAGE }}"
@@ -118,7 +118,7 @@ jobs:
118118
build-args: |
119119
"PUBLIC_CONSOLE_MODE=self-hosted"
120120
"PUBLIC_APPWRITE_MULTI_REGION=false"
121-
"PUBLIC_CONSOLE_FEATURE_FLAGS=sites,index-lengths"
121+
"PUBLIC_CONSOLE_FEATURE_FLAGS="
122122
"PUBLIC_GROWTH_ENDPOINT=${{ secrets.PUBLIC_GROWTH_ENDPOINT }}"
123123
124124
publish-cloud-no-regions:
@@ -156,6 +156,6 @@ jobs:
156156
build-args: |
157157
"PUBLIC_CONSOLE_MODE=cloud"
158158
"PUBLIC_APPWRITE_MULTI_REGION=false"
159-
"PUBLIC_CONSOLE_FEATURE_FLAGS=sites,index-lengths"
159+
"PUBLIC_CONSOLE_FEATURE_FLAGS="
160160
"PUBLIC_STRIPE_KEY=${{ secrets.PUBLIC_STRIPE_KEY_STAGE }}"
161161
"PUBLIC_GROWTH_ENDPOINT=${{ secrets.PUBLIC_GROWTH_ENDPOINT }}"

docker/nginx.conf

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,6 @@ server {
66

77
root /usr/share/nginx/html;
88

9-
# Security headers for all locations
10-
add_header X-UA-Compatible "IE=Edge";
11-
add_header X-Frame-Options SAMEORIGIN;
12-
add_header X-XSS-Protection "1; mode=block;";
13-
add_header X-Content-Type-Options nosniff;
14-
159
# Only cache files in /console/_app/immutable/ for 1 year
1610
location /console/_app/immutable/ {
1711
try_files $uri =404;
@@ -35,6 +29,12 @@ server {
3529
expires 0;
3630
add_header Cache-Control "no-cache, no-store";
3731
add_header Pragma "no-cache";
32+
33+
# Security headers
34+
add_header X-UA-Compatible "IE=Edge";
35+
add_header X-Frame-Options SAMEORIGIN;
36+
add_header X-XSS-Protection "1; mode=block;";
37+
add_header X-Content-Type-Options nosniff;
3838
}
3939

4040
location / {

e2e/journeys/upgrade-free-tier.spec.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ test('upgrade - free tier', async ({ page }) => {
1010
await page.getByRole('link', { name: 'Upgrade', exact: true }).click();
1111
await page.waitForURL(/\/organization-[^/]+\/change-plan/);
1212
await page.locator('input[value="tier-1"]').click();
13-
await page.getByRole('button', { name: 'add' }).first().click();
1413

1514
await enterCreditCard(page);
1615

e2e/steps/pro-project.ts

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,15 @@ type Metadata = {
77
};
88

99
export async function enterCreditCard(page: Page) {
10-
const dialog = page.locator('.modal').filter({
11-
hasText: 'add payment method'
12-
});
13-
await dialog.waitFor({
14-
state: 'visible'
15-
});
10+
// click the `add` button inside correct view layer
11+
await page
12+
.locator('#no-payments-card-stack')
13+
.getByRole('button', { name: 'add' })
14+
.first()
15+
.click();
16+
17+
const dialog = page.locator('.modal').filter({ hasText: 'add payment method' });
18+
await dialog.waitFor({ state: 'visible' });
1619
await page.getByPlaceholder('cardholder').fill('Test User');
1720
const stripe = page.locator('[title="Secure payment input frame"]').nth(0).contentFrame();
1821
await stripe.locator('id=Field-numberInput').fill('4242424242424242');
@@ -35,7 +38,6 @@ export async function createProProject(page: Page): Promise<Metadata> {
3538
await page.getByRole('radio', { name: /^Pro\b/ }).check();
3639
// `create organization` because there's already free created on start!
3740
await page.getByRole('button', { name: 'create organization' }).click();
38-
await page.getByRole('button', { name: 'add' }).first().click();
3941
await enterCreditCard(page);
4042
// skip members
4143
await page.getByRole('button', { name: 'create organization' }).click();

package.json

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,12 @@
2222
},
2323
"dependencies": {
2424
"@ai-sdk/svelte": "^1.1.24",
25-
"@appwrite.io/console": "^1.10.0",
25+
"@appwrite.io/console": "https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@6031134",
2626
"@appwrite.io/pink-icons": "0.25.0",
27-
"@appwrite.io/pink-icons-svelte": "https://pkg.vc/-/@appwrite/@appwrite.io/pink-icons-svelte@d93a5e9",
27+
"@appwrite.io/pink-icons-svelte": "https://pkg.vc/-/@appwrite/@appwrite.io/pink-icons-svelte@2cf27e0",
2828
"@appwrite.io/pink-legacy": "^1.0.3",
29-
"@appwrite.io/pink-svelte": "https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@d93a5e9",
29+
"@appwrite.io/pink-svelte": "https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@40fb564",
30+
"@faker-js/faker": "^9.9.0",
3031
"@popperjs/core": "^2.11.8",
3132
"@sentry/sveltekit": "^8.38.0",
3233
"@stripe/stripe-js": "^3.5.0",
@@ -53,7 +54,7 @@
5354
"@melt-ui/svelte": "^0.86.5",
5455
"@playwright/test": "^1.51.1",
5556
"@sveltejs/adapter-static": "^3.0.8",
56-
"@sveltejs/kit": "^2.20.2",
57+
"@sveltejs/kit": "^2.36.2",
5758
"@sveltejs/vite-plugin-svelte": "^5.0.3",
5859
"@testing-library/dom": "^10.4.0",
5960
"@testing-library/jest-dom": "^6.6.3",
@@ -83,8 +84,8 @@
8384
"tslib": "^2.8.1",
8485
"typescript": "^5.8.2",
8586
"typescript-eslint": "^8.30.1",
86-
"vite": "^6.2.3",
87-
"vitest": "^3.0.0"
87+
"vite": "^7.0.6",
88+
"vitest": "^3.2.4"
8889
},
8990
"pnpm": {
9091
"onlyBuiltDependencies": [
@@ -94,5 +95,5 @@
9495
"svelte-preprocess"
9596
]
9697
},
97-
"packageManager": "pnpm@10.13.1"
98+
"packageManager": "pnpm@10.15.1"
9899
}

0 commit comments

Comments
 (0)