From ee9ebb0c123659458f4534a7655633d15915372d Mon Sep 17 00:00:00 2001 From: Philip Peterson Date: Tue, 22 Apr 2025 19:30:27 -0700 Subject: [PATCH] fix: window not showing up in release (#128) * Try fix cross compilation * 1.0.6d * Remove externals, show window --- .github/workflows/nodejs.yml | 8 +++++--- app/index.ts | 6 +++++- app/package.json | 2 +- app/yarn.lock | 8 ++++---- webpack.config.ts | 26 -------------------------- 5 files changed, 15 insertions(+), 35 deletions(-) diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml index 52803e9b..32e427f8 100644 --- a/.github/workflows/nodejs.yml +++ b/.github/workflows/nodejs.yml @@ -13,9 +13,11 @@ jobs: runs-on: ${{matrix.os}} strategy: matrix: - os: - - macos-latest - - ubuntu-latest + include: + - os: macos-latest + name: macos + - os: ubuntu-latest + name: ubuntu #TODO re-enable these: #- windows-latest fail-fast: false diff --git a/app/index.ts b/app/index.ts index 84a804a4..24564b49 100644 --- a/app/index.ts +++ b/app/index.ts @@ -141,7 +141,11 @@ app.on('ready', () => const hwin = newWindow({width, height, x: startX, y: startY}, cfg, fn, profileName); windowSet.add(hwin); - void hwin.loadURL(url); + void hwin.loadURL(url) + + hwin.once('ready-to-show', () => { + hwin.show(); + }); // the window can be closed by the browser process itself hwin.on('close', () => { diff --git a/app/package.json b/app/package.json index b47c2175..80b32edf 100644 --- a/app/package.json +++ b/app/package.json @@ -21,7 +21,7 @@ "color": "4.2.3", "default-shell": "1.0.1", "electron-devtools-installer": "3.2.0", - "quine-electron-drag-click": "1.0.6b", + "quine-electron-drag-click": "1.0.6d", "electron-fetch": "1.9.1", "electron-is-dev": "2.0.0", "electron-store": "8.2.0", diff --git a/app/yarn.lock b/app/yarn.lock index b6b0e22e..d9a9d176 100644 --- a/app/yarn.lock +++ b/app/yarn.lock @@ -1219,10 +1219,10 @@ queue@6.0.2: dependencies: inherits "~2.0.3" -quine-electron-drag-click@1.0.6b: - version "1.0.6-b" - resolved "https://registry.npmjs.org/quine-electron-drag-click/-/quine-electron-drag-click-1.0.6-b.tgz#778d064db08d82241ae79357ffe982db444c47b2" - integrity sha512-m9uTUhHJf2q3878J8F1UHKRvgVxusodpqn924HePZ42YlfCQa3c85YDa2Ys8BbazmV8GC9f8uEUoKVJBXwOFTw== +quine-electron-drag-click@1.0.6d: + version "1.0.6-d" + resolved "https://registry.npmjs.org/quine-electron-drag-click/-/quine-electron-drag-click-1.0.6-d.tgz#210fc244fdf3a11b3ad1b2e2d7d7670176b5e19b" + integrity sha512-2geemTnPP3GuEGzOR/IbbXbTf+JX/VERjerA4r2TuXYHSanNiEbMWSSZ2wD8RllOnp/tBIE+O4CmmPfJ86rYQQ== dependencies: bindings "^1.5.0" node-addon-api "^3.0.2" diff --git a/webpack.config.ts b/webpack.config.ts index 41b43f49..6beeaf09 100644 --- a/webpack.config.ts +++ b/webpack.config.ts @@ -100,32 +100,6 @@ const config: webpack.Configuration[] = [ ] }, externals: { - 'color-convert': 'commonjs color-convert', - 'color-string': 'commonjs color-string', - columnify: 'commonjs columnify', - lodash: 'commonjs lodash', - ms: 'commonjs ms', - 'normalize-url': 'commonjs normalize-url', - 'parse-url': 'commonjs parse-url', - 'php-escape-shell': 'commonjs php-escape-shell', - plist: 'commonjs plist', - // 'react-dom': 'commonjs react-dom', - 'redux-thunk': 'commonjs redux-thunk', - redux: 'commonjs redux', - reselect: 'commonjs reselect', - 'seamless-immutable': 'commonjs seamless-immutable', - stylis: 'commonjs stylis', - '@xterm/addon-unicode11': 'commonjs @xterm/addon-unicode11', - args: 'commonjs args', - mousetrap: 'commonjs mousetrap', - open: 'commonjs open', - '@xterm/addon-fit': 'commonjs @xterm/addon-fit', - '@xterm/addon-image': 'commonjs @xterm/addon-image', - '@xterm/addon-search': 'commonjs @xterm/addon-search', - '@xterm/addon-web-links': 'commonjs @xterm/addon-web-links', - '@xterm/addon-webgl': 'commonjs @xterm/addon-webgl', - '@xterm/addon-canvas': 'commonjs @xterm/addon-canvas', - xterm: 'commonjs xterm' }, plugins: [ new webpack.IgnorePlugin({resourceRegExp: /.*\.js.map$/i}),