Merge branch 'vuejs:master' into fix/css-loader-compat

Author: Airkro

Diff for: CHANGELOG.md

@@ -1,3 +1,14 @@
+<a name="15.9.7"></a>
+## [15.9.7](https://github.com/vuejs/vue-loader/compare/v15.9.6...v15.9.7) (2021-05-11)
+
+
+### Bug Fixes
+
+* [plugin] Use compiler.webpack when possible ([#1822](https://github.com/vuejs/vue-loader/issues/1822)) ([f7ee30b](https://github.com/vuejs/vue-loader/commit/f7ee30b)), closes [#1781](https://github.com/vuejs/vue-loader/issues/1781)
+* check for compiler.webpack existence ([2472b2f](https://github.com/vuejs/vue-loader/commit/2472b2f))
+
+
+
 <a name="15.9.6"></a>
 ## [15.9.6](https://github.com/vuejs/vue-loader/compare/v15.9.5...v15.9.6) (2020-12-17)
 

Diff for: lib/plugin-webpack5.js

@@ -31,9 +31,12 @@ const ruleSetCompiler = new RuleSetCompiler([
 
 class VueLoaderPlugin {
   apply (compiler) {
+    const normalModule = compiler.webpack
+      ? compiler.webpack.NormalModule
+      : require('webpack/lib/NormalModule')
     // add NS marker so that the loader can detect and report missing plugin
     compiler.hooks.compilation.tap(id, compilation => {
-      const normalModuleLoader = require('webpack/lib/NormalModule').getCompilationHooks(compilation).loader
+      const normalModuleLoader = normalModule.getCompilationHooks(compilation).loader
       normalModuleLoader.tap(id, loaderContext => {
         loaderContext[NS] = true
       })

Diff for: package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "15.9.6",
+  "version": "15.9.7",
   "description": "Vue single-file component loader for Webpack",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",