@dcloudio/vue-cli-plugin-uni 2.0.2-3061520221228002 → 2.0.2-3061720230112002

package/lib/mp/index.js

@@ -9,7 +9,9 @@ const {
   getPlatformCssnano,
   getPlatformStat,
   getPlatformPush,
-  getPlatformUniCloud
+  getPlatformUniCloud,
+  createSource,
+  deleteAsset
 } = require('@dcloudio/uni-cli-shared')
 
 const WebpackUniAppPlugin = require('../../packages/webpack-uni-app-loader/plugin/index')
@@ -26,7 +28,7 @@ function createUniMPPlugin () {
 }
 
 const createWxMpIndependentPlugins = require('@dcloudio/uni-mp-weixin/lib/createIndependentPlugin')
-
+
 const UniTips = require('./tips')
 
 function getProvides () {
@@ -74,65 +76,67 @@ function getProvides () {
   ) { // 非微信小程序，自动注入 wx 对象
     provides.wx = provides.uni
   }
+  if (process.env.UNI_PLATFORM === 'mp-weixin') {
+    provides.wx = [path.resolve(uniPath, '../wx.js'), 'default']
+  }
   return provides
 }
 
-function processWxss (name, assets) {
+function processWxss (compilation, name, assets) {
   const dirname = path.dirname(name)
   const mainWxssCode = `@import "${normalizePath(path.relative(dirname, 'common/main.wxss'))}";`
   const code = `${mainWxssCode}` + assets[name].source().toString()
-  assets[name] = {
-    size () {
-      return Buffer.byteLength(code, 'utf8')
-    },
-    source () {
-      return code
-    }
-  }
+  compilation.updateAsset(name, createSource(code))
 }
 
 const parseRequirePath = path => path.startsWith('common') ? `./${path}` : path
 
-function procssJs (name, assets, hasVendor) {
+function procssJs (compilation, name, assets, hasVendor) {
   const dirname = path.dirname(name)
   const runtimeJsCode = `require('${normalizePath(parseRequirePath(path.relative(dirname, 'common/runtime.js')))}');`
   const vendorJsCode = hasVendor
     ? `require('${normalizePath(parseRequirePath(path.relative(dirname, 'common/vendor.js')))}');` : ''
   const mainJsCode = `require('${normalizePath(parseRequirePath(path.relative(dirname, 'common/main.js')))}');`
   const code = `${runtimeJsCode}${vendorJsCode}${mainJsCode}` + assets[name].source().toString()
-  assets[name] = {
-    size () {
-      return Buffer.byteLength(code, 'utf8')
-    },
-    source () {
-      return code
+  compilation.updateAsset(name, createSource(code))
+}
+
+function processAssets (compilation) {
+  const assets = compilation.assets
+  const hasMainWxss = assets['common/main.wxss']
+  const hasVendor = assets['common/vendor.js']
+  Object.keys(assets).forEach(name => {
+    if (name.startsWith('common')) {
+      return
     }
-  }
+    const extname = path.extname(name)
+    if (extname === '.wxss' && hasMainWxss && process.UNI_ENTRY[name.replace(extname, '')]) {
+      processWxss(compilation, name, assets)
+    } else if (extname === '.js') {
+      procssJs(compilation, name, assets, hasVendor)
+    }
+  })
+  // delete assets['common/main.js']
+  deleteAsset(compilation, 'app.js')
+  deleteAsset(compilation, 'app.json')
+  deleteAsset(compilation, 'app.wxss')
+  deleteAsset(compilation, 'project.config.json')
 }
 
 class PreprocessAssetsPlugin {
   apply (compiler) {
-    compiler.hooks.emit.tap('PreprocessAssetsPlugin', compilation => {
-      const assets = compilation.assets
-      const hasMainWxss = assets['common/main.wxss']
-      const hasVendor = assets['common/vendor.js']
-      Object.keys(assets).forEach(name => {
-        if (name.startsWith('common')) {
-          return
-        }
-        const extname = path.extname(name)
-        if (extname === '.wxss' && hasMainWxss && process.UNI_ENTRY[name.replace(extname, '')]) {
-          processWxss(name, assets)
-        } else if (extname === '.js') {
-          procssJs(name, assets, hasVendor)
-        }
+    if (webpack.version[0] > 4) {
+      compiler.hooks.compilation.tap('PreprocessAssetsPlugin', compilation => {
+        compilation.hooks.processAssets.tap({
+          name: 'PreprocessAssetsPlugin',
+          stage: webpack.Compilation.PROCESS_ASSETS_STAGE_ADDITIONAL
+        }, (_) => {
+          processAssets(compilation)
+        })
       })
-      // delete assets['common/main.js']
-      delete assets['app.js']
-      delete assets['app.json']
-      delete assets['app.wxss']
-      delete assets['project.config.json']
-    })
+    } else {
+      compiler.hooks.emit.tap('PreprocessAssetsPlugin', (compilation) => processAssets(compilation))
+    }
   }
 }
 
@@ -143,7 +147,8 @@ function initSubpackageConfig (webpackConfig, vueOptions) {
   }
   vueOptions.outputDir = process.env.UNI_OUTPUT_DIR
   webpackConfig.output.path(process.env.UNI_OUTPUT_DIR)
-  webpackConfig.output.jsonpFunction('webpackJsonp_' + (process.env.UNI_SUBPACKGE || process.env.UNI_MP_PLUGIN))
+  webpackConfig.output.set(webpack.version[0] > 4 ? 'chunkLoadingGlobal' : 'jsonpFunction', 'webpackJsonp_' + (process
+    .env.UNI_SUBPACKGE || process.env.UNI_MP_PLUGIN))
 }
 
 function addToUniEntry (fileName) {
@@ -192,7 +197,7 @@ module.exports = {
 
     if ((process.env.UNI_SUBPACKGE || process.env.UNI_MP_PLUGIN) && process.env.UNI_SUBPACKGE !== 'main') {
       plugins.push(new PreprocessAssetsPlugin())
-    }
+    }
 
     {
       const globalEnv = process.env.UNI_PLATFORM === 'mp-alipay' ? 'my' : 'wx';
@@ -230,11 +235,11 @@ ${globalEnv}.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;`
     }
     if (process.env.NODE_ENV === 'production' || process.env.UNI_MINIMIZE === 'true') {
       output.pathinfo = false
-    }
-
-    if (process.env.UNI_PLATFORM === 'mp-weixin' && process.env.NODE_ENV === 'production') {
-      plugins.push(new UniTips())
-    }
+    }
+
+    if (process.env.UNI_PLATFORM === 'mp-weixin' && process.env.NODE_ENV === 'production') {
+      plugins.push(new UniTips())
+    }
 
     return {
       mode: process.env.NODE_ENV === 'production' ? 'production' : 'development',
@@ -356,4 +361,4 @@ ${globalEnv}.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;`
     webpackConfig.plugins.delete('preload')
     webpackConfig.plugins.delete('prefetch')
   }
-}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/vue-cli-plugin-uni",
-  "version": "2.0.2-3061520221228002",
+  "version": "2.0.2-3061720230112002",
   "description": "uni-app plugin for vue-cli 3",
   "main": "index.js",
   "repository": {
@@ -17,7 +17,7 @@
   "author": "fxy060608",
   "license": "Apache-2.0",
   "dependencies": {
-    "@dcloudio/uni-stat": "^2.0.2-3061520221228002",
+    "@dcloudio/uni-stat": "^2.0.2-3061720230112002",
     "buffer-json": "^2.0.0",
     "clone-deep": "^4.0.1",
     "cross-env": "^5.2.0",
@@ -41,5 +41,5 @@
     "copy-webpack-plugin": ">=5",
     "postcss": ">=7"
   },
-  "gitHead": "385d4400e9ac643a5cc3296bbb8145e745a9035f"
+  "gitHead": "7f96adf373b1ed1c454915aeedf9f02e80ce6cf7"
 }