Read the statement by Michael Teeuw here.
fail to update Todoist
-
All, my mirror ask for update Todoist so trying
cd MagicMirror/modules/MMM-Todoist/ git pull && npm install
and I get the failure
Aktualisiere 0b27f87..f9bedb8 error: Ihre lokalen Änderungen in den folgenden Dateien würden durch den Merge überschrieben werden: package-lock.json Bitte committen oder stashen Sie Ihre Änderungen, bevor Sie mergen. Abbruch
means my local changes in package-lock.json would be overwritten in case of update.
I can’t remember to change anything :confounded_face:How to fix it please?
-
Thanks that works fine :smiling_face_with_open_mouth_closed_eyes:
Other strange thing, meanwhile I got asked to update whole MM and I did.
I had 2.10.0 run and got these output :confounded_face: upgrading from version 2.9.0 to 2.10.1bash -c "$(curl -sL https://raw.githubusercontent.com/sdetweil/MagicMirror_scripts/master/upgrade-script.sh)" apply the log will be /home/pi/MagicMirror/installers/upgrade.log No LSB modules are available. doing test run = false update log will be in /home/pi/MagicMirror/installers/upgrade.log saving custom.css upgrading from version 2.9.0 to 2.10.1 fetching latest revisions there are 4 local files that are different than the master repo modules/default/weatherforecast/weatherforecast.js package-lock.json vendor/package-lock.json vendor/vendor.js any *-lock.json files do not need to be saved do you want to save these files for later (Y/n)?y updating MagicMirror runtime, please wait npm WARN deprecated @types/vfile-message@2.0.0: This is a stub types definition. vfile-message provides its own type definitions, so you do not need this installed. > core-js@2.6.11 postinstall /home/pi/MagicMirror/node_modules/core-js > node -e "try{require('./postinstall')}catch(e){}" Thank you for using core-js ( https://github.com/zloirock/core-js ) for polyfilling JavaScript standard library! The project needs your help! Please consider supporting of core-js on Open Collective or Patreon: > https://opencollective.com/core-js > https://www.patreon.com/zloirock Also, the author of core-js ( https://github.com/zloirock ) is looking for a good job -) > console-stamp@0.2.9 postinstall /home/pi/MagicMirror/node_modules/console-stamp > node ./msg.js Attention Console-stamp version 3.0.0 Release Candidate is out. Install by using the tag '@next'. NB: Breaking changes. For more details goto: https://www.npmjs.com/package/console-stamp/v/next > electron@3.1.13 postinstall /home/pi/MagicMirror/node_modules/electron > node install.js Downloading tmp-13054-1-SHASUMS256.txt-3.1.13 [============================================>] 100.0% of 4.79 kB (4.79 kB/s) > magicmirror@2.10.1 install /home/pi/MagicMirror > cd vendor && npm install npm WARN optional SKIPPING OPTIONAL DEPENDENCY: fsevents@1.2.4 (node_modules/fsevents): npm WARN notsup SKIPPING OPTIONAL DEPENDENCY: Unsupported platform for fsevents@1.2.4: wanted {"os":"darwin","arch":"any"} (current: {"os":"linux","arch":"arm"}) removed 3 packages and audited 220 packages in 18.516s found 5 vulnerabilities (4 low, 1 high) run `npm audit fix` to fix them, or `npm audit` for details > magicmirror@2.10.1 postinstall /home/pi/MagicMirror > sh untrack-css.sh && sh installers/postinstall/postinstall.sh && npm run install-fonts MagicMirror installation successful! > magicmirror@2.10.1 install-fonts /home/pi/MagicMirror > cd fonts && npm install audited 1 package in 13.139s found 0 vulnerabilities npm WARN grunt-stylelint@0.13.0 requires a peer of stylelint@^12.0.0 but none is installed. You must install peer dependencies yourself. added 196 packages from 191 contributors, removed 248 packages, updated 268 packages and audited 2766 packages in 1036.068s found 0 vulnerabilities processing dependency changes for active modules with package.json files processing for module MMM-Carousel please wait ---------------------------------- audited 859 packages in 28.488s found 6 vulnerabilities (1 moderate, 5 high) run `npm audit fix` to fix them, or `npm audit` for details processing complete for module MMM-Carousel processing for module MMM-Todoist please wait ---------------------------------- audited 63 packages in 5.206s found 0 vulnerabilities processing complete for module MMM-Todoist processing for module MMM-PublicTransportHafas please wait ---------------------------------- audited 41 packages in 3.315s found 0 vulnerabilities processing complete for module MMM-PublicTransportHafas processing for module MMM-PublicTransportHafas please wait ---------------------------------- audited 41 packages in 3.798s found 0 vulnerabilities processing complete for module MMM-PublicTransportHafas processing for module MMM-PublicTransportHafas please wait ---------------------------------- audited 41 packages in 3s found 0 vulnerabilities processing complete for module MMM-PublicTransportHafas restoring custom.css we stashed a set of files that appear changed from the latest repo versions. you should review them see installers/stashed_files for the list you can use git checkout stash@{0} -- filename to extract one file from the stash or git stash pop to restore them all WARNING.. WARNING.. either will overlay the file just installed by the update WARNING..
Over all I can close this thread
@sdetweil Thanks fpor your fast help
-
@bdream said in fail to update Todoist:
package-lock.json
this file is dynamically updated when u do an npm install.
so you can delete it, then do the git pull…
-
Thanks that works fine :smiling_face_with_open_mouth_closed_eyes:
Other strange thing, meanwhile I got asked to update whole MM and I did.
I had 2.10.0 run and got these output :confounded_face: upgrading from version 2.9.0 to 2.10.1bash -c "$(curl -sL https://raw.githubusercontent.com/sdetweil/MagicMirror_scripts/master/upgrade-script.sh)" apply the log will be /home/pi/MagicMirror/installers/upgrade.log No LSB modules are available. doing test run = false update log will be in /home/pi/MagicMirror/installers/upgrade.log saving custom.css upgrading from version 2.9.0 to 2.10.1 fetching latest revisions there are 4 local files that are different than the master repo modules/default/weatherforecast/weatherforecast.js package-lock.json vendor/package-lock.json vendor/vendor.js any *-lock.json files do not need to be saved do you want to save these files for later (Y/n)?y updating MagicMirror runtime, please wait npm WARN deprecated @types/vfile-message@2.0.0: This is a stub types definition. vfile-message provides its own type definitions, so you do not need this installed. > core-js@2.6.11 postinstall /home/pi/MagicMirror/node_modules/core-js > node -e "try{require('./postinstall')}catch(e){}" Thank you for using core-js ( https://github.com/zloirock/core-js ) for polyfilling JavaScript standard library! The project needs your help! Please consider supporting of core-js on Open Collective or Patreon: > https://opencollective.com/core-js > https://www.patreon.com/zloirock Also, the author of core-js ( https://github.com/zloirock ) is looking for a good job -) > console-stamp@0.2.9 postinstall /home/pi/MagicMirror/node_modules/console-stamp > node ./msg.js Attention Console-stamp version 3.0.0 Release Candidate is out. Install by using the tag '@next'. NB: Breaking changes. For more details goto: https://www.npmjs.com/package/console-stamp/v/next > electron@3.1.13 postinstall /home/pi/MagicMirror/node_modules/electron > node install.js Downloading tmp-13054-1-SHASUMS256.txt-3.1.13 [============================================>] 100.0% of 4.79 kB (4.79 kB/s) > magicmirror@2.10.1 install /home/pi/MagicMirror > cd vendor && npm install npm WARN optional SKIPPING OPTIONAL DEPENDENCY: fsevents@1.2.4 (node_modules/fsevents): npm WARN notsup SKIPPING OPTIONAL DEPENDENCY: Unsupported platform for fsevents@1.2.4: wanted {"os":"darwin","arch":"any"} (current: {"os":"linux","arch":"arm"}) removed 3 packages and audited 220 packages in 18.516s found 5 vulnerabilities (4 low, 1 high) run `npm audit fix` to fix them, or `npm audit` for details > magicmirror@2.10.1 postinstall /home/pi/MagicMirror > sh untrack-css.sh && sh installers/postinstall/postinstall.sh && npm run install-fonts MagicMirror installation successful! > magicmirror@2.10.1 install-fonts /home/pi/MagicMirror > cd fonts && npm install audited 1 package in 13.139s found 0 vulnerabilities npm WARN grunt-stylelint@0.13.0 requires a peer of stylelint@^12.0.0 but none is installed. You must install peer dependencies yourself. added 196 packages from 191 contributors, removed 248 packages, updated 268 packages and audited 2766 packages in 1036.068s found 0 vulnerabilities processing dependency changes for active modules with package.json files processing for module MMM-Carousel please wait ---------------------------------- audited 859 packages in 28.488s found 6 vulnerabilities (1 moderate, 5 high) run `npm audit fix` to fix them, or `npm audit` for details processing complete for module MMM-Carousel processing for module MMM-Todoist please wait ---------------------------------- audited 63 packages in 5.206s found 0 vulnerabilities processing complete for module MMM-Todoist processing for module MMM-PublicTransportHafas please wait ---------------------------------- audited 41 packages in 3.315s found 0 vulnerabilities processing complete for module MMM-PublicTransportHafas processing for module MMM-PublicTransportHafas please wait ---------------------------------- audited 41 packages in 3.798s found 0 vulnerabilities processing complete for module MMM-PublicTransportHafas processing for module MMM-PublicTransportHafas please wait ---------------------------------- audited 41 packages in 3s found 0 vulnerabilities processing complete for module MMM-PublicTransportHafas restoring custom.css we stashed a set of files that appear changed from the latest repo versions. you should review them see installers/stashed_files for the list you can use git checkout stash@{0} -- filename to extract one file from the stash or git stash pop to restore them all WARNING.. WARNING.. either will overlay the file just installed by the update WARNING..
Over all I can close this thread
@sdetweil Thanks fpor your fast help
-
:smiling_face_with_sunglasses: how to get it makred as solved?
-
@bdream on the post that u think solves the problem, click the 3 dots to the right
-
@bdream said in fail to update Todoist:
modules/default/weatherforecast/weatherforecast.js
all looks good except for that one file…
if you modified it for some special purpose, you need to restore it from the stash.
-
@sdetweil you are right - thanks again.
That was the workaround cleaning up the header which shows the undefined in front of the city ;)