Merge 93d3ab6fb9 into b59942ad9f
				
					
				
			This commit is contained in:
		
						commit
						eb6db3cf57
					
				
							
								
								
									
										2
									
								
								components.d.ts
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								components.d.ts
									
									
									
									
										vendored
									
									
								
							| @ -50,6 +50,7 @@ declare module '@vue/runtime-core' { | ||||
|     'CModal.demo': typeof import('./src/ui/c-modal/c-modal.demo.vue')['default'] | ||||
|     CModalValue: typeof import('./src/ui/c-modal-value/c-modal-value.vue')['default'] | ||||
|     'CModalValue.demo': typeof import('./src/ui/c-modal-value/c-modal-value.demo.vue')['default'] | ||||
|     CMonacoEditor: typeof import('./src/ui/c-monaco-editor/c-monaco-editor.vue')['default'] | ||||
|     CollapsibleToolMenu: typeof import('./src/components/CollapsibleToolMenu.vue')['default'] | ||||
|     ColorConverter: typeof import('./src/tools/color-converter/color-converter.vue')['default'] | ||||
|     ColoredCard: typeof import('./src/components/ColoredCard.vue')['default'] | ||||
| @ -69,6 +70,7 @@ declare module '@vue/runtime-core' { | ||||
|     DemoWrapper: typeof import('./src/ui/demo/demo-wrapper.vue')['default'] | ||||
|     DeviceInformation: typeof import('./src/tools/device-information/device-information.vue')['default'] | ||||
|     DiffViewer: typeof import('./src/tools/json-diff/diff-viewer/diff-viewer.vue')['default'] | ||||
|     DockerComposeConverter: typeof import('./src/tools/docker-compose-converter/docker-compose-converter.vue')['default'] | ||||
|     DockerRunToDockerComposeConverter: typeof import('./src/tools/docker-run-to-docker-compose-converter/docker-run-to-docker-compose-converter.vue')['default'] | ||||
|     DynamicValues: typeof import('./src/tools/benchmark-builder/dynamic-values.vue')['default'] | ||||
|     Editor: typeof import('./src/tools/html-wysiwyg-editor/editor/editor.vue')['default'] | ||||
|  | ||||
| @ -35,6 +35,7 @@ | ||||
|     "release": "node ./scripts/release.mjs" | ||||
|   }, | ||||
|   "dependencies": { | ||||
|     "@guolao/vue-monaco-editor": "^1.4.1", | ||||
|     "@it-tools/bip39": "^0.0.4", | ||||
|     "@it-tools/oggen": "^1.3.0", | ||||
|     "@sindresorhus/slugify": "^2.2.1", | ||||
| @ -51,6 +52,7 @@ | ||||
|     "change-case": "^4.1.2", | ||||
|     "colord": "^2.9.3", | ||||
|     "composerize-ts": "^0.6.2", | ||||
|     "composeverter": "^1.6.2", | ||||
|     "country-code-lookup": "^0.1.0", | ||||
|     "cron-validator": "^1.3.1", | ||||
|     "cronstrue": "^2.26.0", | ||||
|  | ||||
							
								
								
									
										91
									
								
								pnpm-lock.yaml
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										91
									
								
								pnpm-lock.yaml
									
									
									
										generated
									
									
									
								
							| @ -5,6 +5,9 @@ settings: | ||||
|   excludeLinksFromLockfile: false | ||||
| 
 | ||||
| dependencies: | ||||
|   '@guolao/vue-monaco-editor': | ||||
|     specifier: ^1.4.1 | ||||
|     version: 1.4.1(monaco-editor@0.43.0)(vue@3.3.4) | ||||
|   '@it-tools/bip39': | ||||
|     specifier: ^0.0.4 | ||||
|     version: 0.0.4 | ||||
| @ -53,6 +56,9 @@ dependencies: | ||||
|   composerize-ts: | ||||
|     specifier: ^0.6.2 | ||||
|     version: 0.6.2 | ||||
|   composeverter: | ||||
|     specifier: ^1.6.2 | ||||
|     version: 1.6.2 | ||||
|   country-code-lookup: | ||||
|     specifier: ^0.1.0 | ||||
|     version: 0.1.0 | ||||
| @ -2150,6 +2156,22 @@ packages: | ||||
|     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} | ||||
|     dev: true | ||||
| 
 | ||||
|   /@guolao/vue-monaco-editor@1.4.1(monaco-editor@0.43.0)(vue@3.3.4): | ||||
|     resolution: {integrity: sha512-qJKn0AcxCO5vBENh0dA5j47eaaOxX5gT9Tt7adWhOAPcPZUDFWy+ZJjcGVfmXkUMXOoWNyP78TuK8l3olSRoew==} | ||||
|     peerDependencies: | ||||
|       '@vue/composition-api': ^1.7.1 | ||||
|       monaco-editor: ^0.43.0 | ||||
|       vue: ^2.6.14 || >=3.0.0 | ||||
|     peerDependenciesMeta: | ||||
|       '@vue/composition-api': | ||||
|         optional: true | ||||
|     dependencies: | ||||
|       '@monaco-editor/loader': 1.4.0(monaco-editor@0.43.0) | ||||
|       monaco-editor: 0.43.0 | ||||
|       vue: 3.3.4 | ||||
|       vue-demi: 0.14.6(vue@3.3.4) | ||||
|     dev: false | ||||
| 
 | ||||
|   /@humanwhocodes/config-array@0.11.10: | ||||
|     resolution: {integrity: sha512-KVVjQmNUepDVGXNuoRRdmmEjruj0KfiGSbS8LVc12LMsWDQzRXJ0qdhN8L8uUigKpfEHRhlaQFY0ib1tnUbNeQ==} | ||||
|     engines: {node: '>=10.10.0'} | ||||
| @ -2417,6 +2439,15 @@ packages: | ||||
|     resolution: {integrity: sha512-mrC4y8n88BYvgcgzq9bvTlDgFyi2zuvzmPilRvRc3Uz1iIvq8mDhxJ0rHKFUNzPEScpDvJdIujqiDrulMqiudA==} | ||||
|     dev: true | ||||
| 
 | ||||
|   /@monaco-editor/loader@1.4.0(monaco-editor@0.43.0): | ||||
|     resolution: {integrity: sha512-00ioBig0x642hytVspPl7DbQyaSWRaolYie/UFNjoTdvoKPzo6xrXLhTk9ixgIKcLH5b5vDOjVNiGyY+uDCUlg==} | ||||
|     peerDependencies: | ||||
|       monaco-editor: '>= 0.21.0 < 1' | ||||
|     dependencies: | ||||
|       monaco-editor: 0.43.0 | ||||
|       state-local: 1.0.7 | ||||
|     dev: false | ||||
| 
 | ||||
|   /@nodelib/fs.scandir@2.1.5: | ||||
|     resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==} | ||||
|     engines: {node: '>= 8'} | ||||
| @ -3978,7 +4009,7 @@ packages: | ||||
|   /@vueuse/shared@10.0.0(vue@3.3.4): | ||||
|     resolution: {integrity: sha512-Zh3LgJqvUBWVY3SiMvXanTcfAneGbt63QPczBRDNgQ6jd/ehodO9a1lCFzaA6SWJJoI+ugVTjHFYJdoR656DVQ==} | ||||
|     dependencies: | ||||
|       vue-demi: 0.14.5(vue@3.3.4) | ||||
|       vue-demi: 0.14.6(vue@3.3.4) | ||||
|     transitivePeerDependencies: | ||||
|       - '@vue/composition-api' | ||||
|       - vue | ||||
| @ -3987,7 +4018,7 @@ packages: | ||||
|   /@vueuse/shared@10.3.0(vue@3.3.4): | ||||
|     resolution: {integrity: sha512-kGqCTEuFPMK4+fNWy6dUOiYmxGcUbtznMwBZLC1PubidF4VZY05B+Oht7Jh7/6x4VOWGpvu3R37WHi81cKpiqg==} | ||||
|     dependencies: | ||||
|       vue-demi: 0.14.5(vue@3.3.4) | ||||
|       vue-demi: 0.14.6(vue@3.3.4) | ||||
|     transitivePeerDependencies: | ||||
|       - '@vue/composition-api' | ||||
|       - vue | ||||
| @ -4051,6 +4082,14 @@ packages: | ||||
|       - supports-color | ||||
|     dev: true | ||||
| 
 | ||||
