diff --git a/packages/webpack-plugin/lib/web/processMainScript.js b/packages/webpack-plugin/lib/web/processMainScript.js index 85af173b40..c86ff732d2 100644 --- a/packages/webpack-plugin/lib/web/processMainScript.js +++ b/packages/webpack-plugin/lib/web/processMainScript.js @@ -27,17 +27,16 @@ module.exports = function (script, { let output = `\n import { processAppOption, getComponent } from ${stringifyRequest(loaderContext, optionProcessorPath)} import '@mpxjs/webpack-plugin/lib/runtime/base.styl' - // import Vue from 'vue' - import { createApp } from 'vue' + import Vue from 'vue' import VueRouter from 'vue-router' import Mpx from '@mpxjs/core' import App from ${stringifyRequest(loaderContext, addQuery(resource, { isApp: true }))} // Vue.use(VueRouter) \n` - if (i18n) { - output += buildI18n({ i18n, loaderContext }) - } + // if (i18n) { + // output += buildI18n({ i18n, loaderContext }) + // } output += buildGlobalParams({ moduleId, scriptSrcMode, loaderContext, isProduction, jsonConfig, webConfig, isMain: true, globalTabBar }) output += `export default processAppOption({ diff --git a/test/e2e/proxy-miniprogram-project/copySh.sh b/test/e2e/proxy-miniprogram-project/copySh.sh index b120b377e1..3c1e41b309 100644 --- a/test/e2e/proxy-miniprogram-project/copySh.sh +++ b/test/e2e/proxy-miniprogram-project/copySh.sh @@ -2,8 +2,12 @@ echo "start copy" rm -rf ./node_modules/@mpxjs/core rm -rf ./node_modules/@mpxjs/utils +rm -rf ./node_modules/@mpxjs/webpack-plugin/lib +rm -rf ./node_modules/@mpxjs/api-proxy/src scp -r ../../../packages/core ./node_modules/@mpxjs/core scp -r ../../../packages/utils ./node_modules/@mpxjs/utils +scp -r ../../../packages/webpack-plugin/lib/ ./node_modules/@mpxjs/webpack-plugin/lib/ +scp -r ../../../packages/api-proxy/src/ ./node_modules/@mpxjs/api-proxy/src/ echo "end copy" \ No newline at end of file diff --git a/test/e2e/proxy-miniprogram-project/package.json b/test/e2e/proxy-miniprogram-project/package.json index c272aba130..a5af2a705e 100644 --- a/test/e2e/proxy-miniprogram-project/package.json +++ b/test/e2e/proxy-miniprogram-project/package.json @@ -23,8 +23,7 @@ "@mpxjs/pinia": "^2.8.0", "@mpxjs/store": "^2.8.0", "@mpxjs/utils": "^2.8.0", - "@mpxjs/webpack-plugin": "^2.9.3", - "vue": "^2.7.10", + "vue": "^3.2.36", "vue-demi": "^0.13.11", "vue-i18n": "^8.27.2", "vue-i18n-bridge": "^9.2.2" @@ -44,6 +43,7 @@ "@mpxjs/miniprogram-simulate": "^1.4.12", "@mpxjs/mpx-jest": "0.0.18", "@mpxjs/size-report": "^2.8.0", + "@mpxjs/webpack-plugin": "^2.9.3", "@types/jest": "^27.5.1", "@typescript-eslint/eslint-plugin": "^5.2.0", "@typescript-eslint/parser": "^5.2.0", @@ -74,7 +74,7 @@ "ts-jest": "^27.1.2", "ts-loader": "^9.2.6", "typescript": "^4.1.2", - "vue-loader": "^15.9.3", + "vue-loader": "^17.3.1", "vue-router": "^3.1.3", "vue-style-loader": "^4.1.2", "vue-template-compiler": "^2.6.10", diff --git a/test/e2e/proxy-miniprogram-project/src/app.mpx b/test/e2e/proxy-miniprogram-project/src/app.mpx index 05fb607422..8625b08b62 100644 --- a/test/e2e/proxy-miniprogram-project/src/app.mpx +++ b/test/e2e/proxy-miniprogram-project/src/app.mpx @@ -1,8 +1,8 @@