Skip to content

Commit

Permalink
Merge branch 'main' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
matthme committed Apr 11, 2024
2 parents ada1f5e + 5c36736 commit a5247a9
Show file tree
Hide file tree
Showing 8 changed files with 31 additions and 28 deletions.
1 change: 1 addition & 0 deletions electron-builder.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ files:
- moss.config.json
asarUnpack:
- resources/**
- *.node # https://github.com/electron/packager/issues/217#issuecomment-232376957
afterSign: scripts/notarize.js
win:
executableName: lightningrodlabs-we
Expand Down
44 changes: 22 additions & 22 deletions flake.lock

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

2 changes: 1 addition & 1 deletion libs/we-applet/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@lightningrodlabs/we-applet",
"version": "0.16.1",
"version": "0.16.2",
"main": "./dist/index.js",
"module": "./dist/index.js",
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion libs/we-applet/src/api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import {
WeaveLocation,
FrameNotification,
} from './types';
import { postMessage } from './utils';
import { postMessage } from './utils.js';
import { decode, encode } from '@msgpack/msgpack';
import { fromUint8Array, toUint8Array } from 'js-base64';

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "org.lightningrodlabs.we-electron-alpha",
"version": "0.11.9",
"version": "0.11.10",
"private": true,
"description": "Moss (Alpha)",
"main": "./out/main/index.js",
Expand Down
4 changes: 2 additions & 2 deletions scripts/latest-yaml.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ const latestYaml = {
{
url: exeFileName,
sha512,
size: 'unknown',
size: fileBytes.length,
},
],
path: exeFileName,
Expand All @@ -38,4 +38,4 @@ const latestYaml = {
console.log('sha512: ', sha512);
console.log('modified latest.yaml: ', latestYaml);

fs.writeFileSync('latest.yml', latestYaml, 'utf-8');
fs.writeFileSync('latest.yml', yaml.dump(latestYaml, { lineWidth: -1 }), 'utf-8');
2 changes: 1 addition & 1 deletion src/main/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -508,7 +508,7 @@ app.whenReady().then(async () => {
label: 'Restart',
type: 'normal',
click() {
let options: Electron.RelaunchOptions = {
const options: Electron.RelaunchOptions = {
args: process.argv,
};
// https://github.com/electron-userland/electron-builder/issues/1727#issuecomment-769896927
Expand Down
2 changes: 2 additions & 0 deletions src/renderer/src/groups/elements/group-home.ts
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,8 @@ export class GroupHome extends LitElement {
await this.mossStore.checkForUiUpdates();
(this.shadowRoot!.getElementById('loading-dialog') as LoadingDialog).hide();
notify(msg('Applet UI updated.'));
// Required to have the browser refetch the UI. A nicer approach would be to selectively only
// reload the iframes associated to that applet
window.location.reload();
} catch (e) {
console.error(`Failed to update UI: ${e}`);
Expand Down

0 comments on commit a5247a9

Please sign in to comment.