Compare commits
	
		
			11 Commits
		
	
	
		
			feature/2-
			...
			1.0.3
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 17286551ad | |||
| 174931f154 | |||
| 1108c2be76 | |||
| 2cadf66da7 | |||
| 5468e5ab59 | |||
| 48da695413 | |||
| a648277dae | |||
| cb6a84568e | |||
| cdaa3edfa6 | |||
| de0e26e9ae | |||
| 671409c6af | 
| @@ -27,7 +27,7 @@ name: build:tag | |||||||
| steps: | steps: | ||||||
|   - name: run electron packager |   - name: run electron packager | ||||||
|     depends_on: ["clone"] |     depends_on: ["clone"] | ||||||
|     image: node:15.11.0-alpine3.13 |     image: registry.odit.services/hub/library/node:19.9.0-alpine3.16 | ||||||
|     commands: |     commands: | ||||||
|       - apk add git zip -f |       - apk add git zip -f | ||||||
|       - yarn |       - yarn | ||||||
| @@ -68,7 +68,7 @@ name: prepare:tag | |||||||
|  |  | ||||||
| steps: | steps: | ||||||
|   - name: bump package version |   - name: bump package version | ||||||
|     image: node:alpine |     image: registry.odit.services/hub/library/node:19.9.0-alpine3.16 | ||||||
|     commands: |     commands: | ||||||
|       - npm --no-git-tag-version version ${SOURCE_TAG} |       - npm --no-git-tag-version version ${SOURCE_TAG} | ||||||
|   - name: push new version to repo |   - name: push new version to repo | ||||||
|   | |||||||
							
								
								
									
										16
									
								
								README.md
									
									
									
									
									
								
							
							
						
						
									
										16
									
								
								README.md
									
									
									
									
									
								
							| @@ -1,3 +1,19 @@ | |||||||
| # scanclient-electron | # scanclient-electron | ||||||
|  |  | ||||||
| electron packaged scanclient | electron packaged scanclient | ||||||
|  |  | ||||||
|  | ## Package | ||||||
|  | > Automagicly discovers your os and selects the right packager | ||||||
|  |  | ||||||
|  | ``` | ||||||
|  | pnpm i | ||||||
|  | pnpm build | ||||||
|  | ``` | ||||||
|  |  | ||||||
|  | ## Bundle as MSI | ||||||
|  | > You need to install the [WiX MSI Buildtools](https://wixtoolset.org/docs/wix3/) first | ||||||
|  |  | ||||||
|  | ``` | ||||||
|  | pnpm i | ||||||
|  | pnpm build:msi | ||||||
|  | ``` | ||||||
							
								
								
									
										
											BIN
										
									
								
								favicon.ico
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								favicon.ico
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							| After Width: | Height: | Size: 112 KiB | 
							
								
								
									
										22
									
								
								package.json
									
									
									
									
									
								
							
							
						
						
									
										22
									
								
								package.json
									
									
									
									
									
								
							| @@ -1,19 +1,20 @@ | |||||||
| { | { | ||||||
| 	"name": "@lfk/scanclient-electron", | 	"name": "@lfk/scanclient-electron", | ||||||
| 	"version": "0.2.0", | 	"version": "1.0.3", | ||||||
| 	"description": "minimal electron application", | 	"description": "minimal electron application", | ||||||
| 	"main": "main.js", | 	"main": "main.js", | ||||||
| 	"scripts": { | 	"scripts": { | ||||||
| 		"download": "node download.js", | 		"download": "node download.js", | ||||||
| 		"build": "yarn download && yarn electron:package", | 		"build:msi": "node download.js && electron-forge make", | ||||||
| 		"electron:start": "electron-forge start", | 		"build": "yarn download && yarn electron-forge package", | ||||||
| 		"electron:package": "electron-forge package" | 		"electron:start": "electron-forge start" | ||||||
| 	}, | 	}, | ||||||
| 	"devDependencies": { | 	"devDependencies": { | ||||||
| 		"@electron-forge/cli": "^6.0.0-beta.54", | 		"@electron-forge/cli": "^6.0.0-beta.54", | ||||||
| 		"@electron-forge/maker-deb": "^6.0.0-beta.54", | 		"@electron-forge/maker-deb": "^6.0.0-beta.54", | ||||||
| 		"@electron-forge/maker-rpm": "^6.0.0-beta.54", | 		"@electron-forge/maker-rpm": "^6.0.0-beta.54", | ||||||
| 		"@electron-forge/maker-squirrel": "^6.0.0-beta.54", | 		"@electron-forge/maker-squirrel": "^6.0.0-beta.54", | ||||||
|  | 		"@electron-forge/maker-wix": "^6.0.5", | ||||||
| 		"@electron-forge/maker-zip": "^6.0.0-beta.54", | 		"@electron-forge/maker-zip": "^6.0.0-beta.54", | ||||||
| 		"@taraus-he/tdunzip": "^1.0.4", | 		"@taraus-he/tdunzip": "^1.0.4", | ||||||
| 		"axios": "^0.21.1", | 		"axios": "^0.21.1", | ||||||
| @@ -28,7 +29,9 @@ | |||||||
| 	}, | 	}, | ||||||
| 	"config": { | 	"config": { | ||||||
| 		"forge": { | 		"forge": { | ||||||
| 			"packagerConfig": {}, | 			"packagerConfig": { | ||||||
|  | 				"icon": "./favicon.ico" | ||||||
|  | 			}, | ||||||
| 			"makers": [ | 			"makers": [ | ||||||
| 				{ | 				{ | ||||||
| 					"name": "@electron-forge/maker-zip", | 					"name": "@electron-forge/maker-zip", | ||||||
| @@ -39,6 +42,15 @@ | |||||||
| 						"name": "lfk__scanclient" | 						"name": "lfk__scanclient" | ||||||
| 					} | 					} | ||||||
| 				}, | 				}, | ||||||
|  | 				{ | ||||||
|  | 					"name": "@electron-forge/maker-wix", | ||||||
|  | 					"config": { | ||||||
|  | 						"manufacturer": "ODIT.Services", | ||||||
|  | 						"shortname": "LfKScan", | ||||||
|  | 						"name": "LfKScan", | ||||||
|  | 						"icon": "./favicon.ico" | ||||||
|  | 					} | ||||||
|  | 				}, | ||||||
| 				{ | 				{ | ||||||
| 					"name": "@electron-forge/maker-deb", | 					"name": "@electron-forge/maker-deb", | ||||||
| 					"config": {} | 					"config": {} | ||||||
|   | |||||||
							
								
								
									
										3856
									
								
								pnpm-lock.yaml
									
									
									
										generated
									
									
									
										Normal file
									
								
							
							
						
						
									
										3856
									
								
								pnpm-lock.yaml
									
									
									
										generated
									
									
									
										Normal file
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
		Reference in New Issue
	
	Block a user