@mpxjs/webpack-plugin 2.6.115 → 2.7.0-alpha

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/webpack-plugin",
-  "version": "2.6.115",
+  "version": "2.7.0-alpha",
   "description": "mpx compile core",
   "keywords": [
     "mpx"
@@ -27,12 +27,15 @@
     "@better-scroll/slide": "^2.2.1",
     "@better-scroll/wheel": "^2.2.1",
     "@better-scroll/zoom": "^2.2.1",
+    "@hummer/tenon-dev-server-webpack-plugin": "0.0.2",
+    "@hummer/tenon-loader": "^1.1.0",
+    "@hummer/tenon-style-loader": "^0.2.0",
     "acorn-walk": "^7.2.0",
     "async": "^2.6.0",
     "consolidate": "^0.15.1",
     "css": "^2.2.1",
     "css-selector-tokenizer": "^0.7.0",
-    "cssnano": "^3.10.0",
+    "cssnano": "^5.0.16",
     "de-indent": "^1.0.2",
     "fastparse": "^1.1.1",
     "hash-sum": "^1.0.2",
@@ -40,28 +43,24 @@
     "html-minifier": "^3.5.8",
     "icss-utils": "^2.1.0",
     "json5": "^2.1.3",
-    "loader-utils": "1.1.0",
+    "loader-utils": "^2.0.2",
     "lodash": "^4.17.15",
     "lodash.camelcase": "^4.3.0",
     "lru-cache": "^4.1.2",
     "mime": "^2.2.2",
     "object-assign": "^4.1.1",
-    "postcss": "^6.0.19",
-    "postcss-load-config": "^1.2.0",
-    "postcss-modules-extract-imports": "^1.2.0",
-    "postcss-modules-local-by-default": "^1.2.0",
-    "postcss-modules-scope": "^1.1.0",
-    "postcss-modules-values": "^1.3.0",
-    "postcss-selector-parser": "^2.0.0",
-    "postcss-value-parser": "^3.3.0",
-    "resolve": "^1.5.0",
-    "source-list-map": "^2.0.0",
-    "webpack-sources": "^1.1.0"
+    "postcss": "^8.4.5",
+    "postcss-load-config": "^3.1.1",
+    "postcss-modules-extract-imports": "^3.0.0",
+    "postcss-modules-local-by-default": "^4.0.0",
+    "postcss-modules-scope": "^3.0.0",
+    "postcss-modules-values": "^4.0.0",
+    "postcss-selector-parser": "^6.0.8",
+    "postcss-value-parser": "^4.0.2",
+    "source-list-map": "^2.0.0"
   },
   "peerDependencies": {
-    "css-loader": "^0.28.10",
-    "webpack": "^4.0.0",
-    "webpack-cli": "^3.0.0"
+    "webpack": "^5.48.0"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
@@ -80,5 +79,9 @@
   "devDependencies": {
     "@types/babel-traverse": "^6.25.4",
     "@types/babel-types": "^7.0.4"
-  }
+  },
+  "engines": {
+    "node": ">=14.14.0"
+  },
+  "gitHead": "00ed5b8ad381d9b718828b5e169b1ce5cc45c3a6"
 }

package/lib/built-in-loader.js