|   /ajv-errors@3.0.0(ajv@8.12.0): | ||||
|     resolution: {integrity: sha512-V3wD15YHfHz6y0KdhYFjyy9vWtEVALT9UrxfN3zqlI6dMioHnJrqOYfyPKol3oqrnCM9uwkcdCwkJ0WUcbLMTQ==} | ||||
|     peerDependencies: | ||||
|       ajv: ^8.0.1 | ||||
|     dependencies: | ||||
|       ajv: 8.12.0 | ||||
|     dev: false | ||||
| 
 | ||||
|   /ajv@6.12.6: | ||||
|     resolution: {integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==} | ||||
|     dependencies: | ||||
| @ -4067,7 +4106,6 @@ packages: | ||||
|       json-schema-traverse: 1.0.0 | ||||
|       require-from-string: 2.0.2 | ||||
|       uri-js: 4.4.1 | ||||
|     dev: true | ||||
| 
 | ||||
|   /ansi-colors@4.1.3: | ||||
|     resolution: {integrity: sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==} | ||||
| @ -4527,8 +4565,8 @@ packages: | ||||
|       delayed-stream: 1.0.0 | ||||
|     dev: true | ||||
| 
 | ||||
|   /commander@10.0.0: | ||||
|     resolution: {integrity: sha512-zS5PnTI22FIRM6ylNW8G4Ap0IEOyk62fhLSD0+uHRT9McRCLGpkVNvao4bjimpK/GShynyQkFFxHhwMcETmduA==} | ||||
|   /commander@10.0.1: | ||||
|     resolution: {integrity: sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==} | ||||
|     engines: {node: '>=14'} | ||||
|     dev: false | ||||
| 
 | ||||
