From 37fe4ed0196e877ce1f61c6fee9c3dcca383d2cf Mon Sep 17 00:00:00 2001 From: Haoqun Jiang Date: Mon, 7 Jun 2021 16:56:19 +0800 Subject: [PATCH 1/2] chore: use scoped package names for aliases So that users won't refer to random third-party packages when they see error messages from the aliased package. --- .../lib/commands/build/resolveWcEntry.js | 2 +- packages/@vue/cli-service/lib/config/base.js | 6 ++--- .../vue-loader.js | 2 +- packages/@vue/cli-service/package.json | 2 +- yarn.lock | 22 +++++++++---------- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/packages/@vue/cli-service/lib/commands/build/resolveWcEntry.js b/packages/@vue/cli-service/lib/commands/build/resolveWcEntry.js index 21c640488e..04232145f4 100644 --- a/packages/@vue/cli-service/lib/commands/build/resolveWcEntry.js +++ b/packages/@vue/cli-service/lib/commands/build/resolveWcEntry.js @@ -56,7 +56,7 @@ import wrap from '@vue/web-component-wrapper' // runtime shared by every component chunk import '${resolveImportPath('css-loader/dist/runtime/api.js')}' import '${resolveImportPath('vue-style-loader/lib/addStylesShadow')}' -import '${resolveImportPath('vue-loader-v15/lib/runtime/componentNormalizer')}' +import '${resolveImportPath('@vue/loader-v15/lib/runtime/componentNormalizer')}' ${elements}`.trim() diff --git a/packages/@vue/cli-service/lib/config/base.js b/packages/@vue/cli-service/lib/config/base.js index f821c8fedb..70b96596ef 100644 --- a/packages/@vue/cli-service/lib/config/base.js +++ b/packages/@vue/cli-service/lib/config/base.js @@ -58,7 +58,7 @@ module.exports = (api, options) => { if (vueMajor === 2) { // for Vue 2 projects const vueLoaderCacheConfig = api.genCacheConfig('vue-loader', { - 'vue-loader': require('vue-loader-v15/package.json').version, + 'vue-loader': require('@vue/loader-v15/package.json').version, '@vue/component-compiler-utils': require('@vue/component-compiler-utils/package.json').version, 'vue-template-compiler': require('vue-template-compiler/package.json').version }) @@ -80,7 +80,7 @@ module.exports = (api, options) => { .options(vueLoaderCacheConfig) .end() .use('vue-loader') - .loader(require.resolve('vue-loader-v15')) + .loader(require.resolve('@vue/loader-v15')) .options(Object.assign({ compilerOptions: { whitespace: 'condense' @@ -89,7 +89,7 @@ module.exports = (api, options) => { webpackConfig .plugin('vue-loader') - .use(require('vue-loader-v15').VueLoaderPlugin) + .use(require('@vue/loader-v15').VueLoaderPlugin) // some plugins may implicitly relies on the `vue-loader` dependency path name // such as vue-cli-plugin-apollo diff --git a/packages/@vue/cli-service/lib/config/vue-loader-v15-resolve-compat/vue-loader.js b/packages/@vue/cli-service/lib/config/vue-loader-v15-resolve-compat/vue-loader.js index ff938a5bb9..5ff4a07486 100644 --- a/packages/@vue/cli-service/lib/config/vue-loader-v15-resolve-compat/vue-loader.js +++ b/packages/@vue/cli-service/lib/config/vue-loader-v15-resolve-compat/vue-loader.js @@ -1 +1 @@ -module.exports = require('vue-loader-v15') +module.exports = require('@vue/loader-v15') diff --git a/packages/@vue/cli-service/package.json b/packages/@vue/cli-service/package.json index 8b58987a28..dec4c9a612 100644 --- a/packages/@vue/cli-service/package.json +++ b/packages/@vue/cli-service/package.json @@ -72,7 +72,7 @@ "thread-loader": "^3.0.0", "url-loader": "^4.1.1", "vue-loader": "^16.1.2", - "vue-loader-v15": "npm:vue-loader@^15.9.6", + "@vue/loader-v15": "npm:vue-loader@^15.9.7", "vue-style-loader": "^4.1.3", "webpack": "^5.22.0", "webpack-bundle-analyzer": "^4.4.0", diff --git a/yarn.lock b/yarn.lock index 468c199bab..becdf56d5a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4149,6 +4149,17 @@ dependencies: vue-eslint-parser "^7.0.0" +"@vue/loader-v15@npm:vue-loader@^15.9.7", vue-loader@^15.7.1: + version "15.9.7" + resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.9.7.tgz#15b05775c3e0c38407679393c2ce6df673b01044" + integrity sha512-qzlsbLV1HKEMf19IqCJqdNvFJRCI58WNbS6XbPqK13MrLz65es75w392MSQ5TsARAfIjUw+ATm3vlCXUJSOH9Q== + dependencies: + "@vue/component-compiler-utils" "^3.1.0" + hash-sum "^1.0.2" + loader-utils "^1.1.0" + vue-hot-reload-api "^2.3.0" + vue-style-loader "^4.1.0" + "@vue/shared@3.0.11": version "3.0.11" resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.0.11.tgz#20d22dd0da7d358bb21c17f9bde8628152642c77" @@ -22195,17 +22206,6 @@ vue-jest@^4.0.1: extract-from-css "^0.4.4" source-map "0.5.6" -"vue-loader-v15@npm:vue-loader@^15.9.6", vue-loader@^15.7.1: - version "15.9.6" - resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.9.6.tgz#f4bb9ae20c3a8370af3ecf09b8126d38ffdb6b8b" - integrity sha512-j0cqiLzwbeImIC6nVIby2o/ABAWhlppyL/m5oJ67R5MloP0hj/DtFgb0Zmq3J9CG7AJ+AXIvHVnJAPBvrLyuDg== - dependencies: - "@vue/component-compiler-utils" "^3.1.0" - hash-sum "^1.0.2" - loader-utils "^1.1.0" - vue-hot-reload-api "^2.3.0" - vue-style-loader "^4.1.0" - vue-loader@^16.1.2: version "16.2.0" resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-16.2.0.tgz#046a53308dd47e58efe20ddec1edec027ce3b46e" From 534584e5da7eaa3e5a8b91b30e0d85e0dd29017c Mon Sep 17 00:00:00 2001 From: Haoqun Jiang Date: Mon, 7 Jun 2021 17:37:23 +0800 Subject: [PATCH 2/2] fix: vue-loader depends on the `vue-loader` string in package name --- .../lib/commands/build/resolveWcEntry.js | 2 +- packages/@vue/cli-service/lib/config/base.js | 6 ++--- .../vue-loader.js | 2 +- packages/@vue/cli-service/package.json | 2 +- yarn.lock | 22 +++++++++---------- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/packages/@vue/cli-service/lib/commands/build/resolveWcEntry.js b/packages/@vue/cli-service/lib/commands/build/resolveWcEntry.js index 04232145f4..3012c1e0da 100644 --- a/packages/@vue/cli-service/lib/commands/build/resolveWcEntry.js +++ b/packages/@vue/cli-service/lib/commands/build/resolveWcEntry.js @@ -56,7 +56,7 @@ import wrap from '@vue/web-component-wrapper' // runtime shared by every component chunk import '${resolveImportPath('css-loader/dist/runtime/api.js')}' import '${resolveImportPath('vue-style-loader/lib/addStylesShadow')}' -import '${resolveImportPath('@vue/loader-v15/lib/runtime/componentNormalizer')}' +import '${resolveImportPath('@vue/vue-loader-v15/lib/runtime/componentNormalizer')}' ${elements}`.trim() diff --git a/packages/@vue/cli-service/lib/config/base.js b/packages/@vue/cli-service/lib/config/base.js index 70b96596ef..9220910984 100644 --- a/packages/@vue/cli-service/lib/config/base.js +++ b/packages/@vue/cli-service/lib/config/base.js @@ -58,7 +58,7 @@ module.exports = (api, options) => { if (vueMajor === 2) { // for Vue 2 projects const vueLoaderCacheConfig = api.genCacheConfig('vue-loader', { - 'vue-loader': require('@vue/loader-v15/package.json').version, + 'vue-loader': require('@vue/vue-loader-v15/package.json').version, '@vue/component-compiler-utils': require('@vue/component-compiler-utils/package.json').version, 'vue-template-compiler': require('vue-template-compiler/package.json').version }) @@ -80,7 +80,7 @@ module.exports = (api, options) => { .options(vueLoaderCacheConfig) .end() .use('vue-loader') - .loader(require.resolve('@vue/loader-v15')) + .loader(require.resolve('@vue/vue-loader-v15')) .options(Object.assign({ compilerOptions: { whitespace: 'condense' @@ -89,7 +89,7 @@ module.exports = (api, options) => { webpackConfig .plugin('vue-loader') - .use(require('@vue/loader-v15').VueLoaderPlugin) + .use(require('@vue/vue-loader-v15').VueLoaderPlugin) // some plugins may implicitly relies on the `vue-loader` dependency path name // such as vue-cli-plugin-apollo diff --git a/packages/@vue/cli-service/lib/config/vue-loader-v15-resolve-compat/vue-loader.js b/packages/@vue/cli-service/lib/config/vue-loader-v15-resolve-compat/vue-loader.js index 5ff4a07486..82f3e60459 100644 --- a/packages/@vue/cli-service/lib/config/vue-loader-v15-resolve-compat/vue-loader.js +++ b/packages/@vue/cli-service/lib/config/vue-loader-v15-resolve-compat/vue-loader.js @@ -1 +1 @@ -module.exports = require('@vue/loader-v15') +module.exports = require('@vue/vue-loader-v15') diff --git a/packages/@vue/cli-service/package.json b/packages/@vue/cli-service/package.json index dec4c9a612..b687d18f36 100644 --- a/packages/@vue/cli-service/package.json +++ b/packages/@vue/cli-service/package.json @@ -72,7 +72,7 @@ "thread-loader": "^3.0.0", "url-loader": "^4.1.1", "vue-loader": "^16.1.2", - "@vue/loader-v15": "npm:vue-loader@^15.9.7", + "@vue/vue-loader-v15": "npm:vue-loader@^15.9.7", "vue-style-loader": "^4.1.3", "webpack": "^5.22.0", "webpack-bundle-analyzer": "^4.4.0", diff --git a/yarn.lock b/yarn.lock index becdf56d5a..33ce5d6f3e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4149,17 +4149,6 @@ dependencies: vue-eslint-parser "^7.0.0" -"@vue/loader-v15@npm:vue-loader@^15.9.7", vue-loader@^15.7.1: - version "15.9.7" - resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.9.7.tgz#15b05775c3e0c38407679393c2ce6df673b01044" - integrity sha512-qzlsbLV1HKEMf19IqCJqdNvFJRCI58WNbS6XbPqK13MrLz65es75w392MSQ5TsARAfIjUw+ATm3vlCXUJSOH9Q== - dependencies: - "@vue/component-compiler-utils" "^3.1.0" - hash-sum "^1.0.2" - loader-utils "^1.1.0" - vue-hot-reload-api "^2.3.0" - vue-style-loader "^4.1.0" - "@vue/shared@3.0.11": version "3.0.11" resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.0.11.tgz#20d22dd0da7d358bb21c17f9bde8628152642c77" @@ -4183,6 +4172,17 @@ v-tooltip "^3.0.0-alpha.20" vue-resize "^1.0.0" +"@vue/vue-loader-v15@npm:vue-loader@^15.9.7", vue-loader@^15.7.1: + version "15.9.7" + resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.9.7.tgz#15b05775c3e0c38407679393c2ce6df673b01044" + integrity sha512-qzlsbLV1HKEMf19IqCJqdNvFJRCI58WNbS6XbPqK13MrLz65es75w392MSQ5TsARAfIjUw+ATm3vlCXUJSOH9Q== + dependencies: + "@vue/component-compiler-utils" "^3.1.0" + hash-sum "^1.0.2" + loader-utils "^1.1.0" + vue-hot-reload-api "^2.3.0" + vue-style-loader "^4.1.0" + "@vue/web-component-wrapper@^1.3.0": version "1.3.0" resolved "https://registry.yarnpkg.com/@vue/web-component-wrapper/-/web-component-wrapper-1.3.0.tgz#b6b40a7625429d2bd7c2281ddba601ed05dc7f1a"