mirror of
				https://github.com/zadam/trilium.git
				synced 2025-10-31 02:16:05 +01:00 
			
		
		
		
	Merge pull request #1048 from TriliumNext/chore_webpack-share
chore: make share.js work with webpack
This commit is contained in:
		| @@ -28,7 +28,6 @@ RUN cp -R build/src/* src/. && \ | ||||
|     npm run webpack && \ | ||||
|     npm prune --omit=dev && \ | ||||
|     npm cache clean --force && \ | ||||
|     cp src/public/app/share.js src/public/app-dist/. && \ | ||||
|     cp -r src/public/app/doc_notes src/public/app-dist/. && \ | ||||
|     rm -rf src/public/app/* && \ | ||||
|     mkdir -p src/public/app/services && \ | ||||
|   | ||||
| @@ -27,7 +27,6 @@ RUN cp -R build/src/* src/. && \ | ||||
|     npm run webpack && \ | ||||
|     npm prune --omit=dev && \ | ||||
|     npm cache clean --force && \ | ||||
|     cp src/public/app/share.js src/public/app-dist/. && \ | ||||
|     cp -r src/public/app/doc_notes src/public/app-dist/. && \ | ||||
|     rm -rf src/public/app && \ | ||||
|     mkdir -p src/public/app/services && \ | ||||
|   | ||||
| @@ -68,7 +68,6 @@ find $DIR -name "*.ts" -type f -delete | ||||
|  | ||||
| d="$DIR"/src/public | ||||
| [[ -d "$d"/app-dist ]] || mkdir -pv "$d"/app-dist | ||||
| cp "$d"/app/share.js "$d"/app-dist/ | ||||
| cp -r "$d"/app/doc_notes "$d"/app-dist/ | ||||
|  | ||||
| rm -rf "$d"/app | ||||
|   | ||||
| @@ -3,7 +3,7 @@ | ||||
|  * | ||||
|  * @param noteId of the given note to be fetched. If false, fetches current note. | ||||
|  */ | ||||
| async function fetchNote(noteId = null) { | ||||
| async function fetchNote(noteId: string | null = null) { | ||||
|     if (!noteId) { | ||||
|         noteId = document.body.getAttribute("data-note-id"); | ||||
|     } | ||||
| @@ -25,3 +25,9 @@ document.addEventListener( | ||||
|     }, | ||||
|     false | ||||
| ); | ||||
| 
 | ||||
| // workaround to prevent webpack from removing "fetchNote" as dead code:
 | ||||
| // add fetchNote as property to the window object
 | ||||
| Object.defineProperty(window, "fetchNote", { | ||||
|     value: fetchNote | ||||
| }); | ||||
		Reference in New Issue
	
	Block a user