| @ -4551,8 +4589,9 @@ packages: | ||||
| 
 | ||||
|   /composerize-ts@0.6.2: | ||||
|     resolution: {integrity: sha512-8tw5p/FBxg77ubjVftaXA+pknWbkUgbZ4rbZZs2yFUsj2yvO38IvtfpGLfaJ9mGFj324lFEr/OU9xULrKSF9Ag==} | ||||
|     hasBin: true | ||||
|     dependencies: | ||||
|       commander: 10.0.0 | ||||
|       commander: 10.0.1 | ||||
|       deepmerge-ts: 5.1.0 | ||||
|       flex-js: 1.0.5 | ||||
|       ip-cidr: 3.1.0 | ||||
| @ -4560,6 +4599,15 @@ packages: | ||||
|       yamljs: 0.3.0 | ||||
|     dev: false | ||||
| 
 | ||||
|   /composeverter@1.6.2: | ||||
|     resolution: {integrity: sha512-nlHQYYnsivmTnDrbVs7sVR/Z4WwACiaRI9MZYBdzMhrRrdMW17uGuYNikO/yCMoN+IkeBflSBFcUp7grF88g8Q==} | ||||
|     dependencies: | ||||
|       ajv: 8.12.0 | ||||
|       ajv-errors: 3.0.0(ajv@8.12.0) | ||||
|       core-js: 2.6.12 | ||||
|       yaml: 1.10.2 | ||||
|     dev: false | ||||
| 
 | ||||
|   /concat-map@0.0.1: | ||||
|     resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=} | ||||
| 
 | ||||
| @ -4613,6 +4661,12 @@ packages: | ||||
|       browserslist: 4.22.1 | ||||
|     dev: true | ||||
| 
 | ||||
|   /core-js@2.6.12: | ||||
|     resolution: {integrity: sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==} | ||||
|     deprecated: core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js. | ||||
|     requiresBuild: true | ||||
|     dev: false | ||||
| 
 | ||||
|   /country-code-lookup@0.1.0: | ||||
|     resolution: {integrity: sha512-IOI66HEG+8bXfWPy+sTzuN7161vmDZOHg1wgIPFf3WfD73FeLajnn6C+fnxOIa9RL1WRBDMXQQWW/FOaOYaQ3w==} | ||||
|     dev: false | ||||
| @ -6571,7 +6625,6 @@ packages: | ||||
| 
 | ||||
|   /json-schema-traverse@1.0.0: | ||||
|     resolution: {integrity: sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==} | ||||
|     dev: true | ||||
| 
 | ||||
|   /json-schema@0.4.0: | ||||
|     resolution: {integrity: sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==} | ||||
| @ -7663,15 +7716,9 @@ packages: | ||||
|     resolution: {integrity: sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==} | ||||
|     dev: true | ||||
| 
 | ||||
|   /punycode@2.3.0: | ||||
|     resolution: {integrity: sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==} | ||||
|     engines: {node: '>=6'} | ||||
|     dev: true | ||||
| 
 | ||||
