Merge pull request #1652 from 0xProject/fix/sol-compiler-settings

Fix a bug when combining sol-compiler settings from different sources
0xProject · Feb 26, 2019 · 240f482 · 240f482
2 parents 7c49207 + 885031d
commit 240f482
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/packages/sol-compiler/CHANGELOG.json b/packages/sol-compiler/CHANGELOG.json
@@ -1,4 +1,13 @@
 [
+    {
+        "version": "3.1.1",
+        "changes": [
+            {
+                "note": "Fix a bug when combining compilerSettings from different sources",
+                "pr": 1652
+            }
+        ]
+    },
     {
         "version": "3.1.0",
         "changes": [
@@ -513,4 +522,4 @@
         ],
         "timestamp": 1518102000
     }
-]
+]
diff --git a/packages/sol-compiler/src/compiler.ts b/packages/sol-compiler/src/compiler.ts
@@ -107,7 +107,11 @@ export class Compiler {
         assert.doesConformToSchema('compiler.json', config, compilerOptionsSchema);
         this._contractsDir = path.resolve(passedOpts.contractsDir || config.contractsDir || DEFAULT_CONTRACTS_DIR);
         this._solcVersionIfExists = passedOpts.solcVersion || config.solcVersion;
-        this._compilerSettings = passedOpts.compilerSettings || config.compilerSettings || DEFAULT_COMPILER_SETTINGS;
+        this._compilerSettings = {
+            ...DEFAULT_COMPILER_SETTINGS,
+            ...config.compilerSettings,
+            ...passedOpts.compilerSettings,
+        };
         this._artifactsDir = passedOpts.artifactsDir || config.artifactsDir || DEFAULT_ARTIFACTS_DIR;
         this._specifiedContracts = passedOpts.contracts || config.contracts || ALL_CONTRACTS_IDENTIFIER;
         this._useDockerisedSolc =