@dcloudio/vue-cli-plugin-hbuilderx 2.0.0 → 2.0.1-33420211227001

package/build/css-loader.conf.js

@@ -56,14 +56,14 @@ if (isSass) {
 }
 
 const scssLoader = {
-  loader: 'sass-loader',
+  loader: '@dcloudio/vue-cli-plugin-uni/packages/sass-loader',
   options: {
     sourceMap: false
   }
 }
 
 const sassLoader = {
-  loader: 'sass-loader',
+  loader: '@dcloudio/vue-cli-plugin-uni/packages/sass-loader',
   options: {
     sourceMap: false
   }

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')
@@ -79,9 +79,13 @@ const plugins = [
   new webpack.DefinePlugin({
     'process.env': {
       NODE_ENV: JSON.stringify(process.env.NODE_ENV),
+      UNI_APP_ID: JSON.stringify(process.env.UNI_APP_ID),
+      UNI_APP_NAME: JSON.stringify(process.env.UNI_APP_NAME),
+      UNI_PLATFORM: JSON.stringify(process.env.UNI_PLATFORM),
       VUE_APP_PLATFORM: JSON.stringify(process.env.UNI_PLATFORM),
       UNI_CLOUD_PROVIDER: process.env.UNI_CLOUD_PROVIDER,
-      HBX_USER_TOKEN: JSON.stringify(process.env.HBX_USER_TOKEN || ''),
+      UNICLOUD_DEBUG: process.env.UNICLOUD_DEBUG,
+      RUN_BY_HBUILDERX: process.env.RUN_BY_HBUILDERX,
       UNI_AUTOMATOR_WS_ENDPOINT: JSON.stringify(process.env.UNI_AUTOMATOR_WS_ENDPOINT)
     }
   }),
@@ -105,6 +109,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'
@@ -179,40 +186,50 @@ rules.unshift({
     loader: '@dcloudio/vue-cli-plugin-hbuilderx/packages/webpack-uni-nvue-loader/lib/template.recycle'
   }]
 })
-
-if (process.env.UNI_USING_V3_NATIVE) {
-  try {
-    const automatorJson = require.resolve('@dcloudio/uni-automator/dist/automator.json')
-    plugins.push(new CopyWebpackPlugin([{
-      from: automatorJson,
-      to: '../.automator/' + (process.env.UNI_SUB_PLATFORM || process.env.UNI_PLATFORM) +
-        '/.automator.json',
-      transform (content) {
-        if (process.env.UNI_AUTOMATOR_WS_ENDPOINT) {
-          return JSON.stringify({
-            version: require('@dcloudio/uni-automator/package.json').version,
-            wsEndpoint: process.env.UNI_AUTOMATOR_WS_ENDPOINT
-          })
-        }
-        return ''
-      }
-    }]))
-  } catch (e) {}
-}
+
+if (process.env.UNI_USING_V3_NATIVE) {
+  try {
+    const automatorJson = require.resolve('@dcloudio/uni-automator/dist/automator.json')
+    plugins.push(new CopyWebpackPlugin([{
+      from: automatorJson,
+      to: '../.automator/' + (process.env.UNI_SUB_PLATFORM || process.env.UNI_PLATFORM) +
+        '/.automator.json',
+      transform (content) {
+        if (process.env.UNI_AUTOMATOR_WS_ENDPOINT) {
+          return JSON.stringify({
+            version: require('@dcloudio/uni-automator/package.json').version,
+            wsEndpoint: process.env.UNI_AUTOMATOR_WS_ENDPOINT
+          })
+        }
+        return ''
+      }
+    }]))
+  } catch (e) {}
+}
 
 if (process.env.UNI_USING_NATIVE || process.env.UNI_USING_V3_NATIVE) {
   plugins.push(new WebpackUniMPPlugin())
   const array = [{
     from: path.resolve(process.env.UNI_INPUT_DIR, 'static'),
     to: 'static'
-  }]
-  const hybridHtmlPath = path.resolve(process.env.UNI_INPUT_DIR, 'hybrid/html')
-  if (fs.existsSync(hybridHtmlPath)) {
-    array.push({
-      from: hybridHtmlPath,
-      to: 'hybrid/html'
-    })
+  }]
+
+  const androidPrivacyPath = path.resolve(process.env.UNI_INPUT_DIR, 'androidPrivacy.json')
+  if (fs.existsSync(androidPrivacyPath)) {
+    array.push({
+      from: androidPrivacyPath,
+      to: 'androidPrivacy.json'
+    })
+  }
+
+  const hybridHtmlPath = path.resolve(process.env.UNI_INPUT_DIR, 'hybrid/html')
+  if (fs.existsSync(hybridHtmlPath)) {
+    array.push({
+      from: hybridHtmlPath,
+      to: 'hybrid/html'
+    })
   }