@@ -1,49 +0,0 @@
-const parseComponent = require('./parser')
-const loaderUtils = require('loader-utils')
-const parseRequest = require('./utils/parse-request')
-const normalize = require('./utils/normalize')
-const selectorPath = normalize.lib('selector')
-const genComponentTag = require('./utils/gen-component-tag')
-const getMainCompilation = require('./utils/get-main-compilation')
-
-module.exports = function (content) {
-  this.cacheable()
-  const mainCompilation = getMainCompilation(this._compilation)
-  const mpx = mainCompilation.__mpx__
-  if (!mpx) {
-    return content
-  }
-  const mode = mpx.mode
-  const env = mpx.env
-  const defs = mpx.defs
-  const resourcePath = parseRequest(this.resource).resourcePath
-  const parts = parseComponent(content, {
-    filePath: resourcePath,
-    needMap: this.sourceMap,
-    mode,
-    defs,
-    env
-  })
-
-  let output = ''
-
-  // 内建组件编写规范比较统一，不需要处理太多情况
-  if (parts.template) {
-    output += genComponentTag(parts.template)
-  }
-
-  if (parts.script) {
-    output += '\n' + genComponentTag(parts.script, (script) => {
-      let content = ''
-      if (parts.styles && parts.styles.length) {
-        parts.styles.forEach((style, i) => {
-          const requestString = loaderUtils.stringifyRequest(this, `builtInComponent.styl!=!${selectorPath}?type=styles&index=${i}!${loaderUtils.getRemainingRequest(this)}`)
-          content += `\n  import ${requestString}`
-        })
-      }
-      content += script.content
-      return content
-    })
-  }
-  return output
-}

package/lib/content-loader.js

@@ -1,13 +0,0 @@
-module.exports = function (content) {
-  if (!this.__mpx__) {
-    return content
-  }
-  // todo 由于additionalAssets阶段还会进行一次依赖同步，此处获取的依赖不一定是最终的依赖，可能会有bad case
-  this.__mpx__.fileDependencies.forEach(file => {
-    this.addDependency(file)
-  })
-  this.__mpx__.contextDependencies.forEach(context => {
-    this.addContextDependency(context)
-  })
-  return this.__mpx__.content
-}

package/lib/dependency/ChildCompileDependency.js

@@ -1,24 +0,0 @@
-const NullDependency = require('webpack/lib/dependencies/NullDependency')
-
-class ChildCompileDependency extends NullDependency {
-  constructor (module) {
-    super()
-    this.childCompileEntryModule = module
-  }
-
-  get type () {
-    return 'mpx child compile'
-  }
-
-  updateHash (hash) {
-    super.updateHash(hash)
-    hash.update(this.childCompileEntryModule.identifier())
-  }
-}
-
-ChildCompileDependency.Template = class ChildCompileDependencyTemplate {
-  apply () {
-  }
-}
-
-module.exports = ChildCompileDependency

package/lib/dependency/InjectDependency.js

@@ -1,26 +0,0 @@
-const NullDependency = require('webpack/lib/dependencies/NullDependency')
-
-class InjectDependency extends NullDependency {
-  constructor (options) {
-    super()
-    this.content = options.content
-    this.index = options.index || 0
-  }
-
-  get type () {
-    return 'mpx inject'
-  }
-
-  updateHash (hash) {
-    super.updateHash(hash)
-    hash.update(this.content)
-  }
-}
-
-InjectDependency.Template = class InjectDependencyTemplate {
-  apply (dep, source) {
-    source.insert(dep.index, '/* mpx inject */ ' + dep.content)
-  }
-}
-
-module.exports = InjectDependency

package/lib/dependency/RemovedModuleDependency.js

@@ -1,23 +0,0 @@
-const ModuleDependency = require('webpack/lib/dependencies//ModuleDependency')
-
-class RemovedModuleDependency extends ModuleDependency {
-  constructor (request, removedModule, range) {
-    super(request)
-    this.removedModule = removedModule
-    this.range = range
-  }
-
-  get type () {
-    return 'removed module'
-  }
-}
-
-RemovedModuleDependency.Template = class RemovedModuleDependencyTemplate {
-  apply (dep, source) {
-    if (dep.range) {
-      source.replace(dep.range[0], dep.range[1] - 1, '')
-    }
-  }
-}
-
-module.exports = RemovedModuleDependency

package/lib/dependency/ResolveDependency.js

