@mpxjs/webpack-plugin 2.7.0-beta.10 → 2.7.0-beta.14

package/lib/dependencies/AppEntryDependency.js

@@ -16,6 +16,8 @@ class AppEntryDependency extends NullDependency {
     const mpx = compilation.__mpx__
     const moduleGraph = compilation.moduleGraph
 
+    mpx.getEntryNode(module, 'app')
+
     if (mpx.appInfo.name) {
       const issuer = moduleGraph.getIssuer(module)
       const err = new Error(issuer

package/lib/dependencies/CommonJsVariableDependency.js

@@ -1,5 +1,6 @@
 const ModuleDependency = require('webpack/lib/dependencies/ModuleDependency')
 const makeSerializable = require('webpack/lib/util/makeSerializable')
+const InitFragment = require('webpack/lib//InitFragment')
 
 class CommonJsVariableDependency extends ModuleDependency {
   constructor (request, name) {
@@ -44,7 +45,8 @@ CommonJsVariableDependency.Template = class CommonJsVariableDependencyTemplate e
       runtimeTemplate,
       moduleGraph,
       chunkGraph,
-      runtimeRequirements
+      runtimeRequirements,
+      initFragments
     }
   ) {
     if (!dep.name) return
@@ -57,7 +59,14 @@ CommonJsVariableDependency.Template = class CommonJsVariableDependencyTemplate e
       runtimeRequirements
     })
 
-    source.insert(0, `/* mpx cjs variable */ var ${dep.name} = ${requireExpr};\n`)
+    initFragments.push(
+      new InitFragment(
+        `/* mpx cjs variable */ var ${dep.name} = ${requireExpr};\n`,
+        InitFragment.STAGE_CONSTANTS,
+        1,
+        `mpx cjs variable ${dep.name}`
+      )
+    )
   }
 }
 

package/lib/dependencies/DynamicEntryDependency.js

