Merge branch 'master' of https://github.com/didi/mpx

didi · Dec 11, 2023 · 1055fcc · 1055fcc
2 parents ed167cc + 5a1a48a
commit 1055fcc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/packages/store/@types/index.d.ts b/packages/store/@types/index.d.ts
@@ -6,7 +6,6 @@ type UnboxDepField<D, F> = F extends keyof D ? D[F] : {}
 type GetReturnOrSelf<T> = T extends (...args: any)=> infer R ? R : T
 
 interface compContext {
-  __mpxProxy: object;
   [key: string]: any
 }
 

diff --git a/packages/webpack-plugin/lib/web/processMainScript.js b/packages/webpack-plugin/lib/web/processMainScript.js
@@ -46,7 +46,6 @@ module.exports = function (script, {
   output += `  import Vue from 'vue'
   import VueRouter from 'vue-router'
   import Mpx from '@mpxjs/core'
-  import App from ${stringifyRequest(loaderContext, addQuery(resource, { isApp: true }))}
   import { processAppOption, getComponent } from ${stringifyRequest(loaderContext, optionProcessorPath)}
   Vue.use(VueRouter)\n`
 
@@ -64,6 +63,9 @@ module.exports = function (script, {
     isMain: true,
     globalTabBar
   })
+
+  output += `\n  const App = require(${stringifyRequest(loaderContext, addQuery(resource, { isApp: true }))}).default\n`
+
   output += `
   export default processAppOption({
     App,