Merge conflict detected in your package.json

sdetweil · Jan 1, 2024, 6:15 PM

@Guku did you use apply?

can u look at package.json too?

Guku · Jan 1, 2024, 6:22 PM

@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 · Jan 1, 2024, 6:28 PM

@Guku weird… missing some of file

cd ~/MagicMirror
git checkout package.json

sdetweil · Jan 1, 2024, 6:32 PM

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

same userid at gmail

Guku · Jan 1, 2024, 6:46 PM

@sdetweil ran the command and this is it

git checkout package.json
Updated 1 path from the index

sent email with upgrade log

sdetweil · Jan 1, 2024, 6:47 PM

@Guku now

cd ~/MagicMirror
npm start

sdetweil · Jan 1, 2024, 6:48 PM

@Guku I ran upgarde on my very old desktop, 2.8 to 2.26
all ok

Guku · Jan 1, 2024, 6:53 PM

@sdetweil now this

npm run server

magicmirror@2.26.0 server
node ./serveronly

[01.01.2024 13:52.17.327] [LOG] Starting MagicMirror: v2.26.0
[01.01.2024 13:52.17.329] [LOG] Loading config …
[01.01.2024 13:52.17.330] [DEBUG] config template file not exists, no envsubst
[01.01.2024 13:52.17.332] [LOG] Loading module helpers …
[01.01.2024 13:52.17.332] [LOG] No helper found for module: alert.
[01.01.2024 13:52.17.336] [ERROR] Whoops! There was an uncaught exception…
[01.01.2024 13:52.17.339] [ERROR] Error: Cannot find module ‘command-exists’
Require stack:

/home/lolo/MagicMirror/modules/default/updatenotification/update_helper.js
/home/lolo/MagicMirror/modules/default/updatenotification/node_helper.js
/home/lolo/MagicMirror/js/app.js
/home/lolo/MagicMirror/serveronly/index.js
at Module._resolveFilename (node:internal/modules/cjs/loader:1048:15)
at Module._resolveFilename (/home/lolo/MagicMirror/node_modules/module-alias/index.js:49:29)
at Module._load (node:internal/modules/cjs/loader:901:27)
at Module.require (node:internal/modules/cjs/loader:1115:19)
at require (node:internal/modules/helpers:130:18)
at Object. (/home/lolo/MagicMirror/modules/default/updatenotification/update_helper.js:3:23)
at Module._compile (node:internal/modules/cjs/loader:1241:14)
at Module._extensions…js (node:internal/modules/cjs/loader:1295:10)
at Module.load (node:internal/modules/cjs/loader:1091:32)
at Module._load (node:internal/modules/cjs/loader:938:12)
at Module.require (node:internal/modules/cjs/loader:1115:19)
at require (node:internal/modules/helpers:130:18)
at Object. (/home/lolo/MagicMirror/modules/default/updatenotification/node_helper.js:4:22)
at Module._compile (node:internal/modules/cjs/loader:1241:14)
at Module._extensions…js (node:internal/modules/cjs/loader:1295:10)
at Module.load (node:internal/modules/cjs/loader:1091:32) {
code: ‘MODULE_NOT_FOUND’,
requireStack: [
‘/home/lolo/MagicMirror/modules/default/updatenotification/update_helper.js’,
‘/home/lolo/MagicMirror/modules/default/updatenotification/node_helper.js’,
‘/home/lolo/MagicMirror/js/app.js’,
‘/home/lolo/MagicMirror/serveronly/index.js’
]
}
[01.01.2024 13:52.17.339] [ERROR] MagicMirror² will not quit, but it might be a good idea to check why this happened. Maybe no internet connection?
[01.01.2024 13:52.17.339] [ERROR] If you think this really is an issue, please open an issue on GitHub: https://github.com/MichMich/MagicMirror/issues

sdetweil · Jan 1, 2024, 6:55 PM

@Guku I’m guessing because of the merge conflict the install didn’t work

do

cd ~/MagicMirror
npm install

then start again

Guku · Jan 1, 2024, 6:59 PM

@sdetweil i think that finally did it!
thank you so much for your help Sam!