mirror of
				https://github.com/TriliumNext/Notes.git
				synced 2025-10-31 13:01:31 +08:00 
			
		
		
		
	fix(monorepo/electron): rewrite package.json to avoid flaky config implementations in electron-forge
This commit is contained in:
		
							parent
							
								
									8733acebf5
								
							
						
					
					
						commit
						abcf08e68c
					
				| @ -51,8 +51,5 @@ | |||||||
|     "@electron-forge/maker-squirrel": "7.8.0", |     "@electron-forge/maker-squirrel": "7.8.0", | ||||||
|     "@electron-forge/maker-zip": "7.8.0", |     "@electron-forge/maker-zip": "7.8.0", | ||||||
|     "@electron-forge/plugin-auto-unpack-natives": "7.8.0" |     "@electron-forge/plugin-auto-unpack-natives": "7.8.0" | ||||||
|   }, |  | ||||||
|   "packagerConfig": { |  | ||||||
|     "executableName": "trilium" |  | ||||||
|   } |   } | ||||||
| } | } | ||||||
|  | |||||||
| @ -18,12 +18,13 @@ try { | |||||||
|      */ |      */ | ||||||
|     fs.copySync("../server/build", path.join(DEST_DIR, "node_modules", "@triliumnext/server")); |     fs.copySync("../server/build", path.join(DEST_DIR, "node_modules", "@triliumnext/server")); | ||||||
| 
 | 
 | ||||||
|  |     copyPackageJson(); | ||||||
|  | 
 | ||||||
|     /** |     /** | ||||||
|      * Copy assets. |      * Copy assets. | ||||||
|      */ |      */ | ||||||
|     const assetsToCopy = new Set([ |     const assetsToCopy = new Set([ | ||||||
|         "./package.json", |         "./forge.config.cjs", | ||||||
|         "./forge.config.cjs",    |  | ||||||
|         "./scripts/electron-forge/desktop.ejs", |         "./scripts/electron-forge/desktop.ejs", | ||||||
|         "./scripts/electron-forge/sign-windows.cjs", |         "./scripts/electron-forge/sign-windows.cjs", | ||||||
|     ]); |     ]); | ||||||
| @ -51,7 +52,17 @@ try { | |||||||
|     console.log("Copying complete!") |     console.log("Copying complete!") | ||||||
| 
 | 
 | ||||||
| } catch(err) { | } catch(err) { | ||||||
|     console.error("Error during copy:", err.message) |     console.error("Error during copy:", err) | ||||||
|     process.exit(1) |     process.exit(1) | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
|  | /** | ||||||
|  |  * Rewrite the name field of `package.json` since electron-forge does not support forward slashes in the name. | ||||||
|  |  * Other attempts to rewrite the name field in the forge config have failed. | ||||||
|  |  */ | ||||||
|  | function copyPackageJson() { | ||||||
|  |     const packageJsonPath = path.join("package.json"); | ||||||
|  |     const packageJson = fs.readJSONSync(packageJsonPath); | ||||||
|  |     packageJson.name = "trilium"; | ||||||
|  |     fs.writeJSONSync(path.join(DEST_DIR, "package.json"), packageJson, { spaces: 2 }); | ||||||
|  | } | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user
	 Elian Doran
						Elian Doran