Merge branch 'release-0.11.0' of https://github.com/blakeblackshear/frigate into favorite-delete-protection

docker-compose.yml

@@ -23,6 +23,7 @@ services:
       - /dev/bus/usb:/dev/bus/usb
     ports:
       - "1935:1935"
+      - "3000:3000"
       - "5000:5000"
       - "5001:5001"
       - "8080:8080"

web/config/handlers.js

@@ -2,7 +2,7 @@ import { rest } from 'msw';
 import { API_HOST } from '../src/env';
 
 export const handlers = [
-  rest.get(`${API_HOST}/api/config`, (req, res, ctx) => {
+  rest.get(`${API_HOST}api/config`, (req, res, ctx) => {
     return res(
       ctx.status(200),
       ctx.json({
@@ -35,7 +35,7 @@ export const handlers = [
       })
     );
   }),
-  rest.get(`${API_HOST}/api/stats`, (req, res, ctx) => {
+  rest.get(`${API_HOST}api/stats`, (req, res, ctx) => {
     return res(
       ctx.status(200),
       ctx.json({
@@ -54,7 +54,7 @@ export const handlers = [
       })
     );
   }),
-  rest.get(`${API_HOST}/api/events`, (req, res, ctx) => {
+  rest.get(`${API_HOST}api/events`, (req, res, ctx) => {
     return res(
       ctx.status(200),
       ctx.json(

web/package.json

@@ -3,7 +3,7 @@
   "private": true,
   "version": "0.0.0",
   "scripts": {
-    "dev": "vite",
+    "dev": "vite --host",
     "lint": "eslint ./ --ext .jsx,.js,.tsx,.ts",
     "build": "tsc && vite build --base=/BASE_PATH/",
     "preview": "vite preview",

web/src/__mocks__/env.js

@@ -1,2 +1,2 @@
 export const ENV = 'test';
-export const API_HOST = 'http://base-url.local:5000';
+export const API_HOST = 'http://base-url.local:5000/';

web/src/api/__tests__/index.test.jsx

@@ -18,6 +18,6 @@ describe('useApiHost', () => {
         <Test />
       </ApiProvider>
     );
-    expect(screen.queryByText('http://base-url.local:5000')).toBeInTheDocument();
+    expect(screen.queryByText('http://base-url.local:5000/')).toBeInTheDocument();
   });
 });

web/src/env.js

@@ -1,2 +1,2 @@
 export const ENV = import.meta.env.MODE;
-export const API_HOST = ENV === "production" ? "" : "http://localhost:5000";
+export const API_HOST = ENV === 'production' ? '' : 'http://localhost:5000/';