test: fix test for duplication style injection

yyx990803 · yyx990803 · commit fc83157ac9ec · 2018-03-07T00:49:12.000-05:00
diff --git a/lib/loader.js b/lib/loader.js
@@ -14,16 +14,19 @@ module.exports = function (content) {
   const loaderContext = this
   const isServer = this.target === 'node'
   const isProduction = this.minimize || process.env.NODE_ENV === 'production'
-  const options = loaderUtils.getOptions(this) || {}
 
-  // shadow mode is an internal option
-  // enabled via vue-cli's --target web-component
-  const isShadowMode = !!options.shadowMode
+  const rawOptions = loaderUtils.getOptions(this)
 
   // share options between the main loader of style/template loaders.
   // to support having multiple uses of vue-loader with different options,
   // we cache and retrieve options for each unique options object.
-  const optionsId = saveOptions(options)
+  const optionsId = saveOptions(rawOptions)
+
+  const options = rawOptions || {}
+
+  // shadow mode is an internal option
+  // enabled via vue-cli's --target web-component
+  const isShadowMode = !!options.shadowMode
 
   const filePath = this.resourcePath
   const fileName = path.basename(filePath)
diff --git a/lib/utils/options-cache.js b/lib/utils/options-cache.js
@@ -32,14 +32,14 @@ exports.saveOptions = options => {
     return optionsToId.get(options)
   }
 
-  const threadMode = options.threadMode
+  const threadMode = options && options.threadMode
   const serialized = threadMode ? serialize(options) : null
   const id = serialized ? hash(serialized) : String(idToOptions.size)
 
-  idToOptions.set(id, options)
+  idToOptions.set(id, options || {})
   optionsToId.set(options, id)
 
-  if (serialized) {
+  if (options && serialized) {
     const fsidToOptionsPath = getidToOptionsPath(id)
     if (!fs.existsSync(fsidToOptionsPath)) {
       fs.writeFileSync(fsidToOptionsPath, serialized)
