Commit bc28e81d authored by Philipp Nowinski's avatar Philipp Nowinski

[BUGFIX] configs have to be merged recursively

parent 9d674eff
......@@ -3,6 +3,7 @@
const fs = require('fs');
const path = require('path');
const {argv} = require('yargs');
const merge = require('merge');
let extension;
let watcherActive = false;
......@@ -87,7 +88,7 @@ class Settings {
}
projectConfig = require('../../.sgc-config.json');
if (scriptsConfig) {
mergedConfig = Object.assign(projectConfig, scriptsConfig);
mergedConfig = merge.recursive(scriptsConfig, projectConfig);
} else {
mergedConfig = projectConfig;
}
......
{
"name": "sgc",
"version": "3.2.8",
"version": "3.5.0",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
......@@ -8682,6 +8682,11 @@
"trim-newlines": "^1.0.0"
}
},
"merge": {
"version": "1.2.1",
"resolved": "https://registry.npmjs.org/merge/-/merge-1.2.1.tgz",
"integrity": "sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ=="
},
"merge-source-map": {
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/merge-source-map/-/merge-source-map-1.0.4.tgz",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment