Skip to content

Commit

Permalink
Merge branch 'webrecorder:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
pertsevds authored Jan 9, 2025
2 parents 9b70c77 + a21b2ff commit 0b27119
Show file tree
Hide file tree
Showing 32 changed files with 2,454 additions and 1,583 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/frontend-build-prepare.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ on:
jobs:
setup-and-build:
runs-on: ubuntu-latest
strategy:
matrix:
node: [20, 22]

steps:
# Setup:
Expand All @@ -21,7 +24,7 @@ jobs:
- name: Setup Node
uses: actions/setup-node@v4
with:
node-version: '18'
node-version: ${{ matrix.node }}
cache: 'yarn'
cache-dependency-path: frontend/yarn.lock

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ui-tests-playwright.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- name: Setup Node
uses: actions/setup-node@v4
with:
node-version: '20'
node-version: '22'
cache: 'yarn'
cache-dependency-path: frontend/yarn.lock

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/weblate-reformat.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
- name: Setup Node
uses: actions/setup-node@v4
with:
node-version: '18'
node-version: '22'
cache: 'yarn'
cache-dependency-path: frontend/yarn.lock
- name: Install dependencies
Expand Down
2 changes: 1 addition & 1 deletion backend/btrixcloud/version.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
""" current version """

__version__ = "1.13.1"
__version__ = "1.13.2"
2 changes: 1 addition & 1 deletion chart/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ type: application
icon: https://webrecorder.net/assets/icon.png

# Browsertrix and Chart Version
version: v1.13.1
version: v1.13.2

dependencies:
- name: btrix-admin-logging
Expand Down
4 changes: 2 additions & 2 deletions chart/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ replica_deletion_delay_days: 0

# API Image
# =========================================
backend_image: "docker.io/webrecorder/browsertrix-backend:1.13.1"
backend_image: "docker.io/webrecorder/browsertrix-backend:1.13.2"
backend_pull_policy: "Always"

backend_password_secret: "PASSWORD!"
Expand Down Expand Up @@ -158,7 +158,7 @@ backend_avg_memory_threshold: 95

# Nginx Image
# =========================================
frontend_image: "docker.io/webrecorder/browsertrix-frontend:1.13.1"
frontend_image: "docker.io/webrecorder/browsertrix-frontend:1.13.2"
frontend_pull_policy: "Always"

frontend_cpu: "10m"
Expand Down
1 change: 0 additions & 1 deletion frontend/.yarnrc
Original file line number Diff line number Diff line change
@@ -1 +0,0 @@
ignore-engines true
2 changes: 1 addition & 1 deletion frontend/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# syntax=docker/dockerfile:1.4
FROM --platform=$BUILDPLATFORM docker.io/library/node:18 as build_deps
FROM --platform=$BUILDPLATFORM docker.io/library/node:22 as build_deps

WORKDIR /app
COPY .yarnrc yarn.lock package.json ./
Expand Down
4 changes: 2 additions & 2 deletions frontend/docs/docs/develop/frontend-dev.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ Instead of rebuilding the entire frontend image to view your UI changes, you can

The frontend development server requires an existing backend that has been deployed locally or is in production. See [Deploying Browsertrix](../deploy/index.md).

### 2. Node.js ≥18
### 2. Node.js ≥20

To check if you already have Node.js installed, run the following command in your command line terminal:

```sh
node --version
```

You should see a version number like `v18.12.1`. If you see a command line error instead of a version number, [install Node.js](https://nodejs.org/en/download/package-manager) before continuing.
You should see a version number like `v20.17.0`. If you see a command line error instead of a version number, [install Node.js](https://nodejs.org/en/download/package-manager) before continuing.

??? question "What if my other project requires a different version of Node.js?"

Expand Down
5 changes: 3 additions & 2 deletions frontend/package.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
{
"name": "browsertrix-frontend",
"version": "1.13.1",
"version": "1.13.2",
"main": "index.ts",
"license": "AGPL-3.0-or-later",
"dependencies": {
"@cheap-glitch/mi-cron": "^1.0.1",
"@formatjs/intl-durationformat": "^0.6.4",
"@formatjs/intl-localematcher": "^0.5.9",
"@ianvs/prettier-plugin-sort-imports": "^4.2.1",
"@lit/context": "^1.1.3",
"@lit/localize": "^0.12.1",
"@lit/task": "^1.0.0",
"@novnc/novnc": "^1.4.0-beta",
Expand Down Expand Up @@ -138,7 +139,7 @@
}
},
"engines": {
"node": ">=18"
"node": ">=20 <23"
},
"resolutions": {
"**/playwright": "1.49.0",
Expand Down
1 change: 0 additions & 1 deletion frontend/src/__generated__/locales/de.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion frontend/src/__generated__/locales/es.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 0b27119

Please sign in to comment.