|   /punycode@2.3.1: | ||||
|     resolution: {integrity: sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==} | ||||
|     engines: {node: '>=6'} | ||||
|     dev: true | ||||
| 
 | ||||
|   /qrcode@1.5.1: | ||||
|     resolution: {integrity: sha512-nS8NJ1Z3md8uTjKtP+SGGhfqmTCs5flU/xR623oI0JX+Wepz9R8UrRVCTBTJm3qGw3rH6jJ6MUHjkDx15cxSSg==} | ||||
| @ -7814,7 +7861,6 @@ packages: | ||||
|   /require-from-string@2.0.2: | ||||
|     resolution: {integrity: sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==} | ||||
|     engines: {node: '>=0.10.0'} | ||||
|     dev: true | ||||
| 
 | ||||
|   /require-main-filename@2.0.0: | ||||
|     resolution: {integrity: sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==} | ||||
| @ -8196,6 +8242,10 @@ packages: | ||||
|     resolution: {integrity: sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==} | ||||
|     dev: true | ||||
| 
 | ||||
|   /state-local@1.0.7: | ||||
|     resolution: {integrity: sha512-HTEHMNieakEnoe33shBYcZ7NX83ACUjCu8c40iOGEZsngj9zRnkqS9j1pqQPXwobB0ZcVTk27REb7COQ0UR59w==} | ||||
|     dev: false | ||||
| 
 | ||||
|   /std-env@3.3.3: | ||||
|     resolution: {integrity: sha512-Rz6yejtVyWnVjC1RFvNmYL10kgjC49EOghxWn0RFqlCHGFpQx+Xe7yW3I4ceK1SGrWIGMjD5Kbue8W/udkbMJg==} | ||||
|     dev: true | ||||
| @ -8463,7 +8513,7 @@ packages: | ||||
|     engines: {node: '>=6'} | ||||
|     dependencies: | ||||
|       psl: 1.9.0 | ||||
|       punycode: 2.3.0 | ||||
|       punycode: 2.3.1 | ||||
|       universalify: 0.2.0 | ||||
|       url-parse: 1.5.10 | ||||
|     dev: true | ||||
| @ -8478,7 +8528,7 @@ packages: | ||||
|     resolution: {integrity: sha512-2lv/66T7e5yNyhAAC4NaKe5nVavzuGJQVVtRYLyQ2OI8tsJ61PMLlelehb0wi2Hx6+hT/OJUWZcw8MjlSRnxvw==} | ||||
|     engines: {node: '>=14'} | ||||
|     dependencies: | ||||
|       punycode: 2.3.0 | ||||
|       punycode: 2.3.1 | ||||
|     dev: true | ||||
| 
 | ||||
|   /treemate@0.3.11: | ||||
| @ -8912,8 +8962,7 @@ packages: | ||||
|   /uri-js@4.4.1: | ||||
|     resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==} | ||||
|     dependencies: | ||||
|       punycode: 2.3.0 | ||||
|     dev: true | ||||
|       punycode: 2.3.1 | ||||
| 
 | ||||
|   /url-parse@1.5.10: | ||||
|     resolution: {integrity: sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==} | ||||
| @ -9579,12 +9628,18 @@ packages: | ||||
|       yaml: 2.2.1 | ||||
|     dev: true | ||||
| 
 | ||||
|   /yaml@1.10.2: | ||||
|     resolution: {integrity: sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==} | ||||
|     engines: {node: '>= 6'} | ||||
|     dev: false | ||||
| 
 | ||||
|   /yaml@2.2.1: | ||||
|     resolution: {integrity: sha512-e0WHiYql7+9wr4cWMx3TVQrNwejKaEe7/rHNmQmqRjazfOP5W8PB6Jpebb5o6fIapbz9o9+2ipcaTM2ZwDI6lw==} | ||||
|     engines: {node: '>= 14'} | ||||
| 
 | ||||
|   /yamljs@0.3.0: | ||||
|     resolution: {integrity: sha512-C/FsVVhht4iPQYXOInoxUM/1ELSf9EsgKH34FofQOp6hwCPrW4vG4w5++TED3xRUo8gD7l0P1J1dLlDYzODsTQ==} | ||||
|     hasBin: true | ||||
|     dependencies: | ||||
|       argparse: 1.0.10 | ||||
|       glob: 7.2.3 | ||||
|  | ||||
| @ -2,6 +2,9 @@ import { createApp } from 'vue'; | ||||
| import { createPinia } from 'pinia'; | ||||
| import { createHead } from '@vueuse/head'; | ||||
| 
 | ||||
