Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

updating dependencies, removing the electron-is-dev dependency and moving to electron 33.0.2 #1460

Merged
merged 1 commit into from
Oct 27, 2024
Merged

updating dependencies, removing the electron-is-dev dependency and moving to electron 33.0.2 #1460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions app/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
const { app, dialog, ipcMain, desktopCapturer, globalShortcut, systemPreferences, powerMonitor, Notification, nativeImage } = require('electron');
const path = require('path');
const CustomBackground = require('./customBackground');
const isDev = require('electron-is-dev');
const os = require('os');
const isMac = os.platform() === 'darwin';

Expand All @@ -13,7 +12,7 @@ const { AppConfiguration } = require('./appConfiguration');
const appConfig = new AppConfiguration(app.getPath('userData'), app.getVersion());

const config = appConfig.startupConfig;
config.appPath = path.join(__dirname, isDev ? '' : '../../');
config.appPath = path.join(__dirname, !app.isPackaged ? '' : '../../');

addCommandLineSwitchesAfterConfigLoad();

Expand Down
8 changes: 8 additions & 0 deletions com.github.IsmaelMartinez.teams_for_linux.appdata.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,14 @@
<url type="bugtracker">https://github.com/IsmaelMartinez/teams-for-linux/issues</url>
<launchable type="desktop-id">com.github.IsmaelMartinez.teams_for_linux.desktop</launchable>
<releases>
<release version="1.11.3" date="2024-10-27">
<description>
<ul>
<li>Update electron to 33.0.2</li>
<li>Remove electron-is-dev and just use the app.isPackaged</li>
<li>Other small library updates</li>
</ul>
</description>
<release version="1.11.2" date="2024-10-16">
<description>
<ul>
Expand Down
43 changes: 17 additions & 26 deletions package-lock.json
View file
Open in desktop

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

9 changes: 4 additions & 5 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "teams-for-linux",
"version": "1.11.2",
"version": "1.11.3",
"main": "app/index.js",
"description": "Unofficial client for Microsoft Teams for Linux",
"homepage": "https://github.com/IsmaelMartinez/teams-for-linux",
Expand Down Expand Up @@ -43,7 +43,6 @@
"dependencies": {
"@electron/remote": "^2.1.2",
"@homebridge/dbus-native": "0.6.0",
"electron-is-dev": "2.0.0",
"electron-log": "^5.2.0",
"electron-store": "8.2.0",
"electron-window-state": "5.0.3",
Expand All @@ -54,10 +53,10 @@
},
"devDependencies": {
"@electron/fuses": "^1.8.0",
"@eslint/js": "^9.12.0",
"electron": "^32.2.0",
"@eslint/js": "^9.13.0",
"electron": "^33.0.2",
"electron-builder": "^25.1.8",
"eslint": "^9.12.0",
"eslint": "^9.13.0",
"globals": "^15.11.0"
},
"build": {
Expand Down
Loading