Skip to content

Commit

Permalink
fix(updater): Use escaped installer path to start the nsis updater (#…
Browse files Browse the repository at this point in the history
…727)

Port of v1 change: tauri-apps/tauri#7956

Committed via a GitHub action: https://github.com/tauri-apps/plugins-workspace/actions/runs/6877612128

Co-authored-by: amrbashir <[email protected]>
  • Loading branch information
2 people authored and tauri-bot committed Nov 15, 2023
1 parent 5c138ef commit ff6f5a4
Show file tree
Hide file tree
Showing 11 changed files with 47 additions and 155 deletions.
35 changes: 35 additions & 0 deletions dist-js/index.cjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
'use strict';

var primitives = require('@tauri-apps/api/primitives');

// Copyright 2019-2023 Tauri Programme within The Commons Conservancy
// SPDX-License-Identifier: Apache-2.0
// SPDX-License-Identifier: MIT
class Update {
constructor(metadata) {
this.currentVersion = metadata.currentVersion;
this.version = metadata.version;
this.date = metadata.date;
this.body = metadata.body;
}
/** Downloads the updater package and installs it */
async downloadAndInstall(onEvent) {
const channel = new primitives.Channel();
if (onEvent != null) {
channel.onmessage = onEvent;
}
return primitives.invoke("plugin:updater|download_and_install", {
onEvent: channel,
});
}
}
/** Check for updates, resolves to `null` if no updates are available */
async function check(options) {
if (options?.headers) {
options.headers = Array.from(new Headers(options.headers).entries());
}
return primitives.invoke("plugin:updater|check", { ...options }).then((meta) => (meta.available ? new Update(meta) : null));
}

exports.Update = Update;
exports.check = check;
3 changes: 1 addition & 2 deletions dist-js/index.mjs → dist-js/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,10 @@ class Update {
}
/** Check for updates, resolves to `null` if no updates are available */
async function check(options) {
if (options === null || options === void 0 ? void 0 : options.headers) {
if (options?.headers) {
options.headers = Array.from(new Headers(options.headers).entries());
}
return invoke("plugin:updater|check", { ...options }).then((meta) => (meta.available ? new Update(meta) : null));
}

export { Update, check };
//# sourceMappingURL=index.mjs.map
128 changes: 0 additions & 128 deletions dist-js/index.min.js

This file was deleted.

1 change: 0 additions & 1 deletion dist-js/index.min.js.map

This file was deleted.

1 change: 0 additions & 1 deletion dist-js/index.mjs.map

This file was deleted.

1 change: 0 additions & 1 deletion node_modules/tslib

This file was deleted.

11 changes: 2 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,26 +6,19 @@
"Tauri Programme within The Commons Conservancy"
],
"type": "module",
"browser": "dist-js/index.min.js",
"module": "dist-js/index.mjs",
"types": "dist-js/index.d.ts",
"exports": {
"import": "./dist-js/index.mjs",
"types": "./dist-js/index.d.ts",
"browser": "./dist-js/index.min.js"
"import": "./dist-js/index.js",
"require": "./dist-js/index.cjs"
},
"scripts": {
"build": "rollup -c"
},
"files": [
"dist-js",
"!dist-js/**/*.map",
"README.md",
"LICENSE"
],
"devDependencies": {
"tslib": "^2.5.0"
},
"dependencies": {
"@tauri-apps/api": "2.0.0-alpha.11"
}
Expand Down
7 changes: 7 additions & 0 deletions rollup.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
// Copyright 2019-2023 Tauri Programme within The Commons Conservancy
// SPDX-License-Identifier: Apache-2.0
// SPDX-License-Identifier: MIT

import { createConfig } from "../../shared/rollup.config.js";

export default createConfig();
Loading

0 comments on commit ff6f5a4

Please sign in to comment.