@dcloudio/vue-cli-plugin-hbuilderx 2.0.1-35420220803001 → 2.0.1-36220220916001

package/build/css-loader.conf.js

@@ -1,5 +1,6 @@
 const fs = require('fs')
 const path = require('path')
+const webpack = require('webpack')
 
 const {
   getPlatformScss,
@@ -7,10 +8,6 @@ const {
   nvueCssPreprocessOptions
 } = require('@dcloudio/uni-cli-shared')
 
-const {
-  sassLoaderVersion
-} = require('@dcloudio/uni-cli-shared/lib/scss')
-
 const nvueStyleLoader = {
   loader: '@dcloudio/vue-cli-plugin-hbuilderx/packages/webpack-uni-nvue-loader/lib/style'
 }
@@ -20,27 +17,33 @@ const preprocessLoader = {
   options: nvueCssPreprocessOptions
 }
 
+const options = {
+  sourceMap: false
+}
+const plugins = [
+  require('postcss-import')({
+    resolve (id, basedir, importOptions) {
+      if (id.startsWith('~@/')) {
+        return path.resolve(process.env.UNI_INPUT_DIR, id.substr(3))
+      } else if (id.startsWith('@/')) {
+        return path.resolve(process.env.UNI_INPUT_DIR, id.substr(2))
+      } else if (id.startsWith('/') && !id.startsWith('//')) {
+        return path.resolve(process.env.UNI_INPUT_DIR, id.substr(1))
+      }
+      return id
+    }
+  }),
+  require('@dcloudio/vue-cli-plugin-uni/packages/postcss')
+]
+if (webpack.version[0] > 4) {
+  options.postcssOptions = { plugins }
+} else {
+  options.parser = require('postcss-comment')
+  options.plugins = plugins
+}
 const postcssLoader = {
   loader: 'postcss-loader',
-  options: {
-    sourceMap: false,
-    parser: require('postcss-comment'),
-    plugins: [
-      require('postcss-import')({
-        resolve (id, basedir, importOptions) {
-          if (id.startsWith('~@/')) {
-            return path.resolve(process.env.UNI_INPUT_DIR, id.substr(3))
-          } else if (id.startsWith('@/')) {
-            return path.resolve(process.env.UNI_INPUT_DIR, id.substr(2))
-          } else if (id.startsWith('/') && !id.startsWith('//')) {
-            return path.resolve(process.env.UNI_INPUT_DIR, id.substr(1))
-          }
-          return id
-        }
-      }),
-      require('@dcloudio/vue-cli-plugin-uni/packages/postcss')
-    ]
-  }
+  options
 }
 
 // sass 全局变量
@@ -71,25 +74,15 @@ const sassLoader = {
   }
 }
 
-if (sassLoaderVersion < 8) {
-  scssLoader.options.data = sassData
-  scssLoader.options.outputStyle = 'expanded'
-
-  sassLoader.options.data = sassData
-  sassLoader.options.outputStyle = 'expanded'
-  sassLoader.options.indentedSyntax = true
-} else {
-  const name = sassLoaderVersion >= 9 ? 'additionalData' : 'prependData'
-  scssLoader.options[name] = sassData
-  scssLoader.options.sassOptions = {
-    outputStyle: 'expanded'
-  }
+scssLoader.options.prependData = sassData
+scssLoader.options.sassOptions = {
+  outputStyle: 'expanded'
+}
 
-  sassLoader.options[name] = sassData
-  sassLoader.options.sassOptions = {
-    outputStyle: 'expanded',
-    indentedSyntax: true
-  }
+sassLoader.options.prependData = sassData
+sassLoader.options.sassOptions = {
+  outputStyle: 'expanded',
+  indentedSyntax: true
 }
 
 const lessLoader = {
@@ -143,4 +136,4 @@ module.exports = [{
 }, {
   test: /\.styl(us)?$/,
   oneOf: createOneOf(stylusLoader)
-}]
+}]

package/build/webpack.nvue.conf.js

@@ -3,6 +3,7 @@ const path = require('path')
 const webpack = require('webpack')
 const VueLoaderPlugin = require('@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/plugin')
 const CopyWebpackPlugin = require('copy-webpack-plugin')
