Skip to content

Allow npm to update package-lock.json file#6289

Merged
kumavis merged 2 commits intoMetaMask:developfrom
whymarrh:fix-ci-deps
Mar 12, 2019
Merged

Allow npm to update package-lock.json file#6289
kumavis merged 2 commits intoMetaMask:developfrom
whymarrh:fix-ci-deps

Conversation

@whymarrh
Copy link
Copy Markdown
Contributor

@whymarrh whymarrh commented Mar 12, 2019

This PR updates the package-lock.json file using npm 6.8.0. I've skipped the parts where npm has seemingly broken the Git URLs. I've also bumped the ganache-core version in an attempt to avoid websocket sub-dependency issues.

Before:

└─┬ ganache-core@2.3.1
  ├─┬ web3@1.0.0-beta.35
  │ └─┬ web3-core@1.0.0-beta.35
  │   └─┬ web3-core-requestmanager@1.0.0-beta.35
  │     └─┬ web3-providers-ws@1.0.0-beta.35
  │       └── UNMET DEPENDENCY websocket@git://github.com/frozeman/WebSocket-Node.git#6c72925e3f8aaaea8dc8450f97627e85263999f2 
  └── websocket@1.0.26 

After:

└─┬ ganache-core@2.5.3
  ├─┬ web3@1.0.0-beta.35
  │ └─┬ web3-core@1.0.0-beta.35
  │   └─┬ web3-core-requestmanager@1.0.0-beta.35
  │     └─┬ web3-providers-ws@1.0.0-beta.35
  │       └── UNMET OPTIONAL DEPENDENCY websocket@git://github.com/frozeman/WebSocket-Node.git#6c72925e3f8aaaea8dc8450f97627e85263999f2 
  └── websocket@1.0.26 
An example diff of npm breaking the Git URLs
@@ -10786,7 +10786,7 @@
           "resolved": "https://registry.npmjs.org/eth-block-tracker/-/eth-block-tracker-2.3.1.tgz",
           "integrity": "sha512-NamWuMBIl8kmkJFVj8WzGatySTzQPQag4Xr677yFxdVtIxACFbL/dQowk0MzEqIKk93U1TwY3MjVU6mOcwZnKA==",
           "requires": {
-            "async-eventemitter": "github:ahultgren/async-eventemitter#fa06e39e56786ba541c180061dbf2c0a5bbf951c",
+            "async-eventemitter": "async-eventemitter@github:ahultgren/async-eventemitter#fa06e39e56786ba541c180061dbf2c0a5bbf951c",
             "eth-query": "^2.1.0",
             "ethereumjs-tx": "^1.3.3",
             "ethereumjs-util": "^5.1.3",
@@ -10916,7 +10916,7 @@
               "resolved": "https://registry.npmjs.org/eth-sig-util/-/eth-sig-util-1.4.2.tgz",
               "integrity": "sha1-jZWCAsftuq6Dlwf7pvCf8ydgYhA=",
               "requires": 
-                "ethereumjs-abi": "git+https://github.com/ethereumjs/ethereumjs-abi.git#2863c40e0982acfc0b7163f0285d4c56427c7799",
+                "ethereumjs-abi": "ethereumjs-abi@git+https://github.com/ethereumjs/ethereumjs-abi.git#2863c40e0982acfc0b7163f0285d4c56427c7799",
                 "ethereumjs-util": "^5.1.1"
               },
               "dependencies": {

@kumavis kumavis merged commit 70e7e59 into MetaMask:develop Mar 12, 2019
@whymarrh whymarrh deleted the fix-ci-deps branch March 12, 2019 12:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants