@mpxjs/webpack-plugin 2.7.52 → 2.8.0-beta.2

package/lib/wxss/localsLoader.js

@@ -3,18 +3,18 @@
   Author Tobias Koppers @sokra
   Modified by @hiyuki
 */
-var loaderUtils = require('loader-utils')
-var processCss = require('./processCss')
-var compileExports = require('./compile-exports')
-var createResolver = require('./createResolver')
+const loaderUtils = require('loader-utils')
+const processCss = require('./processCss')
+const compileExports = require('./compile-exports')
+const createResolver = require('./createResolver')
 
 module.exports = function (content) {
   if (this.cacheable) this.cacheable()
-  var callback = this.async()
-  var query = loaderUtils.getOptions(this) || {}
-  var moduleMode = query.modules || query.module
-  var camelCaseKeys = query.camelCase || query.camelcase
-  var resolve = createResolver(query.alias)
+  const callback = this.async()
+  const query = loaderUtils.getOptions(this) || {}
+  const moduleMode = query.modules || query.module
+  const camelCaseKeys = query.camelCase || query.camelcase
+  const resolve = createResolver(query.alias)
 
   processCss(content, null, {
     mode: moduleMode ? 'local' : 'global',
@@ -26,15 +26,15 @@ module.exports = function (content) {
     if (err) return callback(err)
 
     function importItemMatcher (item) {
-      var match = result.importItemRegExp.exec(item)
-      var idx = +match[1]
-      var importItem = result.importItems[idx]
-      var importUrl = importItem.url
+      const match = result.importItemRegExp.exec(item)
+      const idx = +match[1]
+      const importItem = result.importItems[idx]
+      const importUrl = importItem.url
       return '" + require(' + loaderUtils.stringifyRequest(this, importUrl) + ')' +
         '[' + JSON.stringify(importItem.export) + '] + "'
     }
 
-    var exportJs = compileExports(result, importItemMatcher.bind(this), camelCaseKeys)
+    let exportJs = compileExports(result, importItemMatcher.bind(this), camelCaseKeys)
     if (exportJs) {
       exportJs = 'module.exports = ' + exportJs + ';'
     }

package/lib/wxss/processCss.js

@@ -103,12 +103,13 @@ const parserPlugin = function (options) {
           case 'nested-item':
             item.nodes.forEach(processNode)
             break
-          case 'item':
+          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
@@ -210,12 +211,14 @@ module.exports = function processCss (inputSource, inputMap, options, callback)
     // we need a prefix to avoid path rewriting of PostCSS
     from: '/css-loader!' + options.from,
     to: options.to,
-    map: options.sourceMap ? {
-      prev: inputMap,
-      sourcesContent: true,
-      inline: false,
-      annotation: false
-    } : null
+    map: options.sourceMap
+      ? {
+          prev: inputMap,
+          sourcesContent: true,
+          inline: false,
+          annotation: false
+        }
+      : null
   }).then(function (result) {
     callback(null, {
       source: result.css,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/webpack-plugin",
-  "version": "2.7.52",
+  "version": "2.8.0-beta.2",
   "description": "mpx compile core",
   "keywords": [
     "mpx"
@@ -60,7 +60,8 @@
     "webpack": "^5.48.0"
   },
   "publishConfig": {
-    "registry": "https://registry.npmjs.org"
+    "registry": "https://registry.npmjs.org",
+    "access": "public"
   },
   "repository": {
     "type": "git",
@@ -80,5 +81,5 @@
   "engines": {
     "node": ">=14.14.0"
   },
-  "gitHead": "187abad504151455e045c0adf2fe7f81412e0fef"
+  "gitHead": "cd57f83a9d47236f527bd51a8650119514f4b433"
 }

package/lib/utils/env.js

@@ -1,4 +0,0 @@
-/**
- * 判断当前环境是否是浏览器环境
- */
-exports.inBrowser = typeof window !== 'undefined'

package/lib/utils/parse-asset.js

@@ -1,195 +0,0 @@
-const _ = require('lodash')
-
-const acorn = require('acorn')
-
-const walk = require('acorn-walk')
-
-module.exports = parseAsset
-
-function parseAsset (content) {
-  const ast = acorn.parse(content, {
-    sourceType: 'script',
-    // I believe in a bright future of ECMAScript!
-    // Actually, it's set to `2050` to support the latest ECMAScript version that currently exists.
-    // Seems like `acorn` supports such weird option value.
-    ecmaVersion: 2050
-  })
-  const walkState = {
-    locations: null
-  }
-  walk.recursive(ast, walkState, {
-    AssignmentExpression (node, state, c) {
-      if (state.locations) return // Modules are stored in exports.modules:
-      // exports.modules = {};
-
-      const {
-        left,
-        right
-      } = node
-
-      if (left && left.object && left.object.name === 'exports' && left.property && left.property.name === 'modules' && isModulesHash(right)) {
-        state.locations = getModulesLocations(right)
-      }
-
-      // module.exports = ... recursive walk right
-      if (left && left.object && left.object.name === 'module' && left.property && left.property.name === 'exports') {
-        c(right, state)
-      }
-    },
-
-    CallExpression (node, state, c) {
-      if (state.locations) return
-      const args = node.arguments // Main chunk with webpack loader.
-      // Modules are stored in first argument:
-      // (function (...) {...})(<modules>)
-
-      if (node.callee.type === 'FunctionExpression' && !node.callee.id && args.length === 1 && isSimpleModulesList(args[0])) {
-        state.locations = getModulesLocations(args[0])
-        return
-      } // Async Webpack < v4 chunk without webpack loader.
-      // webpackJsonp([<chunks>], <modules>, ...)
-      // As function name may be changed with `output.jsonpFunction` option we can't rely on it's default name.
-
-      if (node.callee.type === 'Identifier' && mayBeAsyncChunkArguments(args) && isModulesList(args[1])) {
-        state.locations = getModulesLocations(args[1])
-        return
-      } // Async Webpack v4 chunk without webpack loader.
-      // (window.webpackJsonp=window.webpackJsonp||[]).push([[<chunks>], <modules>, ...]);
-      // As function name may be changed with `output.jsonpFunction` option we can't rely on it's default name.
-
-      if (isAsyncChunkPushExpression(node)) {
-        state.locations = getModulesLocations(args[0].elements[1])
-        return
-      } // Webpack v4 WebWorkerChunkTemplatePlugin
-      // globalObject.chunkCallbackName([<chunks>],<modules>, ...);
-      // Both globalObject and chunkCallbackName can be changed through the config, so we can't check them.
-
-      if (isAsyncWebWorkerChunkExpression(node)) {
-        state.locations = getModulesLocations(args[1])
-        return
-      } // Walking into arguments because some of plugins (e.g. `DedupePlugin`) or some Webpack
-      // features (e.g. `umd` library output) can wrap modules list into additional IIFE.
-
-      _.each(args, arg => c(arg, state))
-    }
-
-  })
-  let modules
-
-  if (walkState.locations) {
-    modules = _.mapValues(walkState.locations, loc => content.slice(loc.start, loc.end))
-  } else {
-    modules = {}
-  }
-
-  return modules
-}
-
-function isModulesList (node) {
-  return isSimpleModulesList(node) || // Modules are contained in expression `Array([minimum ID]).concat([<module>, <module>, ...])`
-    isOptimizedModulesArray(node)
-}
-
-function isSimpleModulesList (node) {
-  return (// Modules are contained in hash. Keys are module ids.
-    isModulesHash(node) || // Modules are contained in array. Indexes are module ids.
-    isModulesArray(node)
-  )
-}
-
-function isModulesHash (node) {
-  return node.type === 'ObjectExpression' && _(node.properties).map('value').every(isModuleWrapper)
-}
-
-function isModulesArray (node) {
-  return node.type === 'ArrayExpression' && _.every(node.elements, elem => // Some of array items may be skipped because there is no module with such id
-    !elem || isModuleWrapper(elem))
-}
-
-function isOptimizedModulesArray (node) {
-  // Checking whether modules are contained in `Array(<minimum ID>).concat(...modules)` array:
-  // https://github.com/webpack/webpack/blob/v1.14.0/lib/Template.js#L91
-  // The `<minimum ID>` + array indexes are module ids
-  return node.type === 'CallExpression' && node.callee.type === 'MemberExpression' && // Make sure the object called is `Array(<some number>)`
-    node.callee.object.type === 'CallExpression' && node.callee.object.callee.type === 'Identifier' && node.callee.object.callee.name === 'Array' && node.callee.object.arguments.length === 1 && isNumericId(node.callee.object.arguments[0]) && // Make sure the property X called for `Array(<some number>).X` is `concat`
-    node.callee.property.type === 'Identifier' && node.callee.property.name === 'concat' && // Make sure exactly one array is passed in to `concat`
-    node.arguments.length === 1 && isModulesArray(node.arguments[0])
-}
-
-function isModuleWrapper (node) {
-  /* eslint-disable no-mixed-operators */
-  return (// It's an anonymous function expression that wraps module
-    (node.type === 'FunctionExpression' || node.type === 'ArrowFunctionExpression') && !node.id || // If `DedupePlugin` is used it can be an ID of duplicated module...
-    isModuleId(node) || // or an array of shape [<module_id>, ...args]
-    node.type === 'ArrayExpression' && node.elements.length > 1 && isModuleId(node.elements[0])
-  )
-}
-
-function isModuleId (node) {
-  return node.type === 'Literal' && (isNumericId(node) || typeof node.value === 'string')
-}
-
-function isNumericId (node) {
-  return node.type === 'Literal' && Number.isInteger(node.value) && node.value >= 0
-}
-
-function isChunkIds (node) {
-  // Array of numeric or string ids. Chunk IDs are strings when NamedChunksPlugin is used
-  return node.type === 'ArrayExpression' && _.every(node.elements, isModuleId)
-}
-
-function isAsyncChunkPushExpression (node) {
-  const {
-    callee,
-    arguments: args
-  } = node
-  return callee.type === 'MemberExpression' && callee.property.name === 'push' && callee.object.type === 'AssignmentExpression' && args.length === 1 && args[0].type === 'ArrayExpression' && mayBeAsyncChunkArguments(args[0].elements) && isModulesList(args[0].elements[1])
-}
-
-function mayBeAsyncChunkArguments (args) {
-  return args.length >= 2 && isChunkIds(args[0])
-}
-
-function isAsyncWebWorkerChunkExpression (node) {
-  const {
-    callee,
-    type,
-    arguments: args
-  } = node
-  return type === 'CallExpression' && callee.type === 'MemberExpression' && args.length === 2 && isChunkIds(args[0]) && isModulesList(args[1])
-}
-
-function getModulesLocations (node) {
-  if (node.type === 'ObjectExpression') {
-    // Modules hash
-    const modulesNodes = node.properties
-    return _.transform(modulesNodes, (result, moduleNode) => {
-      const moduleId = moduleNode.key.name || moduleNode.key.value
-      result[moduleId] = getModuleLocation(moduleNode.value)
-    }, {})
-  }
-
-  const isOptimizedArray = node.type === 'CallExpression'
-
-  if (node.type === 'ArrayExpression' || isOptimizedArray) {
-    // Modules array or optimized array
-    const minId = isOptimizedArray // Get the [minId] value from the Array() call first argument literal value
-      ? node.callee.object.arguments[0].value // `0` for simple array
-      : 0
-    const modulesNodes = isOptimizedArray // The modules reside in the `concat()` function call arguments
-      ? node.arguments[0].elements : node.elements
-    return _.transform(modulesNodes, (result, moduleNode, i) => {
-      if (!moduleNode) return
-      result[i + minId] = getModuleLocation(moduleNode)
-    }, {})
-  }
-
-  return {}
-}
-
-function getModuleLocation (node) {
-  return {
-    start: node.start,
-    end: node.end
-  }
-}