config-merge-loader - npm Package Compare versions

Comparing version 1.0.0-beta.4 to 1.0.0-beta.5

index.js

@@ -14,25 +14,28 @@ const loaderUtils = require('loader-utils');
   const options = loaderUtils.getOptions(this);
-  const overridePath = path.resolve(this.context, options.override);
 
   this.cacheable && this.cacheable();
 
-  this.loadModule(overridePath,
-    function(err, overrideSource, sourceMap, module) {
-      if (err) { return callback(err); }
+  if (!!options.override && options.override !== this.resourcePath) {
+    this.loadModule(path.resolve(this.context, options.override),
+      function(err, overrideSource, sourceMap, module) {
+        if (err) { return callback(err); }
 
-      const baseObj = JSON.parse(_removeModuleSyntax(source));
-      const overrideObj = JSON.parse(_removeModuleSyntax(overrideSource));
-      let mergedModule;
+        const baseObj = JSON.parse(_removeModuleSyntax(source));
+        const overrideObj = JSON.parse(_removeModuleSyntax(overrideSource));
+        let mergedModule;
 
-      if (!!options.baseNamespace && !!options.overrideNamespace) {
-        mergedModule = {
-          [options.baseNamespace]: deepMerge(baseObj[options.baseNamespace],
-          overrideObj[options.overrideNamespace])
-        };
-      } else {
-        mergedModule = deepMerge(baseObj, overrideObj);
-      }
+        if (!!options.baseNamespace && !!options.overrideNamespace) {
+          mergedModule = {
+            [options.baseNamespace]: deepMerge(baseObj[options.baseNamespace],
+            overrideObj[options.overrideNamespace])
+          };
+        } else {
+          mergedModule = deepMerge(baseObj, overrideObj);
+        }
 
-      callback(null, JSON.stringify(mergedModule));
-    });
+        callback(null, JSON.stringify(mergedModule));
+      });
+  } else {
+    callback(null, JSON.stringify(source));
+  }
 };

package.json

 {
   "name": "config-merge-loader",
-  "version": "1.0.0-beta.4",
+  "version": "1.0.0-beta.5",
   "description": "Loader for mergeing environment specific localiztion or configuration into a base set at build time.",
@@ -5,0 +5,0 @@ "homepage": "https://github.com/bitfyre/config-merge-loader/issues",

No alert changes

Improved metrics

Total package byte prevSize

7774

increased by1.62%

Lines of code

55

increased by5.77%

No dependency changes