Skip to content

Commit 5dfada0

Browse files
andrewbreyandrewbrey
authored
chore: bump dependencies (#5)
1 parent 7202ac9 commit 5dfada0

File tree

7 files changed

+836
-945
lines changed

7 files changed

+836
-945
lines changed

‎main/background.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,11 @@ const videoCSSOnScript =
2222
const videoCSSOffScript =
2323
'document.documentElement.classList.remove("flot-video");';
2424

25-
if (isLinux) {
26-
// https://github.com/electron/electron/issues/25153#issuecomment-843688494
27-
app.commandLine.appendSwitch("use-gl", "desktop");
28-
}
25+
// TODO: can this be omitted finally?
26+
// if (isLinux) {
27+
// // https://github.com/electron/electron/issues/25153#issuecomment-843688494
28+
// app.commandLine.appendSwitch("use-gl", "desktop");
29+
// }
2930

3031
if (isProd) {
3132
serve({ directory: "app" });

‎main/helpers/web-requests.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
import { ElectronBlocker, fullLists, Request } from "@cliqz/adblocker-electron";
2+
import fetch from "cross-fetch";
23
import { app, Session } from "electron";
34
import { readFile, writeFile } from "fs/promises";
45
import { omitBy, toLower } from "lodash";
5-
import fetch from "cross-fetch";
66
import path from "path";
77

88
const verbose = false; // change to true for request block logs
9-
const engineCacheVersion = 1;
9+
const engineCacheVersion = 2;
1010

1111
// Extra sources thanks to https://github.com/th-ch/youtube-music/blob/master/plugins/adblocker/blocker.js
1212
const SOURCES = [
1313
"https://raw.githubusercontent.com/kbinani/adblock-youtube-ads/master/signed.txt",
1414
// uBlock Origin
1515
"https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/filters.txt",
16-
"https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/filters-2021.txt",
16+
"https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/filters-2023.txt",
1717
// Fanboy Annoyances
1818
"https://secure.fanboy.co.nz/fanboy-annoyance_ubo.txt",
1919
];

‎package.json

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"private": true,
33
"name": "Flot",
44
"description": "Open websites in a floating window",
5-
"version": "2.1.0",
5+
"version": "2.1.1",
66
"author": {
77
"name": "Andrew Brey",
88
"email": "[email protected]"
@@ -24,40 +24,40 @@
2424
"postinstall": "electron-builder install-app-deps"
2525
},
2626
"dependencies": {
27-
"@cliqz/adblocker-electron": "1.25.1",
28-
"@headlessui/react": "1.7.2",
29-
"@heroicons/react": "2.0.11",
27+
"@cliqz/adblocker-electron": "1.25.2",
28+
"@headlessui/react": "1.7.8",
29+
"@heroicons/react": "2.0.14",
3030
"classnames": "2.3.2",
3131
"cross-fetch": "3.1.5",
3232
"electron-better-ipc": "2.0.1",
3333
"electron-serve": "^1.1.0",
3434
"electron-store": "^8.1.0",
35-
"electron-updater": "5.2.1",
36-
"framer-motion": "7.3.6",
35+
"electron-updater": "5.3.0",
36+
"framer-motion": "8.5.5",
3737
"lodash": "4.17.21",
3838
"react-use": "17.4.0",
39-
"zustand": "4.1.1"
39+
"zustand": "4.3.2"
4040
},
4141
"devDependencies": {
4242
"@tailwindcss/forms": "0.5.3",
43-
"@types/lodash": "4.14.185",
44-
"@types/node": "^18.7.21",
43+
"@types/lodash": "4.14.191",
44+
"@types/node": "^18.11.18",
4545
"@types/node-fetch": "2.6.2",
46-
"@types/react": "^18.0.21",
47-
"autoprefixer": "^10.4.12",
48-
"concurrently": "7.4.0",
49-
"electron": "^20.2.0",
50-
"electron-builder": "^23.3.3",
46+
"@types/react": "^18.0.27",
47+
"autoprefixer": "^10.4.13",
48+
"concurrently": "7.6.0",
49+
"electron": "^21.4.0",
50+
"electron-builder": "^23.6.0",
5151
"live-server": "1.2.2",
52-
"next": "12.3.1",
53-
"nextron": "^8.2.0",
54-
"postcss": "^8.4.16",
52+
"next": "^12.3.4",
53+
"nextron": "^8.5.0",
54+
"postcss": "^8.4.21",
5555
"react": "^18.2.0",
5656
"react-dom": "^18.2.0",
57-
"tailwindcss": "^3.1.8",
58-
"typescript": "^4.8.3"
57+
"tailwindcss": "^3.2.4",
58+
"typescript": "^4.9.4"
5959
},
6060
"browserslist": [
61-
"Electron >= 20"
61+
"Electron >= 21"
6262
]
6363
}

‎renderer/pages/_document.tsx

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@ class FlotDocument extends Document {
1515
render() {
1616
return (
1717
<Html className="h-full w-full selection:bg-teal-700 selection:text-teal-100">
18+
<script
19+
dangerouslySetInnerHTML={{
20+
__html: "var global = globalThis;",
21+
}}
22+
/>
1823
<Head />
1924
<body className="h-full w-full">
2025
<Main />

‎renderer/pages/index.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ const magicHeight = "max-h-[calc(100%-0px)]";
1010

1111
function PageHome() {
1212
const url = useStore((state) => state.url);
13+
const title = url ? `Flōt | ${url}` : "Flōt";
1314
const storeOpacity = useStore((state) => state.opacity);
1415

1516
const [opacity, setOpactity] = React.useState(1);
@@ -19,7 +20,7 @@ function PageHome() {
1920
return (
2021
<React.Fragment>
2122
<Head>
22-
<title>Flōt | {url}</title>
23+
<title>{title}</title>
2324
</Head>
2425
<header className="h-8 relative">
2526
<FlotBar />

‎renderer/store.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import create from "zustand";
1+
import { create } from "zustand";
22
import {
33
prepareDailyMotionUrl,
44
prepareVimeoUrl,

0 commit comments

Comments
 (0)