+const CopyWebpackPluginVersion = Number(require('copy-webpack-plugin/package.json').version.split('.')[0])
 const TerserPlugin = require('terser-webpack-plugin')
 
 const {
@@ -12,6 +13,12 @@ const {
   getTemplatePath
 } = require('@dcloudio/uni-cli-shared')
 const fileLoader = require('@dcloudio/uni-cli-shared/lib/file-loader')
+const {
+  compileI18nJsonStr
+} = require('@dcloudio/uni-i18n')
+const {
+  initI18nOptions
+} = require('@dcloudio/uni-cli-shared/lib/i18n')
 const WebpackAppPlusNVuePlugin = process.env.UNI_USING_V3
   ? require('../packages/webpack-app-plus-plugin')
   : require('../packages/webpack-app-plus-nvue-plugin')
@@ -112,7 +119,10 @@ if (process.env.NODE_ENV === 'development') {
 
 // const excludeModuleReg = /node_modules(?!(\/|\\).*(weex).*)/
 
-const rules = [{
+const rules = [webpack.version[0] > 4 ? {
+  test: /\.(woff2?|eot|ttf|otf)(\?.*)?$/i,
+  type: 'asset'
+} : {
   test: /\.(png|jpg|gif|ttf|eot|woff|woff2)$/i,
   use: [fileLoader]
 }, {
@@ -194,7 +204,7 @@ rules.unshift({
 if (process.env.UNI_USING_V3_NATIVE) {
   try {
     const automatorJson = require.resolve('@dcloudio/uni-automator/dist/automator.json')
-    plugins.push(new CopyWebpackPlugin([{
+    const patterns = [{
       from: automatorJson,
       to: '../.automator/' + (process.env.UNI_SUB_PLATFORM || process.env.UNI_PLATFORM) +
         '/.automator.json',
@@ -207,31 +217,46 @@ if (process.env.UNI_USING_V3_NATIVE) {
         }
         return ''
       }
-    }]))
-  } catch (e) {}
+    }]
+    plugins.push(new CopyWebpackPlugin(CopyWebpackPluginVersion > 5 ? { patterns } : patterns))
+  } catch (e) { }
 }
 
 if (process.env.UNI_USING_NATIVE || process.env.UNI_USING_V3_NATIVE) {
   plugins.push(new WebpackUniMPPlugin())
   const assetsDir = 'static'
   const hybridDir = 'hybrid/html'
-  const array = [{
+  const patterns = [{
     from: path.resolve(process.env.UNI_INPUT_DIR, assetsDir),
     to: assetsDir
   }]
   // 自动化测试时，不启用androidPrivacy.json
   if (!process.env.UNI_AUTOMATOR_WS_ENDPOINT) {
-    const androidPrivacyPath = path.resolve(process.env.UNI_INPUT_DIR, 'androidPrivacy.json')
-    if (fs.existsSync(androidPrivacyPath)) {
-      array.push({
-        from: androidPrivacyPath,
-        to: 'androidPrivacy.json'
+    const fileName = 'androidPrivacy.json'
+    const context = path.resolve(process.env.UNI_INPUT_DIR)
+    if (fs.existsSync(path.join(context, fileName))) {
+      patterns.push({
+        from: fileName,
+        context,
+        to: fileName,
+        transform (content) {
+          const options = initI18nOptions(
+            process.env.UNI_PLATFORM,
+            process.env.UNI_INPUT_DIR,
+            false,
+            true
+          )
+          if (!options) {
+            return content
+          }
+          return compileI18nJsonStr(content.toString(), options)
+        }
       })
     }
   }
   const hybridHtmlPath = path.resolve(process.env.UNI_INPUT_DIR, hybridDir)
   if (fs.existsSync(hybridHtmlPath)) {
-    array.push({
+    patterns.push({
       from: hybridHtmlPath,
       to: hybridDir
     })
@@ -242,7 +267,7 @@ if (process.env.UNI_USING_NATIVE || process.env.UNI_USING_V3_NATIVE) {
     const assets = modules + module + '/' + assetsDir
     const assetsPath = path.resolve(process.env.UNI_INPUT_DIR, assets)
     if (fs.existsSync(assetsPath)) {
-      array.push({
+      patterns.push({
         from: assetsPath,
         to: assets
       })
@@ -250,7 +275,7 @@ if (process.env.UNI_USING_NATIVE || process.env.UNI_USING_V3_NATIVE) {
     const hybridHtml = modules + module + '/' + hybridDir
     const hybridHtmlPath = path.resolve(process.env.UNI_INPUT_DIR, hybridHtml)
     if (fs.existsSync(hybridHtmlPath)) {
-      array.push({
+      patterns.push({
         from: hybridHtmlPath,
         to: hybridHtml
       })
@@ -258,12 +283,12 @@ if (process.env.UNI_USING_NATIVE || process.env.UNI_USING_V3_NATIVE) {
   })
 
   if (process.env.UNI_USING_NVUE_COMPILER) {
-    array.push({
+    patterns.push({
       from: path.resolve(getTemplatePath(), 'common'),
       to: process.env.UNI_OUTPUT_DIR
     })
   } else if (process.env.UNI_USING_V3_NATIVE) {
-    array.push({
+    patterns.push({
       from: path.resolve(getTemplatePath(), 'weex'),
       to: process.env.UNI_OUTPUT_DIR
     })
@@ -275,7 +300,7 @@ if (process.env.UNI_USING_NATIVE || process.env.UNI_USING_V3_NATIVE) {
         'weapp-tools/template/v8'
       )
     }
-    array.push({
+    patterns.push({
       from: nativeTemplatePath,
       to: process.env.UNI_OUTPUT_DIR
     }, {
@@ -284,15 +309,17 @@ if (process.env.UNI_USING_NATIVE || process.env.UNI_USING_V3_NATIVE) {
         'weapp-tools/template/common'
       ),
       to: process.env.UNI_OUTPUT_DIR,
-      ignore: [
-        '*.js',
-        '*.json',
-        '__uniapppicker.html',
-        '__uniappview.html'
-      ]
+      globOptions: {
+        ignore: [
+          '*.js',
+          '*.json',
+          '__uniapppicker.html',
+          '__uniappview.html'
+        ]
+      }
     })
   }
-  plugins.push(new CopyWebpackPlugin(array))
+  plugins.push(new CopyWebpackPlugin(CopyWebpackPluginVersion > 5 ? { patterns } : patterns))
 }
 
 try {
@@ -305,7 +332,7 @@ try {
       dir: process.env.UNI_INPUT_DIR
     }))
   }
-} catch (e) {}
+} catch (e) { }
 
 module.exports = function () {
   return {
@@ -322,8 +349,7 @@ module.exports = function () {
     performance: {
       hints: false
     },
-    optimization: {
-      namedModules: false,
+    optimization: Object.assign({
       minimizer: [
         new TerserPlugin({
           terserOptions: {
@@ -333,7 +359,7 @@ module.exports = function () {
           }
         })
       ]
-    },
+    }, webpack.version[0] > 4 ? {} : { namedModules: false }),
     output: {
       path: process.env.UNI_OUTPUT_DIR,
       filename: '[name].js'
@@ -377,7 +403,7 @@ module.exports = function () {
       reasons: true,
       errorDetails: true
     },
-    node: {
+    node: webpack.version[0] > 4 ? false : {
       global: false,
       Buffer: false,
       __filename: false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/vue-cli-plugin-hbuilderx",
-  "version": "2.0.1-35420220803001",
+  "version": "2.0.1-36220220916001",
   "description": "HBuilderX plugin for vue-cli 3",
   "main": "index.js",
   "repository": {
@@ -18,5 +18,5 @@
     "css": "~2.2.1",
     "escodegen": "^1.8.1"
   },
-  "gitHead": "4616fac056201ef6f3db91c550c421c713fc973f"
+  "gitHead": "556ee9e4bafafe938d18573edf26cb67ba6b64ee"
 }

package/packages/webpack-app-plus-nvue-plugin/index.js

@@ -14,13 +14,10 @@ class WebpackAppPlusNVuePlugin {
     const changedFiles = []
     compiler.hooks.emit.tapAsync('webpack-uni-nvue', (compilation, callback) => {
       changedFiles.length = 0
-      const changedChunks = compilation.chunks.filter(chunk => {
+      compilation.chunks.forEach(chunk => {
         const oldVersion = chunkVersions[chunk.name]
         chunkVersions[chunk.name] = chunk.hash
-        return chunk.hash !== oldVersion
-      })
-      changedChunks.map(chunk => {
-        if (Array.isArray(chunk.files)) {
+        if (chunk.hash !== oldVersion && Array.isArray(chunk.files)) {
           chunk.files.forEach(file => {
             !changedFiles.includes(file) && (changedFiles.push(file))
           })

package/packages/webpack-app-plus-plugin/index.js

@@ -44,13 +44,10 @@ class WebpackAppPlusPlugin {
       })
 
       compiler.hooks.emit.tapAsync('WebpackAppPlusPlugin', (compilation, callback) => {
-        const changedChunks = compilation.chunks.filter(chunk => {
+        compilation.chunks.forEach(chunk => {
           const oldVersion = chunkVersions[chunk.name]
           chunkVersions[chunk.name] = chunk.hash
-          return chunk.hash !== oldVersion
-        })
-        changedChunks.map(chunk => {
-          if (Array.isArray(chunk.files)) {
+          if (chunk.hash !== oldVersion && Array.isArray(chunk.files)) {
             chunk.files.forEach(file => {
               if (isAppService) {
                 !serviceChangedFiles.includes(file) && (serviceChangedFiles.push(file))