@@ -1,49 +0,0 @@
-const NullDependency = require('webpack/lib/dependencies/NullDependency')
-const parseRequest = require('../utils/parse-request')
-
-class ResolveDependency extends NullDependency {
-  constructor (resource, packageName, pagesMap, componentsMap, staticResourcesMap, publicPath, range, issuerResource, compilation) {
-    super()
-    this.resource = resource
-    this.packageName = packageName
-    this.pagesMap = pagesMap
-    this.componentsMap = componentsMap
-    this.staticResourcesMap = staticResourcesMap
-    this.publicPath = publicPath
-    this.range = range
-    this.issuerResource = issuerResource
-    this.compilation = compilation
-  }
-
-  get type () {
-    return 'mpx resolve'
-  }
-
-  updateHash (hash) {
-    super.updateHash(hash)
-    hash.update(this.resource)
-  }
-}
-
-ResolveDependency.Template = class ResolveDependencyTemplate {
-  apply (dep, source) {
-    const content = this.getContent(dep)
-    source.replace(dep.range[0], dep.range[1] - 1, content)
-  }
-
-  getContent (dep) {
-    const resourcePath = parseRequest(dep.resource).resourcePath
-    const pagesMap = dep.pagesMap
-    const componentsMap = dep.componentsMap[dep.packageName]
-    const mainComponentsMap = dep.componentsMap.main
-    const staticResourcesMap = dep.staticResourcesMap[dep.packageName]
-    const mainStaticResourcesMap = dep.staticResourcesMap.main
-    const resolved = pagesMap[resourcePath] || componentsMap[resourcePath] || mainComponentsMap[resourcePath] || staticResourcesMap[resourcePath] || mainStaticResourcesMap[resourcePath] || ''
-    if (!resolved) {
-      dep.compilation.errors.push(new Error(`Path ${dep.resource} is not a page/component/static resource, which is resolved from ${dep.issuerResource}!`))
-    }
-    return JSON.stringify(dep.publicPath + resolved)
-  }
-}
-
-module.exports = ResolveDependency

package/lib/path-loader.js

@@ -1,3 +0,0 @@
-module.exports = function () {
-  return `module.exports = __mpx_resolve_path__(${JSON.stringify(this.resource)})`
-}

package/lib/plugin-loader.js

