fix: allow to pass an {Object} (options.syntax/options.stringifier)

webpack-contrib · Oct 14, 2017 · 1c58e12 · 1c58e12
1 parent 30d8d51
commit 1c58e12
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 9 deletions.
diff --git a/lib/options.json b/lib/options.json
@@ -20,10 +20,10 @@
       "type": [ "string", "object" ]
     },
     "syntax": {
-      "type": "string"
+      "type": [ "string", "object" ]
     },
     "stringifier": {
-      "type": "string"
+      "type": [ "string", "object" ]
     },
     "sourceMap": {
       "type": [ "string", "boolean" ]

diff --git a/test/loader.test.js b/test/loader.test.js
@@ -5,7 +5,6 @@ const { loader } = require('./helpers/compilation')
 
 describe('Loader', () => {
   test('Default', () => {
-    const _ = /style\.(exec\.js|js)$/
     const config = {
       loader: {
         options: {

diff --git a/test/options/__snapshots__/parser.test.js.snap b/test/options/__snapshots__/parser.test.js.snap
@@ -1,5 +1,5 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Options Parser - {Function} 1`] = `"module.exports = \\"a {\\\\n  color: black\\\\n}\\\\n\\""`;
+exports[`Options Parser - {Object} 1`] = `"module.exports = \\"a {\\\\n  color: black\\\\n}\\\\n\\""`;
 
 exports[`Options Parser - {String} 1`] = `"module.exports = \\"a {\\\\n  color: black\\\\n}\\\\n\\""`;
diff --git a/test/options/__snapshots__/stringifier.test.js.snap b/test/options/__snapshots__/stringifier.test.js.snap
@@ -1,3 +1,5 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`Options Stringifier - {Object} 1`] = `"module.exports = \\"a  color: black\\\\n\\""`;
+
 exports[`Options Stringifier - {String} 1`] = `"module.exports = \\"a  color: black\\\\n\\""`;
diff --git a/test/options/__snapshots__/syntax.test.js.snap b/test/options/__snapshots__/syntax.test.js.snap
@@ -1,3 +1,5 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`Options Syntax - {Object} 1`] = `"module.exports = \\"a\\\\n  color: black\\\\n\\""`;
+
 exports[`Options Syntax - {String} 1`] = `"module.exports = \\"a\\\\n  color: black\\\\n\\""`;
diff --git a/test/options/parser.test.js b/test/options/parser.test.js
@@ -21,7 +21,7 @@ describe('Options', () => {
       })
   })
 
-  test('Parser - {Function}', () => {
+  test('Parser - {Object}', () => {
     const config = {
       loader: {
         options: {

diff --git a/test/options/stringifier.test.js b/test/options/stringifier.test.js
@@ -20,8 +20,8 @@ describe('Options', () => {
         expect(src).toMatchSnapshot()
       })
   })
-  // TODO fix schema
-  test.skip('Stringifier - {Function}', () => {
+
+  test('Stringifier - {Object}', () => {
     const config = {
       loader: {
         options: {

diff --git a/test/options/syntax.test.js b/test/options/syntax.test.js
@@ -20,8 +20,8 @@ describe('Options', () => {
         expect(src).toMatchSnapshot()
       })
   })
-  // TODO fix schema 
-  test.skip('Syntax - {Function}', () => {
+
+  test('Syntax - {Object}', () => {
     const config = {
       loader: {
         options: {