starred/yaak-mountain-loop
1
0
Fork 0
mirror of https://github.com/mountain-loop/yaak.git synced 2026-07-02 19:11:39 +02:00
Code Issues 8 Packages Projects Releases 10 Wiki Activity

Fix import plugin hook

Browse Source
This commit is contained in:
Gregory Schier
2024-07-21 15:46:47 -07:00
parent c0e253ef84
commit a444984aed
2 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugin-runtime/scripts/generate-sea.cjs
+13 -14
View File
@@ -49,16 +49,16 @@ try {
unlinkSync(blobPath); unlinkSync(blobPath);
// NOTE: Don't need to resign, as Tauri will sign the sidecar binaries during release console.log('Re-signing Node.js');
// console.log('Re-signing Node.js'); try {
// try { if (process.platform === 'darwin') execSync(`codesign --sign - ${tmpNodePath}`);
// // if (process.platform === 'darwin') execSync(`codesign --sign - ${tmpNodePath}`); // NOTE: Don't need to resign, as Tauri will sign the sidecar binaries during release
// // else if (process.platform === 'win32') execSync(`"${getSigntoolLocation()}" sign /fd SHA256 ${tmpNodePath}`); // else if (process.platform === 'win32') execSync(`"${getSigntoolLocation()}" sign /fd SHA256 ${tmpNodePath}`);
// /* Nothing for Linux */ /* Nothing for Linux */
// } catch (err) { } catch (err) {
// console.log('Failed sign', err); console.log('Failed sign', err);
// process.exit(1); process.exit(1);
// } }
const key = `${process.platform}_${process.env.NODE_ARCH ?? process.arch}`; const key = `${process.platform}_${process.env.NODE_ARCH ?? process.arch}`;
const dstPath = path.join(destDir, DST_BIN_MAP[key]); const dstPath = path.join(destDir, DST_BIN_MAP[key]);
@@ -79,7 +79,7 @@ function getSigntoolLocation() {
if (!folder.endsWith('.0')) { if (!folder.endsWith('.0')) {
continue; continue;
} }
const folderVersion = parseInt(folder.replace(/\./g,'')); const folderVersion = parseInt(folder.replace(/\./g, ''));
if (folderVersion > maxVersion) { if (folderVersion > maxVersion) {
const signtoolFilename = `${windowsKitsFolder}${folder}/x64/signtool.exe`; const signtoolFilename = `${windowsKitsFolder}${folder}/x64/signtool.exe`;
try { try {
@@ -88,13 +88,12 @@ function getSigntoolLocation() {
fileName = signtoolFilename; fileName = signtoolFilename;
maxVersion = folderVersion; maxVersion = folderVersion;
} }
} } catch {
catch {
console.warn('Skipping %s due to error.', signtoolFilename); console.warn('Skipping %s due to error.', signtoolFilename);
} }
} }
} }
if(fileName === '') { if (fileName === '') {
throw new Error('Unable to find signtool.exe in ' + windowsKitsFolder); throw new Error('Unable to find signtool.exe in ' + windowsKitsFolder);
} }
plugin-runtime/src/index.ts
+1 -1
View File
@@ -31,7 +31,7 @@ class PluginRuntimeService implements PluginRuntimeServiceImplementation {
const plugins = await this.#manager.pluginsWith('import'); const plugins = await this.#manager.pluginsWith('import');
for (const p of plugins) { for (const p of plugins) {
const data = await p.runImport(request.data); const data = await p.runImport(request.data);
if (data != 'null') { if (data != null && data !== 'null') {
const info = { plugin: (await p.getInfo()).name }; const info = { plugin: (await p.getInfo()).name };
return { info, data }; return { info, data };
} }