Merge branch 'main' into main

CorentinTh · Nov 8, 2024 · 294db27 · 294db27
2 parents bb9193d + 4f26daf
commit 294db27
Show file tree

Hide file tree

Showing 22 changed files with 353 additions and 317 deletions.
diff --git a/.github/workflows/cd-app-prod.yaml b/.github/workflows/cd-app-prod.yaml
@@ -13,7 +13,7 @@ jobs:
       deployments: write
     name: Publish app to production
     steps:
-      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
       - run: corepack enable
       - uses: actions/setup-node@v4
         with:
@@ -47,7 +47,7 @@ jobs:
       deployments: write
     name: Publish docs to production
     steps:
-      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
       - run: corepack enable
       - uses: actions/setup-node@v4
         with:

diff --git a/.github/workflows/cd-docker-release.yaml b/.github/workflows/cd-docker-release.yaml
@@ -48,7 +48,7 @@ jobs:
         working-directory: packages/crypto
 
     steps:
-      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
       - run: corepack enable
       - uses: actions/setup-node@v4
         with:
@@ -80,7 +80,7 @@ jobs:
         working-directory: packages/lib
 
     steps:
-      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
       - run: corepack enable
       - uses: actions/setup-node@v4
         with:
@@ -111,7 +111,7 @@ jobs:
         working-directory: packages/cli
 
     steps:
-      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
       - run: corepack enable
       - uses: actions/setup-node@v4
         with:
@@ -144,7 +144,7 @@ jobs:
         run: echo "RELEASE_VERSION=${{ github.event.inputs.release_version }}" >> $GITHUB_ENV
 
       - name: Checkout
-        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
 
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v3
@@ -170,7 +170,7 @@ jobs:
         with:
           context: .
           file: ./Dockerfile
-          platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64,linux/arm64,linux/arm/v7
           push: true
           tags: |
             corentinth/enclosed:latest
@@ -183,7 +183,7 @@ jobs:
         with:
           context: .
           file: ./Dockerfile.rootless
-          platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64,linux/arm64,linux/arm/v7
           push: true
           tags: |
             corentinth/enclosed:latest-rootless

diff --git a/.github/workflows/cd-preview-build.yaml b/.github/workflows/cd-preview-build.yaml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     name: Build app and upload build artifact
     steps:
-      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
       - run: corepack enable
       - uses: actions/setup-node@v4
         with:
@@ -36,7 +36,7 @@ jobs:
     runs-on: ubuntu-latest
     name: Build docs and upload build artifact
     steps:
-      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
       - run: corepack enable
       - uses: actions/setup-node@v4
         with:

diff --git a/.github/workflows/ci-app-client.yaml b/.github/workflows/ci-app-client.yaml
@@ -15,7 +15,7 @@ jobs:
         working-directory: packages/app-client
 
     steps:
-      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
       - run: corepack enable
       - uses: actions/setup-node@v4
         with:

diff --git a/.github/workflows/ci-app-server.yaml b/.github/workflows/ci-app-server.yaml
@@ -15,7 +15,7 @@ jobs:
         working-directory: packages/app-server
 
     steps:
-      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
       - run: corepack enable
       - uses: actions/setup-node@v4
         with:

diff --git a/.github/workflows/ci-cli.yaml b/.github/workflows/ci-cli.yaml
@@ -15,7 +15,7 @@ jobs:
         working-directory: packages/cli
 
     steps:
-      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
       - run: corepack enable
       - uses: actions/setup-node@v4
         with:

diff --git a/.github/workflows/ci-crypto.yaml b/.github/workflows/ci-crypto.yaml
@@ -15,7 +15,7 @@ jobs:
         working-directory: packages/crypto
 
     steps:
-      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
       - run: corepack enable
       - uses: actions/setup-node@v4
         with:

diff --git a/.github/workflows/ci-deploy-cloudflare.yaml b/.github/workflows/ci-deploy-cloudflare.yaml
@@ -15,7 +15,7 @@ jobs:
         working-directory: packages/deploy-cloudflare
 
     steps:
-      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
       - run: corepack enable
       - uses: actions/setup-node@v4
         with:

diff --git a/.github/workflows/ci-docs.yaml b/.github/workflows/ci-docs.yaml
@@ -15,7 +15,7 @@ jobs:
         working-directory: packages/docs
 
     steps:
-      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
       - run: corepack enable
       - uses: actions/setup-node@v4
         with:

diff --git a/.github/workflows/ci-lib.yaml b/.github/workflows/ci-lib.yaml
@@ -15,7 +15,7 @@ jobs:
         working-directory: packages/lib
 
     steps:
-      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
       - run: corepack enable
       - uses: actions/setup-node@v4
         with:

diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,7 @@
-# Base image using Node.js Alpine version 22
-FROM node:22-alpine AS builder
+# Base image is node:22-slim, we cannot use node:22-alpine because of
+# a known issue for arm/v7 architecture (hangs on dependency installation)
+# see https://github.com/nodejs/docker-node/issues/2077
+FROM node:22-slim AS builder
 
 # Set the working directory for the app
 WORKDIR /app

diff --git a/Dockerfile.rootless b/Dockerfile.rootless
@@ -1,5 +1,7 @@
-# Base image using Node.js Alpine version 22
-FROM node:22-alpine AS builder
+# Base image is node:22-slim, we cannot use node:22-alpine because of
+# a known issue for arm/v7 architecture (hangs on dependency installation)
+# see https://github.com/nodejs/docker-node/issues/2077
+FROM node:22-slim AS builder
 
 # Set the working directory for the app
 WORKDIR /app

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@enclosed/root",
-  "version": "1.9.0",
+  "version": "1.9.2",
   "description": "Send private and secure note",
   "packageManager": "pnpm@9.12.2",
   "license": "Apache-2.0",

