fix: use $options suffix for configs

Author: jakobrosenberg

lib/plugins/mdsvex/index.js

@@ -19,7 +19,7 @@ module.exports.default = {
           config: {
             mdsvex: conf,
             svelte: {
-              preprocess: { mdsvex: conf },
+              preprocess$options: { mdsvex: conf },
               preprocess$map: { mdsvex },
               extensions: [extension]
             }

lib/plugins/postcss/index.js

@@ -12,7 +12,7 @@ export default {
 
         const postcssConfig = {
           plugins$map: { postcssImport },
-          plugins: {
+          plugins$options: {
             postcssImport: {},
           }
         }
@@ -24,7 +24,7 @@ export default {
 
             // rollup needs access
             rollup: {
-              plugins: { postcss: postcssConfig },
+              plugins$options: { postcss: postcssConfig },
               plugins$map: { postcss }
             },
 

lib/plugins/preprocess/index.js

@@ -8,7 +8,7 @@ export default {
         app.merge({
           config: {
             svelte: {
-              preprocess: { autoPreprocess: {} },
+              preprocess$options: { autoPreprocess: {} },
               preprocess$map: { autoPreprocess }
             }
           }

lib/plugins/rollup/rollup.template.js

@@ -25,7 +25,7 @@ module.exports = function rollup(app, params) {
       format: 'esm', dir: buildDir
     },
     plugins$map: { svelte, resolve, commonjs, terser, hmr, livereload },
-    plugins: {
+    plugins$options: {
       terser: production && {},
       svelte: app.config.svelte,
       // resolve matching modules from current working directory

lib/plugins/svelte/index.js

@@ -7,7 +7,7 @@ export default {
           config: {
             svelte: {
               extensions: ['.svelte'],
-              preprocess: {},
+              preprocess$options: {},
               preprocess$map: {}
             }
           }

lib/utils/index.js

@@ -46,27 +46,25 @@ async function keysAsFunctionsRecursive(obj, suffix = '$map') {
   const maps = []
 
   // process all descendants' maps first
-  const children = Object.entries(obj).map(([key, value]) => {
+  const children = Object.entries(obj).map(([mapKey, value]) => {
     if (isObject(value)) {
-      if (key.endsWith(suffix))
-        maps.push({ key, value })
+      if (mapKey.endsWith(suffix))
+        maps.push({ mapKey, value })
       else
         return keysAsFunctionsRecursive(value, suffix)
     }
   })
   await Promise.all(children)
 
-  // process own maps
-  const ownMaps = await Promise.all(maps.map(async ({ key, value }) => {
-    delete obj[key]
-    key = key.substr(0, key.length - suffix.length)
-    const result = await keysAsFunctions(obj[key], value, key)
-    return {
-      key,
-      result
-    }
+  // process own maps. Need map instead of forEach for `await`
+  await Promise.all(maps.map(async ({ mapKey, value }) => {
+    const key = mapKey.substr(0, mapKey.length - suffix.length)
+    const optionsKey = `${key}$options`
+    const result = await keysAsFunctions(obj[optionsKey], value, key)
+    delete obj[mapKey]
+    delete obj[optionsKey]
+    obj[key] = result
   }))
-  ownMaps.forEach(thing => obj[thing.key] = thing.result)
 
   return obj
 }