fix(lib/options): handle {Object} return (options.plugins) (#301)

webpack-contrib · Oct 14, 2017 · df010a7 · df010a7
1 parent e7e5478
commit df010a7
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 3 deletions.
diff --git a/lib/options.js b/lib/options.js
@@ -9,7 +9,7 @@ module.exports = function parseOptions (params) {
 
   if (typeof params.plugins === 'undefined') plugins = []
   else if (Array.isArray(params.plugins)) plugins = params.plugins
-  else plugins = params.plugins
+  else plugins = [ params.plugins ]
 
   const options = {}
 

diff --git a/lib/options.json b/lib/options.json
@@ -25,6 +25,13 @@
     "stringifier": {
       "type": [ "string", "object" ]
     },
+    "plugins": {
+      "anyOf": [
+        { "type": "array" },
+        { "type": "object" },
+        { "instanceof": "Function" }
+      ]
+    },
     "sourceMap": {
       "type": [ "string", "boolean" ]
     }

diff --git a/test/options/__snapshots__/plugins.test.js.snap b/test/options/__snapshots__/plugins.test.js.snap
@@ -2,4 +2,8 @@
 
 exports[`Options Plugins - {Array} 1`] = `"module.exports = \\"a { color: rgba(255, 0, 0, 1.0) }\\\\n\\""`;
 
-exports[`Options Plugins - {Function} 1`] = `"module.exports = \\"a { color: rgba(255, 0, 0, 1.0) }\\\\n\\""`;
+exports[`Options Plugins - {Function} - {Array} 1`] = `"module.exports = \\"a { color: rgba(255, 0, 0, 1.0) }\\\\n\\""`;
+
+exports[`Options Plugins - {Function} - {Object} 1`] = `"module.exports = \\"a { color: rgba(255, 0, 0, 1.0) }\\\\n\\""`;
+
+exports[`Options Plugins - {Object} 1`] = `"module.exports = \\"a { color: rgba(255, 0, 0, 1.0) }\\\\n\\""`;
diff --git a/test/options/plugins.test.js b/test/options/plugins.test.js
@@ -22,7 +22,25 @@ describe('Options', () => {
       })
   })
 
-  test('Plugins - {Function}', () => {
+  test('Plugins - {Object}', () => {
+    const config = {
+      loader: {
+        options: {
+          ident: 'postcss',
+          plugins: require('../fixtures/config/plugin')
+        }
+      }
+    }
+
+    return webpack('css/index.js', config).then((stats) => {
+        const src = loader(stats).src
+
+        expect(src).toEqual("module.exports = \"a { color: rgba(255, 0, 0, 1.0) }\\n\"")
+        expect(src).toMatchSnapshot()
+      })
+  })
+
+  test('Plugins - {Function} - {Array}', () => {
     const config = {
       loader: {
         options: {
@@ -39,4 +57,22 @@ describe('Options', () => {
         expect(src).toMatchSnapshot()
       })
   })
+
+  test('Plugins - {Function} - {Object}', () => {
+    const config = {
+      loader: {
+        options: {
+          ident: 'postcss',
+          plugins: () => require('../fixtures/config/plugin')()
+        }
+      }
+    }
+
+    return webpack('css/index.js', config).then((stats) => {
+        const src = loader(stats).src
+
+        expect(src).toEqual("module.exports = \"a { color: rgba(255, 0, 0, 1.0) }\\n\"")
+        expect(src).toMatchSnapshot()
+      })
+  })
 })