@dcloudio/vue-cli-plugin-hbuilderx 2.0.1-alpha-34220220310003 → 2.0.1-alpha-34420220402001

package/build/webpack.nvue.conf.js

@@ -317,7 +317,6 @@ module.exports = function () {
       alias: {
         '@': process.env.UNI_INPUT_DIR,
         'uni-pages': path.resolve(process.env.UNI_INPUT_DIR, 'pages.json'),
-        '@dcloudio/uni-stat': require.resolve('@dcloudio/uni-stat'),
         'uni-app-style': path.resolve(process.env.UNI_INPUT_DIR, getNVueMainEntry()) + '?' + JSON.stringify({
           type: 'appStyle'
         }),

package/module-alias.js

@@ -1,36 +1,36 @@
 const fs = require('fs')
-const path = require('path')
-const moduleAlias = require('module-alias')
-
-const {
-  hasModule
-} = require('@dcloudio/uni-cli-shared/lib/util')
-
-const isInHBuilderX = fs.existsSync(path.resolve(process.env.UNI_CLI_CONTEXT, 'bin/uniapp-cli.js'))
-
-// nvue override
-moduleAlias.addAlias('weex-styler', path.resolve(__dirname, 'packages/weex-styler'))
-moduleAlias.addAlias('weex-template-compiler', path.resolve(__dirname, 'packages/weex-template-compiler'))
-moduleAlias.addAlias('@vue/component-compiler-utils', require.resolve(
-  '@dcloudio/vue-cli-plugin-uni/packages/@vue/component-compiler-utils'))
-moduleAlias.addAlias('@vue/component-compiler-utils/package.json', require.resolve(
-  '@dcloudio/vue-cli-plugin-uni/packages/@vue/component-compiler-utils/package.json'))
-
-if (isInHBuilderX) {
-  moduleAlias.addAlias('typescript', path.resolve(process.env.UNI_HBUILDERX_PLUGINS,
-    'compile-typescript/node_modules/typescript'))
-  moduleAlias.addAlias('less', path.resolve(process.env.UNI_HBUILDERX_PLUGINS,
-    'compile-less/node_modules/less'))
-  moduleAlias.addAlias('node-sass', path.resolve(process.env.UNI_HBUILDERX_PLUGINS,
-    'compile-node-sass/node_modules/node-sass-china'))
-  moduleAlias.addAlias('stylus', path.resolve(process.env.UNI_HBUILDERX_PLUGINS,
-    'compile-stylus/node_modules/stylus'))
-  moduleAlias.addAlias('pug', path.resolve(process.env.UNI_HBUILDERX_PLUGINS,
-    'compile-pug-cli/node_modules/pug'))
-
-  if (!hasModule('typescript')) { // 因为 cli-plugin-typescript 会直接读取typescript/package.json，故，如果未安装 typescript，则先设置一个假的
-    moduleAlias.addAlias('typescript/package.json', path.resolve(__dirname, 'typescript.json'))
-    moduleAlias.addAlias('fork-ts-checker-webpack-plugin', path.resolve(__dirname,
-      'fork-ts-checker-webpack-plugin.fake.js'))
-  }
+const path = require('path')
+const moduleAlias = require('module-alias')
+
+const {
+  hasModule
+} = require('@dcloudio/uni-cli-shared/lib/util')
+
+const isInHBuilderX = fs.existsSync(path.resolve(process.env.UNI_CLI_CONTEXT, 'bin/uniapp-cli.js'))
+
+// nvue override
+moduleAlias.addAlias('weex-styler', path.resolve(__dirname, 'packages/weex-styler'))
+moduleAlias.addAlias('weex-template-compiler', path.resolve(__dirname, 'packages/weex-template-compiler'))
+moduleAlias.addAlias('@vue/component-compiler-utils', require.resolve(
+  '@dcloudio/vue-cli-plugin-uni/packages/@vue/component-compiler-utils'))
+moduleAlias.addAlias('@vue/component-compiler-utils/package.json', require.resolve(
+  '@dcloudio/vue-cli-plugin-uni/packages/@vue/component-compiler-utils/package.json'))
+
+if (isInHBuilderX) {
+  moduleAlias.addAlias('typescript', path.resolve(process.env.UNI_HBUILDERX_PLUGINS,
+    'compile-typescript/node_modules/typescript'))
+  moduleAlias.addAlias('less', path.resolve(process.env.UNI_HBUILDERX_PLUGINS,
+    'compile-less/node_modules/less'))
+  moduleAlias.addAlias('node-sass', path.resolve(process.env.UNI_HBUILDERX_PLUGINS,
+    'compile-node-sass/node_modules/node-sass-china'))
+  moduleAlias.addAlias('stylus', path.resolve(process.env.UNI_HBUILDERX_PLUGINS,
+    'compile-stylus/node_modules/stylus'))
+  moduleAlias.addAlias('pug', path.resolve(process.env.UNI_HBUILDERX_PLUGINS,
+    'compile-pug-cli/node_modules/pug'))
+
+  if (!hasModule('typescript')) { // 因为 cli-plugin-typescript 会直接读取typescript/package.json，故，如果未安装 typescript，则先设置一个假的
+    moduleAlias.addAlias('typescript/package.json', path.resolve(__dirname, 'typescript.json'))
+    moduleAlias.addAlias('fork-ts-checker-webpack-plugin', path.resolve(__dirname,
+      'fork-ts-checker-webpack-plugin.fake.js'))
+  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/vue-cli-plugin-hbuilderx",
-  "version": "2.0.1-alpha-34220220310003",
+  "version": "2.0.1-alpha-34420220402001",
   "description": "HBuilderX plugin for vue-cli 3",
   "main": "index.js",
   "repository": {
@@ -18,5 +18,5 @@
     "css": "~2.2.1",
     "escodegen": "^1.8.1"
   },
-  "gitHead": "f2e034b8068fbdf63fe894ec097edf47d5d7259f"
+  "gitHead": "5590cdf746ea715abe4dd71aa0392f600003bf06"
 }

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

@@ -12,7 +12,8 @@ const {
 } = require('vue-loader/lib/codegen/utils')
 
 const {
-  normalizePath
+  normalizePath,
+  getPlatformStat
 } = require('@dcloudio/uni-cli-shared')
 
 const appVuePath = path.resolve(process.env.UNI_INPUT_DIR, 'App.vue')
@@ -47,7 +48,7 @@ module.exports = function (content, map) {
 
   const loaderContext = this
 
-  const statCode = process.env.UNI_USING_STAT ? 'import \'@dcloudio/uni-stat\';' : ''
+  const statCode = getPlatformStat()
 
   if (this.resourceQuery) {
     const params = loaderUtils.parseQuery(this.resourceQuery)
@@ -88,4 +89,4 @@ module.exports = function (content, map) {
   const automatorCode = process.env.UNI_AUTOMATOR_WS_ENDPOINT ? 'import \'@dcloudio/uni-app-plus/dist/automator\';'
     : ''
   return automatorCode + statCode + content
-}
+}

package/packages/weex-template-compiler/build.js

@@ -1648,6 +1648,7 @@ function parse (
           // condense consecutive whitespaces into single space
           text = text.replace(whitespaceRE, ' ');
         }
+        text = text.trim();
         var res;
         var child;
         if (!inVPre && text !== ' ' && (res = parseText(text, delimiters))) {