Skip to content

Commit 820b9b7

Browse files
authored
chore: use scoped package names for aliases (#6519)
1 parent 4be4bb3 commit 820b9b7

File tree

5 files changed

+17
-17
lines changed

5 files changed

+17
-17
lines changed

Diff for: packages/@vue/cli-service/lib/commands/build/resolveWcEntry.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ import wrap from '@vue/web-component-wrapper'
5656
// runtime shared by every component chunk
5757
import '${resolveImportPath('css-loader/dist/runtime/api.js')}'
5858
import '${resolveImportPath('vue-style-loader/lib/addStylesShadow')}'
59-
import '${resolveImportPath('vue-loader-v15/lib/runtime/componentNormalizer')}'
59+
import '${resolveImportPath('@vue/vue-loader-v15/lib/runtime/componentNormalizer')}'
6060
6161
${elements}`.trim()
6262

Diff for: packages/@vue/cli-service/lib/config/base.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ module.exports = (api, options) => {
5858
if (vueMajor === 2) {
5959
// for Vue 2 projects
6060
const vueLoaderCacheConfig = api.genCacheConfig('vue-loader', {
61-
'vue-loader': require('vue-loader-v15/package.json').version,
61+
'vue-loader': require('@vue/vue-loader-v15/package.json').version,
6262
'@vue/component-compiler-utils': require('@vue/component-compiler-utils/package.json').version,
6363
'vue-template-compiler': require('vue-template-compiler/package.json').version
6464
})
@@ -80,7 +80,7 @@ module.exports = (api, options) => {
8080
.options(vueLoaderCacheConfig)
8181
.end()
8282
.use('vue-loader')
83-
.loader(require.resolve('vue-loader-v15'))
83+
.loader(require.resolve('@vue/vue-loader-v15'))
8484
.options(Object.assign({
8585
compilerOptions: {
8686
whitespace: 'condense'
@@ -89,7 +89,7 @@ module.exports = (api, options) => {
8989

9090
webpackConfig
9191
.plugin('vue-loader')
92-
.use(require('vue-loader-v15').VueLoaderPlugin)
92+
.use(require('@vue/vue-loader-v15').VueLoaderPlugin)
9393

9494
// some plugins may implicitly relies on the `vue-loader` dependency path name
9595
// such as vue-cli-plugin-apollo
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
module.exports = require('vue-loader-v15')
1+
module.exports = require('@vue/vue-loader-v15')

Diff for: packages/@vue/cli-service/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
"thread-loader": "^3.0.0",
7373
"url-loader": "^4.1.1",
7474
"vue-loader": "^16.1.2",
75-
"vue-loader-v15": "npm:vue-loader@^15.9.6",
75+
"@vue/vue-loader-v15": "npm:vue-loader@^15.9.7",
7676
"vue-style-loader": "^4.1.3",
7777
"webpack": "^5.22.0",
7878
"webpack-bundle-analyzer": "^4.4.0",

Diff for: yarn.lock

+11-11
Original file line numberDiff line numberDiff line change
@@ -4172,6 +4172,17 @@
41724172
v-tooltip "^3.0.0-alpha.20"
41734173
vue-resize "^1.0.0"
41744174

4175+
"@vue/vue-loader-v15@npm:vue-loader@^15.9.7", vue-loader@^15.7.1:
4176+
version "15.9.7"
4177+
resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.9.7.tgz#15b05775c3e0c38407679393c2ce6df673b01044"
4178+
integrity sha512-qzlsbLV1HKEMf19IqCJqdNvFJRCI58WNbS6XbPqK13MrLz65es75w392MSQ5TsARAfIjUw+ATm3vlCXUJSOH9Q==
4179+
dependencies:
4180+
"@vue/component-compiler-utils" "^3.1.0"
4181+
hash-sum "^1.0.2"
4182+
loader-utils "^1.1.0"
4183+
vue-hot-reload-api "^2.3.0"
4184+
vue-style-loader "^4.1.0"
4185+
41754186
"@vue/web-component-wrapper@^1.3.0":
41764187
version "1.3.0"
41774188
resolved "https://registry.yarnpkg.com/@vue/web-component-wrapper/-/web-component-wrapper-1.3.0.tgz#b6b40a7625429d2bd7c2281ddba601ed05dc7f1a"
@@ -22195,17 +22206,6 @@ vue-jest@^4.0.1:
2219522206
extract-from-css "^0.4.4"
2219622207
source-map "0.5.6"
2219722208

22198-
"vue-loader-v15@npm:vue-loader@^15.9.6", vue-loader@^15.7.1:
22199-
version "15.9.6"
22200-
resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.9.6.tgz#f4bb9ae20c3a8370af3ecf09b8126d38ffdb6b8b"
22201-
integrity sha512-j0cqiLzwbeImIC6nVIby2o/ABAWhlppyL/m5oJ67R5MloP0hj/DtFgb0Zmq3J9CG7AJ+AXIvHVnJAPBvrLyuDg==
22202-
dependencies:
22203-
"@vue/component-compiler-utils" "^3.1.0"
22204-
hash-sum "^1.0.2"
22205-
loader-utils "^1.1.0"
22206-
vue-hot-reload-api "^2.3.0"
22207-
vue-style-loader "^4.1.0"
22208-
2220922209
vue-loader@^16.1.2:
2221022210
version "16.2.0"
2221122211
resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-16.2.0.tgz#046a53308dd47e58efe20ddec1edec027ce3b46e"

0 commit comments

Comments
 (0)