Try to install npm dependencies if not present before build.

stratisdevex · Dec 11, 2024 · 4ab63e7 · 4ab63e7
1 parent 604ffa2
commit 4ab63e7
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 5 deletions.
diff --git a/src/Stratis.VS.SolidityProjectBuildTasks/CompileContracts.cs b/src/Stratis.VS.SolidityProjectBuildTasks/CompileContracts.cs
@@ -4,6 +4,7 @@
 using System.IO;
 using System.Linq;
 using System.Text;
+
 using Microsoft.Build.Framework;
 using Microsoft.Build.Utilities;
 
@@ -30,8 +31,26 @@ public class CompileContracts : Task
 
         public override bool Execute()
         {
+            if (!File.Exists(Path.Combine(ProjectDir, "node_modules", "solc", "solc.js")))
+            {
+                Log.LogMessage(MessageImportance.High, "Installing NPM dependencies in project directory {0}...", ProjectDir);
+
+                var npmoutput = RunCmd("cmd.exe", "/c npm install", ProjectDir);
+                if (CheckRunCmdError(npmoutput))
+                {
+                    Log.LogError("Could not install NPM dependencies: " + GetRunCmdError(npmoutput));
+                }
+                else
+                {
+                    Log.LogMessage(MessageImportance.High, ((string)npmoutput["stdout"]).Trim());
+                }
+            }
             var solcpath = File.Exists(Path.Combine(ProjectDir, "node_modules", "solc", "solc.js")) ? Path.Combine(ProjectDir, "node_modules", "solc", "solc.js") :
                 Path.Combine(ExtDir, "node_modules", "solc", "solc.js");
+            if (!File.Exists(Path.Combine(ProjectDir, "node_modules", "solc", "solc.js")))
+            {
+                Log.LogWarning("solc compiler not present in project node_modules directory. Falling back to embedded compiler.");
+            }
             var cmdline = "node \"" + solcpath + "\" --standard-json --base-path=\"" + ProjectDir + "\"" + " --include-path=\"" + Path.Combine(ProjectDir, "node_modules") + "\"";
             var sources = Contracts.ToDictionary(k => k.GetMetadata("Filename"), v => new Source() { Urls = new[] { Path.Combine(v.GetMetadata("RelativeDir"), v.ItemSpec) } });
 
@@ -174,7 +193,7 @@ public override bool Execute()
                 {
                     if (cs.evm.bytecode._object != null)
                     {
-                        File.WriteAllBytes(Path.Combine(outputdir, c.Key + ".bin"), FromHexString(c.Value.Values.First().evm.bytecode._object));
+                        File.WriteAllText(Path.Combine(outputdir, c.Key + ".bin"), c.Value.Values.First().evm.bytecode._object);
                     }
                     if (!string.IsNullOrEmpty(cs.evm.bytecode.opcodes))
                     {
@@ -282,9 +301,9 @@ protected bool InstallSolidityLanguageServer()
 
         protected bool InstallNethereumGeneratorToolIfNotPresent()
         {
-            Log.LogMessage(MessageImportance.High, $"Installing .NET tool manifest...");
             if (!File.Exists(Path.Combine(ProjectDir, ".config", "dotnet-tools.json")))
             {
+                Log.LogMessage(MessageImportance.High, $"Installing .NET tool manifest...");
                 if (!CheckRunCmdOutput(RunCmd("cmd.exe", "/c dotnet new tool-manifest", ProjectDir), "was created successfully"))
                 {
                     Log.LogError("Could not install .NET tools manifest in " + ProjectDir);

diff --git a/src/Stratis.VS.StratisEVM/SolidityLanguageSettings.json b/src/Stratis.VS.StratisEVM/SolidityLanguageSettings.json
@@ -3,7 +3,6 @@
   "solidity.telemetry": false,
   "solidity.maxNumberOfProblems": 1,
   "solidity.enabledAsYouTypeCompilationErrorCheck": true,
-  "solidity.defaultCompiler":  "embedded",
-  "solidity.compileUsingRemoteVersion": "latest",
-  "solidity.linter":  "solhint"
+  "solidity.defaultCompiler": "localNodeModule",
+  "solidity.linter": "solhint"
 }