Skip to content

Commit 68bfb7b

Browse files
committed
Merge branch 'develop'
Signed-off-by: Pedro Lamas <[email protected]>
2 parents 564242b + 84afae7 commit 68bfb7b

File tree

103 files changed

+3483
-1792
lines changed

Some content is hidden

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

103 files changed

+3483
-1792
lines changed

.devcontainer/Dockerfile

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,20 @@
1-
FROM alpine:3.18
1+
FROM node:24-alpine
22

33
RUN \
44
apk update \
55
&& apk add \
66
git \
77
git-zsh-completion \
8-
nodejs \
9-
npm \
10-
openssh \
118
sudo \
129
shadow \
1310
zsh \
1411
zsh-completions \
15-
&& rm -f /etc/apk/cache/* /root/.cache \
16-
&& groupadd vscode \
17-
&& useradd -s /bin/zsh --gid vscode -m vscode \
18-
&& echo vscode ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/vscode \
19-
&& chmod 0440 /etc/sudoers.d/vscode \
20-
&& mkdir -p "/home/vscode" \
21-
&& chown vscode:vscode "/home/vscode"
12+
&& echo node ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/node \
13+
&& chmod 0440 /etc/sudoers.d/node \
14+
&& chsh -s /bin/zsh node \
15+
&& rm -f /etc/apk/cache/* /root/.cache
2216

23-
USER vscode
17+
USER node
2418

2519
RUN \
2620
sh -c "$(wget https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh -O -)"

.devcontainer/devcontainer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"dockerComposeFile": "docker-compose.yml",
66
"service": "fluidd",
77
"workspaceFolder": "/workspaces/fluidd",
8-
"forwardPorts": [5000, 8080, 7125, 8110],
8+
"forwardPorts": [7125, 8080],
99
"features": {
1010
},
1111
"postCreateCommand": "npm ci && npm run bootstrap",
@@ -33,5 +33,5 @@
3333
}
3434
}
3535
},
36-
"remoteUser": "vscode"
36+
"remoteUser": "node"
3737
}

.devcontainer/docker-compose.yml

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,8 @@ services:
77
volumes:
88
- ..:/workspaces/fluidd/:cached
99
command: sleep infinity
10-
networks:
11-
- fluidd-dev
12-
ports:
13-
- "5000:5000"
14-
- "8080:8080"
10+
network_mode: service:klipper-simulavr
1511

1612
klipper-simulavr:
1713
image: ei99070/docker-klipper-simulavr:latest
1814
restart: unless-stopped
19-
networks:
20-
- fluidd-dev
21-
ports:
22-
- "7125:7125"
23-
- "8110:8080"
24-
25-
networks:
26-
fluidd-dev:
27-
driver: bridge

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- name: Setup Node
2424
uses: actions/setup-node@v4
2525
with:
26-
node-version: 22
26+
node-version: 24
2727
cache: 'npm'
2828

2929
- name: Install dependencies

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: Setup Node
1717
uses: actions/setup-node@v4
1818
with:
19-
node-version: 22
19+
node-version: 24
2020
cache: 'npm'
2121

2222
- name: Install dependencies

.node-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
22.11.0
1+
24.11.0

components.d.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
/* eslint-disable */
22
// @ts-nocheck
3+
// biome-ignore lint: disable
4+
// oxlint-disable
5+
// ------
36
// Generated by unplugin-vue-components
47
// Read more: https://github.com/vuejs/core/pull/3399
5-
// biome-ignore lint: disable
8+
69
export {}
710

811
/* prettier-ignore */

docs/development/index.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,17 +41,17 @@ printer.
4141

4242
## Running Fluidd locally
4343

44-
### Install Node v20
44+
### Install Node v24
4545

46-
Follow the instructions from [Node.js](https://nodejs.org) to install Node.js, v20.x.
46+
Follow the instructions from [Node.js](https://nodejs.org) to install Node.js, v24.x.
4747

4848
Check that Node.js was installed properly:
4949

5050
```bash
5151
$ node --version
52-
v20.9.0
52+
v24.11.0
5353
$ npm --version
54-
10.1.0
54+
11.6.2
5555
```
5656

5757
### Install dependencies

docs/features/cameras.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,11 @@ The current supported types are:
3434
frame rate.
3535
- A more reliable approach in certain scenarios.
3636

37+
- **UV4L-MJPEG Stream**
38+
- Similiar to regular MJPEG Stream, however it has lower impact on the browser
39+
as it doesn't use a worker to read the stream and thus has no FPS
40+
indication.
41+
3742
- **HLS Stream**
3843
- Loads an HLS (HTTP Live Streaming) video stream via [HLS.js](https://hlsjs.video-dev.org/).
3944
- Utilizes HTML5 video and MediaSource Extensions for playback, requiring a

docs/installation/manual.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ permalink: /installation/manual
1414
Fluidd comes with a `build` script which automatically transpiles and bundles the source code.
1515
Every Fluidd release has a pre-built package available in the [GitHub Releases](https://github.com/fluidd-core/fluidd/releases) (`fluidd.zip`).
1616

17-
To manually build Fluidd, make sure you have NodeJS (v16.x) and Git installed. You can follow these steps to build the Fluidd repository:
17+
To manually build Fluidd, make sure you have NodeJS (v24.x) and Git installed. You can follow these steps to build the Fluidd repository:
1818
1. Clone the [Fluidd source code](https://github.com/fluidd-core/fluidd): `git clone https://github.com/fluidd-core/fluidd.git`
1919
2. Navigate to the Fluidd source code directory: `cd fluidd`
2020
3. Install the dependencies: `npm ci`

0 commit comments

Comments
 (0)