@dcloudio/vue-cli-plugin-uni 2.0.0-alpha-32920211101001 → 2.0.0-alpha-32920211110001

package/commands/build.js

@@ -3,7 +3,9 @@ const path = require('path')
 const {
   runByHBuilderX,
   isInHBuilderX,
-  parseJson
+  parseJson,
+  parsePagesJson,
+  parseManifestJson
 } = require('@dcloudio/uni-cli-shared')
 
 const uniI18n = require('@dcloudio/uni-cli-i18n')
@@ -32,7 +34,8 @@ module.exports = (api, options) => {
       '--auto-host': 'specify automator host',
       '--auto-port': 'specify automator port',
       '--subpackage': 'specify subpackage',
-      '--plugin': 'specify plugin'
+      '--plugin': 'specify plugin',
+      '--manifest': 'build manifest.json'
     }
   }, async (args) => {
     for (const key in defaults) {
@@ -41,6 +44,10 @@ module.exports = (api, options) => {
       }
     }
 
+    if (args.manifest && process.env.UNI_PLATFORM === 'app-plus') {
+      return buildManifestJson()
+    }
+
     const platforms = ['mp-weixin', 'mp-qq', 'mp-baidu', 'mp-alipay', 'mp-toutiao', 'mp-lark']
     if (args.subpackage && platforms.includes(process.env.UNI_PLATFORM)) {
       process.env.UNI_SUBPACKGE = args.subpackage
@@ -135,7 +142,10 @@ async function build (args, api, options) {
   log()
 
   if (!runByHBuilderX && !runByAliIde) {
-    logWithSpinner(uniI18n.__('pluginUni.startCompileProjectToPlatform', { 0: process.env.UNI_SUB_PLATFORM || process.env.UNI_PLATFORM, 1: process.env.UNI_MP_PLUGIN ? uniI18n.__('plugin') : uniI18n.__('platform') }))
+    logWithSpinner(uniI18n.__('pluginUni.startCompileProjectToPlatform', {
+      0: process.env.UNI_SUB_PLATFORM || process.env.UNI_PLATFORM,
+      1: process.env.UNI_MP_PLUGIN ? uniI18n.__('plugin') : uniI18n.__('platform')
+    }))
   }
 
   const targetDir = api.resolve(options.outputDir)
@@ -161,7 +171,8 @@ async function build (args, api, options) {
     process.env.UNI_USING_V3_NATIVE ||
     (process.UNI_NVUE_ENTRY && Object.keys(process.UNI_NVUE_ENTRY).length)
   ) {
-    webpackConfigs.push(require('@dcloudio/vue-cli-plugin-hbuilderx/build/webpack.nvue.conf.js')(process.UNI_NVUE_ENTRY))
+    webpackConfigs.push(require('@dcloudio/vue-cli-plugin-hbuilderx/build/webpack.nvue.conf.js')(process
+      .UNI_NVUE_ENTRY))
   }
 
   return new Promise((resolve, reject) => {
@@ -178,7 +189,8 @@ async function build (args, api, options) {
         return reject('Build failed with errors.')
       }
 
-      if (!args.silent && (process.env.UNI_PLATFORM !== 'app-plus' || process.env.UNI_AUTOMATOR_WS_ENDPOINT)) {
+      if (!args.silent && (process.env.UNI_PLATFORM !== 'app-plus' || process.env
+        .UNI_AUTOMATOR_WS_ENDPOINT)) {
         const targetDirShort = path.relative(
           api.service.context,
           process.env.UNI_OUTPUT_DIR
@@ -195,7 +207,8 @@ async function build (args, api, options) {
             console.log('https://uniapp.dcloud.io/uniCloud/hosting')
           }
         } else {
-          const dirMsg = runByHBuilderX ? '' : `The ${chalk.cyan(targetDirShort)} directory is ready. `
+          const dirMsg = runByHBuilderX ? ''
+            : `The ${chalk.cyan(targetDirShort)} directory is ready. `
           done(`Build complete. ${dirMsg}Watching for changes...`)
         }
       }
@@ -221,7 +234,9 @@ function analysisPluginDir () {
 
   if (!fs.pathExistsSync(pluginJsonPath)) {
     console.log()
-    console.error(uniI18n.__('pluginUni.fileNoExistsCheckAfterRetry', { 0: pluginJsonName }))
+    console.error(uniI18n.__('pluginUni.fileNoExistsCheckAfterRetry', {
+      0: pluginJsonName
+    }))
     console.log()
     process.exit(0)
   }
@@ -235,8 +250,35 @@ function analysisPluginDir () {
 
   if (UNI_MP_PLUGIN_MAIN && !fs.pathExistsSync(mainFilePath)) {
     console.log()
-    console.error(uniI18n.__('pluginUni.entryDileNoExistsCheckAfterRetry', { 0: UNI_MP_PLUGIN_MAIN }))
+    console.error(uniI18n.__('pluginUni.entryDileNoExistsCheckAfterRetry', {
+      0: UNI_MP_PLUGIN_MAIN
+    }))
     console.log()
     process.exit(0)
   }
 }
+
+function buildManifestJson () {
+  const fs = require('fs-extra')
+  const inputDir = process.env.UNI_INPUT_DIR
+  const outputDir = process.env.UNI_OUTPUT_DIR
+  const pagesJsonPath = path.resolve(inputDir, 'pages.json')
+  const manifestJsonPath = path.resolve(inputDir, 'manifest.json')
+
+  const pagesJson = parsePagesJson(fs.readFileSync(pagesJsonPath, 'utf8'))
+  const manifestJson = parseManifestJson(fs.readFileSync(manifestJsonPath, 'utf8'))
+
+  const res = require('@dcloudio/webpack-uni-pages-loader/lib/platforms/app-plus/index.js')(pagesJson,
+    manifestJson,
+    false)
+  if (res && res[0]) {
+    fs.outputFileSync(
+      path.resolve(outputDir, 'manifest.json'),
+      res[0].content
+    )
+  }
+  const {
+    done
+  } = require('@vue/cli-shared-utils')
+  done('Build complete.')
+}

package/lib/check-update.js

@@ -13,6 +13,9 @@ class Upate {
     this._isAlpha = false
     this._uniId = ''
     this._appId = ''
+    this._wt = 0
+    this._lc = ''
+    this._lcin = []
   }
 
   get uniId () {
@@ -47,6 +50,30 @@ class Upate {
     this._isAlpha = value
   }
 
+  get wt () {
+    return this._wt
+  }
+
+  set wt (value) {
+    this._wt = value
+  }
+
+  get lc () {
+    return this._lc
+  }
+
+  set lc (value) {
+    this._lc = value
+  }
+
+  get lcin () {
+    return this._lcin
+  }
+
+  set lcin (value) {
+    this._lcin = value
+  }
+
   get versionType () {
     return (this.isAlpha ? 'a' : 'r')
   }
@@ -156,6 +183,9 @@ class Upate {
     data.appid = this.uniId
     data.vtype = this.versionType
     data.vcode = this.compilerVersion
+    data.wt = this._wt
+    data.lc = this._lc
+    data.in = this._lcin
 
     delete data.lastCheck
 
@@ -234,6 +264,28 @@ Object.assign(Upate.prototype, {
   DEFAULT_INTERVAL: 1000 * 60 * 60 * 24
 })
 
+function getLc () {
+  const result = []
+  const localeDir = path.join(process.env.UNI_CLI_CONTEXT, 'src/locale')
+  if (!fs.existsSync(localeDir)) {
+    return result
+  }
+
+  const files = fs.readdirSync(localeDir)
+  for (let i = files.length - 1; i >= 0; i--) {
+    const filePath = files[i]
+    const extName = filePath.substring(filePath.lastIndexOf('.') + 1).toLowerCase()
+    if (extName !== 'json') {
+      continue
+    }
+
+    if (files[i].indexOf('uni-app.') < 0) {
+      result.push(filePath.substring(0, filePath.lastIndexOf('.')))
+    }
+  }
+  return result
+}
+
 module.exports = async function checkUpdate () {
   const {
     isInHBuilderX,
@@ -255,6 +307,10 @@ module.exports = async function checkUpdate () {
     update.uniId = manifest.appid
     const appIdKey = process.env.UNI_PLATFORM.includes('quickapp') ? 'package' : 'appid'
     update.appId = manifest[process.env.UNI_PLATFORM] ? (manifest[process.env.UNI_PLATFORM][appIdKey] || '') : ''
+    const cf = manifest['mp-weixin'] ? manifest['mp-weixin'].cloudfunctionRoot : ''
+    update.wt = (cf && cf.length) ? 1 : 0
+    update.lc = manifest.locale ? manifest.locale : ''
+    update.lcin = getLc().join(',')
     update.check()
   } catch (e) {
   }

package/lib/configure-webpack.js

@@ -15,7 +15,7 @@ function resolve (dir) {
 }
 
 function resolveModule (dir) {
-  return path.resolve(__dirname, '../../..', dir)
+  return path.resolve(process.env.UNI_CLI_CONTEXT, './node_modules', dir)
 }
 
 module.exports = function configureWebpack (platformOptions, manifestPlatformOptions, vueOptions, api) {
@@ -184,8 +184,9 @@ module.exports = function configureWebpack (platformOptions, manifestPlatformOpt
       platformWebpackConfig = platformWebpackConfig(webpackConfig, vueOptions, api)
     }
     // 移除 node_modules 目录，避免受路径上的 node_modules 影响
-    webpackConfig.resolve.modules = webpackConfig.resolve.modules.filter(module => module !==
-      'node_modules')
+    if (require('@dcloudio/uni-cli-shared/lib/util').isInHBuilderX) {
+      webpackConfig.resolve.modules = webpackConfig.resolve.modules.filter(module => module !== 'node_modules')
+    }
 
     const plugins = []
 
@@ -298,6 +299,17 @@ module.exports = function configureWebpack (platformOptions, manifestPlatformOpt
       }
     } catch (e) {}
 
+    const resolveLoaderAlias = {}
+    const modules = ['@vue/cli-plugin-babel', '@vue/cli-service']
+    modules.forEach(m => {
+      const { dependencies } = require(`${m}/package.json`)
+      Object.keys(dependencies).forEach(key => {
+        if (/-loader$/.test(key)) {
+          resolveLoaderAlias[key] = require.resolve(key)
+        }
+      })
+    })
+
     return merge({
       devtool: false,
       resolve: {
@@ -325,6 +337,9 @@ module.exports = function configureWebpack (platformOptions, manifestPlatformOpt
         noParse: /^(vue|vue-router|vuex|vuex-router-sync)$/,
         rules
       },
+      resolveLoader: {
+        alias: resolveLoaderAlias
+      },
       plugins,
       performance: {
         assetFilter (assetFilename) {
@@ -334,4 +349,4 @@ module.exports = function configureWebpack (platformOptions, manifestPlatformOpt
       watchOptions: require('./util').getWatchOptions()
     }, platformWebpackConfig)
   }
-}
+}

package/lib/env.js

@@ -107,11 +107,13 @@ if (process.env.UNI_CLOUD_SPACES) {
 }
 
 // 初始化环境变量
-const defaultOutputDir = '../../../../dist/' +
+process.env.UNI_CLI_CONTEXT = require('@dcloudio/uni-cli-shared/lib/util').getCLIContext()
+
+const defaultOutputDir = './dist/' +
   (process.env.NODE_ENV === 'production' ? 'build' : 'dev') + '/' +
   (process.env.UNI_SUB_PLATFORM || process.env.UNI_PLATFORM)
 
-process.env.UNI_OUTPUT_DEFAULT_DIR = path.resolve(__dirname, defaultOutputDir)
+process.env.UNI_OUTPUT_DEFAULT_DIR = path.resolve(process.env.UNI_CLI_CONTEXT, defaultOutputDir)
 if (process.env.UNI_OUTPUT_DIR && process.env.UNI_OUTPUT_DIR.indexOf('./') === 0) {
   process.env.UNI_OUTPUT_DIR = path.resolve(process.cwd(), process.env.UNI_OUTPUT_DIR)
 }
@@ -124,8 +126,6 @@ if (process.env.UNI_PLATFORM === 'app-plus') {
   process.env.UNI_OUTPUT_TMP_DIR = path.resolve(process.env.UNI_OUTPUT_DIR, '../.tmp/app-plus')
 }
 
-process.env.UNI_CLI_CONTEXT = path.resolve(__dirname, '../../../../')
-
 process.UNI_LIBRARIES = process.UNI_LIBRARIES || ['@dcloudio/uni-ui']
 
 if (process.env.NODE_ENV === 'production') { // 发行模式,不启用 cache

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/vue-cli-plugin-uni",
-  "version": "2.0.0-alpha-32920211101001",
+  "version": "2.0.0-alpha-32920211110001",
   "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.0-alpha-32920211101001",
+    "@dcloudio/uni-stat": "^2.0.0-alpha-32920211110001",
     "buffer-json": "^2.0.0",
     "copy-webpack-plugin": "^5.1.1",
     "cross-env": "^5.2.0",
@@ -37,5 +37,5 @@
     "wrap-loader": "^0.2.0",
     "xregexp": "4.0.0"
   },
-  "gitHead": "b41670524d25864c988d3581fb76213360c68377"
+  "gitHead": "15d9991409fe19a87c764c3132c1395dc3b891a2"
 }