MagicMirror Forum
    • Recent
    • Tags
    • Unsolved
    • Solved
    • MagicMirror² Repository
    • Documentation
    • 3rd-Party-Modules
    • Donate
    • Discord
    • Register
    • Login
    A New Chapter for MagicMirror: The Community Takes the Lead
    Read the statement by Michael Teeuw here.

    issues updating MMM-calendar EXT3

    Scheduled Pinned Locked Moved Unsolved Troubleshooting
    18 Posts 4 Posters 1.1k Views 4 Watching
    Loading More Posts
    • Oldest to Newest
    • Newest to Oldest
    • Most Votes
    Reply
    • Reply as topic
    Log in to reply
    This topic has been deleted. Only users with topic management privileges can see it.
    • S Offline
      sdetweil @JMac
      last edited by

      @JMac said in issues updating MMM-calendar EXT3:

      used both of those then tried to up date the rest of the module

      sorry, brain fart…

      you need the git pull
      after the git reset , before the npm install

      Sam

      How to add modules

      learning how to use browser developers window for css changes

      J 1 Reply Last reply Reply Quote 0
      • J Offline
        JMac @sdetweil
        last edited by

        @sdetweil so just to be clear its,
        git checkout package-lock.json
        git reset
        git pull
        npm install

        within the calendar ext3 module folder?

        S 1 Reply Last reply Reply Quote 0
        • S Offline
          sdetweil @JMac
          last edited by sdetweil

          @JMac no
          edited

          # put package-lock.json back to last git clone state
          git checkout package-lock.json
          # update the module
          git pull
          # rerun npm install  with new code
          npm install
          

          all in the module folder

          # lines are comments and will be ignored if you copy paste that whole thing
          

          Sam

          How to add modules

          learning how to use browser developers window for css changes

          1 Reply Last reply Reply Quote 0
          • N Offline
            nschertz
            last edited by

            @sdetweil I just encountered the same problem and followed your instructions in your last post. This did not fix the problem. I continue to get the same error

            “your local changes to the following files would be overwritten by the merge: package-lock.json
            please commit them or stash them before you merge.
            Aborting.”

            Thoughts on what to do next?

            Norb

            S 1 Reply Last reply Reply Quote 0
            • S Offline
              sdetweil @nschertz
              last edited by sdetweil

              @nschertz you ARE in the module folder, right?
              edited

              cd ~/MagicMirror/modules/MMM-CalendarExt3
              git checkout package-lock.json
              git pull
              npm install
              

              right?

              Sam

              How to add modules

              learning how to use browser developers window for css changes

              BKeyportB N 2 Replies Last reply Reply Quote 0
              • BKeyportB Offline
                BKeyport Module Developer @sdetweil
                last edited by

                just for information, the real issue is the the lock file is included in the package, right?

                The "E" in "Javascript" stands for "Easy"

                S 1 Reply Last reply Reply Quote 0
                • S Offline
                  sdetweil @BKeyport
                  last edited by sdetweil

                  @BKeyport and it gets updated by npm install

                  You can do npm ci
                  Which will ONLY install the EXACT versions listed in the lock file, even if it’s wrong for your system

                  Sam

                  How to add modules

                  learning how to use browser developers window for css changes

                  1 Reply Last reply Reply Quote 0
                  • N Offline
                    nschertz @sdetweil
                    last edited by

                    @sdetweil Correct. After executing “git reset package-lock.json”, I get the message “Unstaged changes after reset:
                    M package-lock.json”

                    I then run git pull and get
                    pi@MagicMirror:~/MagicMirror/modules/MMM-CalendarExt3 $ git pull

                    Updating e93534d…5f276d4
                    error: Your local changes to the following files would be overwritten by merge:
                    package-lock.json
                    Please commit your changes or stash them before you merge.
                    Aborting

                    S 1 Reply Last reply Reply Quote 0
                    • S Offline
                      sdetweil @nschertz
                      last edited by sdetweil

                      @nschertz sorry, oops… wrong command!

                      git checkout package-lock.json
                      

                      fixed the prior posts with note edited

                      Sam

                      How to add modules

                      learning how to use browser developers window for css changes

                      1 Reply Last reply Reply Quote 0
                      • N Offline
                        nschertz
                        last edited by

                        to clarify… execute “git checkout package.json” instead of " git reset package.json" or execute “git checkout package.json” and " git reset package.json"?

                        S 1 Reply Last reply Reply Quote 0
                        • 1
                        • 2
                        • 1 / 2
                        • First post
                          Last post
                        Enjoying MagicMirror? Please consider a donation!
                        MagicMirror created by Michael Teeuw.
                        Forum managed by Sam, technical setup by Karsten.
                        This forum is using NodeBB as its core | Contributors
                        Contact | Privacy Policy