@@ -1,287 +0,0 @@
-const path = require('path')
-const async = require('async')
-const JSON5 = require('json5')
-const SingleEntryPlugin = require('webpack/lib/SingleEntryPlugin')
-const parseRequest = require('./utils/parse-request')
-const toPosix = require('./utils/to-posix')
-const getMainCompilation = require('./utils/get-main-compilation')
-const isUrlRequestRaw = require('./utils/is-url-request')
-const loaderUtils = require('loader-utils')
-const normalize = require('./utils/normalize')
-const addQuery = require('./utils/add-query')
-const nativeLoaderPath = normalize.lib('native-loader')
-
-// webpack4中.json文件会走json parser，抽取内容的占位内容必须为合法json，否则会在parse阶段报错
-const defaultResultSource = '{}'
-
-// ali不导出的插件页面的固定prefix
-const NO_EXPORT = '__mpx_plugin_no_export_page__'
-
-module.exports = function (source) {
-  // 该loader中会在每次编译中动态添加entry，不能缓存，否则watch不好使
-  this.cacheable(false)
-
-  const nativeCallback = this.async()
-  const mainCompilation = getMainCompilation(this._compilation)
-  const mpx = mainCompilation.__mpx__
-
-  mpx.isPluginMode = true
-
-  const isUrlRequest = r => isUrlRequestRaw(r, projectRoot)
-  const urlToRequest = r => loaderUtils.urlToRequest(r, projectRoot)
-  const resolve = (context, request, callback) => {
-    const { queryObj } = parseRequest(request)
-    context = queryObj.context || context
-    return this.resolve(context, request, callback)
-  }
-
-  const emitWarning = (msg) => {
-    this.emitWarning(
-      new Error('[plugin loader][' + this.resource + ']: ' + msg)
-    )
-  }
-
-  const emitError = (msg) => {
-    this.emitError(
-      new Error('[plugin loader][' + this.resource + ']: ' + msg)
-    )
-  }
-
-  if (!mpx) {
-    return nativeCallback(null, source)
-  }
-
-  const context = this.context
-  const packageName = 'main'
-  const pagesMap = mpx.pagesMap
-  const getOutputPath = mpx.getOutputPath
-  const componentsMap = mpx.componentsMap[packageName]
-  const getEntryNode = mpx.getEntryNode
-  const resolveMode = mpx.resolveMode
-  const projectRoot = mpx.projectRoot
-  const extract = mpx.extract
-  const pathHash = mpx.pathHash
-  const resourceName = this._compilation._preparedEntrypoints[0].name
-
-  const entryModule = this._module
-  // 通过rawRequest关联entryNode和entryModule
-  const entryRequest = entryModule.rawRequest
-  const entryType = 'Plugin'
-  const currentEntry = getEntryNode(entryRequest, entryType, entryModule)
-  // 最终输出中不需要为plugin.json产生chunk，而是使用extract直接输出json文件，删除plugin.json对应的entrypoint
-  this._compilation._preparedEntrypoints.pop()
-  // 为了在体积统计中能够统计到该entry，将其缓存在mpx.removedChunks中
-  mpx.removedChunks.push({
-    entryModule
-  })
-
-  let entryDeps = new Set()
-
-  let cacheCallback
-
-  const checkEntryDeps = (callback) => {
-    callback = callback || cacheCallback
-    if (callback && entryDeps.size === 0) {
-      callback()
-    } else {
-      cacheCallback = callback
-    }
-  }
-
-  const addEntrySafely = (resource, name, callback) => {
-    const dep = SingleEntryPlugin.createDependency(resource, name)
-    entryDeps.add(dep)
-    this._compilation.addEntry(this._compiler.context, dep, name, (err, module) => {
-      entryDeps.delete(dep)
-      checkEntryDeps()
-      callback(err, module)
-    })
-  }
-
-  // 初次处理json
-  const callback = (err) => {
-    checkEntryDeps(() => {
-      if (err) return nativeCallback(err)
-      if (mpx.mode === 'ali' && pluginEntry.pages) {
-        let publicPages = Object.keys(pluginEntry.pages).reduce((cur, key) => {
-          if (!key.startsWith(NO_EXPORT)) {
-            cur[key] = pluginEntry.pages[key]
-          }
-          return cur
-        }, {})
-        pluginEntry.publicPages = publicPages
-        pluginEntry.pages = Object.values(pluginEntry.pages)
-      }
-      const sideEffects = []
-      const file = resourceName + '.json'
-      sideEffects.push((additionalAssets) => {
-        additionalAssets[file].modules = additionalAssets[file].modules || []
-        additionalAssets[file].modules.push(entryModule)
-      })
-      extract(JSON.stringify(pluginEntry), file, 0, sideEffects)
-      nativeCallback(null, defaultResultSource)
-    })
-  }
-
-  let pluginEntry
-  try {
-    pluginEntry = JSON5.parse(source)
-  } catch (err) {
-    return callback(err)
-  }
-
-  let processMain, processComponents, processPages
-
-  processMain = processComponents = processPages = (callback) => {
-    callback()
-  }
-
-  if (pluginEntry.main) {
-    processMain = function (main, callback) {
-      if (!isUrlRequest(main)) return callback()
-      if (resolveMode === 'native') {
-        main = urlToRequest(main)
-      }
-      resolve(context, main, (err, resource) => {
-        if (err) return callback(err)
-        const { resourcePath } = parseRequest(resource)
-        // 获取pageName
-        const relative = path.relative(context, resourcePath)
-        const mainPath = toPosix(/^(.*?)(\.[^.]*)?$/.exec(relative)[1])
-        if (/^\./.test(mainPath)) {
-          emitError(`The plugin's main path [${main}] must be in the context [${context}]!`)
-          return callback()
-        }
-        pluginEntry.main = mainPath + '.js'
-        addEntrySafely(resource, mainPath, (err, module) => {
-          if (err) return callback(err)
-          mpx.pluginMainModule = module
-          currentEntry.addChild(getEntryNode(resource, 'PluginMain', module))
-          callback(err, module)
-        })
-      })
-    }.bind(this, pluginEntry.main)
-  }
-
-  if (pluginEntry.publicComponents) {
-    processComponents = function (components, callback) {
-      async.forEachOf(components, (component, name, callback) => {
-        if (!isUrlRequest(component)) return callback()
-        if (resolveMode === 'native') {
-          component = urlToRequest(component)
-        }
-        resolve(context, component, (err, resource, info) => {
-          if (err) return callback(err)
-          const resourcePath = parseRequest(resource).resourcePath
-          const parsed = path.parse(resourcePath)
-          const ext = parsed.ext
-          let outputPath
-          if (ext === '.js') {
-            let root = info.descriptionFileRoot
-            let name = 'nativeComponent'
-            if (info.descriptionFileData) {
-              if (info.descriptionFileData.miniprogram) {
-                root = path.join(root, info.descriptionFileData.miniprogram)
-              }
-              if (info.descriptionFileData.name) {
-                // 去掉name里面的@符号，因为支付宝不支持文件路径上有@
-                name = info.descriptionFileData.name.split('@').join('')
-              }
-            }
-            const resourceName = path.join(parsed.dir, parsed.name)
-            let relativePath = path.relative(root, resourceName)
-            outputPath = path.join('components', name + pathHash(root), relativePath)
-          } else {
-            outputPath = getOutputPath(resourcePath, 'component')
-          }
-          const componentPath = toPosix(outputPath)
-          pluginEntry.publicComponents[name] = componentPath
-          // 与json-compiler处理组件的行为表现一致
-          resource = addQuery(resource, {
-            packageName: 'main'
-          })
-          if (ext === '.js') {
-            resource = '!!' + nativeLoaderPath + '!' + resource
-          }
-          currentEntry.addChild(getEntryNode(resource, 'Component'))
-          // 如果之前已经创建了入口，直接return
-          if (componentsMap[resourcePath] === componentPath) return callback()
-          componentsMap[resourcePath] = componentPath
-          addEntrySafely(resource, componentPath, callback)
-        })
-      }, callback)
-    }.bind(this, pluginEntry.publicComponents)
-  }
-
-  if (pluginEntry.pages) {
-    // 处理 pages
-    if (mpx.srcMode === 'ali') { // 处理ali
-      let pagesMap = pluginEntry.publicPages
-      pluginEntry.pages = pluginEntry.pages.reduce((cur, val, index) => {
-        if (!Object.values(pagesMap).includes(val)) { // no export page
-          cur[`${NO_EXPORT}${index}`] = val
-        }
-        return cur
-      }, pagesMap)
-    }
-    processPages = function (pages, callback) {
-      async.forEachOf(pages, (page, name, callback) => {
-        let aliasPath = ''
-        if (typeof page !== 'string') {
-          aliasPath = page.path
-          page = page.src
-        }
-        if (!isUrlRequest(page)) return callback()
-        if (resolveMode === 'native') {
-          page = urlToRequest(page)
-        }
-        resolve(context, page, (err, resource) => {
-          if (err) return callback(err)
-          const { resourcePath } = parseRequest(resource)
-          const ext = path.extname(resourcePath)
-          // 获取pageName
-          let pageName
-          if (aliasPath) {
-            pageName = toPosix(aliasPath)
-            // 判断 key 存在重复情况直接报错
-            for (let key in pagesMap) {
-              if (pagesMap[key] === pageName && key !== resourcePath) {
-                emitError(`Current page [${resourcePath}] registers a conflict page path [${pageName}] with existed page [${key}], which is not allowed, please rename it!`)
-                return callback()
-              }
-            }
-          } else {
-            const relative = path.relative(context, resourcePath)
-            pageName = toPosix(/^(.*?)(\.[^.]*)?$/.exec(relative)[1])
-            if (/^\./.test(pageName)) {
-              // 如果当前page不存在于context中，插件模式下报错
-              emitError(`Current page [${resourcePath}] is not in current pages directory [${context}], which is not allowed in plugin mode!`)
-              return callback()
-            }
-            // 如果当前page与已有page存在命名冲突，插件模式下报错
-            for (let key in pagesMap) {
-              if (pagesMap[key] === pageName && key !== resourcePath) {
-                emitError(`Current page [${resourcePath}] is registered with a conflict page path [${pageName}], which is already existed in system, which is not allowed in plugin mode!`)
-                return callback()
-              }
-            }
-          }
-          if (ext === '.js') {
-            resource = '!!' + nativeLoaderPath + '!' + resource
-          }
-          // 如果之前已经创建了入口，直接return
-          if (pagesMap[resourcePath]) {
-            emitWarning(`Current page [${resourcePath}] which is imported from [${this.resourcePath}] has been registered in pagesMap already, it will be ignored, please check it and remove the redundant page declaration!`)
-            return callback()
-          }
-          currentEntry.addChild(getEntryNode(resource, 'Page'))
-          pagesMap[resourcePath] = pageName
-          pluginEntry.pages[name] = pageName
-          addEntrySafely(resource, pageName, callback)
-        })
-      }, callback)
-    }.bind(this, pluginEntry.pages)
-  }
-
-  async.parallel([processMain, processComponents, processPages], callback)
-}

