` + `})
` + '
';
+ }
+
+ const mime = resource.mime ? resource.mime.toLowerCase() : '';
+ if (ResourceModel.isSupportedImageMimeType(mime)) {
+ let newSrc = `./${ResourceModel.filename(resource)}`;
+ if (resourceBaseUrl) newSrc = resourceBaseUrl + newSrc;
+ return {
+ 'data-resource-id': resource.id,
+ src: newSrc,
+ };
+ }
+
+ return null;
+};
+
+module.exports = utils;
diff --git a/ReactNativeClient/lib/joplin-renderer/vendor/fountain.min.js b/ReactNativeClient/lib/joplin-renderer/vendor/fountain.min.js
new file mode 100644
index 000000000..0ddebd3bd
--- /dev/null
+++ b/ReactNativeClient/lib/joplin-renderer/vendor/fountain.min.js
@@ -0,0 +1,14 @@
+// https://github.com/mattdaly/Fountain.js/
+
+(function(){var d={title_page:/^((?:title|credit|author[s]?|source|notes|draft date|date|contact|copyright)\:)/gim,scene_heading:/^((?:\*{0,3}_?)?(?:(?:int|ext|est|i\/e)[. ]).+)|^(?:\.(?!\.+))(.+)/i,scene_number:/( *#(.+)# *)/,transition:/^((?:FADE (?:TO BLACK|OUT)|CUT TO BLACK)\.|.+ TO\:)|^(?:> *)(.+)/,dialogue:/^([A-Z*_]+[0-9A-Z (._\-')]*)(\^?)?(?:\n(?!\n+))([\s\S]+)/,parenthetical:/^(\(.+\))$/,action:/^(.+)/g,centered:/^(?:> *)(.+)(?: *<)(\n.+)*/g,section:/^(#+)(?: *)(.*)/,synopsis:/^(?:\=(?!\=+) *)(.*)/,
+note:/^(?:\[{2}(?!\[+))(.+)(?:\]{2}(?!\[+))$/,note_inline:/(?:\[{2}(?!\[+))([\s\S]+?)(?:\]{2}(?!\[+))/g,boneyard:/(^\/\*|^\*\/)$/g,page_break:/^\={3,}$/,line_break:/^ {2}$/,emphasis:/(_|\*{1,3}|_\*{1,3}|\*{1,3}_)(.+)(_|\*{1,3}|_\*{1,3}|\*{1,3}_)/g,bold_italic_underline:/(_{1}\*{3}(?=.+\*{3}_{1})|\*{3}_{1}(?=.+_{1}\*{3}))(.+?)(\*{3}_{1}|_{1}\*{3})/g,bold_underline:/(_{1}\*{2}(?=.+\*{2}_{1})|\*{2}_{1}(?=.+_{1}\*{2}))(.+?)(\*{2}_{1}|_{1}\*{2})/g,italic_underline:/(?:_{1}\*{1}(?=.+\*{1}_{1})|\*{1}_{1}(?=.+_{1}\*{1}))(.+?)(\*{1}_{1}|_{1}\*{1})/g,
+bold_italic:/(\*{3}(?=.+\*{3}))(.+?)(\*{3})/g,bold:/(\*{2}(?=.+\*{2}))(.+?)(\*{2})/g,italic:/(\*{1}(?=.+\*{1}))(.+?)(\*{1})/g,underline:/(_{1}(?=.+_{1}))(.+?)(_{1})/g,splitter:/\n{2,}/g,cleaner:/^\n+|\n+$/,standardizer:/\r\n|\r/g,whitespacer:/^\t+|^ {3,}/gm},n={note:"<\!-- $1 --\>",line_break:"` + '",bold_italic_underline:'$2',bold_underline:'$2',italic_underline:'$2',bold_italic:'$2', +bold:'$2',italic:'$2',underline:'$2',lexer:function(c){if(c){for(var j="underline,italic,bold,bold_italic,italic_underline,bold_underline,bold_italic_underline".split(","),k=j.length,g,b,c=c.replace(d.note_inline,n.note).replace(/\\\*/g,"[star]").replace(/\\_/g,"[underline]").replace(/\n/g,n.line_break);k--;)g=j[k],b=d[g],b.test(c)&&(c=c.replace(b,n[g]));return c.replace(/\[star\]/g,"*").replace(/\[underline\]/g, +"_").trim()}}},h=function(c,d){return h.parse(c,d)};h.parse=function(c,j,k){var g;void 0===k&&"function"===typeof j&&(k=j,j=void 0);for(var b=c.replace(d.boneyard,"\n$1\n").replace(d.standardizer,"\n").replace(d.cleaner,"").replace(d.whitespacer,"").split(d.splitter),f=b.length,e,a,l,i,h,m,c=[];f--;)if(e=b[f],d.title_page.test(e)){a=e.replace(d.title_page,"\n$1").split(d.splitter).reverse();i=0;for(h=a.length;i
"," ").replace(/<(?:.|\n)*?>/g,"");break;case "credit":f.push('
'+b.text+"
");break;case "author":f.push('");break;case "authors":f.push('");break;case "source":f.push(''+b.text+"
");break;case "notes":f.push(''+b.text+"
");break;case "draft_date":f.push(''+b.text+"
");break;case "date":f.push(''+b.text+"
");break;case "contact":f.push(''+b.text+"
");break;case "copyright":f.push(''+b.text+"
");break;case "scene_heading":a.push(""+b.text+"
");break;case "dual_dialogue_begin":a.push('');break;case "dialogue_begin":a.push('
");break;case "section":a.push('');break;case "character":a.push("
");
+break;case "dual_dialogue_end":a.push(""+b.text+"
");break;case "parenthetical":a.push(''+b.text+"
");break;case "dialogue":a.push(""+b.text+"
");break;case "dialogue_end":a.push("'+b.text+"
");break;case "synopsis":a.push(''+b.text+"
");break;case "note":a.push("<\!-- "+b.text+"--\>");break;case "boneyard_begin":a.push("<\!-- ");break;case "boneyard_end":a.push(" --\>");break;case "action":a.push(""+b.text+"
");break;case "centered":a.push(''+b.text+"
");break;case "page_break":a.push("");break; +case "line_break":a.push("
")}g={title:g,html:{title_page:f.join(""),script:a.join("")},tokens:j?c.reverse():void 0};g="function"===typeof k?k(g):g;return g};"undefined"!==typeof module?module.exports=h:this.fountain=h}).call(this); \ No newline at end of file diff --git a/ReactNativeClient/lib/joplin-renderer/webviewLib.js b/ReactNativeClient/lib/joplin-renderer/webviewLib.js new file mode 100644 index 000000000..4f9a34e67 --- /dev/null +++ b/ReactNativeClient/lib/joplin-renderer/webviewLib.js @@ -0,0 +1,110 @@ +const webviewLib = {}; + +let manualDownloadResourceElements = []; + +webviewLib.onUnloadedResourceClick = function(event) { + const resourceId = event.currentTarget.getAttribute('data-resource-id'); + webviewLib.options_.postMessage(`markForDownload:${resourceId}`); +}; + +webviewLib.setupResourceManualDownload = function() { + for (const element of manualDownloadResourceElements) { + element.style.cursor = 'default'; + element.removeEventListener('click', webviewLib.onUnloadedResourceClick); + } + + manualDownloadResourceElements = []; + + const elements = document.getElementsByClassName('resource-status-notDownloaded'); + + for (const element of elements) { + element.style.cursor = 'pointer'; + element.addEventListener('click', webviewLib.onUnloadedResourceClick); + manualDownloadResourceElements.push(element); + } +}; + +webviewLib.handleInternalLink = function(event, anchorNode) { + const href = anchorNode.getAttribute('href'); + if (!href) return false; + + if (href.indexOf('#') === 0) { + event.preventDefault(); + let old_hash = location.hash; + + location.hash = href; + + // HACK + // For some reason anchors at the bottom cause the webview to move itself + // so that the content is aligned with the top of the screen + // This basically refreshes the scroll view so that is returns to a normal + // position, the scroll positions stays correct though + // Additionally an anchor could not be clicked twice because the location + // would not change, this fixes that also + setTimeout(function() { + location.hash = old_hash; + }, 10); + return true; + } + + return false; +}; + +webviewLib.getParentAnchorElement = function(element) { + let counter = 0; + while (true) { + if (counter++ >= 10000) { + console.warn('been looping for too long - exiting'); + return null; + } + + if (!element) return null; + if (element.nodeName === 'A') return element; + element = element.parentElement; + } +}; + +webviewLib.cloneError = function(error) { + return { + message: error.message, + stack: error.stack, + }; +}; + +webviewLib.logEnabledEventHandler = function(fn) { + return function(event) { + try { + return fn(event); + } catch (error) { + webviewLib.options_.postMessage(`error:${JSON.stringify(webviewLib.cloneError(error))}`); + throw error; + } + }; +}; + +webviewLib.initialize = function(options) { + webviewLib.options_ = options; +}; + +document.addEventListener('click', function(event) { + const anchor = webviewLib.getParentAnchorElement(event.target); + if (!anchor) return; + + // Prevent URLs added via tags from being opened within the application itself + // otherwise it would open the whole website within the WebView. + + // Note that we already handle some links in html_inline.js, however not all of them + // go through this plugin, in particular links coming from third-party packages such + // as Katex. + if (!anchor.hasAttribute('data-from-md')) { + if (webviewLib.handleInternalLink(event, anchor)) return; + event.preventDefault(); + if (anchor.getAttribute('href')) webviewLib.options_.postMessage(anchor.getAttribute('href')); + return; + } + + // If this is an internal link, jump to the anchor directly + if (anchor.hasAttribute('data-from-md')) { + if (webviewLib.handleInternalLink(event, anchor)) return; + } +}); diff --git a/ReactNativeClient/lib/markdownUtils.js b/ReactNativeClient/lib/markdownUtils.js index c619b54db..6ac4301b9 100644 --- a/ReactNativeClient/lib/markdownUtils.js +++ b/ReactNativeClient/lib/markdownUtils.js @@ -1,7 +1,7 @@ const stringPadding = require('string-padding'); const urlUtils = require('lib/urlUtils'); const MarkdownIt = require('markdown-it'); -const { setupLinkify } = require('joplin-renderer'); +const { setupLinkify } = require('lib/joplin-renderer'); const markdownUtils = { // Not really escaping because that's not supported by marked.js diff --git a/ReactNativeClient/lib/markupLanguageUtils.js b/ReactNativeClient/lib/markupLanguageUtils.js index 50b863597..311bad621 100644 --- a/ReactNativeClient/lib/markupLanguageUtils.js +++ b/ReactNativeClient/lib/markupLanguageUtils.js @@ -2,7 +2,7 @@ const markdownUtils = require('lib/markdownUtils'); const htmlUtils = require('lib/htmlUtils'); const Setting = require('lib/models/Setting'); const Resource = require('lib/models/Resource'); -const { MarkupToHtml } = require('joplin-renderer'); +const { MarkupToHtml } = require('lib/joplin-renderer'); class MarkupLanguageUtils { lib_(language) { diff --git a/ReactNativeClient/lib/models/Note.js b/ReactNativeClient/lib/models/Note.js index 68c38d86f..8bc4af74f 100644 --- a/ReactNativeClient/lib/models/Note.js +++ b/ReactNativeClient/lib/models/Note.js @@ -11,7 +11,7 @@ const { _ } = require('lib/locale.js'); const ArrayUtils = require('lib/ArrayUtils.js'); const lodash = require('lodash'); const urlUtils = require('lib/urlUtils.js'); -const { MarkupToHtml } = require('joplin-renderer'); +const { MarkupToHtml } = require('lib/joplin-renderer'); class Note extends BaseItem { static tableName() { diff --git a/ReactNativeClient/lib/services/InteropService_Exporter_Html.js b/ReactNativeClient/lib/services/InteropService_Exporter_Html.js index 10bc4c752..943cffef4 100644 --- a/ReactNativeClient/lib/services/InteropService_Exporter_Html.js +++ b/ReactNativeClient/lib/services/InteropService_Exporter_Html.js @@ -9,7 +9,7 @@ const { themeStyle } = require('../../theme.js'); const { dirname } = require('lib/path-utils.js'); const { escapeHtml } = require('lib/string-utils.js'); const markupLanguageUtils = require('lib/markupLanguageUtils'); -const { assetsToHeaders } = require('joplin-renderer'); +const { assetsToHeaders } = require('lib/joplin-renderer'); class InteropService_Exporter_Html extends InteropService_Exporter_Base { diff --git a/ReactNativeClient/lib/services/rest/Api.js b/ReactNativeClient/lib/services/rest/Api.js index a6d041333..2b7dc9130 100644 --- a/ReactNativeClient/lib/services/rest/Api.js +++ b/ReactNativeClient/lib/services/rest/Api.js @@ -22,7 +22,7 @@ const ApiResponse = require('lib/services/rest/ApiResponse'); const SearchEngineUtils = require('lib/services/SearchEngineUtils'); const { FoldersScreenUtils } = require('lib/folders-screen-utils.js'); const uri2path = require('file-uri-to-path'); -const { MarkupToHtml } = require('joplin-renderer'); +const { MarkupToHtml } = require('lib/joplin-renderer'); const { uuid } = require('lib/uuid'); class ApiError extends Error { diff --git a/ReactNativeClient/package-lock.json b/ReactNativeClient/package-lock.json index d6beee4e8..eb521c994 100644 --- a/ReactNativeClient/package-lock.json +++ b/ReactNativeClient/package-lock.json @@ -2691,11 +2691,6 @@ "locate-path": "^2.0.0" } }, - "font-awesome-filetypes": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/font-awesome-filetypes/-/font-awesome-filetypes-2.1.0.tgz", - "integrity": "sha512-U6hi14GRjfZFIWsTNyVmCBuHyPhiizWEKVbaQqHipKQv3rA1l1PNvmKulzpqxonFnQMToty5ZhfWbc/0IjLDGA==" - }, "for-in": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", @@ -2736,6 +2731,7 @@ "version": "8.1.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", + "dev": true, "requires": { "graceful-fs": "^4.2.0", "jsonfile": "^4.0.0", @@ -2745,7 +2741,8 @@ "graceful-fs": { "version": "4.2.3", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz", - "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==" + "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==", + "dev": true } } }, @@ -3369,11 +3366,6 @@ } } }, - "highlight.js": { - "version": "9.18.0", - "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-9.18.0.tgz", - "integrity": "sha512-A97kI1KAUzKoAiEoaGcf2O9YPS8nbDTCRFokaaeBhnqjQTvbAuAJrQMm21zw8s8xzaMtCQBtgbyGXLGxdxQyqQ==" - }, "hoist-non-react-statics": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-2.5.0.tgz", @@ -3758,58 +3750,6 @@ "integrity": "sha512-+f/4OLeqY8RAmXnonI1ffeY1DR8kMNJPhv5WMFehchf7U71cjMQVKkOz1n6asz6kfVoAqKNWJz1A/18i18AcXA==", "dev": true }, - "joplin-renderer": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/joplin-renderer/-/joplin-renderer-1.0.8.tgz", - "integrity": "sha512-Q4SSYXl9ErcnUDTz7N4FjWcOOgfPEf5yyNRjU2J1fuxZ/1VbYt6MnfBB7OeiRW+XF+4Arhihk+/XVK++of4hEA==", - "requires": { - "base-64": "^0.1.0", - "font-awesome-filetypes": "^2.1.0", - "fs-extra": "^8.1.0", - "highlight.js": "^9.17.1", - "html-entities": "^1.2.1", - "json-stringify-safe": "^5.0.1", - "katex": "^0.11.1", - "markdown-it": "^10.0.0", - "markdown-it-abbr": "^1.0.4", - "markdown-it-anchor": "^5.2.5", - "markdown-it-deflist": "^2.0.3", - "markdown-it-emoji": "^1.4.0", - "markdown-it-footnote": "^3.0.2", - "markdown-it-ins": "^3.0.0", - "markdown-it-mark": "^3.0.0", - "markdown-it-multimd-table": "^4.0.1", - "markdown-it-sub": "^1.0.0", - "markdown-it-sup": "^1.0.0", - "markdown-it-toc-done-right": "^4.1.0", - "md5": "^2.2.1", - "uslug": "^1.0.4" - }, - "dependencies": { - "entities": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/entities/-/entities-2.0.0.tgz", - "integrity": "sha512-D9f7V0JSRwIxlRI2mjMqufDrRDnx8p+eEOz7aUM9SuvF8gsBzra0/6tbjl1m8eQHrZlYj6PxqE00hZ1SAIKPLw==" - }, - "markdown-it": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-10.0.0.tgz", - "integrity": "sha512-YWOP1j7UbDNz+TumYP1kpwnP0aEa711cJjrAQrzd0UXlbJfc5aAq0F/PZHjiioqDC1NKgvIMX+o+9Bk7yuM2dg==", - "requires": { - "argparse": "^1.0.7", - "entities": "~2.0.0", - "linkify-it": "^2.0.0", - "mdurl": "^1.0.1", - "uc.micro": "^1.0.5" - } - }, - "uc.micro": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz", - "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==" - } - } - }, "js-tokens": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz", @@ -3847,11 +3787,6 @@ "jsonify": "~0.0.0" } }, - "json-stringify-safe": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", - "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=" - }, "json5": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.0.tgz", @@ -3873,21 +3808,6 @@ "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz", "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=" }, - "katex": { - "version": "0.11.1", - "resolved": "https://registry.npmjs.org/katex/-/katex-0.11.1.tgz", - "integrity": "sha512-5oANDICCTX0NqYIyAiFCCwjQ7ERu3DQG2JFHLbYOf+fXaMoH8eg/zOq5WSYJsKMi/QebW+Eh3gSM+oss1H/bww==", - "requires": { - "commander": "^2.19.0" - }, - "dependencies": { - "commander": { - "version": "2.20.3", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", - "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==" - } - } - }, "kind-of": { "version": "3.2.2", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", @@ -4043,83 +3963,6 @@ "uc.micro": "^1.0.3" } }, - "markdown-it-abbr": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/markdown-it-abbr/-/markdown-it-abbr-1.0.4.tgz", - "integrity": "sha1-1mtTZFIcuz3Yqlna37ovtoZcj9g=" - }, - "markdown-it-anchor": { - "version": "5.2.5", - "resolved": "https://registry.npmjs.org/markdown-it-anchor/-/markdown-it-anchor-5.2.5.tgz", - "integrity": "sha512-xLIjLQmtym3QpoY9llBgApknl7pxAcN3WDRc2d3rwpl+/YvDZHPmKscGs+L6E05xf2KrCXPBvosWt7MZukwSpQ==" - }, - "markdown-it-deflist": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/markdown-it-deflist/-/markdown-it-deflist-2.0.3.tgz", - "integrity": "sha512-/BNZ8ksW42bflm1qQLnRI09oqU2847Z7MVavrR0MORyKLtiUYOMpwtlAfMSZAQU9UCvaUZMpgVAqoS3vpToJxw==" - }, - "markdown-it-emoji": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/markdown-it-emoji/-/markdown-it-emoji-1.4.0.tgz", - "integrity": "sha1-m+4OmpkKljupbfaYDE/dsF37Tcw=" - }, - "markdown-it-footnote": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/markdown-it-footnote/-/markdown-it-footnote-3.0.2.tgz", - "integrity": "sha512-JVW6fCmZWjvMdDQSbOT3nnOQtd9iAXmw7hTSh26+v42BnvXeVyGMDBm5b/EZocMed2MbCAHiTX632vY0FyGB8A==" - }, - "markdown-it-ins": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/markdown-it-ins/-/markdown-it-ins-3.0.0.tgz", - "integrity": "sha512-+vyAdBuMGwmT2yMlAFJSx2VR/0QZ1onQ/Mkkmr4l9tDFOh5sVoAgRbkgbuSsk+sxJ9vaMH/IQ323ydfvQrPO/Q==" - }, - "markdown-it-mark": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/markdown-it-mark/-/markdown-it-mark-3.0.0.tgz", - "integrity": "sha512-HqMWeKfMMOu4zBO0emmxsoMWmbf2cPKZY1wP6FsTbKmicFfp5y4L3KXAsNeO1rM6NTJVOrNlLKMPjWzriBGspw==" - }, - "markdown-it-multimd-table": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/markdown-it-multimd-table/-/markdown-it-multimd-table-4.0.1.tgz", - "integrity": "sha512-ZgRV8LlGz6JXTZ5zd82yCL8IVG5MRastMWxxrc6hQC8aC8kq/7zpp+ksBqVqcdTmTdabnkuSo/7h3SyKM31YCA==", - "requires": { - "markdown-it": "^8.4.2" - }, - "dependencies": { - "markdown-it": { - "version": "8.4.2", - "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-8.4.2.tgz", - "integrity": "sha512-GcRz3AWTqSUphY3vsUqQSFMbgR38a4Lh3GWlHRh/7MRwz8mcu9n2IO7HOh+bXHrR9kOPDl5RNCaEsrneb+xhHQ==", - "requires": { - "argparse": "^1.0.7", - "entities": "~1.1.1", - "linkify-it": "^2.0.0", - "mdurl": "^1.0.1", - "uc.micro": "^1.0.5" - } - }, - "uc.micro": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz", - "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==" - } - } - }, - "markdown-it-sub": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/markdown-it-sub/-/markdown-it-sub-1.0.0.tgz", - "integrity": "sha1-N1/WAm6ufdywEkl/ZBEZXqHjr+g=" - }, - "markdown-it-sup": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/markdown-it-sup/-/markdown-it-sup-1.0.0.tgz", - "integrity": "sha1-y5yf+RpSVawI8/09YyhuFd8KH8M=" - }, - "markdown-it-toc-done-right": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/markdown-it-toc-done-right/-/markdown-it-toc-done-right-4.1.0.tgz", - "integrity": "sha512-UhD2Oj6cZV3ycYPoelt4hTkwKIK3zbPP1wjjdpCq7UGtWQOFalDFDv1s2zBYV6aR2gMs/X8kpJcOYsQmUbiXDw==" - }, "math-random": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/math-random/-/math-random-1.0.4.tgz", @@ -7261,11 +7104,6 @@ "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==" }, - "unorm": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/unorm/-/unorm-1.6.0.tgz", - "integrity": "sha512-b2/KCUlYZUeA7JFUuRJZPUtr4gZvBh7tavtv4fvk4+KV9pfGiR6CQAQAWl49ZpR3ts2dk4FYkP7EIgDJoiOLDA==" - }, "unpipe": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", @@ -7347,14 +7185,6 @@ "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz", "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==" }, - "uslug": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/uslug/-/uslug-1.0.4.tgz", - "integrity": "sha1-uaIvCRTgqGFAYz2swwLl9PpFBnc=", - "requires": { - "unorm": ">= 1.0.0" - } - }, "utf8": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/utf8/-/utf8-2.1.2.tgz", diff --git a/ReactNativeClient/package.json b/ReactNativeClient/package.json index 984d454a0..320d5b252 100644 --- a/ReactNativeClient/package.json +++ b/ReactNativeClient/package.json @@ -19,7 +19,6 @@ "events": "^1.1.1", "form-data": "^2.1.4", "html-entities": "^1.2.1", - "joplin-renderer": "^1.0.8", "jsc-android": "241213.1.0", "markdown-it": "^8.4.0", "md5": "^2.2.1", diff --git a/joplin.code-workspace b/joplin.code-workspace index e38243287..e7553665e 100644 --- a/joplin.code-workspace +++ b/joplin.code-workspace @@ -8,9 +8,6 @@ "name": "Joplin Nextcloud App", "path": "D:/Web/www/nextcloud/apps/joplin" }, - { - "path": "D:/Docs/PROGS/Node/joplin-renderer" - } ], "settings": { "files.exclude": { diff --git a/package.json b/package.json index 43c7da888..70bad06f9 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,8 @@ "linter-ci": "./node_modules/.bin/eslint --ext .js --ext .jsx --ext .ts --ext .tsx", "tsc": "tsc", "tsc-watch": "tsc --watch", - "copyLib": "rsync --delete -a ReactNativeClient/lib/ ElectronClient/app/lib/" + "copyLib": "rsync --delete -a ReactNativeClient/lib/ ElectronClient/app/lib/", + "postinstall": "cd ReactNativeClient && cd lib && cd joplin-renderer && npm i" }, "husky": { "hooks": {