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

Finally fixed the solc loading issue. 

Moved the instantiation of the live-plugin-manager in to the child solc process. This allowed us to use the live-plugin-manager to require the installed solc file.

If the module is the same version as used by embark, the module is still loading using the normal require (from node_modules), as before.
This commit is contained in:
emizzle 2018-06-13 23:16:54 +10:00 committed by Iuri Matias
parent 49b15d020e
commit 6d6c398a6d
1 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
package-lock.json generated
View File

@ -44,8 +44,15 @@
<<<<<<< develop
=======
<<<<<<< refs/remotes/origin/bug_fix/solc-loading-issue
<<<<<<< refs/remotes/origin/bug_fix/solc-loading-issue
=======
=======
<<<<<<< develop
>>>>>>> use neo-blessed
=======
<<<<<<< develop
>>>>>>> Finally fixed the solc loading issue.
>>>>>>> Finally fixed the solc loading issue.
"@types/debug": {
"version": "0.0.30",
"resolved": "https://registry.npmjs.org/@types/debug/-/debug-0.0.30.tgz",
@ -114,11 +121,19 @@
"integrity": "sha1-EYHsvh2XtwNODqHjXmLobMJrQi0="
},
<<<<<<< develop
<<<<<<< develop
=======
>>>>>>> Finally fixed the solc loading issue.
=======
>>>>>>> use neo-blessed
=======
<<<<<<< refs/remotes/origin/bug_fix/solc-loading-issue
>>>>>>> Finally fixed the solc loading issue.
>>>>>>> use neo-blessed
=======
=======
>>>>>>> Finally fixed the solc loading issue.
>>>>>>> Finally fixed the solc loading issue.
"abbrev": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
@ -7519,7 +7534,11 @@
"@types/fs-extra": "5.0.3",
=======
<<<<<<< refs/remotes/origin/bug_fix/solc-loading-issue
<<<<<<< refs/remotes/origin/bug_fix/solc-loading-issue
=======
=======
<<<<<<< develop
>>>>>>> Finally fixed the solc loading issue.
"live-plugin-manager-git-fix": {
"version": "0.12.1",
"resolved": "https://registry.npmjs.org/live-plugin-manager-git-fix/-/live-plugin-manager-git-fix-0.12.1.tgz",
@ -7614,11 +7633,19 @@
}
},
<<<<<<< develop
<<<<<<< develop
=======
>>>>>>> Finally fixed the solc loading issue.
=======
>>>>>>> point to a forked npm package (for now), to avoid the npm install issues some users are reporting
=======
<<<<<<< refs/remotes/origin/bug_fix/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
=======
=======
>>>>>>> Finally fixed the solc loading issue.
>>>>>>> Finally fixed the solc loading issue.
"load-json-file": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",