fix: compat with html-webpack-plugin

yyx990803 · yyx990803 · commit 8626739c2586 · 2018-03-24T17:15:25.000-04:00
fix #1213
diff --git a/lib/loaders/pitcher.js b/lib/loaders/pitcher.js
@@ -10,11 +10,6 @@ module.exports = code => code
 // and transform it into appropriate requests.
 module.exports.pitch = function (remainingRequest) {
   const query = qs.parse(this.resourceQuery.slice(1))
-
-  if (query.vue == null) {
-    return
-  }
-
   const loaders = this.loaders.slice(1) // remove self
 
   // loader.request contains both the resolved loader path and its options
diff --git a/lib/plugin.js b/lib/plugin.js
@@ -89,7 +89,11 @@ module.exports = class VueLoaderPlugin {
     // inject global pitcher (responsible for injecting template compiler
     // loader & CSS post loader)
     rawRules.unshift({
-      loader: require.resolve('./loaders/pitch')
+      loader: require.resolve('./loaders/pitcher'),
+      resourceQuery: query => {
+        const parsed = qs.parse(query.slice(1))
+        return parsed.vue != null
+      }
     })
   }
 }
diff --git a/package.json b/package.json
@@ -49,6 +49,7 @@
     "eslint": "^4.19.0",
     "eslint-plugin-vue-libs": "^2.1.0",
     "file-loader": "^1.1.11",
+    "html-webpack-plugin": "^3.1.0",
     "javascript-stringify": "^1.6.0",
     "jest": "^22.4.2",
     "jsdom": "^11.6.2",
diff --git a/test/edgeCases.spec.js b/test/edgeCases.spec.js
@@ -1,11 +1,14 @@
+const path = require('path')
+const normalizeNewline = require('normalize-newline')
+const HTMLPlugin = require('html-webpack-plugin')
+
 const {
+  mfs,
   bundle,
   mockRender,
   mockBundleAndRun
 } = require('./utils')
 
-const normalizeNewline = require('normalize-newline')
-
 const assertComponent = ({ window, module }, done) => {
   const vnode = mockRender(module, {
     msg: 'hi'
@@ -128,3 +131,20 @@ test('should not duplicate css modules value imports', done => {
     done()
   })
 })
+
+test('html-webpack-plugin', done => {
+  bundle({
+    entry: 'basic.vue',
+    plugins: [
+      new HTMLPlugin({
+        inject: true,
+        template: path.resolve(__dirname, 'fixtures/index.html'),
+        filename: 'output.html'
+      })
+    ]
+  }, () => {
+    const html = mfs.readFileSync('/output.html', 'utf-8')
+    expect(html).toMatch('test.build.js')
+    done()
+  }, true)
+})
diff --git a/test/fixtures/index.html b/test/fixtures/index.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title></title>
+  </head>
+  <body>
+  </body>
+</html>
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,11 @@ module.exports = class VueLoaderPlugin {`
`89`	`89`	`// inject global pitcher (responsible for injecting template compiler`
`90`	`90`	`// loader & CSS post loader)`
`91`	`91`	`rawRules.unshift({`
`92`		`- loader: require.resolve('./loaders/pitch')`
	`92`	`+ loader: require.resolve('./loaders/pitcher'),`
	`93`	`+ resourceQuery: query => {`
	`94`	`+ const parsed = qs.parse(query.slice(1))`
	`95`	`+ return parsed.vue != null`
	`96`	`+ }`
`93`	`97`	`})`
`94`	`98`	`}`
`95`	`99`	`}`