embarklabs
/
embark
mirror of https://github.com/embarklabs/embark.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

point to a forked npm package (for now), to avoid the npm install issues some users are reporting

This commit is contained in:
Iuri Matias 2018-06-13 09:05:51 -04:00
parent b96df79c59
commit 6730322784
1 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
package-lock.json generated
View File

@ -7487,6 +7487,7 @@
} }
} }
}, },
<<<<<<< develop
<<<<<<< develop <<<<<<< develop
"live-plugin-manager-git-fix": { "live-plugin-manager-git-fix": {
<<<<<<< refs/remotes/origin/bug_fix/solc-loading-issue <<<<<<< refs/remotes/origin/bug_fix/solc-loading-issue
@ -7507,6 +7508,17 @@
"requires": { "requires": {
"@types/debug": "0.0.30", "@types/debug": "0.0.30",
"@types/fs-extra": "5.0.3", "@types/fs-extra": "5.0.3",
=======
<<<<<<< refs/remotes/origin/bug_fix/solc-loading-issue
=======
"live-plugin-manager-git-fix": {
"version": "0.12.0",
"resolved": "https://registry.npmjs.org/live-plugin-manager-git-fix/-/live-plugin-manager-git-fix-0.12.0.tgz",
"integrity": "sha512-2T5XLjlzPfbvAO1d4U2QvcG/YEewWTqG4GEX5GNQB3rEuHQ/YA3ChwylBbEIC/7Ase4h0vpRER60PJHgjn8/3A==",
"requires": {
"@types/debug": "0.0.30",
"@types/fs-extra": "5.0.2",
>>>>>>> point to a forked npm package (for now), to avoid the npm install issues some users are reporting
"@types/lockfile": "1.0.0", "@types/lockfile": "1.0.0",
"@types/node-fetch": "1.6.9", "@types/node-fetch": "1.6.9",
"@types/semver": "5.5.0", "@types/semver": "5.5.0",
@ -7547,6 +7559,23 @@
"graceful-fs": "4.1.11" "graceful-fs": "4.1.11"
} }
}, },
<<<<<<< develop
=======
"minipass": {
"version": "2.3.3",
"resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.3.tgz",
"integrity": "sha512-/jAn9/tEX4gnpyRATxgHEOV6xbcyxgT7iUnxo9Y3+OB0zX00TgKIv/2FZCf5brBbICcwbLqVv2ImjvWWrQMSYw==",
"requires": {
"safe-buffer": "5.1.2",
"yallist": "3.0.2"
}
},
"safe-buffer": {
"version": "5.1.2",
"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
},
>>>>>>> point to a forked npm package (for now), to avoid the npm install issues some users are reporting
"tar": { "tar": {
"version": "4.4.4", "version": "4.4.4",
"resolved": "https://registry.npmjs.org/tar/-/tar-4.4.4.tgz", "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.4.tgz",
@ -7568,8 +7597,12 @@
} }
} }
}, },
<<<<<<< develop
======= =======
>>>>>>> Finally fixed the solc loading issue. >>>>>>> Finally fixed the solc loading issue.
=======
>>>>>>> point to a forked npm package (for now), to avoid the npm install issues some users are reporting
>>>>>>> point to a forked npm package (for now), to avoid the npm install issues some users are reporting
"load-json-file": { "load-json-file": {
"version": "4.0.0", "version": "4.0.0",
"resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz", "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",