mirror of
				https://github.com/TriliumNext/Notes.git
				synced 2025-11-04 15:11:31 +08:00 
			
		
		
		
	transform setup.js to the webpacked version in the build
This commit is contained in:
		
							parent
							
								
									48c843c087
								
							
						
					
					
						commit
						64c9734f05
					
				@ -1,4 +1,4 @@
 | 
			
		||||
FROM node:12.16.2-alpine
 | 
			
		||||
FROM node:12.16.3-alpine
 | 
			
		||||
 | 
			
		||||
# Create app directory
 | 
			
		||||
WORKDIR /usr/src/app
 | 
			
		||||
 | 
			
		||||
@ -1,7 +1,7 @@
 | 
			
		||||
#!/usr/bin/env bash
 | 
			
		||||
 | 
			
		||||
PKG_DIR=dist/trilium-linux-x64-server
 | 
			
		||||
NODE_VERSION=12.16.2
 | 
			
		||||
NODE_VERSION=12.16.3
 | 
			
		||||
 | 
			
		||||
if [ "$1" != "DONTCOPY" ]
 | 
			
		||||
then
 | 
			
		||||
 | 
			
		||||
@ -35,3 +35,4 @@ rm -r $DIR/src/public/app
 | 
			
		||||
 | 
			
		||||
sed -i -e 's/app\/desktop.js/app-dist\/desktop.js/g' $DIR/src/views/desktop.ejs
 | 
			
		||||
sed -i -e 's/app\/mobile.js/app-dist\/mobile.js/g' $DIR/src/views/mobile.ejs
 | 
			
		||||
sed -i -e 's/app\/setup.js/app-dist\/setup.js/g' $DIR/src/views/setup.ejs
 | 
			
		||||
@ -210,7 +210,7 @@
 | 
			
		||||
 | 
			
		||||
<script src="libraries/knockout.min.js"></script>
 | 
			
		||||
 | 
			
		||||
<script src="app-dist/setup.js" crossorigin type="module"></script>
 | 
			
		||||
<script src="app/setup.js" crossorigin type="module"></script>
 | 
			
		||||
<link href="stylesheets/themes.css" rel="stylesheet">
 | 
			
		||||
</body>
 | 
			
		||||
</html>
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user