+
   if (process.env.UNI_USING_NVUE_COMPILER) {
     array.push({
       from: path.resolve(getTemplatePath(), 'common'),
@@ -251,6 +268,18 @@ if (process.env.UNI_USING_NATIVE || process.env.UNI_USING_V3_NATIVE) {
   plugins.push(new CopyWebpackPlugin(array))
 }
 
+try {
+  if (process.env.UNI_HBUILDERX_PLUGINS) {
+    require(path.resolve(process.env.UNI_HBUILDERX_PLUGINS, 'uni_helpers/lib/bytenode'))
+    const {
+      W
+    } = require(path.resolve(process.env.UNI_HBUILDERX_PLUGINS, 'uni_helpers'))
+    plugins.push(new W({
+      dir: process.env.UNI_INPUT_DIR
+    }))
+  }
+} catch (e) {}
+
 module.exports = function () {
   return {
     target: 'node', // 激活 vue-loader 的 isServer 逻辑
@@ -360,4 +389,4 @@ module.exports = function () {
       zlib: false
     }
   }
-}
+}

package/index.js

@@ -1,7 +1,8 @@
 const fs = require('fs')
 const path = require('path')
+const uniI18n = require('@dcloudio/uni-cli-i18n')
 
-process.env.UNI_CLI_CONTEXT = path.resolve(__dirname, '../../../')
+process.env.UNI_CLI_CONTEXT = require('@dcloudio/uni-cli-shared/lib/util').getCLIContext()
 
 process.env.UNI_HBUILDERX_PLUGINS = process.env.UNI_HBUILDERX_PLUGINS || 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",
+  "version": "2.0.1-33420211227001",
   "description": "HBuilderX plugin for vue-cli 3",
   "main": "index.js",
   "repository": {
@@ -18,5 +18,5 @@
     "css": "~2.2.1",
     "escodegen": "^1.8.1"
   },
-  "gitHead": "b1bdfb4de3f518c1c0fbab242403ea05feced4e3"
+  "gitHead": "f54af18016d88ecbd0776ad013f5c1eb65a8debe"
 }

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,8 @@ 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')
+const print = require('../../../util/console')
 
 // @todo:
 // font-relative lengths: em, ex, ch, ic
@@ -52,12 +54,22 @@ 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))
+          msgs.forEach(msg => {
+            switch (msg.split(':')[0]) {
+              case 'ERROR':
+                print.error(msg)
+                break
+              case 'WARNING' :
+                print.warn(msg)
+                break
+              default:
+                print.log(msg)
+                break
+            }
+          })
         }
       }
       try {

package/packages/weex-styler/lib/validator.js

@@ -549,6 +549,7 @@ function FLEW_WRAP_VALIDATOR (v) {
 
 var PROP_NAME_GROUPS = {
   boxModel: {
+    display: genEnumValidator(['flex']),
     width: LENGTH_VALIDATOR,
     height: LENGTH_VALIDATOR,
     overflow: genEnumValidator(['hidden']),

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)
-})
+})

package/util/console.js

@@ -0,0 +1,23 @@
+const ZERO_WIDTH_CHAR = {
+  NOTE: '',
+  WARNING: '\u200B',
+  ERROR: '\u200C',
+  backup0: '\u200D',
+  backup1: '\u200E',
+  backup2: '\u200F',
+  backup3: '\uFEFF'
+}
+
+module.exports = {
+  warn (msg) {
+    msg = ZERO_WIDTH_CHAR.WARNING + msg + ZERO_WIDTH_CHAR.WARNING
+    console.warn(msg)
+  },
+  error (msg) {
+    msg = ZERO_WIDTH_CHAR.ERROR + msg + ZERO_WIDTH_CHAR.ERROR
+    console.error(msg)
+  },
+  log (msg) {
+    console.log(msg)
+  }
+}