Skip to content

Commit 04ccf21

Browse files
committed
feat: refactor to turso db
1 parent 4575cc6 commit 04ccf21

12 files changed

Lines changed: 259 additions & 397 deletions

.github/release-template.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
- Download and run Firebot-v{0}-setup.exe
1616

1717
## MacOS Install
18-
- Download Firebot-v{0}-macos-arm64.dmg (Apple Silicon) or Firebot-v{0}-macos-x64.dmg (Intel Macs)
18+
- Download Firebot-v{0}-macos-arm64.dmg (Apple Silicon)
1919
- Right click the .dmg and select "Open"
2020
- In the dialog that appears click "Cancel"
2121
- Right click the .dmg again and select "Open"

.github/workflows/compile-and-release.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,5 +142,4 @@ jobs:
142142
./bundles/Linux/firebot-v${{ needs.checkversion.outputs.version }}-linux-x64.tar.gz
143143
./bundles/Linux/firebot-v${{ needs.checkversion.outputs.version }}-linux-x64.deb
144144
./bundles/Linux/firebot-v${{ needs.checkversion.outputs.version }}-linux-x64.rpm
145-
./bundles/macOS/firebot-v${{ needs.checkversion.outputs.version }}-macos-x64.dmg
146145
./bundles/macOS/firebot-v${{ needs.checkversion.outputs.version }}-macos-arm64.dmg

grunt/compile.js

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ const createWindowsInstaller = require('electron-winstaller').createWindowsInsta
1313
*/
1414
module.exports = function (grunt) {
1515

16-
const macIntelPathIn = path.resolve(__dirname, `../dist/pack/Firebot-darwin-x64/Firebot.app`);
1716
const macArmPathIn = path.resolve(__dirname, `../dist/pack/Firebot-darwin-arm64/Firebot.app`);
1817
const macPathOut = path.resolve(__dirname, '../dist/install/darwin');
1918
const macDmgIcon = path.resolve(__dirname, `../build/gui/images/logo_transparent_2.png`);
@@ -138,15 +137,6 @@ module.exports = function (grunt) {
138137
}
139138
},
140139
'create-macos-installer': {
141-
x64: {
142-
appPath: macIntelPathIn,
143-
out: macPathOut,
144-
name: `firebot-v${version}-macos-x64`,
145-
title: "Firebot Installer",
146-
icon: macDmgIcon,
147-
background: macDmgBg,
148-
installInstructionsPath: path.resolve(__dirname, '../macos-x64-install-instructions.txt')
149-
},
150140
arm64: {
151141
appPath: macArmPathIn,
152142
out: macPathOut,
@@ -185,7 +175,7 @@ module.exports = function (grunt) {
185175
break;
186176

187177
case 'darwin':
188-
compileCommands = ['create-macos-installer:x64', 'create-macos-installer:arm64'];
178+
compileCommands = ['create-macos-installer:arm64'];
189179
break;
190180

191181
default:

grunt/copy.js

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,13 +60,6 @@ module.exports = function (grunt) {
6060
},
6161
darwin: {
6262
files: [
63-
{
64-
expand: true,
65-
dest: 'dist/pack/Firebot-darwin-x64/Firebot.app/Contents/Resources/resources/',
66-
cwd: 'build/resources/',
67-
src: ['**'],
68-
filter: 'isFile'
69-
},
7063
{
7164
expand: true,
7265
dest: 'dist/pack/Firebot-darwin-arm64/Firebot.app/Contents/Resources/resources/',

grunt/pack.js

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -31,20 +31,20 @@ module.exports = function (grunt) {
3131
let ignoreFlags;
3232
try {
3333
ignoreFlags = formatIgnoreList([
34-
{dotfiles: true},
35-
{dotdirs: true},
36-
{path: 'build/resources'},
37-
{path: 'dist'},
38-
{path: 'doc'},
39-
{path: 'docs'},
40-
{path: 'grunt'},
41-
{path: 'profiles'},
42-
{path: 'src'},
43-
{path: 'Gruntfile.js', isFile: true},
44-
{path: 'package.lock', isFile: true},
45-
{path: 'README.md', isFile: true},
46-
{path: 'secrets.gpg', isFile: true},
47-
{path: 'tsconfig.json', isFile: true}
34+
{ dotfiles: true },
35+
{ dotdirs: true },
36+
{ path: 'build/resources' },
37+
{ path: 'dist' },
38+
{ path: 'doc' },
39+
{ path: 'docs' },
40+
{ path: 'grunt' },
41+
{ path: 'profiles' },
42+
{ path: 'src' },
43+
{ path: 'Gruntfile.js', isFile: true },
44+
{ path: 'package.lock', isFile: true },
45+
{ path: 'README.md', isFile: true },
46+
{ path: 'secrets.gpg', isFile: true },
47+
{ path: 'tsconfig.json', isFile: true }
4848
]);
4949
} catch (err) {
5050
grunt.fail.fatal(err);
@@ -53,9 +53,8 @@ module.exports = function (grunt) {
5353

5454
const flags = [
5555
'--out="./dist/pack"',
56-
'--arch=x64',
5756
`--electronVersion=${version}`,
58-
'--asar.unpack="**/@duckdb/**/*.{node,dylib,so,dll}"',
57+
'--asar.unpack="**/@tursodatabase/**/*.node"',
5958
'--prune',
6059
'--overwrite',
6160
'--version-string.ProductName="Firebot v5"',
@@ -76,13 +75,13 @@ module.exports = function (grunt) {
7675
grunt.config.merge({
7776
shell: {
7877
packwin64: {
79-
command: `npx --no-install @electron/packager . Firebot --platform=win32 ${flags} --app-version=${windowsAppVersion}`
78+
command: `npx --no-install @electron/packager . Firebot --platform=win32 --arch=x64 ${flags} --app-version=${windowsAppVersion}`
8079
},
8180
packdarwin: {
82-
command: `npx --no-install @electron/packager . Firebot --platform=darwin ${flags} --arch=arm64 --extend-info="extra.plist" --extra-resource="./src/resources/firebot-setup-file-icon.icns"`
81+
command: `npx --no-install @electron/packager . Firebot --platform=darwin --arch=arm64 ${flags} --extend-info="extra.plist" --extra-resource="./src/resources/firebot-setup-file-icon.icns"`
8382
},
8483
packlinux: {
85-
command: `npx --no-install @electron/packager . Firebot --platform=linux ${flags}`
84+
command: `npx --no-install @electron/packager . Firebot --platform=linux --arch=x64 ${flags}`
8685
}
8786
}
8887
});

macos-x64-install-instructions.txt

Lines changed: 0 additions & 9 deletions
This file was deleted.

package-lock.json

Lines changed: 75 additions & 133 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@
6060
},
6161
"dependencies": {
6262
"@aws-sdk/client-polly": "^3.26.0",
63-
"@duckdb/node-api": "^1.5.4-r.1",
6463
"@lucide/vue": "^1.18.0",
6564
"@seald-io/nedb": "^4.0.4",
65+
"@tursodatabase/database": "^0.6.1",
6666
"@twurple/chat": "^8.1.4",
6767
"@twurple/eventsub-ws": "^8.1.4",
6868
"@types/tinycolor2": "^1.4.6",

0 commit comments

Comments
 (0)