| import { install as VueMonacoEditorPlugin, loader } from '@guolao/vue-monaco-editor'; | ||||
| import * as monaco from 'monaco-editor'; | ||||
| 
 | ||||
| import { registerSW } from 'virtual:pwa-register'; | ||||
| import { plausible } from './plugins/plausible.plugin'; | ||||
| 
 | ||||
| @ -13,10 +16,14 @@ import App from './App.vue'; | ||||
| import router from './router'; | ||||
| import { i18nPlugin } from './plugins/i18n.plugin'; | ||||
| 
 | ||||
| // loaded monaco-editor from `node_modules`
 | ||||
| loader.config({ monaco }); | ||||
| 
 | ||||
| registerSW(); | ||||
| 
 | ||||
| const app = createApp(App); | ||||
| 
 | ||||
| app.use(VueMonacoEditorPlugin); | ||||
| app.use(createPinia()); | ||||
| app.use(createHead()); | ||||
| app.use(i18nPlugin); | ||||
|  | ||||
							
								
								
									
										19
									
								
								src/tools/docker-compose-converter/composeverter.d.ts
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										19
									
								
								src/tools/docker-compose-converter/composeverter.d.ts
									
									
									
									
										vendored
									
									
										Normal file
									
								
							| @ -0,0 +1,19 @@ | ||||
| declare module 'composeverter' { | ||||
|   interface Configuration { | ||||
|     expandVolumes?: boolean; | ||||
|     expandPorts?: boolean; | ||||
|     indent?: number; | ||||
|   } | ||||
|   interface DockerComposeValidatioError { | ||||
|     line?: number; | ||||
|     message: string; | ||||
|     helpLink?: string; | ||||
|   } | ||||
|   export function validateDockerComposeToCommonSpec(content: string): DockerComposeValidatioError[]; | ||||
|   export function migrateFromV2xToV3x(content: string, configuration?: Configuration = null): string; | ||||
|   export function migrateFromV3xToV2x(content: string, configuration?: Configuration = null): string; | ||||
|   export function migrateFromV1ToV2x(content: string, configuration?: Configuration = null): string; | ||||
|   export function migrateToCommonSpec(content: string, configuration?: Configuration = null): string; | ||||
|   export function migrateFromV2xToV3x(content: string, configuration?: Configuration = null): string; | ||||
|   export function getDockerComposeSchemaWithoutFormats(): object; | ||||
| } | ||||
							
								
								
									
										144
									
								
								src/tools/docker-compose-converter/docker-compose-converter.vue
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										144
									
								
								src/tools/docker-compose-converter/docker-compose-converter.vue
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,144 @@ | ||||
| <script setup lang="ts"> | ||||
| import Composeverter from 'composeverter'; | ||||
| import { useDownloadFileFromBase64 } from '@/composable/downloadBase64'; | ||||
| import { textToBase64 } from '@/utils/base64'; | ||||
| import TextareaCopyable from '@/components/TextareaCopyable.vue'; | ||||
| 
 | ||||
| const dockerCompose = ref( | ||||
|   `nginx: | ||||
|     ports: | ||||
|         - '80:80' | ||||
|     volumes: | ||||
|         - '/var/run/docker.sock:/tmp/docker.sock:ro' | ||||
|     image: nginx`, | ||||
| ); | ||||
| const indentSize = useStorage('docker-compose-converter:indent-size', 4); | ||||
| 
 | ||||
| const expandVolumes = ref( | ||||
|   false, | ||||
| ); | ||||
| const expandPorts = ref( | ||||
|   false, | ||||
| ); | ||||
| const conversion = useStorage('docker-compose-converter:conversion', 'latest'); | ||||
| const conversionOptions = [ | ||||
|   { value: 'v1ToV2x', label: 'V1 to V2 2.x' }, | ||||
|   { value: 'v1ToV3x', label: 'V1 to V2 3.x' }, | ||||
|   { value: 'v2xToV3x', label: 'V2 - 2.x to 3.x' }, | ||||
|   { value: 'v3xToV2x', label: 'V2 - 3.x to 2.x' }, | ||||
|   { value: 'latest', label: 'To CommonSpec' }, | ||||
| ]; | ||||
| 
 | ||||