package/lib/staticConfig.js

@@ -1,4 +0,0 @@
-module.exports = {
-  MPX_ROOT_VIEW: 'mpx-root-view', // 根节点类名
-  MPX_APP_MODULE_ID: 'mpx-app-scope' // app文件moduleId
-}

package/lib/utils/get-main-compilation.js

@@ -1,6 +0,0 @@
-module.exports = function (compilation) {
-  while (compilation.compiler.parentCompilation) {
-    compilation = compilation.compiler.parentCompilation
-  }
-  return compilation
-}

package/lib/utils/read-json-for-src.js

@@ -1,34 +0,0 @@
-const parseRequest = require('./parse-request')
-const mpxJSON = require('./mpx-json')
-const getMainCompilation = require('./get-main-compilation')
-
-module.exports = function readJsonForSrc (src, loaderContext, callback) {
-  const fs = loaderContext._compiler.inputFileSystem
-  const mpx = getMainCompilation(loaderContext._compilation).__mpx__
-  const defs = mpx.defs
-  const resolve = (context, request, callback) => {
-    const { queryObj } = parseRequest(request)
-    context = queryObj.context || context
-    return loaderContext.resolve(context, request, callback)
-  }
-
-  resolve(loaderContext.context, src, (err, result) => {
-    if (err) return callback(err)
-    const { rawResourcePath: resourcePath } = parseRequest(result)
-    loaderContext.addDependency(resourcePath)
-    fs.readFile(resourcePath, (err, content) => {
-      if (err) {
-        return callback(err)
-      }
-      content = content.toString('utf-8')
-      if (resourcePath.endsWith('.json.js')) {
-        try {
-          content = mpxJSON.compileMPXJSONText({ source: content, defs, filePath: resourcePath })
-        } catch (e) {
-          return callback(e)
-        }
-      }
-      callback(null, content)
-    })
-  })
-}

package/lib/utils/try-require.js

@@ -1,16 +0,0 @@
-const cwd = process.cwd()
-const resolve = require('resolve')
-
-module.exports = function tryRequire (dep) {
-  let fromCwd
-  try {
-    fromCwd = resolve.sync(dep, { basedir: cwd })
-  } catch (e) {}
-  if (fromCwd) {
-    return require(fromCwd)
-  } else {
-    try {
-      return require(dep)
-    } catch (e) {}
-  }
-}