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

package/lib/wxss/processCss.js

@@ -17,129 +17,133 @@ const modulesScope = require('postcss-modules-scope')
 const modulesValues = require('postcss-modules-values')
 const valueParser = require('postcss-value-parser')
 const isUrlRequest = require('../utils/is-url-request')
+// css-loader-parser
 
-const parserPlugin = postcss.plugin('css-loader-parser', function (options) {
-  return function (css) {
-    const imports = {}
-    let exports = {}
-    const importItems = []
-    const urlItems = []
+const parserPlugin = function (options) {
+  return {
+    postcssPlugin: 'css-loader-parser',
+    Once (css) {
+      const imports = {}
+      let exports = {}
+      const importItems = []
+      const urlItems = []
+
+      function replaceImportsInString (str) {
+        if (options.import) {
+          const tokens = valueParser(str)
+          tokens.walk(function (node) {
+            if (node.type !== 'word') {
+              return
+            }
+            const token = node.value
+            const importIndex = imports['$' + token]
+            if (typeof importIndex === 'number') {
+              node.value = '___CSS_LOADER_IMPORT___' + importIndex + '___'
+            }
+          })
+          return tokens.toString()
+        }
+        return str
+      }
 
-    function replaceImportsInString (str) {
       if (options.import) {
-        const tokens = valueParser(str)
-        tokens.walk(function (node) {
-          if (node.type !== 'word') {
+        css.walkAtRules(/^import$/i, function (rule) {
+          const values = Tokenizer.parseValues(rule.params)
+          let url = values.nodes[0].nodes[0]
+          if (url && url.type === 'url') {
+            url = url.url
+          } else if (url && url.type === 'string') {
+            url = url.value
+          } else throw rule.error('Unexpected format ' + rule.params)
+          if (!url.replace(/\s/g, '').length) {
             return
           }
-          const token = node.value
-          const importIndex = imports['$' + token]
-          if (typeof importIndex === 'number') {
-            node.value = '___CSS_LOADER_IMPORT___' + importIndex + '___'
+          values.nodes[0].nodes.shift()
+          const mediaQuery = Tokenizer.stringifyValues(values)
+
+          if (isUrlRequest(url, options.root)) {
+            url = loaderUtils.urlToRequest(url, options.root)
           }
+
+          importItems.push({
+            url: url,
+            mediaQuery: mediaQuery
+          })
+          rule.remove()
         })
-        return tokens.toString()
       }
-      return str
-    }
-
-    if (options.import) {
-      css.walkAtRules(/^import$/i, function (rule) {
-        const values = Tokenizer.parseValues(rule.params)
-        let url = values.nodes[0].nodes[0]
-        if (url && url.type === 'url') {
-          url = url.url
-        } else if (url && url.type === 'string') {
-          url = url.value
-        } else throw rule.error('Unexpected format ' + rule.params)
-        if (!url.replace(/\s/g, '').length) {
-          return
-        }
-        values.nodes[0].nodes.shift()
-        const mediaQuery = Tokenizer.stringifyValues(values)
 
-        if (isUrlRequest(url, options.root)) {
-          url = loaderUtils.urlToRequest(url, options.root)
-        }
-
-        importItems.push({
-          url: url,
-          mediaQuery: mediaQuery
+      const icss = icssUtils.extractICSS(css)
+      exports = icss.icssExports
+      Object.keys(icss.icssImports).forEach(function (key) {
+        const url = loaderUtils.parseString(key)
+        Object.keys(icss.icssImports[key]).forEach(function (prop) {
+          imports['$' + prop] = importItems.length
+          importItems.push({
+            url: url,
+            export: icss.icssImports[key][prop]
+          })
         })
-        rule.remove()
       })
-    }
 
-    const icss = icssUtils.extractICSS(css)
-    exports = icss.icssExports
-    Object.keys(icss.icssImports).forEach(function (key) {
-      const url = loaderUtils.parseString(key)
-      Object.keys(icss.icssImports[key]).forEach(function (prop) {
-        imports['$' + prop] = importItems.length
-        importItems.push({
-          url: url,
-          export: icss.icssImports[key][prop]
-        })
+      Object.keys(exports).forEach(function (exportName) {
+        exports[exportName] = replaceImportsInString(exports[exportName])
       })
-    })
-
-    Object.keys(exports).forEach(function (exportName) {
-      exports[exportName] = replaceImportsInString(exports[exportName])
-    })
 
-    function isAlias (url) {
-      // Handle alias starting by / and root disabled
-      return url !== options.resolve(url)
-    }
+      function isAlias (url) {
+        // Handle alias starting by / and root disabled
+        return url !== options.resolve(url)
+      }
 
-    function processNode (item) {
-      switch (item.type) {
-        case 'value':
-          item.nodes.forEach(processNode)
-          break
-        case 'nested-item':
-          item.nodes.forEach(processNode)
-          break
-        case 'item':
-          const importIndex = imports['$' + item.name]
-          if (typeof importIndex === 'number') {
-            item.name = '___CSS_LOADER_IMPORT___' + importIndex + '___'
-          }
-          break
-        case 'url':
-          if (options.url && item.url.replace(/\s/g, '').length && !/^#/.test(item.url) && (isAlias(item.url) || isUrlRequest(item.url, options.root))) {
-            // Strip quotes, they will be re-added if the module needs them
-            item.stringType = ''
-            delete item.innerSpacingBefore
-            delete item.innerSpacingAfter
-            const url = item.url
-            item.url = '___CSS_LOADER_URL___' + urlItems.length + '___'
-            urlItems.push({
-              url: url
-            })
-          }
-          break
+      function processNode (item) {
+        switch (item.type) {
+          case 'value':
+            item.nodes.forEach(processNode)
+            break
+          case 'nested-item':
+            item.nodes.forEach(processNode)
+            break
+          case 'item':
+            const importIndex = imports['$' + item.name]
+            if (typeof importIndex === 'number') {
+              item.name = '___CSS_LOADER_IMPORT___' + importIndex + '___'
+            }
+            break
+          case 'url':
+            if (options.url && item.url.replace(/\s/g, '').length && !/^#/.test(item.url) && (isAlias(item.url) || isUrlRequest(item.url, options.root))) {
+              // Strip quotes, they will be re-added if the module needs them
+              item.stringType = ''
+              delete item.innerSpacingBefore
+              delete item.innerSpacingAfter
+              const url = item.url
+              item.url = '___CSS_LOADER_URL___' + urlItems.length + '___'
+              urlItems.push({
+                url: url
+              })
+            }
+            break
+        }
       }
-    }
 
-    css.walkDecls(function (decl) {
-      const values = Tokenizer.parseValues(decl.value)
-      values.nodes.forEach(function (value) {
-        value.nodes.forEach(processNode)
+      css.walkDecls(function (decl) {
+        const values = Tokenizer.parseValues(decl.value)
+        values.nodes.forEach(function (value) {
+          value.nodes.forEach(processNode)
+        })
+        decl.value = Tokenizer.stringifyValues(values)
+      })
+      css.walkAtRules(function (atrule) {
+        if (typeof atrule.params === 'string') {
+          atrule.params = replaceImportsInString(atrule.params)
+        }
       })
-      decl.value = Tokenizer.stringifyValues(values)
-    })
-    css.walkAtRules(function (atrule) {
-      if (typeof atrule.params === 'string') {
-        atrule.params = replaceImportsInString(atrule.params)
-      }
-    })
 
-    options.importItems = importItems
-    options.urlItems = urlItems
-    options.exports = exports
+      options.importItems = importItems
+      options.urlItems = urlItems
+      options.exports = exports
+    }
   }
-})
+}
 
 module.exports = function processCss (inputSource, inputMap, options, callback) {
   const query = options.query

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/webpack-plugin",
-  "version": "2.6.114-alpha.4",
+  "version": "2.6.114-alpha.7",
   "description": "mpx compile core",
   "keywords": [
     "mpx"
@@ -35,7 +35,7 @@
     "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",
@@ -43,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"
@@ -82,8 +78,10 @@
   },
   "devDependencies": {
     "@types/babel-traverse": "^6.25.4",
-    "@types/babel-types": "^7.0.4",
-    "webpack": "^4.46.0"
+    "@types/babel-types": "^7.0.4"
   },
-  "gitHead": "9e21edc9a7478dc477064bd14679f794d892592b"
+  "engines": {
+    "node": ">=14.14.0"
+  },
+  "gitHead": "7845b794ae3b68530449aedac841b5910ef7a546"
 }

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,53 +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}!`))
-    }
-    // for tenon
-    if (dep.compilation.__mpx__.mode === 'tenon') {
-      return `getRelativePath(currentURL, ${JSON.stringify(resolved)}) + '.js'`
-    }
-    return JSON.stringify(dep.publicPath + resolved)
-  }
-}
-
-module.exports = ResolveDependency