Update MMM

[mattx38]

Hello,

I juste saw there is an update of MMM.
I try to launch the " git pull && npm install " command but I have a warning message that the following packages would be crushed :
-package-lock.json
-package.json

Then, how can I manage updating my MMM ?

[sdetweil]

@mattx38 erase package-lock.json

Did u modify package.json?

And git checkout package.json to restore it if u are ok w that

[mattx38]

don’t remember doing so…
I’m backuping my whole “MagicMirror” folder from the pi.

[Stoffbeuteluwe]

patrickhahn@Patricks-Mini MagicMirror % git pull
Updating 5bf90ae..447c0bf
Fast-forward
 .eslintrc.json                                     |    1 +
 .github/ISSUE_TEMPLATE.md                          |   21 +-
 .travis.yml                                        |   27 +-
 CHANGELOG.md                                       |   59 +-
 Gruntfile.js                                       |   13 +-
 clientonly/index.js                                |    2 -
 config/config.js.sample                            |   18 +-
 index.html                                         |    2 +-
 installers/dumpactivemodules.js                    |   15 -
 installers/fixuppm2.sh                             |  183 -
 installers/mm.sh                                   |    1 +
 installers/pm2_MagicMirror.json                    |    7 -
 installers/postinstall/postinstall.sh              |    2 -
 installers/raspberry.sh                            |  569 ---
 installers/screensaveroff.sh                       |  101 -
 installers/upgrade-script.sh                       |  361 --
 js/app.js                                          |   11 +-
 js/electron.js                                     |    2 -
 js/loader.js                                       |    6 +-
 js/main.js                                         |   15 +-
 js/module.js                                       |   11 +-
 js/node_helper.js                                  |    4 +-
 js/server.js                                       |   14 +-
 js/socketclient.js                                 |    8 +-
 modules/README.md                                  |  721 ----
 modules/default/alert/README.md                    |   63 +-
 modules/default/calendar/README.md                 |  105 +-
 modules/default/calendar/calendar.js               |    4 +-
 modules/default/calendar/calendarfetcher.js        |   13 +-
 modules/default/calendar/debug.js                  |    2 +-
 .../default/calendar/vendor/ical.js/node-ical.js   |   15 +-
 modules/default/clock/README.md                    |   54 +-
 modules/default/clock/clock.js                     |   58 +-
 modules/default/clock/clock_screenshot.png         |  Bin 30525 -> 0 bytes
 modules/default/clock/clock_styles.css             |   10 +
 modules/default/compliments/README.md              |  148 +-
 modules/default/compliments/compliments.js         |   41 +-
 .../default/compliments/compliments_screenshot.png |  Bin 26157 -> 0 bytes
 modules/default/currentweather/README.md           |   86 +-
 modules/default/currentweather/currentweather.js   |   23 +-
 .../default/currentweather/weather_screenshot.png  |  Bin 38566 -> 0 bytes
 modules/default/helloworld/README.md               |   23 +-
 modules/default/newsfeed/README.md                 |  104 +-
 modules/default/newsfeed/newsfeed.js               |    5 +-
 modules/default/newsfeed/newsfeed_screenshot.png   |  Bin 45375 -> 0 bytes
 modules/default/updatenotification/README.md       |   24 +-
 modules/default/updatenotification/node_helper.js  |   74 +-
 .../updatenotification/updatenotification.js       |    1 +
 modules/default/weather/README.md                  |  117 +-
 modules/default/weather/current.png                |  Bin 8141 -> 0 bytes
 modules/default/weather/forecast.png               |  Bin 16385 -> 0 bytes
 modules/default/weatherforecast/README.md          |   79 +-
 .../weatherforecast/forecast_screenshot.png        |  Bin 86206 -> 0 bytes
 package-lock.json                                  | 4524 +++++++++-----------
 package.json                                       |   21 +-
 run-start.sh                                       |   67 -
 serveronly/index.js                                |    3 +-
 tests/configs/check_config.js                      |   14 +-
 .../modules/compliments/compliments_date.js        |   41 +
 .../modules/weather/forecastweather_default.js     |   46 +-
 .../modules/weather/forecastweather_options.js     |   52 +-
 tests/e2e/modules/compliments_spec.js              |   15 +
 tests/e2e/modules/mocks/weather_current.js         |   98 +-
 tests/e2e/modules/mocks/weather_forecast.js        |  184 +-
 tests/e2e/modules/weather_spec.js                  |   39 +-
 tests/e2e/vendor_spec.js                           |   15 +-
 tests/node_modules/webdriverajaxstub/index.js      |    4 +-
 tests/unit/functions/currentweather_spec.js        |    1 +
 tests/unit/functions/weatherforecast_spec.js       |    1 +
 translations/fi.json                               |    5 +-
 translations/he.json                               |   36 +
 translations/hr.json                               |    2 +-
 translations/pl.json                               |    3 +-
 translations/pt-br.json                            |    5 +-
 translations/tr.json                               |   14 +-
 translations/translations.js                       |   10 +-
 translations/uk.json                               |   36 +
 untrack-css.sh                                     |   11 -
 78 files changed, 2680 insertions(+), 5790 deletions(-)
 mode change 100755 => 100644 CHANGELOG.md
 delete mode 100644 installers/dumpactivemodules.js
 delete mode 100755 installers/fixuppm2.sh
 delete mode 100644 installers/pm2_MagicMirror.json
 delete mode 100644 installers/postinstall/postinstall.sh
 delete mode 100755 installers/raspberry.sh
 delete mode 100755 installers/screensaveroff.sh
 delete mode 100755 installers/upgrade-script.sh
 delete mode 100644 modules/README.md
 delete mode 100644 modules/default/clock/clock_screenshot.png
 delete mode 100644 modules/default/compliments/compliments_screenshot.png
 delete mode 100644 modules/default/currentweather/weather_screenshot.png
 delete mode 100644 modules/default/newsfeed/newsfeed_screenshot.png
 delete mode 100644 modules/default/weather/current.png
 delete mode 100644 modules/default/weather/forecast.png
 delete mode 100644 modules/default/weatherforecast/forecast_screenshot.png
 delete mode 100755 run-start.sh
 create mode 100644 tests/configs/modules/compliments/compliments_date.js
 create mode 100644 translations/he.json
 create mode 100644 translations/uk.json
 delete mode 100755 untrack-css.sh
