@mpxjs/webpack-plugin 2.6.114-alpha.7 → 2.6.114-alpha.8

package/lib/tenon/index.js

@@ -65,7 +65,6 @@ module.exports = function ({
             resolveMode,
             loaderContext,
             pagesMap,
-            pagesEntryMap: mpx.pagesEntryMap,
             pathHash: mpx.pathHash,
             componentsMap,
             projectRoot

package/lib/tenon/processJSON.js

@@ -6,7 +6,7 @@ const parseRequest = require('../utils/parse-request')
 const toPosix = require('../utils/to-posix')
 const addQuery = require('../utils/add-query')
 const parseComponent = require('../parser')
-const readJsonForSrc = require('../utils/read-json-for-src')
+const getJSONContent = require('../utils/get-json-content')
 const isUrlRequest = require('../utils/is-url-request')
 
 module.exports = function (json, options, rawCallback) {
@@ -17,7 +17,6 @@ module.exports = function (json, options, rawCallback) {
   const resolveMode = options.resolveMode
   const pagesMap = options.pagesMap
   const componentsMap = options.componentsMap
-  const pagesEntryMap = options.pagesEntryMap
   const projectRoot = options.projectRoot
   const pathHash = options.pathHash
   const localPagesMap = {}
@@ -134,8 +133,8 @@ module.exports = function (json, options, rawCallback) {
               if (json.content) {
                 content = json.content
               } else if (json.src) {
-                return readJsonForSrc(json.src, loaderContext, (content) => {
-                  callback(null, result, content)
+                return getJSONContent(json || {}, loaderContext, (err, content) => {
+                  callback(err, result, content)
                 })
               }
             }
@@ -230,8 +229,8 @@ module.exports = function (json, options, rawCallback) {
               pageName = toPosix(path.join(tarRoot, /^(.*?)(\.[^.]*)?$/.exec(relative)[1]))
               // 如果当前page与已有page存在命名冲突，也进行重命名
               for (let key in pagesMap) {
-                // 此处引入pagesEntryMap确保相同entry下路由路径重复注册才报错，不同entry下的路由路径重复则无影响
-                if (pagesMap[key] === pageName && key !== resourcePath && pagesEntryMap[key] === loaderContext.resourcePath) {
+                // 此处引入pagesMap确保相同entry下路由路径重复注册才报错，不同entry下的路由路径重复则无影响
+                if (pagesMap[key] === pageName && key !== resourcePath && pagesMap[key] === loaderContext.resourcePath) {
                   const pageNameRaw = pageName
                   pageName = toPosix(path.join(tarRoot, getPageName(resourcePath, ext)))
                   emitWarning(`Current page [${resourcePath}] is registered with a conflict page path [${pageNameRaw}] which is already existed in system, the page path will be replaced with [${pageName}], use ?resolve to get the page path and navigate to it!`)
@@ -244,9 +243,9 @@ module.exports = function (json, options, rawCallback) {
             emitWarning(`Current page [${resourcePath}] which is imported from [${loaderContext.resourcePath}] has been registered in pagesMap already, it will be ignored, please check it and remove the redundant page declaration!`)
             return callback()
           }
-          buildInfo.pagesMap = buildInfo.pagesMap || {}
-          buildInfo.pagesMap[resourcePath] = pagesMap[resourcePath] = pageName
-          pagesEntryMap[resourcePath] = loaderContext.resourcePath
+          // buildInfo.pagesMap = buildInfo.pagesMap || {}
+          // buildInfo.pagesMap[resourcePath] = pagesMap[resourcePath] = pageName
+          // pagesMap[resourcePath] = loaderContext.resourcePath
           localPagesMap[pageName] = {
             resource: addQuery(resource, { page: true }),
             async: tarRoot || queryObj.async,

package/lib/tenon/processScript.js

@@ -2,11 +2,10 @@ const genComponentTag = require('../utils/gen-component-tag')
 const loaderUtils = require('loader-utils')
 const addQuery = require('../utils/add-query')
 const normalize = require('../utils/normalize')
-// const SingleEntryPlugin = require('webpack/lib/SingleEntryPlugin')
-// const AddEntryDependency = require('../dependency/AddEntryDependency')
 const builtInLoaderPath = normalize.lib('built-in-loader')
 const optionProcessorPath = normalize.lib('runtime/optionProcessor')
 const createJSONHelper = require('../json-compiler/helper')
+const async = require('async')
 
 function shallowStringify (obj) {
   let arr = []
@@ -22,11 +21,6 @@ function shallowStringify (obj) {
   return `{${arr.join(',')}}`
 }
 
-// let entryDeps = new Set()
-
-// let callbacked = false
-// let cacheCallback
-
 module.exports = function (script, options, callback) {
   const ctorType = options.ctorType
   const builtInComponentsMap = options.builtInComponentsMap
@@ -85,7 +79,8 @@ module.exports = function (script, options, callback) {
   }
 
   const {
-    processJsExport
+    processPage,
+    processDynamicEntry
   } = createJSONHelper({
     loaderContext,
     emitWarning,
@@ -170,27 +165,6 @@ module.exports = function (script, options, callback) {
       let firstPage = ''
       const pagesMap = {}
       const componentsMap = {}
-      Object.keys(localPagesMap).forEach((pagePath) => {
-        const pageCfg = localPagesMap[pagePath]
-        // const pageRequest = stringifyRequest(pageCfg.resource)
-        processJsExport(addQuery(pageCfg.resource, { tenon: true }), loaderContext.context, '', () => {})
-        // addEntryDep(loaderContext, addQuery(pageCfg.resource, { tenon: true }), pagePath)
-        // addEntrySafely(loaderContext, addQuery(pageCfg.resource, { tenon: true }), pagePath)
-        // loaderContext.resolve(loaderContext._compiler.context, addQuery(pageCfg.resource, { tenon: true }), (err, resource) => {
-        //   if(err) return callback(err)
-
-        // })
-        // if (pageCfg.async) {
-        //   pagesMap[pagePath] = `()=>import(${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]
@@ -261,12 +235,26 @@ module.exports = function (script, options, callback) {
       // i18n`
       //     }
       //   }
-      content += `\n  )\n`
+      content += `\n  )\n__dynamic_page_slot__\n`
       return content
     }
   })
   output += '\n'
-  callback(null, {
-    output
+  // 处理pages
+  const pageSet = new Set()
+  let dynamicPageStr = ''
+  async.each(localPagesMap, (pageCfg, callback) => {
+    processPage(addQuery(pageCfg.resource, { tenon: true }), loaderContext.context, '', (err, entry, { key }) => {
+      if (err) return callback()
+      if (pageSet.has(key)) return callback()
+      pageSet.add(key)
+      dynamicPageStr += `\n"${entry}"`
+      callback()
+    })
+  }, () => {
+    output = output.replace('__dynamic_page_slot__', processDynamicEntry(dynamicPageStr) || '')
+    callback(null, {
+      output
+    })
   })
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/webpack-plugin",
-  "version": "2.6.114-alpha.7",
+  "version": "2.6.114-alpha.8",
   "description": "mpx compile core",
   "keywords": [
     "mpx"
@@ -83,5 +83,5 @@
   "engines": {
     "node": ">=14.14.0"
   },
-  "gitHead": "7845b794ae3b68530449aedac841b5910ef7a546"
+  "gitHead": "f6a3d039dbe797630651f9d945b8755a5f05e528"
 }