Merge pull request #14 from wata-lb/#13_cannot_convert_null_to_object

#13 loader.query is not defined in webpack.config.js, cause error (Cannot convert undefined or null to object)

index.js

@@ -34,7 +34,7 @@ module.exports = function(source) {
   const tags = []
 
   // parse the user query
-  const query = getOptions(this)
+  const query = getOptions(this) || {}
 
   // normalise the query object in case of question marks
   const opts = Object.keys(query).reduce(function(acc, key) {

test/index.js

@@ -13,7 +13,7 @@ function readFile(file) {
   return normalize(fs.readFileSync(path.join(EXPECT, file), 'utf8'))
 }
 
-function compile(opts = {}) {
+function compile(opts) {
   webpackConfig.module.loaders[0].query = opts
   const compiler = webpack(webpackConfig)
   return new Promise(resolve => {
@@ -25,8 +25,15 @@ function compile(opts = {}) {
 }
 
 describe('riot-tag-loader unit test', () => {
-  it('riot loader default options', (done) => {
-    compile().then(content => {
+  it('riot loader undefined options', (done) => {
+    compile(undefined).then(content => {
+      assert.equal(content, readFile('bundle-normal.js'))
+      done()
+    })
+  })
+
+  it('riot loader empty options', (done) => {
+    compile({}).then(content => {
       assert.equal(content, readFile('bundle-normal.js'))
       done()
     })
@@ -54,4 +61,5 @@ describe('riot-tag-loader unit test', () => {
       done()
     })
   })
+
 })

test/webpack.config.js

@@ -15,8 +15,7 @@ module.exports = {
     loaders: [
       {
         test: /\.tag$/,
-        loader: 'riot-tag-loader',
-        query: {}
+        loader: 'riot-tag-loader'
       }
     ]
   },