| const conversionResult = computed(() => { | ||||
|   try { | ||||
|     let convertedDockerCompose = ''; | ||||
|     const config = { | ||||
|       expandPorts: expandPorts.value, | ||||
|       expandVolumes: expandVolumes.value, | ||||
|       indent: indentSize.value, | ||||
|     }; | ||||
|     switch (conversion.value) { | ||||
|       case 'latest': | ||||
|         convertedDockerCompose = Composeverter.migrateToCommonSpec(dockerCompose.value, config); | ||||
|         break; | ||||
|       case 'v1ToV2x': | ||||
|         convertedDockerCompose = Composeverter.migrateFromV1ToV2x(dockerCompose.value, config); | ||||
|         break; | ||||
|       case 'v1ToV3x': | ||||
|         convertedDockerCompose = Composeverter.migrateFromV2xToV3x(Composeverter.migrateFromV1ToV2x(dockerCompose.value), config); | ||||
|         break; | ||||
|       case 'v2xToV3x': | ||||
|         convertedDockerCompose = Composeverter.migrateFromV2xToV3x(dockerCompose.value, config); | ||||
|         break; | ||||
|       case 'v3xToV2x': | ||||
|         convertedDockerCompose = Composeverter.migrateFromV3xToV2x(dockerCompose.value, config); | ||||
|         break; | ||||
| 
 | ||||
|       default: | ||||
|         throw new Error(`Unknown conversion '${conversion}'`); | ||||
|     } | ||||
|     return { yaml: convertedDockerCompose, errors: [] }; | ||||
|   } | ||||
|   catch (e: any) { | ||||
|     return { yaml: '#see error messages', errors: e.toString().split('\n') }; | ||||
|   } | ||||
| }); | ||||
| 
 | ||||
| const convertedDockerCompose = computed(() => conversionResult.value.yaml); | ||||
| const errors = computed(() => conversionResult.value.errors); | ||||
| 
 | ||||
| const convertedDockerComposeBase64 = computed(() => `data:application/yaml;base64,${textToBase64(convertedDockerCompose.value)}`); | ||||
| const { download } = useDownloadFileFromBase64({ source: convertedDockerComposeBase64, filename: 'docker-compose.yml' }); | ||||
| 
 | ||||
| const MONACO_EDITOR_OPTIONS = { | ||||
|   automaticLayout: true, | ||||
|   formatOnType: true, | ||||
|   formatOnPaste: true, | ||||
| }; | ||||
| </script> | ||||
| 
 | ||||
| <template> | ||||
|   <div> | ||||
|     <c-label label="Paste your existing Docker Compose:"> | ||||
|       <div relative w-full> | ||||
|         <c-monaco-editor | ||||
|           v-model:value="dockerCompose" | ||||
|           theme="vs-dark" | ||||
|           language="yaml" | ||||
|           height="200px" | ||||
|           :options="MONACO_EDITOR_OPTIONS" | ||||
|         /> | ||||
|       </div> | ||||
|     </c-label> | ||||
| 
 | ||||
|     <div v-if="errors.length > 0"> | ||||
|       <n-alert title="The following errors occured" type="error" mt-5> | ||||
|         <ul> | ||||
|           <li v-for="(message, index) of errors" :key="index"> | ||||
|             {{ message }} | ||||
|           </li> | ||||
|         </ul> | ||||
|       </n-alert> | ||||
|     </div> | ||||
| 
 | ||||
|     <n-divider /> | ||||
| 
 | ||||
|     <n-grid cols="4" x-gap="12" w-full> | ||||
|       <n-gi span="2"> | ||||
|         <c-select | ||||
|           v-model:value="conversion" | ||||
|           label-position="top" | ||||
|           label="Docker Compose conversion:" | ||||
|           :options="conversionOptions" | ||||
|           placeholder="Select Docker Compose conversion" | ||||
|         /> | ||||
|       </n-gi> | ||||
|       <n-gi span="2"> | ||||
|         <n-form-item label="Indent size:" label-placement="top" label-width="100" :show-feedback="false"> | ||||
|           <n-input-number v-model:value="indentSize" min="0" max="10" w-100px /> | ||||
|         </n-form-item> | ||||
|       </n-gi> | ||||
|     </n-grid> | ||||
| 
 | ||||