diff --git a/packages/app-client/package.json b/packages/app-client/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@enclosed/app-client",
   "type": "module",
-  "version": "1.9.0",
+  "version": "1.9.2",
   "packageManager": "pnpm@9.12.2",
   "description": "Enclosed frontend client",
   "author": "Corentin Thomasset <corentinth@proton.me> (https://corentin.tech)",
@@ -34,7 +34,7 @@
     "@solid-primitives/i18n": "^2.1.1",
     "@solid-primitives/storage": "^4.2.1",
     "@solidjs/router": "^0.14.3",
-    "@unocss/reset": "^0.63.0",
+    "@unocss/reset": "^0.64.0",
     "class-variance-authority": "^0.7.0",
     "clsx": "^2.1.1",
     "jszip": "^3.10.1",
@@ -55,7 +55,7 @@
     "jsdom": "^25.0.0",
     "tsx": "^4.19.1",
     "typescript": "catalog:",
-    "unocss": "^0.63.0",
+    "unocss": "^0.64.0",
     "vite": "^5.0.11",
     "vite-plugin-solid": "^2.8.2",
     "vitest": "catalog:"

diff --git a/packages/app-client/src/locales/ru.json b/packages/app-client/src/locales/ru.json
@@ -12,13 +12,13 @@
     "github": "GitHub",
     "theme": {
       "light-mode": "Светлая тема",
-      "dark-mode": "Темная тема",
+      "dark-mode": "Тёмная тема",
       "system-mode": "Система"
     },
     "settings": {
       "documentation": "Документация",
-      "cli": "Закрытый интерфейс командной строки",
-      "support": "Поддержка Enclosed",
+      "cli": "Enclosed CLI",
+      "support": "Поддержать Enclosed",
       "report-bug": "Сообщить об ошибке",
       "logout": "Выйти",
       "contribute-to-i18n": "Внести свой вклад в i18n"
@@ -32,7 +32,7 @@
   },
   "login": {
     "title": "Войти в Enclosed",
-    "description": "Это приватный режим Enclosed. Введите учетные данные, чтобы создать заметку.",
+    "description": "Это приватный режим Enclosed. Введите учётные данные, чтобы создать заметку.",
     "email": "Электронная почта",
     "password": "Пароль",
     "submit": "Логин",
@@ -41,15 +41,15 @@
       "unknown": "Неизвестная ошибка. Пожалуйста, повторите попытку позже."
     },
     "footer": [
-      "Нет учетной записи?",
+      "Нет учётной записи?",
       "Связаться с владельцем"
     ]
   },
   "create": {
     "errors": {
       "empty-note": "Введите содержание заметки или приложите файл",
       "rate-limit": "Вы превысили лимит создания заметок. Пожалуйста, повторите попытку позже.",
-      "too-large": "Превышен объем содержания заметки и вложения. Уменьшите размер и повторите попытку.",
+      "too-large": "Превышен объём содержания заметки и вложения. Уменьшите размер и повторите попытку.",
       "unauthorized": "У вас нет прав для создания заметки. Войдите в систему и повторите попытку.",
       "unknown": "При создании заметки произошла ошибка. Повторите попытку."
     },
@@ -77,7 +77,7 @@
       },
       "attach-files": "Прикрепить файлы",
       "drop-files": {
-        "title": "Перенесите файлы сюда",
+        "title": "Перетащите файлы сюда",
         "description": "Перетащите файлы, чтобы прикрепить их к заметке"
       },
       "create": "Создать заметку",

diff --git a/packages/app-server/package.json b/packages/app-server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@enclosed/app-server",
   "type": "module",
-  "version": "1.9.0",
+  "version": "1.9.2",
   "packageManager": "pnpm@9.12.2",
   "description": "Enclosed backend server",
   "author": "Corentin Thomasset <corentinth@proton.me> (https://corentin.tech)",

diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@enclosed/cli",
   "type": "module",
-  "version": "1.9.0",
+  "version": "1.9.2",
   "packageManager": "pnpm@9.12.2",
   "description": "Enclosed cli to create secure notes.",
   "author": "Corentin Thomasset <corentinth@proton.me> (https://corentin.tech)",

diff --git a/packages/crypto/package.json b/packages/crypto/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@enclosed/crypto",
   "type": "module",
-  "version": "1.9.0",
+  "version": "1.9.2",
   "packageManager": "pnpm@9.12.2",
   "description": "Enclosed cross-env crypto primitives",
   "author": "Corentin Thomasset <corentinth@proton.me> (https://corentin.tech)",

diff --git a/packages/deploy-cloudflare/package.json b/packages/deploy-cloudflare/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@enclosed/deploy-cloudflare",
-  "version": "1.9.0",
+  "version": "1.9.2",
   "description": "Deploy scripts for Cloudflare Pages",
   "packageManager": "pnpm@9.12.2",
   "license": "Apache-2.0",

diff --git a/packages/docs/package.json b/packages/docs/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@enclosed/docs",
   "type": "module",
-  "version": "1.9.0",
+  "version": "1.9.2",
   "packageManager": "pnpm@9.12.2",
   "description": "Documentation website for Enclosed.",
   "author": "Corentin Thomasset <corentinth@proton.me> (https://corentin.tech)",

diff --git a/packages/lib/package.json b/packages/lib/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@enclosed/lib",
   "type": "module",
-  "version": "1.9.0",
+  "version": "1.9.2",
   "packageManager": "pnpm@9.12.2",
   "description": "Enclosed lib to create secure notes.",
   "author": "Corentin Thomasset <corentinth@proton.me> (https://corentin.tech)",