From 57e77d54d4b70221223f58b8f908173118e42338 Mon Sep 17 00:00:00 2001 From: winixt Date: Tue, 14 Sep 2021 17:00:53 +0800 Subject: [PATCH] fix: vue and @vue/compiler-sfc version match problem --- .../templates/app/h5/package.json | 5 +- .../templates/app/pc/package.json | 5 +- packages/fes-preset-built-in/package.json | 1 - .../src/plugins/features/checkVuePackage.js | 2 +- packages/fes-template-h5/package.json | 5 +- yarn.lock | 77 +++++++++++++++++-- 6 files changed, 82 insertions(+), 13 deletions(-) diff --git a/packages/create-fes-app/templates/app/h5/package.json b/packages/create-fes-app/templates/app/h5/package.json index e44aa3e3..d3693a1e 100644 --- a/packages/create-fes-app/templates/app/h5/package.json +++ b/packages/create-fes-app/templates/app/h5/package.json @@ -40,14 +40,15 @@ "access": "public" }, "devDependencies": { - "@webank/eslint-config-webank": "0.3.1", + "@vue/compiler-sfc": "^3.2.6", + "@webank/eslint-config-webank": "0.4.2", "@ttou/postcss-px-to-viewport": "1.1.1" }, "dependencies": { "@fesjs/fes": "^2.0.0", "@fesjs/plugin-icon": "^2.0.0", "@fesjs/plugin-request": "^2.0.0", - "vue": "^3.0.5" + "vue": "^3.2.6" }, "private": true } \ No newline at end of file diff --git a/packages/create-fes-app/templates/app/pc/package.json b/packages/create-fes-app/templates/app/pc/package.json index c501874e..1d8bb80d 100644 --- a/packages/create-fes-app/templates/app/pc/package.json +++ b/packages/create-fes-app/templates/app/pc/package.json @@ -43,7 +43,8 @@ "access": "public" }, "devDependencies": { - "@webank/eslint-config-webank": "0.3.1" + "@vue/compiler-sfc": "^3.2.6", + "@webank/eslint-config-webank": "0.4.2" }, "dependencies": { "@fesjs/fes": "^2.0.0", @@ -52,7 +53,7 @@ "@fesjs/plugin-model": "^2.0.0", "@fesjs/plugin-enums": "^2.0.0", "ant-design-vue": "^2.2.0", - "vue": "^3.1.0" + "vue": "^3.2.6" }, "private": true } \ No newline at end of file diff --git a/packages/fes-preset-built-in/package.json b/packages/fes-preset-built-in/package.json index 1cc82592..44101053 100644 --- a/packages/fes-preset-built-in/package.json +++ b/packages/fes-preset-built-in/package.json @@ -37,7 +37,6 @@ "@fesjs/utils": "^2.0.2", "@soda/friendly-errors-webpack-plugin": "^1.8.0", "@vue/babel-plugin-jsx": "^1.0.2", - "@vue/compiler-sfc": "^3.0.4", "autoprefixer": "^10.2.4", "babel-loader": "^8.2.2", "babel-plugin-import": "1.13.3", diff --git a/packages/fes-preset-built-in/src/plugins/features/checkVuePackage.js b/packages/fes-preset-built-in/src/plugins/features/checkVuePackage.js index 7f71dd64..ea94d33a 100644 --- a/packages/fes-preset-built-in/src/plugins/features/checkVuePackage.js +++ b/packages/fes-preset-built-in/src/plugins/features/checkVuePackage.js @@ -17,7 +17,7 @@ export default (api) => { const vuePkg = require('vue/package.json'); const vueCompilerPkg = require('@vue/compiler-sfc/package.json'); if ( - !semver.satisfies(vuePkg.version, vueCompilerPkg.version, { includePrerelease: true }) + !semver.satisfies(vuePkg.version, `~${vueCompilerPkg.version.replace(/\d+$/, '0')}`, { includePrerelease: true }) ) { console.log( chalk.red( diff --git a/packages/fes-template-h5/package.json b/packages/fes-template-h5/package.json index 65f3a7ff..110d98f4 100644 --- a/packages/fes-template-h5/package.json +++ b/packages/fes-template-h5/package.json @@ -41,13 +41,14 @@ }, "devDependencies": { "@webank/eslint-config-webank": "0.3.1", - "@ttou/postcss-px-to-viewport": "1.1.4" + "@ttou/postcss-px-to-viewport": "1.1.4", + "@vue/compiler-sfc": "3.2.2" }, "dependencies": { "@fesjs/fes": "^2.0.0", "@fesjs/plugin-icon": "^2.0.0", "@fesjs/plugin-request": "^2.0.0", - "vue": "^3.0.5" + "vue": "3.2.2" }, "private": true } \ No newline at end of file diff --git a/yarn.lock b/yarn.lock index 69c4c9c0..df26ed8f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2966,6 +2966,17 @@ html-tags "^3.1.0" svg-tags "^1.0.0" +"@vue/compiler-core@3.2.11": + version "3.2.11" + resolved "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.11.tgz#10af3777dba303ee7aae668029f131cb90391bee" + integrity sha512-bcbsLx5XyQg8WDDEGwmpX0BfEfv82wIs9fWFelpyVhNRGMaABvUTalYINyfhVT+jOqNaD4JBhJiVKd/8TmsHWg== + dependencies: + "@babel/parser" "^7.15.0" + "@babel/types" "^7.15.0" + "@vue/shared" "3.2.11" + estree-walker "^2.0.2" + source-map "^0.6.1" + "@vue/compiler-core@3.2.2": version "3.2.2" resolved "http://10.107.103.115:8001/@vue/compiler-core/download/@vue/compiler-core-3.2.2.tgz#8d3e29f129579ed9b14f48af735fd8d95f248504" @@ -2977,6 +2988,14 @@ estree-walker "^2.0.1" source-map "^0.6.1" +"@vue/compiler-dom@3.2.11": + version "3.2.11" + resolved "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.11.tgz#d066f8e1f1812b4e881593819ade0fe6d654c776" + integrity sha512-DNvhUHI/1Hn0/+ZYDYGAuDGasUm+XHKC3FE4GqkNCTO/fcLaJMRg/7eT1m1lkc7jPffUwwfh1rZru5mwzOjrNw== + dependencies: + "@vue/compiler-core" "3.2.11" + "@vue/shared" "3.2.11" + "@vue/compiler-dom@3.2.2": version "3.2.2" resolved "http://10.107.103.115:8001/@vue/compiler-dom/download/@vue/compiler-dom-3.2.2.tgz#26e198498746c53047c3744d26fc95e670692ab7" @@ -2985,7 +3004,7 @@ "@vue/compiler-core" "3.2.2" "@vue/shared" "3.2.2" -"@vue/compiler-sfc@^3.0.4", "@vue/compiler-sfc@^3.2.2": +"@vue/compiler-sfc@3.2.2", "@vue/compiler-sfc@^3.2.2": version "3.2.2" resolved "http://10.107.103.115:8001/@vue/compiler-sfc/download/@vue/compiler-sfc-3.2.2.tgz#5b7b13b07689be8e4880d856f72d1be500785be9" integrity sha1-W3sTsHaJvo5IgNhW9y0b5QB4W+k= @@ -3008,6 +3027,38 @@ postcss-selector-parser "^6.0.4" source-map "^0.6.1" +"@vue/compiler-sfc@^3.0.4": + version "3.2.11" + resolved "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.11.tgz#628fa12238760d9b9b339ac2e125a759224fadbf" + integrity sha512-cUIaS8mgJrQ6yucj2AupWAwBRITK3W/a8wCOn9g5fJGtOl8h4APY8vN3lzP8HIJDyEeRF3I8SfRhL+oX97kSnw== + dependencies: + "@babel/parser" "^7.15.0" + "@babel/types" "^7.15.0" + "@types/estree" "^0.0.48" + "@vue/compiler-core" "3.2.11" + "@vue/compiler-dom" "3.2.11" + "@vue/compiler-ssr" "3.2.11" + "@vue/ref-transform" "3.2.11" + "@vue/shared" "3.2.11" + consolidate "^0.16.0" + estree-walker "^2.0.2" + hash-sum "^2.0.0" + lru-cache "^5.1.1" + magic-string "^0.25.7" + merge-source-map "^1.1.0" + postcss "^8.1.10" + postcss-modules "^4.0.0" + postcss-selector-parser "^6.0.4" + source-map "^0.6.1" + +"@vue/compiler-ssr@3.2.11": + version "3.2.11" + resolved "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.11.tgz#702cef3429651645bdbe09fe5962803b5a621abb" + integrity sha512-+ptAdUlFDij+Z0VGCbRRkxQlNev5LkbZAntvkxrFjc08CTMhZmiV4Js48n2hAmuSXaKNEpmGkDGU26c/vf1+xw== + dependencies: + "@vue/compiler-dom" "3.2.11" + "@vue/shared" "3.2.11" + "@vue/compiler-ssr@3.2.2": version "3.2.2" resolved "http://10.107.103.115:8001/@vue/compiler-ssr/download/@vue/compiler-ssr-3.2.2.tgz#633bb8e01f00a969c35ca12db32be7fe4c7185a9" @@ -3028,6 +3079,17 @@ dependencies: "@vue/shared" "3.2.2" +"@vue/ref-transform@3.2.11": + version "3.2.11" + resolved "https://registry.npmjs.org/@vue/ref-transform/-/ref-transform-3.2.11.tgz#4d282b9570d1485a73e7bf5d57cce27b4a7aa690" + integrity sha512-7rX0YsfYb7+1PeKPME1tQyUQcQgt0sIXRRnPD1Vw8Zs2KIo90YLy9CrvwalcRCxGw0ScsjBEhVjJtWIT79TElg== + dependencies: + "@babel/parser" "^7.15.0" + "@vue/compiler-core" "3.2.11" + "@vue/shared" "3.2.11" + estree-walker "^2.0.2" + magic-string "^0.25.7" + "@vue/runtime-core@3.2.2": version "3.2.2" resolved "http://10.107.103.115:8001/@vue/runtime-core/download/@vue/runtime-core-3.2.2.tgz#b9a7250783de19dd8dd6febf008084b0f9144586" @@ -3053,6 +3115,11 @@ "@vue/compiler-ssr" "3.2.2" "@vue/shared" "3.2.2" +"@vue/shared@3.2.11": + version "3.2.11" + resolved "https://registry.npmjs.org/@vue/shared/-/shared-3.2.11.tgz#01899f54949caf1ac241de397bd17069632574de" + integrity sha512-ovfXAsSsCvV9JVceWjkqC/7OF5HbgLOtCWjCIosmPGG8lxbPuavhIxRH1dTx4Dg9xLgRTNLvI3pVxG4ItQZekg== + "@vue/shared@3.2.2", "@vue/shared@^3.2.2": version "3.2.2" resolved "http://10.107.103.115:8001/@vue/shared/download/@vue/shared-3.2.2.tgz#6104185ebd57af5a14ac51c1f491b2205fc24054" @@ -6087,10 +6154,10 @@ estree-walker@^1.0.1: resolved "http://10.107.103.115:8001/estree-walker/download/estree-walker-1.0.1.tgz#31bc5d612c96b704106b477e6dd5d8aa138cb700" integrity sha1-MbxdYSyWtwQQa0d+bdXYqhOMtwA= -estree-walker@^2.0.1: +estree-walker@^2.0.1, estree-walker@^2.0.2: version "2.0.2" - resolved "http://10.107.103.115:8001/estree-walker/download/estree-walker-2.0.2.tgz#52f010178c2a4c117a7757cfe942adb7d2da4cac" - integrity sha1-UvAQF4wqTBF6d1fP6UKtt9LaTKw= + resolved "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz#52f010178c2a4c117a7757cfe942adb7d2da4cac" + integrity sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w== esutils@^2.0.2: version "2.0.3" @@ -13240,7 +13307,7 @@ vue3-jest@^27.0.0-alpha.1: source-map "0.5.6" tsconfig "^7.0.0" -vue@^3.0.5, vue@^3.2.2: +vue@3.2.2, vue@^3.0.5, vue@^3.2.2: version "3.2.2" resolved "http://10.107.103.115:8001/vue/download/vue-3.2.2.tgz#11715cb71a02baefd0f6e6552dc623680eb1bf32" integrity sha1-EXFctxoCuu/Q9uZVLcYjaA6xvzI=