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

package/lib/dependencies/CommonJsVariableDependency.js

@@ -41,13 +41,10 @@ CommonJsVariableDependency.Template = class CommonJsVariableDependencyTemplate e
     dep,
     source,
     {
-      module,
       runtimeTemplate,
       moduleGraph,
       chunkGraph,
-      runtimeRequirements,
-      runtime,
-      initFragments
+      runtimeRequirements
     }
   ) {
     if (!dep.name) return
@@ -60,9 +57,7 @@ CommonJsVariableDependency.Template = class CommonJsVariableDependencyTemplate e
       runtimeRequirements
     })
 
-    requireExpr = `/* mpx cjs variable */ var ${dep.name} = ` + requireExpr
-
-    source.insert(0, requireExpr)
+    source.insert(0, `/* mpx cjs variable */ var ${dep.name} = ${requireExpr};\n`)
   }
 }
 

package/lib/dependencies/DynamicEntryDependency.js

@@ -20,7 +20,8 @@ class DynamicEntryDependency extends NullDependency {
   }
 
   get key () {
-    return `${this.resource}_${this.entryType}_${this.outputPath}_${this.packageRoot}_${this.relativePath}_${this.range[0]}_${this.range[1]}`
+    const { resource, entryType, outputPath, packageRoot, relativePath, range } = this
+    return toPosix([resource, entryType, outputPath, packageRoot, relativePath, ...range].join('|'))
   }
 
   addEntry (compilation, callback) {
@@ -45,6 +46,9 @@ class DynamicEntryDependency extends NullDependency {
       resultPath = toPosix(path.relative(relativePath, resultPath))
     }
 
+    // export类型的resultPath需要添加.js后缀
+    if (entryType === 'export') resultPath += '.js'
+
     if (alreadyOutputed) return callback(null, { resultPath })
 
     if (packageRoot) {

package/lib/dependencies/{RecordStaticResourceDependency.js → RecordResourceMapDependency.js}

@@ -1,28 +1,32 @@
 const NullDependency = require('webpack/lib/dependencies/NullDependency')
 const makeSerializable = require('webpack/lib/util/makeSerializable')
 
-class RecordStaticResourceDependency extends NullDependency {
-  constructor (resourcePath, outputPath, packageRoot = '') {
+class RecordResourceMapDependency extends NullDependency {
+  constructor (resourcePath, resourceType, outputPath, packageRoot = '') {
     super()
     this.resourcePath = resourcePath
+    this.resourceType = resourceType
     this.outputPath = outputPath
     this.packageRoot = packageRoot
   }
 
   get type () {
-    return 'mpx record static resource'
+    return 'mpx record resource map'
   }
 
   mpxAction (module, compilation, callback) {
     const mpx = compilation.__mpx__
     const packageName = this.packageRoot || 'main'
-    mpx.staticResourcesMap[packageName][this.resourcePath] = this.outputPath
+    const resourceMap = mpx[`${this.resourceType}sMap`] || mpx.otherResourcesMap
+    const subResourceMap = resourceMap.main ? resourceMap[packageName] : resourceMap
+    subResourceMap[this.resourcePath] = this.outputPath
     return callback()
   }
 
   serialize (context) {
     const { write } = context
     write(this.resourcePath)
+    write(this.resourceType)
     write(this.outputPath)
     write(this.packageRoot)
     super.serialize(context)
@@ -31,17 +35,18 @@ class RecordStaticResourceDependency extends NullDependency {
   deserialize (context) {
     const { read } = context
     this.resourcePath = read()
+    this.resourceType = read()
     this.outputPath = read()
     this.packageRoot = read()
     super.deserialize(context)
   }
 }
 
-RecordStaticResourceDependency.Template = class RecordStaticResourceDependencyTemplate {
+RecordResourceMapDependency.Template = class RecordResourceMapDependencyTemplate {
   apply () {
   }
 }
 
-makeSerializable(RecordStaticResourceDependency, '@mpxjs/webpack-plugin/lib/dependencies/RecordStaticResourceDependency')
+makeSerializable(RecordResourceMapDependency, '@mpxjs/webpack-plugin/lib/dependencies/RecordResourceMapDependency')
 
-module.exports = RecordStaticResourceDependency
+module.exports = RecordResourceMapDependency

package/lib/dependencies/RemoveEntryDependency.js

@@ -0,0 +1,40 @@
+const NullDependency = require('webpack/lib/dependencies/NullDependency')
+const makeSerializable = require('webpack/lib/util/makeSerializable')
+
+class RemoveEntryDependency extends NullDependency {
+  constructor (entryName) {
+    super()
+    this.entryName = entryName
+  }
+
+  get type () {
+    return 'mpx remove entry'
+  }
+
+  serialize (context) {
+    const { write } = context
+    write(this.entryName)
+    super.serialize(context)
+  }
+
+  deserialize (context) {
+    const { read } = context
+    this.entryName = read()
+    super.deserialize(context)
+  }
+
+  mpxAction (module, compilation, callback) {
+    const { entryName } = this
+    compilation.entries.delete(entryName)
+    return callback()
+  }
+}
+
+RemoveEntryDependency.Template = class RemoveEntryDependencyTemplate {
+  apply () {
+  }
+}
+
+makeSerializable(RemoveEntryDependency, '@mpxjs/webpack-plugin/lib/dependencies/RemoveEntryDependency')
+
+module.exports = RemoveEntryDependency

package/lib/dependencies/ResolveDependency.js

@@ -37,8 +37,13 @@ class ResolveDependency extends NullDependency {
 
   // resolved可能会动态变更，需用此更新hash
   updateHash (hash, context) {
-    const resolved = this.getResolved()
-    if (resolved) hash.update(resolved)
+    this.resolved = this.getResolved()
+    const { resource, issuerResource, compilation } = this
+    if (this.resolved) {
+      hash.update(this.resolved)
+    } else {
+      compilation.errors.push(new Error(`Path ${resource} is not a page/component/static resource, which is resolved from ${issuerResource}!`))
+    }
     super.updateHash(hash, context)
   }
 
@@ -68,12 +73,8 @@ ResolveDependency.Template = class ResolveDependencyTemplate {
   }
 
   getContent (dep) {
-    const { resource, issuerResource, compilation } = dep
+    const { resolved = '', compilation } = dep
     const publicPath = compilation.outputOptions.publicPath || ''
-    const resolved = dep.getResolved()
-    if (!resolved) {
-      compilation.errors.push(new Error(`Path ${resource} is not a page/component/static resource, which is resolved from ${issuerResource}!`))
-    }
     return JSON.stringify(publicPath + resolved)
   }
 }

package/lib/extractor.js

@@ -3,8 +3,8 @@ const loaderUtils = require('loader-utils')
 const parseRequest = require('./utils/parse-request')
 const toPosix = require('./utils/to-posix')
 const fixRelative = require('./utils/fix-relative')
-const normalize = require('./utils/normalize')
 const addQuery = require('./utils/add-query')
+const normalize = require('./utils/normalize')
 const { MPX_DISABLE_EXTRACTOR_CACHE, DEFAULT_RESULT_SOURCE } = require('./utils/const')
 
 module.exports = content => content
@@ -37,7 +37,7 @@ module.exports.pitch = async function (remainingRequest) {
   })
 
   let request = remainingRequest
-  // static的情况下需要添加recordLoader记录相关静态资源的输出路径
+  // static的情况下需要用record-loader记录相关静态资源的输出路径，不能直接在这里记录，需要确保在子依赖开始构建前完成记录，因为子依赖构建时可能就需要访问当前资源的输出路径
   if (isStatic) {
     const recordLoader = normalize.lib('record-loader')
     request = `${recordLoader}!${remainingRequest}`
@@ -87,6 +87,7 @@ module.exports.pitch = async function (remainingRequest) {
             resultSource += `module.exports = ${JSON.stringify(relativePath)};\n`
           } else {
             this.emitFile(issuerFile, '', undefined, {
+              skipEmit: true,
               extractedInfo: {
                 content: `@import "${relativePath}";\n`,
                 index: -1

package/lib/file-loader.js

@@ -2,7 +2,7 @@ const path = require('path')
 const loaderUtils = require('loader-utils')
 const toPosix = require('./utils/to-posix')
 const parseRequest = require('./utils/parse-request')
-const RecordStaticResourceDependency = require('./dependencies/RecordStaticResourceDependency')
+const RecordResourceMapDependency = require('./dependencies/RecordResourceMapDependency')
 
 module.exports = function loader (content, prevOptions) {
   const options = prevOptions || loaderUtils.getOptions(this) || {}
@@ -28,7 +28,7 @@ module.exports = function loader (content, prevOptions) {
     const { resourcePath, queryObj } = parseRequest(this.resource)
     const packageRoot = queryObj.packageRoot || ''
     url = outputPath = toPosix(path.join(packageRoot, outputPath))
-    this._module.addPresentationalDependency(new RecordStaticResourceDependency(resourcePath, outputPath, packageRoot))
+    this._module.addPresentationalDependency(new RecordResourceMapDependency(resourcePath, 'staticResource', outputPath, packageRoot))
   }
 
   let publicPath = `__webpack_public_path__ + ${JSON.stringify(url)}`

package/lib/helpers.js

@@ -60,6 +60,7 @@ module.exports = function createHelpers (loaderContext) {
     switch (type) {
       case 'json':
         options.asScript = true
+        if (part.useJSONJS) options.useJSONJS = true
       // eslint-disable-next-line no-fallthrough
       case 'styles':
       case 'template':