patrickhahn@Patricks-Mini MagicMirror % npm install
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.
npm WARN ws@7.2.1 requires a peer of bufferutil@^4.0.1 but none is installed. You must install peer dependencies yourself.
npm WARN ws@7.2.1 requires a peer of utf-8-validate@^5.0.2 but none is installed. You must install peer dependencies yourself.

npm ERR! path /Users/patrickhahn/MagicMirror/node_modules/.bin/jsonlint
npm ERR! code EEXIST
npm ERR! Refusing to delete /Users/patrickhahn/MagicMirror/node_modules/.bin/jsonlint: ../jsonlint/lib/cli.js symlink target is not controlled by npm /Users/patrickhahn/MagicMirror/node_modules/@prantlf/jsonlint
npm ERR! File exists: /Users/patrickhahn/MagicMirror/node_modules/.bin/jsonlint
npm ERR! Move it away, and try again.

npm ERR! A complete log of this run can be found in:
npm ERR!     /Users/patrickhahn/.npm/_logs/2020-04-01T16_02_31_101Z-debug.log

i have some errors to…need help please

thanks

[sdetweil]

@Stoffbeuteluwe erase that jsonlint file, and npm install again

[mattx38]

@sdetweil How can I acknowledge the update anyway (it will overwrite the two files) ?

[sdetweil]

@mattx38 it will not overwrite

U have to do the two commands I said before

[mattx38]

@sdetweil said in Update MMM:

@mattx38 erase package-lock.json

Did u modify package.json?

And git checkout package.json to restore it if u are ok w that

Ok, I erased the package-lock.json file.
What command should I use to check package.json ?
I’m a beginner…

[sdetweil]

@mattx38 do

cd ~/MagicMirror
git checkout package.json

[Stoffbeuteluwe]

@sdetweil Perfect Sam thanks…