package.json

{
	"name": "meld-auto-merge",
	"displayName": "Weld Merge",
	"description": "3-Way Git Merge Conflict Editor for VS Code, ported from GNOME Meld",
	"version": "0.0.12",
	"icon": "images/icon.png",
	"publisher": "pknowles",
	"author": "Pyarelal Knowles",
	"repository": {
		"type": "git",
		"url": "https://github.com/pknowles/weld-merge.git"
	},
	"keywords": [
		"weld",
		"weld-merge",
		"meld",
		"meld-style",
		"merge",
		"mergetool",
		"merge tool",
		"diff",
		"3-way merge",
		"three-way merge",
		"conflict",
		"conflict resolution",
		"git",
		"git merge",
		"git conflict"
	],
	"engines": {
		"vscode": "^1.105.0"
	},
	"categories": [
		"Other"
	],
	"activationEvents": [
		"onStartupFinished",
		"onExtensionActivated:vscode.git"
	],
	"extensionKind": [
		"workspace"
	],
	"extensionDependencies": [
		"vscode.git"
	],
	"main": "./out/extension.js",
	"contributes": {
		"customEditors": [
			{
				"viewType": "weld.mergeEditor",
				"displayName": "Weld 3-Way Merge",
				"selector": [
					{
						"filenamePattern": "*"
					}
				],
				"priority": "option"
			},
			{
				"viewType": "weld.submoduleConflict",
				"displayName": "Weld Submodule Conflict",
				"selector": [
					{
						"filenamePattern": "*.weld-submodule-conflict"
					}
				],
				"priority": "option"
			}
		],
		"viewsContainers": {
			"activitybar": [
				{
					"id": "meld-auto-merge",
					"title": "Weld Merge",
					"icon": "images/icon.png"
				}
			]
		},
		"views": {
			"scm": [
				{
					"id": "weldConflictedFiles",
					"name": "Weld Merge : Conflicted Files",
					"icon": "$(warning)"
				}
			]
		},
		"menus": {
			"view/item/context": [
				{
					"command": "meld-auto-merge.smartAdd",
					"when": "view == weldConflictedFiles && viewItem == conflictedFile",
					"group": "inline@1"
				},
				{
					"command": "meld-auto-merge.checkoutConflicted",
					"when": "view == weldConflictedFiles && (viewItem == resolvedFile || viewItem == resolvedSubmodule)",
					"group": "inline@2"
				},
				{
					"command": "meld-auto-merge.autoMerge",
					"when": "view == weldConflictedFiles && viewItem == conflictedFile",
					"group": "1_meld@1"
				},
				{
					"command": "meld-auto-merge.checkoutConflicted",
					"when": "view == weldConflictedFiles && (viewItem == conflictedFile || viewItem == conflictedSubmodule)",
					"group": "1_meld@2"
				},
				{
					"command": "meld-auto-merge.rerereForget",
					"when": "view == weldConflictedFiles && viewItem == conflictedFile",
					"group": "1_meld@3"
				},
				{
					"command": "meld-auto-merge.openConflictedFile",
					"when": "view == weldConflictedFiles && viewItem == conflictedFile",
					"group": "2_open@1"
				},
				{
					"command": "meld-auto-merge.openMergeEditor",
					"when": "view == weldConflictedFiles && viewItem == conflictedFile",
					"group": "2_open@2"
				}
			],
			"view/title": [
				{
					"command": "meld-auto-merge.autoMergeAll",
					"when": "view == weldConflictedFiles",
					"group": "navigation@1"
				},
				{
					"command": "meld-auto-merge.refreshConflicted",
					"when": "view == weldConflictedFiles",
					"group": "navigation@2"
				}
			],
			"commandPalette": [
				{
					"command": "meld-auto-merge.openMergeEditor",
					"when": "false"
				},
				{
					"command": "meld-auto-merge.openConflictedFile",
					"when": "false"
				}
			]
		},
		"commands": [
			{
				"command": "meld-auto-merge.autoMerge",
				"title": "Weld: Auto-Merge Current File",
				"icon": "$(merge)"
			},
			{
				"command": "meld-auto-merge.autoMergeAll",
				"title": "Weld: Auto-Merge All Conflicted Files",
				"icon": "$(check-all)"
			},
			{
				"command": "meld-auto-merge.checkoutConflicted",
				"title": "Weld: Checkout Conflicted (-m)",
				"icon": "$(history)"
			},
			{
				"command": "meld-auto-merge.rerereForget",
				"title": "Weld: Rerere Forget File",
				"icon": "$(trash)"
			},
			{
				"command": "meld-auto-merge.smartAdd",
				"title": "Weld: Git Add Resolved",
				"icon": "$(add)"
			},
			{
				"command": "meld-auto-merge.openMergeEditor",
				"title": "Open VS Code's 3-Way Merge Editor",
				"icon": "$(git-merge)"
			},
			{
				"command": "meld-auto-merge.openConflictedFile",
				"title": "Open File (Default Editor)",
				"icon": "$(file-text)"
			},
			{
				"command": "meld-auto-merge.openMeldDiff",
				"title": "Weld: 3-Way Merge Conflict Editor",
				"icon": "$(split-horizontal)"
			},
			{
				"command": "meld-auto-merge.refreshConflicted",
				"title": "Weld: Refresh Conflicted Files",
				"icon": "$(refresh)"
			}
		],
		"configuration": {
			"title": "Weld Merge",
			"properties": {
				"weld.mergeEditor.syntaxHighlighting": {
					"type": "boolean",
					"default": true,
					"description": "Enable syntax highlighting in the merge editor."
				},
				"weld.mergeEditor.baseCompareHighlighting": {
					"type": "boolean",
					"default": true,
					"description": "Use base diff highlight when base-comparing."
				},
				"weld.mergeEditor.smoothScrolling": {
					"type": "boolean",
					"default": true,
					"description": "Enable smooth proportional scrolling synchronization across panels."
				}
			}
		},
		"keybindings": [
			{
				"command": "weldConflictedFiles.focus",
				"key": "alt+m",
				"mac": "cmd+alt+m"
			}
		],
		"colors": [
			{
				"id": "weldMerge.diffInsertBackground",
				"description": "Background color for inserted lines in the merge editor.",
				"defaults": {
					"dark": "#00c80026",
					"light": "#00c80026",
					"highContrast": "#00c80026"
				}
			},
			{
				"id": "weldMerge.diffDeleteBackground",
				"description": "Background color for deleted lines in the merge editor.",
				"defaults": {
					"dark": "#00c80026",
					"light": "#00c80026",
					"highContrast": "#00c80026"
				}
			},
			{
				"id": "weldMerge.diffReplaceBackground",
				"description": "Background color for replaced lines in the merge editor.",
				"defaults": {
					"dark": "#0064ff26",
					"light": "#0064ff26",
					"highContrast": "#0064ff26"
				}
			},
			{
				"id": "weldMerge.diffConflictBackground",
				"description": "Background color for conflicting lines in the merge editor.",
				"defaults": {
					"dark": "#ff000026",
					"light": "#ff000026",
					"highContrast": "#ff000026"
				}
			},
			{
				"id": "weldMerge.diffReplaceInlineBackground",
				"description": "Background color for inline changed text within replaced lines.",
				"defaults": {
					"dark": "#0064ff59",
					"light": "#0064ff59",
					"highContrast": "#0064ff59"
				}
			},
			{
				"id": "weldMerge.diffCurtainInsertFill",
				"description": "Fill color for insert diff areas in the merging curtain.",
				"defaults": {
					"dark": "#00c80033",
					"light": "#00c80033",
					"highContrast": "#00c80033"
				}
			},
			{
				"id": "weldMerge.diffCurtainInsertStroke",
				"description": "Stroke color for insert diff areas in the merging curtain.",
				"defaults": {
					"dark": "#00c80080",
					"light": "#00c80080",
					"highContrast": "#00c80080"
				}
			},
			{
				"id": "weldMerge.diffCurtainDeleteFill",
				"description": "Fill color for delete diff areas in the merging curtain.",
				"defaults": {
					"dark": "#00c80033",
					"light": "#00c80033",
					"highContrast": "#00c80033"
				}
			},
			{
				"id": "weldMerge.diffCurtainDeleteStroke",
				"description": "Stroke color for delete diff areas in the merging curtain.",
				"defaults": {
					"dark": "#00c80080",
					"light": "#00c80080",
					"highContrast": "#00c80080"
				}
			},
			{
				"id": "weldMerge.diffCurtainReplaceFill",
				"description": "Fill color for replace diff areas in the merging curtain.",
				"defaults": {
					"dark": "#0064ff33",
					"light": "#0064ff33",
					"highContrast": "#0064ff33"
				}
			},
			{
				"id": "weldMerge.diffCurtainReplaceStroke",
				"description": "Stroke color for replace diff areas in the merging curtain.",
				"defaults": {
					"dark": "#0064ff80",
					"light": "#0064ff80",
					"highContrast": "#0064ff80"
				}
			},
			{
				"id": "weldMerge.diffCurtainConflictFill",
				"description": "Fill color for conflict diff areas in the merging curtain.",
				"defaults": {
					"dark": "#ff000033",
					"light": "#ff000033",
					"highContrast": "#ff000033"
				}
			},
			{
				"id": "weldMerge.diffCurtainConflictStroke",
				"description": "Stroke color for conflict diff areas in the merging curtain.",
				"defaults": {
					"dark": "#ff000080",
					"light": "#ff000080",
					"highContrast": "#ff000080"
				}
			}
		]
	},
	"scripts": {
		"vscode:prepublish": "npm run build",
		"build:webview": "esbuild ./src/webview/ui/index.tsx --bundle --outfile=./out/webview/index.js --format=iife --platform=browser --loader:.ttf=file --minify --define:process.env.NODE_ENV='\"production\"' && esbuild ./src/webview/submoduleUi/index.tsx --bundle --outfile=./out/webview/submodule.js --format=iife --platform=browser --loader:.ttf=file --minify --define:process.env.NODE_ENV='\"production\"'",
		"build:webview:dev": "esbuild ./src/webview/ui/index.tsx --bundle --outfile=./out/webview/index.js --format=iife --platform=browser --loader:.ttf=file --define:process.env.NODE_ENV='\"development\"'",
		"build:extension": "esbuild ./src/extension.ts --bundle --outfile=./out/extension.js --external:vscode --format=cjs --platform=node --sourcemap",
		"build": "tsc --noEmit && npm run format && npm run lint && npm run knip && npm run build:webview && npm run build:extension",
		"watch:webview": "esbuild ./src/webview/ui/index.tsx --bundle --outfile=./out/webview/index.js --format=iife --platform=browser --loader:.ttf=file --watch --define:process.env.NODE_ENV='\"development\"' & esbuild ./src/webview/submoduleUi/index.tsx --bundle --outfile=./out/webview/submodule.js --format=iife --platform=browser --loader:.ttf=file --watch --define:process.env.NODE_ENV='\"development\"'",
		"watch:extension": "esbuild ./src/extension.ts --bundle --outfile=./out/extension.js --external:vscode --format=cjs --platform=node --sourcemap --watch",
		"watch": "npm run watch:webview & npm run watch:extension & tsc --noEmit --watch",
		"pretest": "npm run build",
		"test": "npx jest",
		"test:coverage": "npx jest --coverage",
		"test:vscode": "env -u ELECTRON_RUN_AS_NODE npx tsx test/vscode/runTest.ts",
		"test:vscode:restored-tabs": "env -u ELECTRON_RUN_AS_NODE npx tsx scripts/test_restored_tabs.ts",
		"test:vscode:remote-ssh": "env -u ELECTRON_RUN_AS_NODE npx tsx test/vscode-remote-ssh/runTest.ts",
		"test:mutate": "stryker run",
		"test:fuzz": "JAZZER_FUZZ=1 npx jest -c jest.fuzz.config.js",
		"test:fuzz:corpus": "npx tsx scripts/generate_fuzz_corpus.ts",
		"test:bench": "npx tsx test/benchmarking/main.ts",
		"test:e2e": "npx playwright test test/e2e",
		"ratchet": "npx tsx scripts/ratchet_coverage.ts",
		"pre-checkin": "npm run lint && npm run build && npm run test:coverage && npm run test:vscode && npm run test:vscode:restored-tabs && npm run test:e2e && npm run jscpd && npm run depcruise && npm run ratchet",
		"format": "biome format --write .",
		"lint": "biome lint --error-on-warnings --write .",
		"knip": "knip",
		"jscpd": "jscpd src",
		"depcruise": "depcruise src",
		"prepare": "husky"
	},
	"overrides": {
		"dompurify": "^3.3.3",
		"tar": "^7.5.13",
		"brace-expansion": "^5.0.5",
		"serialize-javascript": "^7.0.5"
	},
	"devDependencies": {
		"@biomejs/biome": "2.4.14",
		"@jazzer.js/core": "^4.0.0",
		"@jazzer.js/jest-runner": "^4.0.0",
		"@jest/globals": "^30.3.0",
		"@monaco-editor/react": "^4.7.0",
		"@playwright/test": "^1.59.1",
		"@stryker-mutator/core": "^9.6.1",
		"@stryker-mutator/jest-runner": "^9.6.1",
		"@stryker-mutator/typescript-checker": "^9.6.1",
		"@testing-library/jest-dom": "^6.9.1",
		"@testing-library/react": "^16.3.2",
		"@types/jest": "^30.0.0",
		"@types/lodash.debounce": "^4.0.9",
		"@types/mocha": "^10.0.10",
		"@types/node": "25.x",
		"@types/react": "^19.2.14",
		"@types/react-dom": "^19.2.3",
		"@types/sinon": "^21.0.1",
		"@types/vscode": "^1.105.0",
		"@vscode/test-electron": "^2.5.2",
		"dependency-cruiser": "^17.4.0",
		"diff": "^9.0.0",
		"esbuild": "^0.28.0",
		"glob": "^13.0.6",
		"husky": "^9.1.7",
		"jest": "^30.3.0",
		"jest-environment-jsdom": "^30.3.0",
		"jscpd": "^4.0.9",
		"knip": "^6.11.0",
		"lint-staged": "^16.4.0",
		"lodash.debounce": "^4.0.8",
		"mocha": "^11.3.0",
		"monaco-editor": "^0.55.1",
		"playwright": "^1.59.1",
		"react": "^19.2.5",
		"react-dom": "^19.2.5",
		"sinon": "^22.0.0",
		"tinybench": "^6.0.1",
		"ts-jest": "^29.4.9",
		"tsx": "^4.21.0",
		"typescript": "^6.0.3",
		"xvfb": "^0.4.0"
	},
	"lint-staged": {
		"*.{js,ts,jsx,tsx,json}": [
			"biome check --error-on-warnings --write --no-errors-on-unmatched"
		]
	}
}