@dcloudio/vue-cli-plugin-hbuilderx 2.0.0-32220210818001 → 2.0.0-32920210926001

package/build/webpack.nvue.conf.js

@@ -11,7 +11,7 @@ const {
   nvueHtmlPreprocessOptions,
   getTemplatePath
 } = require('@dcloudio/uni-cli-shared')
-
+const fileLoader = require('@dcloudio/uni-cli-shared/lib/file-loader')
 const WebpackAppPlusNVuePlugin = process.env.UNI_USING_V3
   ? require('../packages/webpack-app-plus-plugin')
   : require('../packages/webpack-app-plus-nvue-plugin')
@@ -108,6 +108,9 @@ if (process.env.NODE_ENV === 'development') {
 // const excludeModuleReg = /node_modules(?!(\/|\\).*(weex).*)/
 
 const rules = [{
+  test: /\.(png|jpg|gif|ttf|eot|woff|woff2)$/i,
+  use: [fileLoader]
+}, {
   test: path.resolve(process.env.UNI_INPUT_DIR, 'pages.json'),
   use: [{
     loader: '@dcloudio/webpack-uni-pages-loader'
@@ -208,7 +211,7 @@ if (process.env.UNI_USING_NATIVE || process.env.UNI_USING_V3_NATIVE) {
   const array = [{
     from: path.resolve(process.env.UNI_INPUT_DIR, 'static'),
     to: 'static'
-  }]
+  }]
 
   const androidPrivacyPath = path.resolve(process.env.UNI_INPUT_DIR, 'androidPrivacy.json')
   if (fs.existsSync(androidPrivacyPath)) {

package/index.js

@@ -1,5 +1,6 @@
 const fs = require('fs')
 const path = require('path')
+const uniI18n = require('@dcloudio/uni-cli-i18n')
 
 process.env.UNI_CLI_CONTEXT = path.resolve(__dirname, '../../../')
 
@@ -18,7 +19,7 @@ module.exports = (api, options) => { // 仅处理 app-plus 相关逻辑
     !process.env.UNI_USING_V3_NATIVE
   ) {
     if (!fs.existsSync(path.resolve(process.env.UNI_HBUILDERX_PLUGINS, 'weapp-tools/lib/index.js'))) {
-      console.error('请使用 HBuilderX 编译运行至 app-plus 平台')
+      console.error(uniI18n.__('pluginHbuilderx.plaseHXCompileAppPlatform'))
       process.exit(0)
     }
   }
@@ -36,4 +37,4 @@ module.exports = (api, options) => { // 仅处理 app-plus 相关逻辑
       plugins
     }
   })
-}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/vue-cli-plugin-hbuilderx",
-  "version": "2.0.0-32220210818001",
+  "version": "2.0.0-32920210926001",
   "description": "HBuilderX plugin for vue-cli 3",
   "main": "index.js",
   "repository": {
@@ -18,5 +18,5 @@
     "css": "~2.2.1",
     "escodegen": "^1.8.1"
   },
-  "gitHead": "d297b8ae6037fb857408d1d6d140f7d7b4929b91"
+  "gitHead": "5e7404fe087c97dfc46bfa7b0ab9044a2fa90142"
 }

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

@@ -1,5 +1,6 @@
 const fs = require('fs')
 const path = require('path')
+const uniI18n = require('@dcloudio/uni-cli-i18n')
 
 const {
   log,
@@ -19,7 +20,7 @@ let isFirst = true
 let compiling = false
 class WebpackAppPlusPlugin {
   apply (compiler) {
-    if (process.env.UNI_USING_V3) {
+    if (process.env.UNI_USING_V3) {
       const chunkVersions = {}
 
       const entry = compiler.options.entry()
@@ -31,7 +32,7 @@ class WebpackAppPlusPlugin {
       compiler.hooks.invalid.tap('WebpackAppPlusPlugin', (fileName, changeTime) => {
         if (!compiling) {
           compiling = true
-          console.log('开始差量编译...')
+          console.log(uniI18n.__('performingHotReload'))
         }
       })
 
@@ -100,7 +101,7 @@ class WebpackAppPlusPlugin {
       })
     } else {
       compiler.hooks.done.tapPromise('WebpackAppPlusPlugin', compilation => {
-        return new Promise((resolve, reject) => {
+        return new Promise((resolve, reject) => {
           if (process.env.UNI_USING_NATIVE || process.env.UNI_USING_V3_NATIVE) {
             return resolve()
           }
@@ -137,4 +138,4 @@ class WebpackAppPlusPlugin {
   }
 }
 
-module.exports = WebpackAppPlusPlugin
+module.exports = WebpackAppPlusPlugin

package/packages/webpack-uni-nvue-loader/lib/style.js

@@ -7,6 +7,7 @@ module.exports = function (content, map) {
   this.cacheable && this.cacheable()
   this.callback(null, 'module.exports = ' + genStyleString(content, this), map)
 }
+const uniI18n = require('@dcloudio/uni-cli-i18n')
 
 // @todo:
 // font-relative lengths: em, ex, ch, ic
@@ -52,9 +53,7 @@ function genStyleString (input, loader) {
         })
         if (msgs.length) {
           if (isFirst) {
-            msgs.unshift(
-              'nvue中不支持如下css。如全局或公共样式受影响，建议将告警样式写在ifndef APP-PLUS-NVUE的条件编译中，详情如下：'
-            )
+            msgs.unshift(uniI18n.__('pluginHbuilderx.nvueCssWarning'))
             isFirst = false
           }
           msgs.forEach(msg => console.warn(msg))

package/template/bin/uniapp-cli.js

@@ -1,9 +1,10 @@
 #!/usr/bin/env node
+const uniI18n = require('@dcloudio/uni-cli-i18n')
 
 // TODO 暂时处理安装目录包含特殊符号，导致 H5 预览资源加载失败的问题。
 const matchSymbol = __dirname.match(/[()]/)
 if (matchSymbol) {
-  console.error(`编译失败：HBuilderX 安装目录不能包括 ${matchSymbol[0]} 等特殊字符`)
+  console.error(uniI18n.__('pluginHbuilderx.hxBuildFailed', { "0": matchSymbol[0] }))
   process.exit(0)
 }
 
@@ -22,10 +23,10 @@ process.env.UNI_OUTPUT_DIR = path.resolve(process.env.UNI_OUTPUT_DIR)
 const service = new Service(process.env.VUE_CLI_CONTEXT || process.cwd())
 
 service.run((process.env.NODE_ENV === 'development' && process.env.UNI_PLATFORM === 'h5') ? 'uni-serve' : 'uni-build', {
-  watch: process.env.NODE_ENV === 'development',
+  watch: process.env.NODE_ENV === 'development',
   minimize: process.env.UNI_MINIMIZE === 'true',
   clean: false
 }).catch(err => {
   error(err)
   process.exit(1)
-})
+})