fix loader deprecation warnings

kommander · May 2, 2017 · fb6e539 · fb6e539
1 parent 3439234
commit fb6e539
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 10 deletions.
diff --git a/extensions/md.js b/extensions/md.js
@@ -7,7 +7,7 @@ const HtmlWebpackPlugin = require('html-webpack-plugin');
 module.exports = (aden) => {
   // TODO: use short keys for ext config { md: { entry: 'index', markedOptions, ... }}
   aden.registerKey('md', {
-    type: 'custom',
+    type: 'object',
     config: true,
     value: {
       entry: 'index',
@@ -122,9 +122,12 @@ module.exports = (aden) => {
       loader: require.resolve('markdown-loader'),
     };
 
-    if (pages[0].key.md.value.marked) {
+    // The loader treats an empty object as options with parseQuery(),
+    // which is deprecated. Might show different behaviour with md-loader versions > 2.0.0
+    const markedOpts = pages[0].key.md.value.marked;
+    if (markedOpts && Object.keys(markedOpts).length > 0) {
       Object.assign(markdownLoader, {
-        options: pages[0].key.md.value.marked,
+        options: markedOpts,
       });
     }
 

diff --git a/lib/aden.constants.js b/lib/aden.constants.js
@@ -1,6 +1,7 @@
 const _ = require('lodash');
 
 const keyTypes = {
+  KEY_TYPE_OBJECT: 'object',
   KEY_TYPE_STRING: 'string',
   KEY_TYPE_STRING_ARRAY: 'stringarray',
   KEY_TYPE_FUNCTION: 'function',

diff --git a/lib/aden.js b/lib/aden.js
@@ -25,7 +25,13 @@ const logger = require('./aden.logger');
 const mkdirp = require('mkdirp');
 
 // Core modules
-const AdenConstants = require('./aden.constants.js');
+const {
+  KEY_TYPE_STRING,
+  KEY_TYPE_CUSTOM,
+  KEY_TYPE_FILE_ARRAY,
+  KEY_TYPE_FILE,
+  allowedKeyTypes,
+} = require('./aden.constants.js');
 const AdenBuild = require('./aden.build.js');
 const AdenDev = require('./aden.dev.js');
 const AdenInit = require('./aden.init.js');
@@ -137,7 +143,7 @@ AdenBackend.prototype.registerFile = function registerFile(keyName, regex, opts
   this.log.debug('registerFile(s)', { keyName, regex, opts });
 
   this.registerKey(keyName, _.extend(opts.key, {
-    type: opts.multi ? AdenConstants.KEY_TYPE_FILE_ARRAY : AdenConstants.KEY_TYPE_FILE,
+    type: opts.multi ? KEY_TYPE_FILE_ARRAY : KEY_TYPE_FILE,
     value: opts.multi ? [] : null,
     inherit: false,
   }));
@@ -175,13 +181,13 @@ AdenBackend.prototype.registerFile = function registerFile(keyName, regex, opts
 AdenBackend.prototype.registerKey = function registerKey(name, key) {
   this.log.debug('registerKey', name, key);
 
-  if (key.type && !AdenConstants.allowedKeyTypes.includes(key.type)) {
+  if (key.type && !allowedKeyTypes.includes(key.type)) {
     throw cannot('register', 'key')
       .because('type is not supported').addInfo(key.type);
   }
 
   const newKey = _.extend({
-    type: AdenConstants.KEY_TYPE_STRING,
+    type: KEY_TYPE_STRING,
     inherit: false,
     build: false,
     value: null,
@@ -207,9 +213,9 @@ AdenBackend.prototype.applyKeys = function applyKeys(page, keys) {
       const newKey = Object.assign({}, key);
 
       if (!newKey.inherit) {
-        if (newKey.type === AdenConstants.KEY_TYPE_FILE_ARRAY) {
+        if (newKey.type === KEY_TYPE_FILE_ARRAY) {
           newKey.value = [];
-        } else if (newKey.type === AdenConstants.KEY_TYPE_CUSTOM) {
+        } else if (newKey.type === KEY_TYPE_CUSTOM) {
           newKey.value = newKey.value;
         } else {
           newKey.value = null;

diff --git a/lib/aden.page.js b/lib/aden.page.js
@@ -6,6 +6,8 @@ const uuid = require('uuid');
 const _ = require('lodash');
 const pathIsInside = require('path-is-inside');
 
+const { KEY_TYPE_OBJECT } = require('./aden.constants.js');
+
 function parsePage(pagePath, maybeParentPage) {
   return Promise.resolve().then(() => {
     try {
@@ -198,7 +200,9 @@ function applyFileConfig(fileConfig, page) {
       .forEach((key) => Object.assign(
         key,
         {
-          value: _.merge(key.value || {}, fileConfig[key.name] || {}),
+          value: key.type === KEY_TYPE_OBJECT && fileConfig[key.name]
+            ? _.merge(key.value || {}, fileConfig[key.name])
+            : fileConfig[key.name] || key.value,
         }
       ));