|     <n-divider /> | ||||
| 
 | ||||
|     <div class="mb-6 flex flex-row items-center gap-2"> | ||||
|       <n-checkbox v-model:checked="expandPorts"> | ||||
|         Expand Ports | ||||
|       </n-checkbox> | ||||
|       <n-checkbox v-model:checked="expandVolumes"> | ||||
|         Expand Volumes | ||||
|       </n-checkbox> | ||||
|     </div> | ||||
| 
 | ||||
|     <n-divider /> | ||||
| 
 | ||||
|     <TextareaCopyable :value="convertedDockerCompose" language="yaml" /> | ||||
| 
 | ||||
|     <div mt-5 flex justify-center> | ||||
|       <c-button :disabled="dockerCompose === ''" secondary @click="download"> | ||||
|         Download converted docker-compose.yml | ||||
|       </c-button> | ||||
|     </div> | ||||
|   </div> | ||||
| </template> | ||||
							
								
								
									
										12
									
								
								src/tools/docker-compose-converter/index.ts
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										12
									
								
								src/tools/docker-compose-converter/index.ts
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,12 @@ | ||||
| import { BrandDocker } from '@vicons/tabler'; | ||||
| import { defineTool } from '../tool'; | ||||
| 
 | ||||
| export const tool = defineTool({ | ||||
|   name: 'Docker Compose Format Converter', | ||||
|   path: '/docker-compose-converter', | ||||
|   description: 'Convert Docker Compose file between V1, 2.x, 3.x or CommonSpec and may expand ports/volumes syntaxes', | ||||
|   keywords: ['docker', 'compose', 'converter'], | ||||
|   component: () => import('./docker-compose-converter.vue'), | ||||
|   icon: BrandDocker, | ||||
|   createdAt: new Date('2024-01-04'), | ||||
| }); | ||||
| @ -80,6 +80,7 @@ import { tool as urlParser } from './url-parser'; | ||||
| import { tool as uuidGenerator } from './uuid-generator'; | ||||
| import { tool as macAddressLookup } from './mac-address-lookup'; | ||||
| import { tool as xmlFormatter } from './xml-formatter'; | ||||
| import { tool as dockerComposeConverter } from './docker-compose-converter'; | ||||
| import { tool as yamlViewer } from './yaml-viewer'; | ||||
| 
 | ||||
