Merge conflict detected in your package.json

Guku

@sdetweil Hi, so i had the same issue and after running the commands i get this

MagicMirror $ git commit -m"save new"
U package-lock.json
error: Committing is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use ‘git add/rm ’
hint: as appropriate to mark resolution and make a commit.
Thanks

sdetweil

@Guku i hate package-lock.json… should NEVER be shipped…

its used in the test env to get the right level of code, but we have SO many platforms, that the lock file is garbage…

anyhow

cd ~/MagicMirror
git checkout package-lock.json

Guku

@sdetweil just more errors…

/MagicMirror $ git checkout package-lock.json
error: path ‘package-lock.json’ is unmerged
i just started fresh with version 2.25 few months ago and this is the 1st update, how are things go wrong so quickly? the old build i had for few years without and issue.

sdetweil

@Guku rm package-lock.json

to erase it

my upgrade script handles this for you

Guku

@sdetweil said in Merge conflict detected in your package.json:

rm package-lock.json

ran your upgrade script and now see this

MagicMirror $ npm run server
npm ERR! code EJSONPARSE
npm ERR! JSON.parse Invalid package.json: JSONParseError: Expected double-quoted property name in JSON at position 3552 while parsing ‘{
npm ERR! JSON.parse “name”: “magicmirror”,
npm ERR! JSON.parse “version”: "2’
npm ERR! JSON.parse Failed to parse JSON data.
npm ERR! JSON.parse Note: package.json must be actual JSON, not just JavaScript.

npm ERR! A complete log of this run can be found in: /home/lolo/.npm/_logs/2024-01-01T18_11_41_122Z-debug-0.log

sdetweil

@Guku did you use apply?

can u look at package.json too?

Guku

@sdetweil i did use apply at the end and here the file

{
	"name": "magicmirror",
	"version": "2.26.0",
	"description": "The open source modular smart mirror platform.",
	"main": "js/electron.js",
	"scripts": {
		"start": "DISPLAY=\"${DISPLAY:=:0}\" ./node_modules/.bin/electron js/electron.js",
		"start:dev": "DISPLAY=\"${DISPLAY:=:0}\" ./node_modules/.bin/electron js/electron.js dev",
		"server": "node ./serveronly",
		"install-mm": "npm install --no-audit --no-fund --no-update-notifier --only=prod --omit=dev",
		"install-mm:dev": "npm install --no-audit --no-fund --no-update-notifier",
		"install-vendor": "echo \"Installing vendor files ...\n\" && cd vendor && npm install --loglevel=error --no-audit --no-fund --no-update-notifier",
		"install-fonts": "echo \"Installing fonts ...\n\" && cd fonts && npm install --loglevel=error --no-audit --no-fund --no-update-notifier",
		"postinstall": "npm run install-vendor && npm run install-fonts && echo \"MagicMirror² installation finished successfully! \n\"",
		"test": "NODE_ENV=test jest -i --forceExit",
		"test:coverage": "NODE_ENV=test jest --coverage -i --verbose false --forceExit",
		"test:electron": "NODE_ENV=test jest --selectProjects electron -i --forceExit",
		"test:e2e": "NODE_ENV=test jest --selectProjects e2e -i --forceExit",
		"test:unit": "NODE_ENV=test jest --selectProjects unit",
		"test:prettier": "prettier . --check",
		"test:js": "eslint 'js/**/*.js' 'modules/default/**/*.js' 'clientonly/*.js' 'serveronly/*.js' 'translations/*.js' 'vendor/*.js' 'tests/**/*.js' 'config/*'",
		"test:css": "stylelint 'css/main.css' 'fonts/*.css' 'modules/default/**/*.css' 'vendor/*.css' --config .stylelintrc.json",
		"test:calendar": "node ./modules/default/calendar/debug.js",
		"config:check": "node js/check_config.js",
		"lint:prettier": "prettier . --write",
		"lint:js": "eslint 'js/**/*.js' 'modules/default/**/*.js' 'clientonly/*.js' 'serveronly/*.js' 'translations/*.js' 'vendor/*.js' 'tests/**/*.js' 'config/*' --fix",
		"lint:css": "stylelint 'css/main.css' 'fonts/*.css' 'modules/default/**/*.css' 'vendor/*.css' --config .stylelintrc.json --fix",
		"lint:staged": "lint-staged",
		"prepare": "[ -f node_modules/.bin/husky ] && husky install || echo no husky installed."
	},
	"repository": {
		"type": "git",
		"url": "git+https://github.com/MichMich/MagicMirror.git"
	},
	"keywords": [
		"magic mirror",
		"magicmirror",
		"smart mirror",
		"mirror UI",
		"modular"
	],
	"author": "Michael Teeuw",
	"contributors": [
		"https://github.com/MichMich/MagicMirror/graphs/contributors"
	],
	"license": "MIT",
	"bugs": {
		"url": "https://github.com/MichMich/MagicMirror/issues"
	},
	"homepage": "https://magicmirror.builders",
	"devDependencies": {
		"@stylistic/eslint-plugin": "^1.5.1",
		"eslint-plugin-import": "^2.29.1",
		"eslint-plugin-jest": "^27.6.0",
		"eslint-plugin-jsdoc": "^46.9.1",
		"express-basic-auth": "^1.2.1",
		"husky": "^8.0.3",
		"jest": "^29.7.0",
		"jsdom": "^23.0.1",
		"lint-staged": "^15.2.0",
		"lodash": "^4.17.21",
		"playwright": "^1.40.1",
		"prettier": "^3.1.1",
		"sinon": "^17.0.1",
		"stylelint": "^16.1.0",
		"stylelint-config-standard": "^36.0.0",
		"stylelint-prettier": "^5.0.0",
		"suncalc": "^1.9.0"
	},
	"optionalDependencies": {
		"electron": "^27.2.0"
	},
	"dependencies": {
		"colors": "^1.4.0",
		"command-exists": "^1.2.9",
		"console-stamp": "^3.1.2",
		"envsub": "^4.1.0",
		"eslint": "^8.56.0",
		"express": "^4.18.2",
		"express-ipfilter": "^1.3.1",
		"feedme": "^2.0.2",
		"helmet": "^7.1.0",
		"html-to-text": "^9.0.5",
		"iconv-lite": "^0.6.3",
		"module-alias": "^2.2.3",
	},
	"lint-staged": {
		"*": "prettier --write",
		"*.js": "eslint",
		"*.css": "stylelint"
	},
	"_moduleAliases": {
		"node_helper": "js/node_helper.js",
		"logger": "js/logger.js"
	},
	"engines": {
		"node": ">=18"
	}
}

sdetweil

@Guku weird… missing some of file

cd ~/MagicMirror
git checkout package.json

sdetweil

@Guku also, can u send me the ~/MagicMirror/installers/upgrade.log

same userid at gmail

Guku

@sdetweil ran the command and this is it

git checkout package.json
Updated 1 path from the index

sent email with upgrade log