Merge remote-tracking branch 'upstream/master'

Alex-Sokolov · Alex-Sokolov · commit 30867c1fe590 · 2019-11-27T23:26:13.000+03:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,24 @@
+<a name="15.7.2"></a>
+## [15.7.2](https://github.com/vuejs/vue-loader/compare/v15.7.1...v15.7.2) (2019-11-02)
+
+
+### Bug Fixes
+
+* add cache-loader to optional peer dependency ([e9d8b71](https://github.com/vuejs/vue-loader/commit/e9d8b71))
+* use `require.resolve` when referencing `cache-loader` ([#1585](https://github.com/vuejs/vue-loader/issues/1585)) ([d3fa467](https://github.com/vuejs/vue-loader/commit/d3fa467))
+
+
+
+<a name="15.7.1"></a>
+## [15.7.1](https://github.com/vuejs/vue-loader/compare/v15.7.0...v15.7.1) (2019-07-18)
+
+
+### Bug Fixes
+
+* use "api.isRecorded" instead of "module.hot.data" ([#1569](https://github.com/vuejs/vue-loader/issues/1569)) ([6a05115](https://github.com/vuejs/vue-loader/commit/6a05115))
+
+
+
 <a name="15.7.0"></a>
 # [15.7.0](https://github.com/vuejs/vue-loader/compare/v15.6.4...v15.7.0) (2019-02-28)
 
diff --git a/docs/guide/asset-url.md b/docs/guide/asset-url.md
@@ -25,7 +25,8 @@ By default the following tag/attribute combinations are transformed, and can be
   video: ['src', 'poster'],
   source: 'src',
   img: 'src',
-  image: 'xlink:href'
+  image: ['xlink:href', 'href'],
+  use: ['xlink:href', 'href']
 }
 ```
 
diff --git a/docs/guide/custom-blocks.md b/docs/guide/custom-blocks.md
@@ -76,7 +76,7 @@ This is the documentation for component B.
 <!-- ComponentA.vue -->
 <template>
   <div>
-    <ComponentB/>
+    <ComponentB />
     <p>{{ docs }}</p>
   </div>
 </template>
diff --git a/docs/guide/pre-processors.md b/docs/guide/pre-processors.md
@@ -63,6 +63,10 @@ Note that `sass-loader` processes the non-indent-based `scss` syntax by default.
       loader: 'sass-loader',
       options: {
         indentedSyntax: true
+        // sass-loader version >= 8
+        sassOptions: {
+          indentedSyntax: true
+        }
       }
     }
   ]
@@ -71,7 +75,7 @@ Note that `sass-loader` processes the non-indent-based `scss` syntax by default.
 
 ### Sharing Global Variables
 
-`sass-loader` also supports a `data` option which allows you to share common variables among all processed files without having to explicit import them:
+`sass-loader` also supports a `prependData` option which allows you to share common variables among all processed files without having to explicit import them:
 
 ``` js
 // webpack.config.js -> module.rules
@@ -84,7 +88,8 @@ Note that `sass-loader` processes the non-indent-based `scss` syntax by default.
       loader: 'sass-loader',
       options: {
         // you can also read from a file, e.g. `variables.scss`
-        data: `$color: red;`
+        // use `data` here if sass-loader version < 8
+        prependData: `$color: red;`
       }
     }
   ]
diff --git a/docs/options.md b/docs/options.md
@@ -14,7 +14,8 @@ sidebar: auto
     video: ['src', 'poster'],
     source: 'src',
     img: 'src',
-    image: 'xlink:href'
+    image: ['xlink:href', 'href'],
+    use: ['xlink:href', 'href']
   }
   ```
 
diff --git a/docs/ru/guide/asset-url.md b/docs/ru/guide/asset-url.md
@@ -25,7 +25,8 @@ createElement('img', {
   video: ['src', 'poster'],
   source: 'src',
   img: 'src',
-  image: 'xlink:href'
+  image: ['xlink:href', 'href'],
+  use: ['xlink:href', 'href']
 }
 ```
 
diff --git a/docs/ru/guide/pre-processors.md b/docs/ru/guide/pre-processors.md
@@ -63,6 +63,10 @@ module.exports = {
       loader: 'sass-loader',
       options: {
         indentedSyntax: true
+        // sass-loader >= 8
+        sassOptions: {
+          indentedSyntax: true
+        }
       }
     }
   ]
@@ -71,7 +75,7 @@ module.exports = {
 
 ### Передача глобальных переменных
 
-`sass-loader` также поддерживает опцию `data`, которая позволяет вам передавать общие переменные во все обрабатываемые файлы без необходимости везде их явно импортировать:
+`sass-loader` также поддерживает опцию `prependData`, которая позволяет вам передавать общие переменные во все обрабатываемые файлы без необходимости везде их явно импортировать:
 
 ``` js
 // webpack.config.js -> module.rules
@@ -84,7 +88,8 @@ module.exports = {
       loader: 'sass-loader',
       options: {
         // вы можете также указать файл, например `variables.scss`
-        data: `$color: red;`
+        // use `data` here if sass-loader version < 8
+        prependData: `$color: red;`
       }
     }
   ]
diff --git a/docs/ru/options.md b/docs/ru/options.md
@@ -14,7 +14,8 @@ sidebar: auto
     video: ['src', 'poster'],
     source: 'src',
     img: 'src',
-    image: 'xlink:href'
+    image: ['xlink:href', 'href'],
+    use: ['xlink:href', 'href']
   }
   ```
 
diff --git a/docs/zh/guide/asset-url.md b/docs/zh/guide/asset-url.md
@@ -25,7 +25,8 @@ createElement('img', {
   video: ['src', 'poster'],
   source: 'src',
   img: 'src',
-  image: 'xlink:href'
+  image: ['xlink:href', 'href'],
+  use: ['xlink:href', 'href']
 }
 ```
 
diff --git a/docs/zh/guide/pre-processors.md b/docs/zh/guide/pre-processors.md
@@ -63,6 +63,10 @@ module.exports = {
       loader: 'sass-loader',
       options: {
         indentedSyntax: true
+        // sass-loader version >= 8
+        sassOptions: {
+          indentedSyntax: true
+        }
       }
     }
   ]
@@ -71,7 +75,7 @@ module.exports = {
 
 ### 共享全局变量
 
-`sass-loader` 也支持一个 `data` 选项，这个选项允许你在所有被处理的文件之间共享常见的变量，而不需要显式地导入它们：
+`sass-loader` 也支持一个 `prependData` 选项，这个选项允许你在所有被处理的文件之间共享常见的变量，而不需要显式地导入它们：
 
 ``` js
 // webpack.config.js -> module.rules
@@ -84,7 +88,8 @@ module.exports = {
       loader: 'sass-loader',
       options: {
         // 你也可以从一个文件读取，例如 `variables.scss`
-        data: `$color: red;`
+        // 如果 sass-loader 版本 < 8，这里使用 `data` 字段
+        prependData: `$color: red;`
       }
     }
   ]
@@ -220,7 +225,7 @@ TypeScript 的配置可以通过 `tsconfig.json` 来完成。你也可以查阅
 
 ## Pug
 
-模板的处理会稍微有些不同，因为绝大对数 webpack 的模板类 loader，诸如 `pug-loader`，会返回一个模板函数而不是一个编译好的 HTML 字符串。所以我们需要使用一个返回原始的 HTML 字符串的 loader，例如 `pug-plain-loader`，而不是使用 `pug-loader`。
+模板的处理会稍微有些不同，因为绝大多数 webpack 的模板类 loader，诸如 `pug-loader`，会返回一个模板函数而不是一个编译好的 HTML 字符串。所以我们需要使用一个返回原始的 HTML 字符串的 loader，例如 `pug-plain-loader`，而不是使用 `pug-loader`。
 
 ``` bash
 npm install -D pug pug-plain-loader
diff --git a/docs/zh/guide/scoped-css.md b/docs/zh/guide/scoped-css.md
@@ -62,7 +62,7 @@
 .a[data-v-f3f3eg9] .b { /* ... */ }
 ```
 
-有些像 Sass 之类的预处理器无法正确解析 `>>>`。这种情况下你可以使用 `/deep/` 操作符取而代之——这是一个 `>>>` 的别名，同样可以正常工作。
+有些像 Sass 之类的预处理器无法正确解析 `>>>`。这种情况下你可以使用 `/deep/` 或 `::v-deep` 操作符取而代之——两者都是 `>>>` 的别名，同样可以正常工作。
 
 ## 动态生成的内容
 
diff --git a/docs/zh/options.md b/docs/zh/options.md
@@ -14,7 +14,8 @@ sidebar: auto
     video: ['src', 'poster'],
     source: 'src',
     img: 'src',
-    image: 'xlink:href'
+    image: ['xlink:href', 'href'],
+    use: ['xlink:href', 'href']
   }
   ```
 
diff --git a/lib/codegen/hotReload.js b/lib/codegen/hotReload.js
@@ -19,7 +19,7 @@ if (module.hot) {
   api.install(require('vue'))
   if (api.compatible) {
     module.hot.accept()
-    if (!module.hot.data) {
+    if (!api.isRecorded('${id}')) {
       api.createRecord('${id}', component.options)
     } else {
       api.${functional ? 'rerender' : 'reload'}('${id}', component.options)
diff --git a/lib/index.d.ts b/lib/index.d.ts
@@ -1,7 +1,24 @@
 import { Plugin } from 'webpack'
+import { VueTemplateCompiler } from '@vue/component-compiler-utils/dist/types'
+import { CompilerOptions } from 'vue-template-compiler'
 
 declare namespace VueLoader {
   class VueLoaderPlugin extends Plugin {}
+
+  interface VueLoaderOptions {
+    transformAssetUrls?: { [tag: string]: string | Array<string> }
+    compiler?: VueTemplateCompiler
+    compilerOptions?: CompilerOptions
+    transpileOptions?: Object
+    optimizeSSR?: boolean
+    hotReload?: boolean
+    productionMode?: boolean
+    shadowMode?: boolean
+    cacheDirectory?: string
+    cacheIdentifier?: string
+    prettify?: boolean
+    exposeFilename?: boolean
+  }
 }
 
 export = VueLoader
diff --git a/lib/loaders/pitcher.js b/lib/loaders/pitcher.js
@@ -128,7 +128,7 @@ module.exports.pitch = function (remainingRequest) {
   if (query.type === `template`) {
     const path = require('path')
     const cacheLoader = cacheDirectory && cacheIdentifier
-      ? [`cache-loader?${JSON.stringify({
+      ? [`${require.resolve('cache-loader')}?${JSON.stringify({
         // For some reason, webpack fails to generate consistent hash if we
         // use absolute paths here, even though the path is only used in a
         // comment. For now we have to ensure cacheDirectory is a relative path.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "15.7.0",
+  "version": "15.7.2",
   "description": "Vue single-file component loader for Webpack",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -36,14 +36,20 @@
     "css-loader": "*",
     "webpack": "^4.1.0 || ^5.0.0-0"
   },
+  "peerDependenciesMeta": {
+    "cache-loader": {
+      "optional": true
+    }
+  },
   "dependencies": {
-    "@vue/component-compiler-utils": "^2.5.1",
+    "@vue/component-compiler-utils": "^3.0.0",
     "hash-sum": "^1.0.2",
     "loader-utils": "^1.1.0",
     "vue-hot-reload-api": "^2.3.0",
     "vue-style-loader": "^4.1.0"
   },
   "devDependencies": {
+    "@types/webpack": "^4.4.27",
     "babel-core": "^6.26.0",
     "babel-loader": "^7.1.4",
     "babel-preset-env": "^1.6.1",
diff --git a/test/advanced.spec.js b/test/advanced.spec.js
@@ -90,7 +90,7 @@ test('expose file basename as __file in production when exposeFilename enabled',
 test('source map', done => {
   bundle({
     entry: 'basic.vue',
-    devtool: '#source-map'
+    devtool: 'source-map'
   }, code => {
     const map = mfs.readFileSync('/test.build.js.map', 'utf-8')
     const smc = new SourceMapConsumer(JSON.parse(map))
diff --git a/test/template.spec.js b/test/template.spec.js
@@ -49,7 +49,13 @@ test('transform relative URLs and respects resolve alias', done => {
     },
     module: {
       rules: [
-        { test: /\.png$/, loader: 'file-loader?name=[name].[hash:6].[ext]' }
+        {
+          test: /\.png$/,
+          loader: 'file-loader',
+          options: {
+            name: '[name].[hash:6].[ext]'
+          }
+        }
       ]
     }
   }, ({ window, module }) => {
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,8 @@ By default the following tag/attribute combinations are transformed, and can be`
`25`	`25`	`video: ['src', 'poster'],`
`26`	`26`	`source: 'src',`
`27`	`27`	`img: 'src',`
`28`		`- image: 'xlink:href'`
	`28`	`+ image: ['xlink:href', 'href'],`
	`29`	`+ use: ['xlink:href', 'href']`
`29`	`30`	`}`
`30`	`31`	```
`31`	`32`
Original file line number	Diff line number	Diff line change
@@ -63,6 +63,10 @@ Note that `sass-loader` processes the non-indent-based `scss` syntax by default.
`63`	`63`	`loader: 'sass-loader',`
`64`	`64`	`options: {`
`65`	`65`	`indentedSyntax: true`
	`66`	`+ // sass-loader version >= 8`
	`67`	`+ sassOptions: {`
	`68`	`+ indentedSyntax: true`
	`69`	`+ }`
`66`	`70`	`}`
`67`	`71`	`}`
`68`	`72`	`]`
@@ -71,7 +75,7 @@ Note that `sass-loader` processes the non-indent-based `scss` syntax by default.
`71`	`75`
`72`	`76`	`### Sharing Global Variables`
`73`	`77`
`74`		-`sass-loader` also supports a `data` option which allows you to share common variables among all processed files without having to explicit import them:
	`78`	+`sass-loader` also supports a `prependData` option which allows you to share common variables among all processed files without having to explicit import them:
`75`	`79`
`76`	`80`	``` js
`77`	`81`	`// webpack.config.js -> module.rules`
@@ -84,7 +88,8 @@ Note that `sass-loader` processes the non-indent-based `scss` syntax by default.
`84`	`88`	`loader: 'sass-loader',`
`85`	`89`	`options: {`
`86`	`90`	// you can also read from a file, e.g. `variables.scss`
`87`		- data: `$color: red;`
	`91`	+ // use `data` here if sass-loader version < 8
	`92`	+ prependData: `$color: red;`
`88`	`93`	`}`
`89`	`94`	`}`
`90`	`95`	`]`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,8 @@ sidebar: auto`
`14`	`14`	`video: ['src', 'poster'],`
`15`	`15`	`source: 'src',`
`16`	`16`	`img: 'src',`
`17`		`- image: 'xlink:href'`
	`17`	`+ image: ['xlink:href', 'href'],`
	`18`	`+ use: ['xlink:href', 'href']`
`18`	`19`	`}`
`19`	`20`	```
`20`	`21`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,8 @@ createElement('img', {`
`25`	`25`	`video: ['src', 'poster'],`
`26`	`26`	`source: 'src',`
`27`	`27`	`img: 'src',`
`28`		`- image: 'xlink:href'`
	`28`	`+ image: ['xlink:href', 'href'],`
	`29`	`+ use: ['xlink:href', 'href']`
`29`	`30`	`}`
`30`	`31`	```
`31`	`32`
Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,10 @@ module.exports = {`
`63`	`63`	`loader: 'sass-loader',`
`64`	`64`	`options: {`
`65`	`65`	`indentedSyntax: true`
	`66`	`+ // sass-loader >= 8`
	`67`	`+ sassOptions: {`
	`68`	`+ indentedSyntax: true`
	`69`	`+ }`
`66`	`70`	`}`
`67`	`71`	`}`
`68`	`72`	`]`
`@@ -71,7 +75,7 @@ module.exports = {`
`71`	`75`
`72`	`76`	`### Передача глобальных переменных`
`73`	`77`
`74`		-`sass-loader` также поддерживает опцию `data`, которая позволяет вам передавать общие переменные во все обрабатываемые файлы без необходимости везде их явно импортировать:
	`78`	+`sass-loader` также поддерживает опцию `prependData`, которая позволяет вам передавать общие переменные во все обрабатываемые файлы без необходимости везде их явно импортировать:
`75`	`79`
`76`	`80`	``` js
`77`	`81`	`// webpack.config.js -> module.rules`
`@@ -84,7 +88,8 @@ module.exports = {`
`84`	`88`	`loader: 'sass-loader',`
`85`	`89`	`options: {`
`86`	`90`	// вы можете также указать файл, например `variables.scss`
`87`		- data: `$color: red;`
	`91`	+ // use `data` here if sass-loader version < 8
	`92`	+ prependData: `$color: red;`
`88`	`93`	`}`
`89`	`94`	`}`
`90`	`95`	`]`