Skip to content

Commit 5e09b78

Browse files
committed
fix: implement unified versioning system and fix desktop app loading
- Fix desktop app black screen by always loading web URL instead of local files - Integrate desktop app versioning with main app automated versioning system - Update desktop build workflow to trigger on main package.json changes - Ensure single version consistency across web and desktop applications
1 parent 845a69f commit 5e09b78

5 files changed

Lines changed: 14 additions & 19 deletions

File tree

.github/workflows/desktop-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ jobs:
8484
- name: Check if version changed
8585
id: version-check
8686
run: |
87-
if git diff HEAD~1 HEAD --name-only | grep -q "apps/desktop/package\.json" && git diff HEAD~1 HEAD | grep -E "^\+.*version.*[0-9]+\.[0-9]+\.[0-9]+"; then
87+
if git diff HEAD~1 HEAD --name-only | grep -q "package\.json" && git diff HEAD~1 HEAD | grep -E "^\+.*version.*[0-9]+\.[0-9]+\.[0-9]+"; then
8888
VERSION=$(node -p "require('./package.json').version")
8989
echo "version-changed=true" >> $GITHUB_OUTPUT
9090
echo "new-version=v$VERSION" >> $GITHUB_OUTPUT

apps/desktop/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "typelets-desktop",
3-
"version": "0.4.23",
3+
"version": "1.15.3",
44
"description": "Typelets Desktop - Secure Note Taking App",
55
"main": "dist/main.js",
66
"author": "Typelets Team",

apps/desktop/src/main.ts

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -28,34 +28,20 @@ function createWindow(): void {
2828
},
2929
icon: join(__dirname, 'assets', 'icon.png'),
3030
titleBarStyle: 'default',
31-
show: false
31+
show: true
3232
});
3333

3434
if (isDev) {
3535
mainWindow.webContents.session.clearCache();
36-
37-
mainWindow.loadURL('https://app.typelets.com');
3836
mainWindow.webContents.openDevTools();
39-
} else {
40-
mainWindow.loadFile(join(__dirname, '../../dist/index.html'));
4137
}
4238

43-
mainWindow.once('ready-to-show', () => {
44-
mainWindow.show();
45-
});
39+
mainWindow.loadURL('https://app.typelets.com');
4640

4741
mainWindow.webContents.setWindowOpenHandler(({ url }) => {
4842
shell.openExternal(url);
4943
return { action: 'deny' };
5044
});
51-
52-
mainWindow.webContents.on('will-navigate', (event, navigationUrl) => {
53-
const parsedUrl = new URL(navigationUrl);
54-
55-
if (parsedUrl.origin !== 'https://app.typlets.com' && !isDev) {
56-
event.preventDefault();
57-
}
58-
});
5945
}
6046

6147
app.whenReady().then(() => {

scripts/update-version.js

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,15 @@ const versionContent = `export const APP_VERSION = '${version}';\n`;
1919
fs.writeFileSync(versionFilePath, versionContent);
2020
console.log(`Updated version.ts to ${version}`);
2121

22+
// Update desktop app package.json version
23+
const desktopPackagePath = path.join(__dirname, '../apps/desktop/package.json');
24+
if (fs.existsSync(desktopPackagePath)) {
25+
const desktopPackage = JSON.parse(fs.readFileSync(desktopPackagePath, 'utf8'));
26+
desktopPackage.version = version;
27+
fs.writeFileSync(desktopPackagePath, JSON.stringify(desktopPackage, null, 2) + '\n');
28+
console.log(`Updated desktop package.json to ${version}`);
29+
}
30+
2231
// Update README if you have version badges
2332
const readmePath = path.join(__dirname, '../README.md');
2433
if (fs.existsSync(readmePath)) {

src/constants/version.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export const APP_VERSION = '1.15.2';
1+
export const APP_VERSION = '1.15.3';

0 commit comments

Comments
 (0)