allow requiring native node modules from backend scripts

This commit is contained in:
zadam 2019-08-12 20:41:38 +02:00
parent b1075d956f
commit dfa1ab65c6
3 changed files with 9 additions and 9 deletions

14
package-lock.json generated
View File

@ -1,6 +1,6 @@
{
"name": "trilium",
"version": "0.34.1",
"version": "0.34.2",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
@ -3108,9 +3108,9 @@
"integrity": "sha512-PcW2a0tyTuPHz3tWyYqtK6r1fZ3gp+3Sop8Ph+ZYN81Ob5rwmbHEzaqs10N3BEsaGTkh/ooniXK+WwszGlc2+Q=="
},
"electron": {
"version": "6.0.0",
"resolved": "https://registry.npmjs.org/electron/-/electron-6.0.0.tgz",
"integrity": "sha512-JVHj0dYtvVFrzVk1TgvrdXJSyLpdvlWNLhtG8ItYZsyg9XbCOQ9OoPfgLm04FjMzKMzEl4YIN0PfGC02MTx3PQ==",
"version": "6.0.1",
"resolved": "https://registry.npmjs.org/electron/-/electron-6.0.1.tgz",
"integrity": "sha512-XY69rI5IThIxsOS2BD+1ZkHE9hqkm4xN5a3WQFSmFRr2by4q5CnIe9vXmptlouGPTLs3tb7ySX/+K9CvH3szvg==",
"dev": true,
"requires": {
"@types/node": "^10.12.18",
@ -3720,9 +3720,9 @@
"dev": true
},
"semver": {
"version": "5.7.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
"integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==",
"version": "5.7.1",
"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
"integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
"dev": true
}
}

View File

@ -78,7 +78,7 @@
},
"devDependencies": {
"devtron": "1.4.0",
"electron": "6.0.0",
"electron": "6.0.1",
"electron-builder": "21.1.5",
"electron-compile": "6.4.4",
"electron-installer-debian": "2.0.0",

View File

@ -11,7 +11,7 @@ function ScriptContext(allNotes, apiParams = {}) {
const note = candidates.find(c => c.title === moduleName);
if (!note) {
throw new Error("Could not find module note " + moduleName);
return require(moduleName);
}
return this.modules[note.noteId].exports;