Fix import plugin hook

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
+10 -11
View File
@@ -49,16 +49,16 @@ try {
unlinkSync(blobPath); unlinkSync(blobPath);
console.log('Re-signing Node.js');
try {
if (process.platform === 'darwin') execSync(`codesign --sign - ${tmpNodePath}`);
// NOTE: Don't need to resign, as Tauri will sign the sidecar binaries during release // NOTE: Don't need to resign, as Tauri will sign the sidecar binaries during release
// console.log('Re-signing Node.js'); // else if (process.platform === 'win32') execSync(`"${getSigntoolLocation()}" sign /fd SHA256 ${tmpNodePath}`);
// try { /* Nothing for Linux */
// // if (process.platform === 'darwin') execSync(`codesign --sign - ${tmpNodePath}`); } catch (err) {
// // else if (process.platform === 'win32') execSync(`"${getSigntoolLocation()}" sign /fd SHA256 ${tmpNodePath}`); console.log('Failed sign', err);
// /* Nothing for Linux */ process.exit(1);
// } catch (err) { }
// console.log('Failed sign', err);
// 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]);
@@ -88,8 +88,7 @@ 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);
} }
} }
+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 };
} }