@@ -27,7 +27,7 @@ class DynamicEntryDependency extends NullDependency {
   addEntry (compilation, callback) {
     const mpx = compilation.__mpx__
     const publicPath = compilation.outputOptions.publicPath || ''
-    let { resource, entryType, outputPath, relativePath } = this
+    let { resource, entryType, outputPath, relativePath, originEntryNode } = this
 
     const { packageRoot, outputPath: filename, alreadyOutputed } = mpx.getPackageInfo({
       resource,
@@ -59,7 +59,7 @@ class DynamicEntryDependency extends NullDependency {
       if (entryType === 'export') {
         mpx.exportModules.add(entryModule)
       }
-      // todo entry的父子关系可以在这里建立
+      originEntryNode.addChild(mpx.getEntryNode(entryModule, entryType))
       return callback(null, {
         resultPath,
         entryModule
@@ -70,6 +70,7 @@ class DynamicEntryDependency extends NullDependency {
   mpxAction (module, compilation, callback) {
     const mpx = compilation.__mpx__
     const { packageRoot } = this
+    this.originEntryNode = mpx.getEntryNode(module)
     // 分包构建在需要在主包构建完成后在finishMake中处理，返回的资源路径先用key来占位，在合成extractedAssets时再进行最终替换
     if (packageRoot && mpx.currentPackageRoot !== packageRoot) {
       mpx.subpackagesEntriesMap[packageRoot] = mpx.subpackagesEntriesMap[packageRoot] || []

package/lib/dependencies/FlagPluginDependency.js

@@ -9,6 +9,7 @@ class FlagPluginDependency extends NullDependency {
   mpxAction (module, compilation, callback) {
     const mpx = compilation.__mpx__
     mpx.isPluginMode = true
+    mpx.getEntryNode(module, 'plugin')
     return callback()
   }
 }

package/lib/dependencies/RecordIndependentDependency.js

@@ -0,0 +1,41 @@
+const NullDependency = require('webpack/lib/dependencies/NullDependency')
+const makeSerializable = require('webpack/lib/util/makeSerializable')
+
+class RecordIndependentDependency extends NullDependency {
+  constructor (root) {
+    super()
+    this.root = root
+  }
+
+  get type () {
+    return 'mpx record independent'
+  }
+
+  mpxAction (module, compilation, callback) {
+    const mpx = compilation.__mpx__
+    const { root } = this
+    mpx.independentSubpackagesMap[root] = true
+    return callback()
+  }
+
+  serialize (context) {
+    const { write } = context
+    write(this.root)
+    super.serialize(context)
+  }
+
+  deserialize (context) {
+    const { read } = context
+    this.root = read()
+    super.deserialize(context)
+  }
+}
+
+RecordIndependentDependency.Template = class RecordIndependentDependencyTemplate {
+  apply () {
+  }
+}
+
+makeSerializable(RecordIndependentDependency, '@mpxjs/webpack-plugin/lib/dependencies/RecordIndependentDependency')
+
+module.exports = RecordIndependentDependency

package/lib/extractor.js

@@ -51,6 +51,10 @@ module.exports.pitch = async function (remainingRequest) {
     }).join('\n')
   }
 
+  let resultSource = DEFAULT_RESULT_SOURCE
+
+  if (typeof content !== 'string') return resultSource
+
   const extractedInfo = {
     content,
     index
@@ -61,8 +65,6 @@ module.exports.pitch = async function (remainingRequest) {
     extractedInfo
   })
 
-  let resultSource = DEFAULT_RESULT_SOURCE
-
   const { buildInfo } = this._module
 
   // 如果importModule子模块中包含动态特性，比如动态添加入口和静态资源输出路径，则当前extractor模块不可缓存

package/lib/index.js

@@ -26,6 +26,7 @@ const PackageEntryPlugin = require('./resolver/PackageEntryPlugin')
 const AppEntryDependency = require('./dependencies/AppEntryDependency')
 const RecordResourceMapDependency = require('./dependencies/RecordResourceMapDependency')
 const RecordGlobalComponentsDependency = require('./dependencies/RecordGlobalComponentsDependency')
+const RecordIndependentDependency = require('./dependencies/RecordIndependentDependency')
 const DynamicEntryDependency = require('./dependencies/DynamicEntryDependency')
 const FlagPluginDependency = require('./dependencies/FlagPluginDependency')
 const RemoveEntryDependency = require('./dependencies/RemoveEntryDependency')
@@ -77,35 +78,6 @@ const isChunkInPackage = (chunkName, packageName) => {
   return (new RegExp(`^${packageName}\\/`)).test(chunkName)
 }
 
-const getPackageCacheGroup = packageName => {
-  if (packageName === 'main') {
-    return {
-      // 对于独立分包模块不应用该cacheGroup
-      test: (module) => {
-        const { queryObj } = parseRequest(module.resource)
-        return !queryObj.isIndependent
-      },
-      name: 'bundle',
-      minChunks: 2,
-      chunks: 'all'
-    }
-  } else {
-    return {
-      test: (module, { chunkGraph }) => {
-        const chunks = chunkGraph.getModuleChunksIterable(module)
-        return chunks.size && every(chunks, (chunk) => {
-          return isChunkInPackage(chunk.name, packageName)
-        })
-      },
-      name: `${packageName}/bundle`,
-      minChunks: 2,
-      minSize: 1000,
-      priority: 100,
-      chunks: 'all'
-    }
-  }
-}
-
 const externalsMap = {
   weui: /^weui-miniprogram/
 }
@@ -113,20 +85,19 @@ const externalsMap = {
 const warnings = []
 const errors = []
 
-// class EntryNode {
-//   constructor (options) {
-//     this.request = options.request
-//     this.type = options.type
-//     this.module = null
-//     this.parents = new Set()
-//     this.children = new Set()
-//   }
-//
-//   addChild (node) {
-//     this.children.add(node)
-//     node.parents.add(this)
-//   }
-// }
+class EntryNode {
+  constructor (module, type) {
+    this.module = module
+    this.type = type
+    this.parents = new Set()
+    this.children = new Set()
+  }
+
+  addChild (node) {
+    this.children.add(node)
+    node.parents.add(this)
+  }
+}
 
 class MpxWebpackPlugin {
   constructor (options = {}) {
@@ -365,6 +336,42 @@ class MpxWebpackPlugin {
 
     let mpx
 
+    const getPackageCacheGroup = packageName => {
+      if (packageName === 'main') {
+        return {
+          // 对于独立分包模块不应用该cacheGroup
+          test: (module) => {
+            let isIndependent = false
+            if (module.resource) {
+              const { queryObj } = parseRequest(module.resource)
+              isIndependent = queryObj.isIndependent
+            } else {
+              const identifier = module.identifier()
+              isIndependent = /\|isIndependent\|/.test(identifier)
+            }
+            return !isIndependent
+          },
+          name: 'bundle',
+          minChunks: 2,
+          chunks: 'all'
+        }
+      } else {
+        return {
+          test: (module, { chunkGraph }) => {
+            const chunks = chunkGraph.getModuleChunksIterable(module)
+            return chunks.size && every(chunks, (chunk) => {
+              return isChunkInPackage(chunk.name, packageName)
+            })
+          },
+          name: `${packageName}/bundle`,
+          minChunks: 2,
+          minSize: 1000,
+          priority: 100,
+          chunks: 'all'
+        }
+      }
+    }
+
     const processSubpackagesEntriesMap = (compilation, callback) => {
       const mpx = compilation.__mpx__
       if (mpx && !isEmptyObject(mpx.subpackagesEntriesMap)) {
@@ -439,6 +446,9 @@ class MpxWebpackPlugin {
       compilation.dependencyFactories.set(RecordGlobalComponentsDependency, new NullFactory())
       compilation.dependencyTemplates.set(RecordGlobalComponentsDependency, new RecordGlobalComponentsDependency.Template())
 
+      compilation.dependencyFactories.set(RecordIndependentDependency, new NullFactory())
+      compilation.dependencyTemplates.set(RecordIndependentDependency, new RecordIndependentDependency.Template())
+
       compilation.dependencyFactories.set(CommonJsVariableDependency, normalModuleFactory)
       compilation.dependencyTemplates.set(CommonJsVariableDependency, new CommonJsVariableDependency.Template())
     })
@@ -473,10 +483,8 @@ class MpxWebpackPlugin {
           subpackagesEntriesMap: {},
           replacePathMap: {},
           exportModules: new Set(),
-          // 记录entry依赖关系，用于体积分析
-          entryNodesMap: {},
           // 记录entryModule与entryNode的对应关系，用于体积分析
-          entryModulesMap: new Map(),
+          entryNodeModulesMap: new Map(),
           extractedMap: {},
           usingComponents: {},
           // todo es6 map读写性能高于object，之后会逐步替换
@@ -520,6 +528,15 @@ class MpxWebpackPlugin {
             compilation.addEntry(compiler.context, dep, { name }, callback)
             return dep
           },
+          getEntryNode: (module, type) => {
+            const entryNodeModulesMap = mpx.entryNodeModulesMap
+            let entryNode = entryNodeModulesMap.get(module)
+            if (!entryNode) {
+              entryNode = new EntryNode(module, type)
+              entryNodeModulesMap.set(module, entryNode)
+            }
+            return entryNode
+          },
           getOutputPath: (resourcePath, type, { ext = '', conflictPath = '' } = {}) => {
             const name = path.parse(resourcePath).name
             const hash = mpx.pathHash(resourcePath)
@@ -672,10 +689,12 @@ class MpxWebpackPlugin {
       const rawAddModule = compilation.addModule
       compilation.addModule = (module, callback) => {
         const issuerResource = module.issuerResource
-        // 避免context module报错
-        if (module.request && module.resource) {
+        const currentPackageRoot = mpx.currentPackageRoot
+        const isIndependent = mpx.independentSubpackagesMap[currentPackageRoot]
+
+        if (module.resource) {
+          // NormalModule
           const isStatic = isStaticModule(module)
-          const isIndependent = mpx.independentSubpackagesMap[mpx.currentPackageRoot]
 
           let needPackageQuery = isStatic || isIndependent
 
@@ -696,15 +715,24 @@ class MpxWebpackPlugin {
                 compilation.errors.push(e)
               }
             })
-            const queryObj = {}
-            if (packageRoot) queryObj.packageRoot = packageRoot
-            // todo 后续可以考虑用module.layer来隔离独立分包的模块
-            if (isIndependent) queryObj.isIndependent = true
-            module.request = addQuery(module.request, queryObj)
-            module.resource = addQuery(module.resource, queryObj)
+            if (packageRoot) {
+              const queryObj = {
+                packageRoot
+              }
+              if (isIndependent) queryObj.isIndependent = true
+              module.request = addQuery(module.request, queryObj)
+              module.resource = addQuery(module.resource, queryObj)
+            }
+          }
+        } else if (isIndependent) {
+          // ContextModule和RawModule只在独立分包的情况下添加分包标记，其余默认不添加
+          const postfix = `|isIndependent|${currentPackageRoot}`
+          if (module._identifier) {
+            module._identifier += postfix
+          } else if (module.identifierStr) {
+            module.identifierStr += postfix
           }
         }
-
         return rawAddModule.call(compilation, module, callback)
       }
 

package/lib/json-compiler/index.js

@@ -12,6 +12,7 @@ const getJSONContent = require('../utils/get-json-content')
 const createHelpers = require('../helpers')
 const createJSONHelper = require('./helper')
 const RecordGlobalComponentsDependency = require('../dependencies/RecordGlobalComponentsDependency')
+const RecordIndependentDependency = require('../dependencies/RecordIndependentDependency')
 const { MPX_DISABLE_EXTRACTOR_CACHE, RESOLVE_IGNORED_ERR, JSON_JS_EXT } = require('../utils/const')
 const resolve = require('../utils/resolve')
 
@@ -360,7 +361,7 @@ module.exports = function (content) {
         const otherConfig = getOtherConfig(subPackage)
         // 支付宝不支持独立分包，无需处理
         if (otherConfig.independent && mode !== 'ali') {
-          mpx.independentSubpackagesMap[tarRoot] = true
+          this._module.addPresentationalDependency(new RecordIndependentDependency(tarRoot))
         }
 
         subPackagesCfg[tarRoot] = {

package/lib/loader.js

@@ -15,6 +15,8 @@ const getJSONContent = require('./utils/get-json-content')
 const normalize = require('./utils/normalize')
 const getEntryName = require('./utils/get-entry-name')
 const AppEntryDependency = require('./dependencies/AppEntryDependency')
+const RecordResourceMapDependency = require('./dependencies/RecordResourceMapDependency')
+const CommonJsVariableDependency = require('./dependencies/CommonJsVariableDependency')
 const { MPX_APP_MODULE_ID } = require('./utils/const')
 
 module.exports = function (content) {
@@ -25,7 +27,9 @@ module.exports = function (content) {
     return content
   }
   const { resourcePath, queryObj } = parseRequest(this.resource)
-  const packageName = queryObj.packageRoot || mpx.currentPackageRoot || 'main'
+  const packageRoot = queryObj.packageRoot || mpx.currentPackageRoot
+  const packageName = packageRoot || 'main'
+  const isIndependent = queryObj.isIndependent
   const pagesMap = mpx.pagesMap
   const componentsMap = mpx.componentsMap[packageName]
   const mode = mpx.mode
@@ -37,16 +41,6 @@ module.exports = function (content) {
   const vueContentCache = mpx.vueContentCache
   const autoScope = matchCondition(resourcePath, mpx.autoScopeRules)
 
-  // 支持资源query传入isPage或isComponent支持页面/组件单独编译
-  if ((queryObj.isComponent && !componentsMap[resourcePath]) || (queryObj.isPage && !pagesMap[resourcePath])) {
-    const entryName = getEntryName(this)
-    if (queryObj.isComponent) {
-      componentsMap[resourcePath] = entryName || 'noEntryComponent'
-    } else {
-      pagesMap[resourcePath] = entryName || 'noEntryPage'
-    }
-  }
-
   let ctorType = 'app'
   if (pagesMap[resourcePath]) {
     // page
@@ -56,6 +50,13 @@ module.exports = function (content) {
     ctorType = 'component'
   }
 
+  // 支持资源query传入isPage或isComponent支持页面/组件单独编译
+  if (queryObj.isComponent || queryObj.isPage) {
+    const entryName = getEntryName(this) || (queryObj.isComponent ? 'noEntryComponent' : 'noEntryPage')
+    ctorType = queryObj.isComponent ? 'component' : 'page'
+    this._module.addPresentationalDependency(new RecordResourceMapDependency(resourcePath, ctorType, entryName, packageRoot))
+  }
+
   const loaderContext = this
   const stringifyRequest = r => loaderUtils.stringifyRequest(loaderContext, r)
   const isProduction = this.minimize || process.env.NODE_ENV === 'production'
@@ -217,15 +218,21 @@ module.exports = function (content) {
       if (!isProduction) {
         output += `global.currentResource = ${JSON.stringify(filePath)}\n`
       }
-      // 为app或独立分包页面注入i18n
-      if (i18n && (ctorType === 'app' || (ctorType === 'page' && queryObj.isIndependent))) {
+      // todo 对于独立分包支持将app.mpx中的script block作为独立分包入口逻辑注入到所有页面和组件中，将独立分包i18n的注入也迁移到入口逻辑中
+      // 为app或独立分包入口注入i18n
+      if (i18n && (ctorType === 'app' || isIndependent)) {
         const i18nWxsPath = normalize.lib('runtime/i18n.wxs')
         const i18nWxsLoaderPath = normalize.lib('wxs/i18n-loader.js')
         const i18nWxsRequest = i18nWxsLoaderPath + '!' + i18nWxsPath
+        const i18nMethodsVar = 'i18nMethods'
+        this._module.addDependency(new CommonJsVariableDependency(i18nWxsRequest, i18nMethodsVar))
 
         output += `if (!global.i18n) {
-  global.i18n = ${JSON.stringify({ locale: i18n.locale, version: 0 })}
-  global.i18nMethods = require(${loaderUtils.stringifyRequest(loaderContext, i18nWxsRequest)})
+  global.i18n = ${JSON.stringify({
+    locale: i18n.locale,
+    version: 0
+  })}
+  global.i18nMethods = ${i18nMethodsVar}
 }\n`
       }
       // 注入构造函数
@@ -297,29 +304,17 @@ module.exports = function (content) {
       // script
       output += '/* script */\n'
       let scriptSrcMode = srcMode
-      const script = parts.script
+      // 给予script默认值, 确保生成js request以自动补全js
+      const script = parts.script || {}
       if (script) {
         scriptSrcMode = script.mode || scriptSrcMode
         if (scriptSrcMode) output += `global.currentSrcMode = ${JSON.stringify(scriptSrcMode)}\n`
-        const extraOptions = {}
+        // 传递ctorType以补全js内容
+        const extraOptions = {
+          ctorType
+        }
         if (script.src) extraOptions.resourcePath = resourcePath
         output += getRequire('script', script, extraOptions) + '\n'
-      } else {
-        // todo 依然创建request在selector中进行补全或者将i18n通过CommonJsVariableDependency改造为initFragments的方式进行注入，否则在app.mpx中没有script区块的情况下无法保证i18n注入代码在@mpxjs/core之前执行
-        switch (ctorType) {
-          case 'app':
-            output += 'import {createApp} from "@mpxjs/core"\n' +
-              'createApp({})\n'
-            break
-          case 'page':
-            output += 'import {createPage} from "@mpxjs/core"\n' +
-              'createPage({})\n'
-            break
-          case 'component':
-            output += 'import {createComponent} from "@mpxjs/core"\n' +
-              'createComponent({})\n'
-        }
-        output += '\n'
       }
       callback(null, output)
     }

package/lib/selector.js

@@ -9,6 +9,7 @@ module.exports = function (content) {
     return content
   }
   const { queryObj } = parseRequest(this.resource)
+  const ctorType = queryObj.ctorType
   const type = queryObj.type
   const index = queryObj.index || 0
   const mode = mpx.mode
@@ -24,6 +25,26 @@ module.exports = function (content) {
   if (Array.isArray(part)) {
     part = part[index]
   }
+  if (!part) {
+    let content = ''
+    // 补全js内容
+    if (type === 'script') {
+      switch (ctorType) {
+        case 'app':
+          content += 'import {createApp} from "@mpxjs/core"\n' +
+            'createApp({})\n'
+          break
+        case 'page':
+          content += 'import {createPage} from "@mpxjs/core"\n' +
+            'createPage({})\n'
+          break
+        case 'component':
+          content += 'import {createComponent} from "@mpxjs/core"\n' +
+            'createComponent({})\n'
+      }
+    }
+    part = { content }
+  }
   part = part || { content: '' }
   this.callback(null, part.content, part.map)
 }

package/lib/style-compiler/index.js

@@ -38,15 +38,14 @@ module.exports = function (css, map) {
       },
       config.options
     )
-    // ali环境处理host选择器
+    // ali平台下处理scoped和host选择器
     if (mode === 'ali') {
+      if (queryObj.scoped) {
+        plugins.push(scopeId({ id }))
+      }
       plugins.push(transSpecial({ id }))
     }
 
-    if (queryObj.scoped) {
-      plugins.push(scopeId({ id }))
-    }
-
     plugins.push(pluginCondStrip({
       defs
     }))

package/lib/template-compiler/compiler.js

@@ -2039,7 +2039,10 @@ function processElement (el, root, options, meta) {
 
   const pass = isNative || processTemplate(el) || processingTemplate
 
-  processScoped(el, options)
+  // 仅ali平台需要scoped模拟样式隔离
+  if (mode === 'ali') {
+    processScoped(el, options)
+  }
 
   if (transAli) {
     processAliExternalClassesHack(el, options)

package/lib/web/processScript.js

@@ -113,12 +113,6 @@ module.exports = function (script, {
   import Vue from 'vue'
   import VueRouter from 'vue-router'
   Vue.use(VueRouter)
-  import BScroll from '@better-scroll/core'
-  import PullDown from '@better-scroll/pull-down'
-  import ObserveDOM from '@better-scroll/observe-dom'
-  BScroll.use(ObserveDOM)
-  BScroll.use(PullDown)
-  global.BScroll = BScroll
   global.getApp = function(){}
   global.getCurrentPages = function(){
     if(!global.__mpxRouter) return []

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/webpack-plugin",
-  "version": "2.7.0-beta.10",
+  "version": "2.7.0-beta.14",
   "description": "mpx compile core",
   "keywords": [
     "mpx"
@@ -77,5 +77,5 @@
     "@types/babel-traverse": "^6.25.4",
     "@types/babel-types": "^7.0.4"
   },
-  "gitHead": "fc256c06948aa20fca8acfdf29ec57ea453647d7"
+  "gitHead": "5f071c52c82077115a40350caa45669bc3b82221"
 }