@mpxjs/webpack-plugin 2.8.28-beta.3 → 2.8.28-beta.5

package/lib/index.js

@@ -524,6 +524,7 @@ class MpxWebpackPlugin {
       compilation.warnings = compilation.warnings.concat(warnings)
       compilation.errors = compilation.errors.concat(errors)
       const moduleGraph = compilation.moduleGraph
+
       if (!compilation.__mpx__) {
         // init mpx
         mpx = compilation.__mpx__ = {
@@ -774,9 +775,8 @@ class MpxWebpackPlugin {
         async.forEach(presentationalDependencies.filter((dep) => dep.mpxAction), (dep, callback) => {
           dep.mpxAction(module, compilation, callback)
         }, (err) => {
-          rawProcessModuleDependencies.call(compilation, module, (innerErr) => {
-            return callback(err || innerErr)
-          })
+          if (err) compilation.errors.push(err)
+          rawProcessModuleDependencies.call(compilation, module, callback)
         })
       }
 

package/lib/json-compiler/index.js

@@ -98,14 +98,7 @@ module.exports = function (content) {
                 if (err) return callback(err)
                 if (!this._compilation) return callback()
                 const targetPath = path.relative(context, file)
-                this._compilation.assets[targetPath] = {
-                  size: function size () {
-                    return stats.size
-                  },
-                  source: function source () {
-                    return content
-                  }
-                }
+                this.emitFile(targetPath, content)
                 callback()
               })
             }

package/lib/loader.js

@@ -69,7 +69,7 @@ module.exports = function (content) {
 
   if (ctorType === 'app') {
     const appName = getEntryName(this)
-    this._module.addPresentationalDependency(new AppEntryDependency(resourcePath, appName))
+    if (appName) this._module.addPresentationalDependency(new AppEntryDependency(resourcePath, appName))
   }
   const loaderContext = this
   const stringifyRequest = r => loaderUtils.stringifyRequest(loaderContext, r)

package/lib/template-compiler/compiler.js

@@ -762,7 +762,7 @@ function parse (template, options) {
     },
     comment: function comment (text) {
       if (!currentParent) genTempRoot()
-      if (options.hasComment) {
+      if (options.hasComment || /mpx_config_/.test(text)) {
         currentParent.children.push({
           type: 3,
           text: text,

package/lib/wxss/loader.js

@@ -223,18 +223,18 @@ module.exports = async function loader (content, map, meta) {
     imports.unshift({
       type: 'api_import',
       importName: '___CSS_LOADER_API_IMPORT___',
-      url: stringifyRequest(this, require.resolve('./runtime/api'))
+      url: stringifyRequest(this, '!!' + require.resolve('./runtime/api'))
     })
 
     if (options.sourceMap) {
       imports.unshift({
         importName: '___CSS_LOADER_API_SOURCEMAP_IMPORT___',
-        url: stringifyRequest(this, require.resolve('./runtime/sourceMaps'))
+        url: stringifyRequest(this, '!!' + require.resolve('./runtime/sourceMaps'))
       })
     } else {
       imports.unshift({
         importName: '___CSS_LOADER_API_NO_SOURCEMAP_IMPORT___',
-        url: stringifyRequest(this, require.resolve('./runtime/noSourceMaps'))
+        url: stringifyRequest(this, '!!' + require.resolve('./runtime/noSourceMaps'))
       })
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/webpack-plugin",
-  "version": "2.8.28-beta.3",
+  "version": "2.8.28-beta.5",
   "description": "mpx compile core",
   "keywords": [
     "mpx"
@@ -20,13 +20,13 @@
     "@babel/parser": "^7.16.2",
     "@babel/traverse": "^7.16.0",
     "@babel/types": "^7.16.0",
-    "@better-scroll/core": "^2.2.1",
-    "@better-scroll/movable": "^2.2.1",
-    "@better-scroll/observe-dom": "^2.2.1",
-    "@better-scroll/pull-down": "^2.2.1",
-    "@better-scroll/slide": "^2.2.1",
-    "@better-scroll/wheel": "^2.2.1",
-    "@better-scroll/zoom": "^2.2.1",
+    "@better-scroll/core": "^2.5.1",
+    "@better-scroll/movable": "^2.5.1",
+    "@better-scroll/observe-dom": "^2.5.1",
+    "@better-scroll/pull-down": "^2.5.1",
+    "@better-scroll/slide": "^2.5.1",
+    "@better-scroll/wheel": "^2.5.1",
+    "@better-scroll/zoom": "^2.5.1",
     "acorn-walk": "^7.2.0",
     "async": "^2.6.0",
     "consolidate": "^0.15.1",
@@ -82,5 +82,5 @@
   "engines": {
     "node": ">=14.14.0"
   },
-  "gitHead": "17e31567bab825b2fb7b96f30e08d92fe1cc1038"
+  "gitHead": "f415e2d6a1c14b51b2cee6eb654205608f217401"
 }