Skip to content

Commit 9365452

Browse files
authored
Merge branch 'appwrite:main' into feat-development-keys
2 parents d37192c + e5ab426 commit 9365452

File tree

185 files changed

+4119
-1661
lines changed

Some content is hidden

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

185 files changed

+4119
-1661
lines changed

.github/workflows/publish.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ jobs:
1717
- name: Log in to Docker Hub
1818
uses: docker/login-action@v3
1919
with:
20-
username: ${{ secrets.DOCKER_USERNAME }}
21-
password: ${{ secrets.DOCKER_PASSWORD }}
20+
username: ${{ vars.DOCKERHUB_USERNAME }}
21+
password: ${{ secrets.DOCKERHUB_TOKEN }}
2222
- name: Extract metadata (tags, labels) for Docker
2323
id: meta
2424
uses: docker/metadata-action@v5
@@ -54,8 +54,8 @@ jobs:
5454
- name: Log in to Docker Hub
5555
uses: docker/login-action@v3
5656
with:
57-
username: ${{ secrets.DOCKER_USERNAME }}
58-
password: ${{ secrets.DOCKER_PASSWORD }}
57+
username: ${{ vars.DOCKERHUB_USERNAME }}
58+
password: ${{ secrets.DOCKERHUB_TOKEN }}
5959
- name: Extract metadata (tags, labels) for Docker
6060
id: meta
6161
uses: docker/metadata-action@v5
@@ -90,8 +90,8 @@ jobs:
9090
- name: Log in to Docker Hub
9191
uses: docker/login-action@v3
9292
with:
93-
username: ${{ secrets.DOCKER_USERNAME }}
94-
password: ${{ secrets.DOCKER_PASSWORD }}
93+
username: ${{ vars.DOCKERHUB_USERNAME }}
94+
password: ${{ secrets.DOCKERHUB_TOKEN }}
9595
- name: Extract metadata (tags, labels) for Docker
9696
id: meta
9797
uses: docker/metadata-action@v5

Dockerfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ WORKDIR /app
55
ENV PNPM_HOME="/pnpm"
66
ENV PATH="$PNPM_HOME:$PATH"
77
RUN corepack enable
8+
RUN corepack prepare pnpm@10.0.0 --activate
89

910
ADD ./package.json /app/package.json
1011
ADD ./pnpm-lock.yaml /app/pnpm-lock.yaml
@@ -38,4 +39,4 @@ FROM nginx:1.25-alpine
3839
EXPOSE 80
3940

4041
COPY docker/nginx.conf /etc/nginx/conf.d/default.conf
41-
COPY --from=build /app/build /usr/share/nginx/html/console
42+
COPY --from=build /app/build /usr/share/nginx/html/console

package.json

+4-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"e2e:ui": "playwright test tests/e2e --ui"
2020
},
2121
"dependencies": {
22-
"@appwrite.io/console": "1.4.4",
22+
"@appwrite.io/console": "1.5.1",
2323
"@appwrite.io/pink": "0.25.0",
2424
"@appwrite.io/pink-icons": "0.25.0",
2525
"@popperjs/core": "^2.11.8",
@@ -36,6 +36,7 @@
3636
"plausible-tracker": "^0.3.9",
3737
"pretty-bytes": "^6.1.1",
3838
"prismjs": "^1.29.0",
39+
"remarkable": "^2.0.1",
3940
"svelte-confetti": "^1.4.0",
4041
"tippy.js": "^6.3.7"
4142
},
@@ -52,6 +53,7 @@
5253
"@testing-library/user-event": "^14.5.2",
5354
"@types/deep-equal": "^1.0.4",
5455
"@types/prismjs": "^1.26.5",
56+
"@types/remarkable": "^2.0.8",
5557
"@typescript-eslint/eslint-plugin": "^7.18.0",
5658
"@typescript-eslint/parser": "^7.18.0",
5759
"@vitest/ui": "^1.6.0",
@@ -71,7 +73,7 @@
7173
"tslib": "^2.8.1",
7274
"typescript": "^5.6.3",
7375
"vite": "^5.4.11",
74-
"vitest": "^1.6.0"
76+
"vitest": "^1.6.1"
7577
},
7678
"type": "module",
7779
"packageManager": "pnpm@9.7.0+sha512.dc09430156b427f5ecfc79888899e1c39d2d690f004be70e05230b72cb173d96839587545d09429b55ac3c429c801b4dc3c0e002f653830a420fa2dd4e3cf9cf"

playwright.config.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ const config: PlaywrightTestConfig = {
1212
webServer: {
1313
timeout: 120000,
1414
env: {
15-
PUBLIC_APPWRITE_ENDPOINT: 'https://console-testing.appwrite.org/v1',
15+
PUBLIC_APPWRITE_ENDPOINT: 'https://dlbillingic.appwrite.org/v1',
1616
PUBLIC_CONSOLE_MODE: 'cloud',
1717
PUBLIC_STRIPE_KEY:
1818
'pk_test_51LT5nsGYD1ySxNCyd7b304wPD8Y1XKKWR6hqo6cu3GIRwgvcVNzoZv4vKt5DfYXL1gRGw4JOqE19afwkJYJq1g3K004eVfpdWn'

0 commit comments

Comments
 (0)