Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix missing share.js in public/app-dist folder; Delete unused public/app folder (Docker build) #3410

Merged
merged 1 commit into from
Dec 13, 2022

Conversation

DynamoFox
Copy link
Contributor

Hi, when I enabled the webpack bundle generation in the Docker build I wrongly assumed that share.js would have been bundled as well, well, it's not the case. Looking at copy-trilium.sh it seems like the file is just 'manually' copied to app-dist and then the app folder is wiped.
This PR introduces the same behavior as the copy-trilium.sh script in the Dockerfile.
Should fix: #3409

(Little side-note: Ultimately I think the Docker build should run the same scripts in the bin/ folder to generate Trilium's server edition, instead of replicating the same behavior manually in the Dockerfile which is easily error-prone... This would probably avoid more annoyances like the one this PR solves in the future.)

@zadam zadam merged commit f739259 into zadam:master Dec 13, 2022
@zadam
Copy link
Owner

zadam commented Dec 13, 2022

Thanks for the fix.

(Little side-note: Ultimately I think the Docker build should run the same scripts in the bin/ folder to generate Trilium's server edition, instead of replicating the same behavior manually in the Dockerfile which is easily error-prone... This would probably avoid more annoyances like the one this PR solves in the future.)

I agree, it is currently quite messy and error-prone.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

(Bug report) Router not found for request /assets/v0.57.4/app-dist/share.js
2 participants