MagicMirror Forum
    • Recent
    • Tags
    • Unsolved
    • Solved
    • MagicMirror² Repository
    • Documentation
    • 3rd-Party-Modules
    • Donate
    • Discord
    • Register
    • Login
    1. Home
    2. Guku
    3. Posts
    A New Chapter for MagicMirror: The Community Takes the Lead
    Read the statement by Michael Teeuw here.
    G
    Offline
    • Profile
    • Following 0
    • Followers 0
    • Topics 2
    • Posts 17
    • Groups 0

    Posts

    Recent Best Controversial
    • RE: Merge conflict detected in your package.json

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

      posted in Troubleshooting
      G
      Guku
    • RE: Merge conflict detected in your package.json

      @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
      posted in Troubleshooting
      G
      Guku
    • RE: Merge conflict detected in your package.json

      @sdetweil ran the command and this is it

      git checkout package.json
      Updated 1 path from the index

      sent email with upgrade log

      posted in Troubleshooting
      G
      Guku
    • RE: Merge conflict detected in your package.json

      @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"
      	}
      }
      
      posted in Troubleshooting
      G
      Guku
    • RE: Merge conflict detected in your package.json

      @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

      posted in Troubleshooting
      G
      Guku
    • RE: Merge conflict detected in your package.json

      @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.

      posted in Troubleshooting
      G
      Guku
    • RE: Merge conflict detected in your package.json

      @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

      posted in Troubleshooting
      G
      Guku
    • 1 / 1