Tools/Notes
1
0
Fork 0
mirror of https://github.com/TriliumNext/Notes.git synced 2025-08-12 20:02:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1048 from TriliumNext/chore_webpack-share

Browse Source 
chore: make share.js work with webpack
This commit is contained in:
Elian Doran 2025-01-27 22:42:13 +02:00 committed by GitHub
commit 9125aeca29
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Dockerfile
View File

@ -28,7 +28,6 @@ RUN cp -R build/src/* src/. && \
npm run webpack && \ npm run webpack && \
npm prune --omit=dev && \ npm prune --omit=dev && \
npm cache clean --force && \ 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/. && \ cp -r src/public/app/doc_notes src/public/app-dist/. && \
rm -rf src/public/app/* && \ rm -rf src/public/app/* && \
mkdir -p src/public/app/services && \ mkdir -p src/public/app/services && \

1
Dockerfile.alpine
View File

@ -27,7 +27,6 @@ RUN cp -R build/src/* src/. && \
npm run webpack && \ npm run webpack && \
npm prune --omit=dev && \ npm prune --omit=dev && \
npm cache clean --force && \ 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/. && \ cp -r src/public/app/doc_notes src/public/app-dist/. && \
rm -rf src/public/app && \ rm -rf src/public/app && \
mkdir -p src/public/app/services && \ mkdir -p src/public/app/services && \

1
bin/copy-trilium.sh
View File

@ -68,7 +68,6 @@ find $DIR -name "*.ts" -type f -delete
d="$DIR"/src/public d="$DIR"/src/public
[[ -d "$d"/app-dist ]] || mkdir -pv "$d"/app-dist [[ -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/ cp -r "$d"/app/doc_notes "$d"/app-dist/
rm -rf "$d"/app rm -rf "$d"/app

8
src/public/app/share.js → src/public/app/share.ts
View File

@ -3,7 +3,7 @@
* *
* @param noteId of the given note to be fetched. If false, fetches current note. * @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) { if (!noteId) {
noteId = document.body.getAttribute("data-note-id"); noteId = document.body.getAttribute("data-note-id");
} }
@ -25,3 +25,9 @@ document.addEventListener(
}, },
false 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
});