| export const toolsByCategory: ToolCategory[] = [ | ||||
| @ -146,6 +147,7 @@ export const toolsByCategory: ToolCategory[] = [ | ||||
|       sqlPrettify, | ||||
|       chmodCalculator, | ||||
|       dockerRunToDockerComposeConverter, | ||||
|       dockerComposeConverter, | ||||
|       xmlFormatter, | ||||
|       yamlViewer, | ||||
|     ], | ||||
|  | ||||
							
								
								
									
										124
									
								
								src/ui/c-monaco-editor/c-monaco-editor.vue
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										124
									
								
								src/ui/c-monaco-editor/c-monaco-editor.vue
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,124 @@ | ||||
| <script setup lang="ts"> | ||||
| import * as monacoEditor from 'monaco-editor'; | ||||
| import type { MonacoEditor } from '@guolao/vue-monaco-editor'; | ||||
| import EditorWorker from 'monaco-editor/esm/vs/editor/editor.worker?worker'; | ||||
| import JsonWorker from 'monaco-editor/esm/vs/language/json/json.worker?worker'; | ||||
| import CssWorker from 'monaco-editor/esm/vs/language/css/css.worker?worker'; | ||||
| import HtmlWorker from 'monaco-editor/esm/vs/language/html/html.worker?worker'; | ||||
| import TsWorker from 'monaco-editor/esm/vs/language/typescript/ts.worker?worker'; | ||||
| import { useStyleStore } from '@/stores/style.store'; | ||||
| 
 | ||||
| const props = withDefaults(defineProps<EditorProps>(), { | ||||
|   theme: 'vs', | ||||
|   options: () => ({}), | ||||
|   overrideServices: () => ({}), | ||||
|   saveViewState: true, | ||||
|   width: '100%', | ||||
|   height: '100%', | ||||
| }); | ||||
| 
 | ||||
| const emits = defineEmits<{ | ||||
|   (e: 'update:value', value: string | undefined): void | ||||
|   (e: 'beforeMount', monaco: MonacoEditor): void | ||||
|   (e: 'mount', editor: monacoEditor.editor.IStandaloneCodeEditor, monaco: MonacoEditor): void | ||||
|   (e: 'change', value: string | undefined, event: monacoEditor.editor.IModelContentChangedEvent): void | ||||
|   (e: 'validate', markers: monacoEditor.editor.IMarker[]): void | ||||
| }>(); | ||||
| 
 | ||||
| interface MonacoEnvironment { | ||||
|   getWorker(_: any, label: string): Worker | ||||
| } | ||||
| // eslint-disable-next-line @typescript-eslint/no-namespace | ||||
| declare module globalThis { | ||||
|   let MonacoEnvironment: MonacoEnvironment; | ||||
| } | ||||
| 
 | ||||
| const value = useVModel(props, 'value', emits); | ||||
| 
 | ||||
| globalThis.MonacoEnvironment = { | ||||
|   getWorker(_: any, label: string) { | ||||
|     if (label === 'json') { | ||||
|       return new JsonWorker(); | ||||
|     } | ||||
|     if (label === 'css' || label === 'scss' || label === 'less') { | ||||
|       return new CssWorker(); | ||||
|     } | ||||
|     if (label === 'html' || label === 'handlebars' || label === 'razor') { | ||||
|       return new HtmlWorker(); | ||||
|     } | ||||
|     if (label === 'typescript' || label === 'javascript') { | ||||
|       return new TsWorker(); | ||||
|     } | ||||
|     return new EditorWorker(); | ||||
|   }, | ||||
| }; | ||||
| 
 | ||||
| export interface EditorProps { | ||||
|   defaultValue?: string | ||||
|   defaultPath?: string | ||||
|   defaultLanguage?: string | ||||
|   value?: string | ||||
|   language?: string | ||||
|   path?: string | ||||
| 
 | ||||
|   /* === */ | ||||
| 
 | ||||
|   theme: 'vs' | string | ||||
|   line?: number | ||||
|   options?: monacoEditor.editor.IStandaloneEditorConstructionOptions | ||||
|   overrideServices?: monacoEditor.editor.IEditorOverrideServices | ||||
|   saveViewState?: boolean | ||||
| 
 | ||||
|   /* === */ | ||||
| 
 | ||||
|   width?: number | string | ||||
|   height?: number | string | ||||
|   className?: string | ||||
| } | ||||
| 
 | ||||
| monacoEditor.editor.defineTheme('it-tools-dark', { | ||||
|   base: 'vs-dark', | ||||
|   inherit: true, | ||||
|   rules: [], | ||||
|   colors: { | ||||
|     'editor.background': '#00000000', | ||||
|   }, | ||||
| }); | ||||
| 
 | ||||
| monacoEditor.editor.defineTheme('it-tools-light', { | ||||
|   base: 'vs', | ||||
|   inherit: true, | ||||
|   rules: [], | ||||
|   colors: { | ||||
|     'editor.background': '#00000000', | ||||
|   }, | ||||
| }); | ||||
| 
 | ||||
| const styleStore = useStyleStore(); | ||||
| 
 | ||||
| watch( | ||||
|   () => styleStore.isDarkTheme, | ||||
|   isDarkTheme => monacoEditor.editor.setTheme(isDarkTheme ? 'it-tools-dark' : 'it-tools-light'), | ||||
|   { immediate: true }, | ||||
| ); | ||||
| 
 | ||||
| const attrs = useAttrs(); | ||||
| const inheritedAttrs = { ...attrs, ...props }; | ||||
| </script> | ||||
| 
 | ||||
| <script lang="ts"> | ||||
| export default { | ||||
|   inheritAttrs: false, | ||||
| }; | ||||
| </script> | ||||
| 
 | ||||
| <template> | ||||
|   <vue-monaco-editor | ||||
|     v-bind="inheritedAttrs" | ||||
|     v-model:value="value" | ||||
|     @before-mount="(monaco: MonacoEditor) => emits('beforeMount', monaco)" | ||||
|     @mount="(editor: monacoEditor.editor.IStandaloneCodeEditor, monaco: MonacoEditor) => emits('mount', editor, monaco)" | ||||
|     @change="(value: string | undefined, event: monacoEditor.editor.IModelContentChangedEvent) => emits('change', value, event)" | ||||
|     @validate="(markers: monacoEditor.editor.IMarker[]) => emits('validate', markers)" | ||||
|   /> | ||||
| </template> | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user