@mpxjs/webpack-plugin 2.8.35 → 2.9.0-beta.0

package/lib/web/processMainScript.js

@@ -0,0 +1,56 @@
+const addQuery = require('../utils/add-query')
+const normalize = require('../utils/normalize')
+const optionProcessorPath = normalize.lib('runtime/optionProcessor')
+const { buildComponentsMap, buildPagesMap, buildGlobalParams, shallowStringify, stringifyRequest, buildI18n } = require('./script-helper')
+
+module.exports = function (script, {
+  loaderContext,
+  ctorType,
+  srcMode,
+  moduleId,
+  isProduction,
+  jsonConfig,
+  localComponentsMap,
+  tabBar,
+  tabBarMap,
+  tabBarStr,
+  localPagesMap,
+  resource
+}, callback) {
+  const { i18n, webConfig } = loaderContext.getMpx()
+
+  const { pagesMap, firstPage, globalTabBar } = buildPagesMap({ localPagesMap, loaderContext, tabBar, tabBarMap, tabBarStr })
+
+  const componentsMap = buildComponentsMap({ localComponentsMap, loaderContext })
+
+  const scriptSrcMode = script ? script.mode || srcMode : srcMode
+
+  let output = `\n  import { processAppOption, getComponent } from ${stringifyRequest(loaderContext, optionProcessorPath)}
+          import '@mpxjs/webpack-plugin/lib/runtime/base.styl'
+          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 })
+  }
+
+  output += buildGlobalParams({ moduleId, scriptSrcMode, loaderContext, isProduction, jsonConfig, webConfig, isMain: true, globalTabBar })
+  output += `export default processAppOption({
+                        App,
+                        tabBarMap: ${JSON.stringify(tabBarMap)},
+                        firstPage: ${JSON.stringify(firstPage)},
+                        pagesMap: ${shallowStringify(pagesMap)},
+                        componentsMap: ${shallowStringify(componentsMap)},
+                        Vue,
+                        VueRouter,
+                        webConfig: ${JSON.stringify(webConfig)}
+                    })`
+
+  callback(null, {
+    output
+  })
+}

package/lib/web/processScript.js

@@ -1,33 +1,8 @@
 const genComponentTag = require('../utils/gen-component-tag')
 const loaderUtils = require('loader-utils')
-const addQuery = require('../utils/add-query')
 const normalize = require('../utils/normalize')
-const hasOwn = require('../utils/has-own')
-const createHelpers = require('../helpers')
 const optionProcessorPath = normalize.lib('runtime/optionProcessor')
-const tabBarContainerPath = normalize.lib('runtime/components/web/mpx-tab-bar-container.vue')
-const tabBarPath = normalize.lib('runtime/components/web/mpx-tab-bar.vue')
-
-function shallowStringify (obj) {
-  const arr = []
-  for (const key in obj) {
-    if (hasOwn(obj, key)) {
-      let value = obj[key]
-      if (Array.isArray(value)) {
-        value = `[${value.join(',')}]`
-      }
-      arr.push(`'${key}':${value}`)
-    }
-  }
-  return `{${arr.join(',')}}`
-}
-
-function getAsyncChunkName (chunkName) {
-  if (chunkName && typeof chunkName !== 'boolean') {
-    return `/* webpackChunkName: "${chunkName}" */`
-  }
-  return ''
-}
+const { buildComponentsMap, getRequireScript, buildGlobalParams, shallowStringify } = require('./script-helper')
 
 module.exports = function (script, {
   loaderContext,
@@ -38,50 +13,14 @@ module.exports = function (script, {
   componentGenerics,
   jsonConfig,
   outputPath,
-  tabBarMap,
-  tabBarStr,
   builtInComponentsMap,
   genericsInfo,
   wxsModuleMap,
-  localComponentsMap,
-  localPagesMap
+  localComponentsMap
 }, callback) {
-  const {
-    i18n,
-    projectRoot,
-    webConfig,
-    appInfo
-  } = loaderContext.getMpx()
-  const { getRequire } = createHelpers(loaderContext)
-  const tabBar = jsonConfig.tabBar
-
-  const emitWarning = (msg) => {
-    loaderContext.emitWarning(
-      new Error('[script processor][' + loaderContext.resource + ']: ' + msg)
-    )
-  }
+  const { projectRoot, appInfo } = loaderContext.getMpx()
 
   const stringifyRequest = r => loaderUtils.stringifyRequest(loaderContext, r)
-  const tabBarPagesMap = {}
-  if (tabBar && tabBarMap) {
-    // 挂载tabBar组件
-    const tabBarRequest = stringifyRequest(addQuery(tabBar.custom ? './custom-tab-bar/index' : tabBarPath, { isComponent: true }))
-    tabBarPagesMap['mpx-tab-bar'] = `getComponent(require(${tabBarRequest}))`
-    // 挂载tabBar页面
-    Object.keys(tabBarMap).forEach((pagePath) => {
-      const pageCfg = localPagesMap[pagePath]
-      if (pageCfg) {
-        const pageRequest = stringifyRequest(pageCfg.resource)
-        if (pageCfg.async) {
-          tabBarPagesMap[pagePath] = `()=>import(${getAsyncChunkName(pageCfg.async)}${pageRequest}).then(res => getComponent(res, { __mpxPageRoute: ${JSON.stringify(pagePath)} }))`
-        } else {
-          tabBarPagesMap[pagePath] = `getComponent(require(${pageRequest}), { __mpxPageRoute: ${JSON.stringify(pagePath)} })`
-        }
-      } else {
-        emitWarning(`TabBar page path ${pagePath} is not exist in local page map, please check!`)
-      }
-    })
-  }
 
   let output = '/* script */\n'
 
@@ -101,58 +40,7 @@ module.exports = function (script, {
       return attrs
     },
     content (script) {
-      let content = `\n  import processOption, { getComponent, getWxsMixin } from ${stringifyRequest(optionProcessorPath)}\n`
-      // add import
-      if (ctorType === 'app') {
-        content += `  import '@mpxjs/webpack-plugin/lib/runtime/base.styl'
-  import Vue from 'vue'
-  import VueRouter from 'vue-router'
-  import Mpx from '@mpxjs/core'
-  Vue.use(VueRouter)
-  global.getApp = function(){}
-  global.getCurrentPages = function(){
-    if(!global.__mpxRouter) return []
-    // @ts-ignore
-    return global.__mpxRouter.stack.map(item => {
-      let page
-      const vnode = item.vnode
-      if(vnode && vnode.componentInstance) {
-        page = vnode.tag.endsWith('mpx-tab-bar-container') ? vnode.componentInstance.$refs.tabBarPage : vnode.componentInstance
-      }
-      return page || { route: item.path.slice(1) }
-    })
-  }
-  global.__networkTimeout = ${JSON.stringify(jsonConfig.networkTimeout)}
-  global.__mpxGenericsMap = {}
-  global.__mpxOptionsMap = {}
-  global.__style = ${JSON.stringify(jsonConfig.style || 'v1')}
-  global.__mpxPageConfig = ${JSON.stringify(jsonConfig.window)}
-  global.__mpxTransRpxFn = ${webConfig.transRpxFn}\n`
-        if (i18n) {
-          const i18nObj = Object.assign({}, i18n)
-          content += `  import VueI18n from 'vue-i18n'
-  import { createI18n } from 'vue-i18n-bridge'
-
-  Vue.use(VueI18n , { bridge: true })\n`
-          const requestObj = {}
-          const i18nKeys = ['messages', 'dateTimeFormats', 'numberFormats']
-          i18nKeys.forEach((key) => {
-            if (i18nObj[`${key}Path`]) {
-              requestObj[key] = stringifyRequest(i18nObj[`${key}Path`])
-              delete i18nObj[`${key}Path`]
-            }
-          })
-          content += `  const i18nCfg = ${JSON.stringify(i18nObj)}\n`
-          Object.keys(requestObj).forEach((key) => {
-            content += `  i18nCfg.${key} = require(${requestObj[key]})\n`
-          })
-          content += '  i18nCfg.legacy = false\n'
-          content += `  const i18n = createI18n(i18nCfg, VueI18n)
-  Vue.use(i18n)
-  Mpx.i18n = i18n
-  \n`
-        }
-      }
+      let content = `\n  import processComponentOption, { getComponent, getWxsMixin } from ${stringifyRequest(optionProcessorPath)}\n`
       let hasApp = true
       if (!appInfo.name) {
         hasApp = false
@@ -166,63 +54,10 @@ module.exports = function (script, {
           content += `  wxsModules.${module} = ${expression}\n`
         })
       }
-      let firstPage = ''
-      const pagesMap = {}
-      const componentsMap = {}
-      Object.keys(localPagesMap).forEach((pagePath) => {
-        const pageCfg = localPagesMap[pagePath]
-        const pageRequest = stringifyRequest(pageCfg.resource)
-        if (tabBarMap && tabBarMap[pagePath]) {
-          pagesMap[pagePath] = `getComponent(require(${stringifyRequest(tabBarContainerPath)}), { __mpxBuiltIn: true })`
-        } else {
-          if (pageCfg.async) {
-            pagesMap[pagePath] = `()=>import(${getAsyncChunkName(pageCfg.async)} ${pageRequest}).then(res => getComponent(res, { __mpxPageRoute: ${JSON.stringify(pagePath)} }))`
-          } else {
-            // 为了保持小程序中app->page->component的js执行顺序，所有的page和component都改为require引入
-            pagesMap[pagePath] = `getComponent(require(${pageRequest}), { __mpxPageRoute: ${JSON.stringify(pagePath)} })`
-          }
-        }
 
-        if (pageCfg.isFirst) {
-          firstPage = pagePath
-        }
-      })
-
-      Object.keys(localComponentsMap).forEach((componentName) => {
-        const componentCfg = localComponentsMap[componentName]
-        const componentRequest = stringifyRequest(componentCfg.resource)
-        if (componentCfg.async) {
-          componentsMap[componentName] = `()=>import(${getAsyncChunkName(componentCfg.async)}${componentRequest}).then(res => getComponent(res))`
-        } else {
-          componentsMap[componentName] = `getComponent(require(${componentRequest}))`
-        }
-      })
-
-      Object.keys(builtInComponentsMap).forEach((componentName) => {
-        const componentCfg = builtInComponentsMap[componentName]
-        const componentRequest = stringifyRequest(componentCfg.resource)
-        componentsMap[componentName] = `getComponent(require(${componentRequest}), { __mpxBuiltIn: true })`
-      })
-
-      content += `  global.currentModuleId = ${JSON.stringify(moduleId)}\n`
-      content += `  global.currentSrcMode = ${JSON.stringify(scriptSrcMode)}\n`
-      content += `  global.currentInject = ${JSON.stringify({ moduleId })}\n`
-      if (!isProduction) {
-        content += `  global.currentResource = ${JSON.stringify(loaderContext.resourcePath)}\n`
-      }
+      // 获取组件集合
+      const componentsMap = buildComponentsMap({ localComponentsMap, builtInComponentsMap, loaderContext })
 
-      content += '  /** script content **/\n'
-
-      // 传递ctorType以补全js内容
-      const extraOptions = {
-        ctorType,
-        lang: script.lang || 'js'
-      }
-      // todo 仅靠vueContentCache保障模块唯一性还是不够严谨，后续需要考虑去除原始query后构建request
-      content += `  ${getRequire('script', script, extraOptions)}\n`
-
-      // createApp/Page/Component执行完成后立刻获取当前的option并暂存
-      content += `  const currentOption = global.__mpxOptionsMap[${JSON.stringify(moduleId)}]\n`
       // 获取pageConfig
       const pageConfig = {}
       if (ctorType === 'page') {
@@ -237,36 +72,21 @@ module.exports = function (script, {
             pageConfig[key] = jsonConfig[key]
           })
       }
-      // 为了执行顺序正确，tabBarPagesMap在app逻辑执行完成后注入，保障小程序中app->page->component的js执行顺序
-      if (tabBarStr && tabBarPagesMap) {
-        content += `  global.__tabBar = ${tabBarStr}
-  Vue.observable(global.__tabBar)
-  // @ts-ignore
-  global.__tabBarPagesMap = ${shallowStringify(tabBarPagesMap)}\n`
-      }
-      // 配置平台转换通过createFactory在core中convertor中定义和进行
-      // 通过processOption进行组件注册和路由注入
-      content += `  export default processOption(
-    currentOption,
-    ${JSON.stringify(ctorType)},
-    ${JSON.stringify(firstPage)},
-    ${JSON.stringify(outputPath)},
-    ${JSON.stringify(pageConfig)},
-    // @ts-ignore
-    ${shallowStringify(pagesMap)},
+
+      content += buildGlobalParams({ moduleId, scriptSrcMode, loaderContext, isProduction })
+      content += getRequireScript({ ctorType, script, loaderContext })
+      content += `  export default processComponentOption({
+    option: global.__mpxOptionsMap[${JSON.stringify(moduleId)}],
+    ctorType: ${JSON.stringify(ctorType)},
+    outputPath: ${JSON.stringify(outputPath)},
+    pageConfig: ${JSON.stringify(pageConfig)},
     // @ts-ignore
-    ${shallowStringify(componentsMap)},
-    ${JSON.stringify(tabBarMap)},
-    ${JSON.stringify(componentGenerics)},
-    ${JSON.stringify(genericsInfo)},
-    getWxsMixin(wxsModules),
-    ${hasApp}`
-      if (ctorType === 'app') {
-        content += `,
-    Vue,
-    VueRouter`
-      }
-      content += '\n  )\n'
+    componentsMap: ${shallowStringify(componentsMap)},
+    componentGenerics: ${JSON.stringify(componentGenerics)},
+    genericsInfo: ${JSON.stringify(genericsInfo)},
+    mixin: getWxsMixin(wxsModules),
+    hasApp: ${hasApp}`
+      content += '\n  })\n'
       return content
     }
   })

package/lib/web/processTemplate.js

@@ -38,7 +38,8 @@ module.exports = function (template, {
     wxsContentMap,
     decodeHTMLText,
     externalClasses,
-    checkUsingComponents
+    checkUsingComponents,
+    webConfig
     // autoVirtualHostRules
   } = mpx
   const { resourcePath } = parseRequest(loaderContext.resource)
@@ -48,9 +49,11 @@ module.exports = function (template, {
   let output = '/* template */\n'
 
   if (ctorType === 'app') {
+    const { el } = webConfig
+    const idName = el?.match(/#(.*)/)?.[1] || 'app'
     template = {
       tag: 'template',
-      content: '<div class="app"><mpx-keep-alive><router-view class="page"></router-view></mpx-keep-alive></div>'
+      content: `<div id="${idName}" class="app"><mpx-keep-alive><router-view class="page"></router-view></mpx-keep-alive></div>`
     }
     builtInComponentsMap['mpx-keep-alive'] = {
       resource: addQuery('@mpxjs/webpack-plugin/lib/runtime/components/web/mpx-keep-alive.vue', { isComponent: true })

package/lib/web/script-helper.js

@@ -0,0 +1,195 @@
+const hasOwn = require('../utils/has-own')
+const loaderUtils = require('loader-utils')
+const normalize = require('../utils/normalize')
+const createHelpers = require('../helpers')
+const tabBarContainerPath = normalize.lib('runtime/components/web/mpx-tab-bar-container.vue')
+const tabBarPath = normalize.lib('runtime/components/web/mpx-tab-bar.vue')
+const addQuery = require('../utils/add-query')
+
+function stringifyRequest (loaderContext, request) {
+  return loaderUtils.stringifyRequest(loaderContext, request)
+}
+
+function shallowStringify (obj) {
+  const arr = []
+  for (const key in obj) {
+    if (hasOwn(obj, key)) {
+      let value = obj[key]
+      if (Array.isArray(value)) {
+        value = `[${value.join(',')}]`
+      }
+      arr.push(`'${key}':${value}`)
+    }
+  }
+  return `{${arr.join(',')}}`
+}
+
+function getAsyncChunkName (chunkName) {
+  if (chunkName && typeof chunkName !== 'boolean') {
+    return `/* webpackChunkName: "${chunkName}" */`
+  }
+  return ''
+}
+
+function buildComponentsMap ({ localComponentsMap, builtInComponentsMap, loaderContext }) {
+  const componentsMap = {}
+  if (localComponentsMap) {
+    Object.keys(localComponentsMap).forEach((componentName) => {
+      const componentCfg = localComponentsMap[componentName]
+      const componentRequest = stringifyRequest(loaderContext, componentCfg.resource)
+      if (componentCfg.async) {
+        componentsMap[componentName] = `()=>import(${getAsyncChunkName(componentCfg.async)}${componentRequest}).then(res => getComponent(res))`
+      } else {
+        componentsMap[componentName] = `getComponent(require(${componentRequest}))`
+      }
+    })
+  }
+  if (builtInComponentsMap) {
+    Object.keys(builtInComponentsMap).forEach((componentName) => {
+      const componentCfg = builtInComponentsMap[componentName]
+      const componentRequest = stringifyRequest(loaderContext, componentCfg.resource)
+      componentsMap[componentName] = `getComponent(require(${componentRequest}), { __mpxBuiltIn: true })`
+    })
+  }
+  return componentsMap
+}
+
+function buildPagesMap ({ localPagesMap, loaderContext, tabBar, tabBarMap, tabBarStr }) {
+  let globalTabBar = ''
+  let firstPage = ''
+  const pagesMap = {}
+  const tabBarPagesMap = {}
+  if (tabBar && tabBarMap) {
+    // 挂载tabBar组件
+    const tabBarRequest = stringifyRequest(loaderContext, addQuery(tabBar.custom ? './custom-tab-bar/index' : tabBarPath, { isComponent: true }))
+    tabBarPagesMap['mpx-tab-bar'] = `getComponent(require(${tabBarRequest}))`
+    // 挂载tabBar页面
+    Object.keys(tabBarMap).forEach((pagePath) => {
+      const pageCfg = localPagesMap[pagePath]
+      if (pageCfg) {
+        const pageRequest = stringifyRequest(loaderContext, pageCfg.resource)
+        if (pageCfg.async) {
+          tabBarPagesMap[pagePath] = `()=>import(${getAsyncChunkName(pageCfg.async)}${pageRequest}).then(res => getComponent(res, { __mpxPageRoute: ${JSON.stringify(pagePath)} }))`
+        } else {
+          tabBarPagesMap[pagePath] = `getComponent(require(${pageRequest}), { __mpxPageRoute: ${JSON.stringify(pagePath)} })`
+        }
+      } else {
+        loaderContext.emitWarning(
+          new Error('[json processor][' + loaderContext.resource + ']: ' + `TabBar page path ${pagePath} is not exist in local page map, please check!`)
+        )
+      }
+    })
+  }
+  if (tabBarStr && tabBarPagesMap) {
+    globalTabBar += `  global.__tabBar = ${tabBarStr}
+                        Vue.observable(global.__tabBar)
+                        // @ts-ignore
+                        global.__tabBarPagesMap = ${shallowStringify(tabBarPagesMap)}\n`
+  }
+  Object.keys(localPagesMap).forEach((pagePath) => {
+    const pageCfg = localPagesMap[pagePath]
+    const pageRequest = stringifyRequest(loaderContext, pageCfg.resource)
+    if (tabBarMap && tabBarMap[pagePath]) {
+      pagesMap[pagePath] = `getComponent(require(${stringifyRequest(loaderContext, tabBarContainerPath)}), { __mpxBuiltIn: true })`
+    } else {
+      if (pageCfg.async) {
+        pagesMap[pagePath] = `()=>import(${getAsyncChunkName(pageCfg.async)} ${pageRequest}).then(res => getComponent(res, { __mpxPageRoute: ${JSON.stringify(pagePath)} }))`
+      } else {
+        // 为了保持小程序中app->page->component的js执行顺序，所有的page和component都改为require引入
+        pagesMap[pagePath] = `getComponent(require(${pageRequest}), { __mpxPageRoute: ${JSON.stringify(pagePath)} })`
+      }
+    }
+
+    if (pageCfg.isFirst) {
+      firstPage = pagePath
+    }
+  })
+  return {
+    pagesMap,
+    firstPage,
+    globalTabBar
+  }
+}
+
+function getRequireScript ({ ctorType, script, loaderContext }) {
+  let content = '  /** script content **/\n'
+  const extraOptions = { ctorType, lang: script.lang || 'js' }
+  const { getRequire } = createHelpers(loaderContext)
+  content += `  ${getRequire('script', script, extraOptions)}\n`
+  return content
+}
+
+function buildGlobalParams ({ moduleId, scriptSrcMode, loaderContext, isProduction, jsonConfig, webConfig, isMain, globalTabBar }) {
+  let content = ''
+  if (isMain) {
+    content += `global.getApp = function(){}
+    global.getCurrentPages = function () {
+      if (!(typeof window !== 'undefined')) {
+        console.error('[Mpx runtime error]: Dangerous API! global.getCurrentPages is running in non browser environment, It may cause some problems, please use this method with caution')
+        return
+      }
+      if (!global.__mpxRouter) return []
+      // @ts-ignore
+      return global.__mpxRouter.stack.map(item => {
+        let page
+        const vnode = item.vnode
+        if (vnode && vnode.componentInstance) {
+          page = vnode.tag.endsWith('mpx-tab-bar-container') ? vnode.componentInstance.$refs.tabBarPage : vnode.componentInstance
+        }
+        return page || { route: item.path.slice(1) }
+      })
+    }
+    global.__networkTimeout = ${JSON.stringify(jsonConfig.networkTimeout)}
+    global.__mpxGenericsMap = {}
+    global.__mpxOptionsMap = {}
+    global.__style = ${JSON.stringify(jsonConfig.style || 'v1')}
+    global.__mpxPageConfig = ${JSON.stringify(jsonConfig.window)}
+    global.__mpxTransRpxFn = ${webConfig.transRpxFn}\n`
+    if (globalTabBar) {
+      content += globalTabBar
+    }
+  }
+  content += `  global.currentModuleId = ${JSON.stringify(moduleId)}\n`
+  content += `  global.currentSrcMode = ${JSON.stringify(scriptSrcMode)}\n`
+  content += `  global.currentInject = ${JSON.stringify({ moduleId })}\n`
+  if (!isProduction) {
+    content += `  global.currentResource = ${JSON.stringify(loaderContext.resourcePath)}\n`
+  }
+  return content
+}
+
+function buildI18n ({ i18n, loaderContext }) {
+  let i18nContent = ''
+  const i18nObj = Object.assign({}, i18n)
+  i18nContent += `  import VueI18n from 'vue-i18n'
+          import { createI18n } from 'vue-i18n-bridge'
+          Vue.use(VueI18n , { bridge: true })\n`
+  const requestObj = {}
+  const i18nKeys = ['messages', 'dateTimeFormats', 'numberFormats']
+  i18nKeys.forEach((key) => {
+    if (i18nObj[`${key}Path`]) {
+      requestObj[key] = stringifyRequest(loaderContext, i18nObj[`${key}Path`])
+      delete i18nObj[`${key}Path`]
+    }
+  })
+  i18nContent += `  const i18nCfg = ${JSON.stringify(i18nObj)}\n`
+  Object.keys(requestObj).forEach((key) => {
+    i18nContent += `  i18nCfg.${key} = require(${requestObj[key]})\n`
+  })
+  i18nContent += '  i18nCfg.legacy = false\n'
+  i18nContent += `  const i18n = createI18n(i18nCfg, VueI18n)
+                        Vue.use(i18n)
+                        Mpx.i18n = i18n\n`
+  return i18nContent
+}
+
+module.exports = {
+  buildPagesMap,
+  buildComponentsMap,
+  getRequireScript,
+  buildGlobalParams,
+  shallowStringify,
+  getAsyncChunkName,
+  stringifyRequest,
+  buildI18n
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/webpack-plugin",
-  "version": "2.8.35",
+  "version": "2.9.0-beta.0",
   "description": "mpx compile core",
   "keywords": [
     "mpx"
@@ -82,5 +82,5 @@
   "engines": {
     "node": ">=14.14.0"
   },
-  "gitHead": "ee18a2c1b3f78b7f3033398b83675cac40deb6c6"
+  "gitHead": "67b611aeae99f916d46ca8d5d9ed784ddf53f05c"
 }