@dcloudio/uni-cli-shared 2.0.1-34920220609002 → 2.0.1-35320220729002

package/lib/index.js

@@ -58,8 +58,9 @@ const {
   nvueCssPreprocessOptions,
   nvueHtmlPreprocessOptions,
   getPlatformGlobal,
-  getPlatformStat,
-  getPlatformPush
+  getPlatformStat,
+  getPlatformPush,
+  getPlatformUniCloud
 } = require('./platform')
 
 module.exports = {
@@ -109,6 +110,7 @@ module.exports = {
   nvueCssPreprocessOptions,
   nvueHtmlPreprocessOptions,
   getPlatformGlobal,
-  getPlatformStat,
-  getPlatformPush
-}
+  getPlatformStat,
+  getPlatformPush,
+  getPlatformUniCloud
+}

package/lib/manifest.js

@@ -1,4 +1,7 @@
 const path = require('path')
+const {
+  hasOwn
+} = require('./util')
 
 const {
   getJson,
@@ -98,6 +101,24 @@ function getH5Options (manifestJson) {
   return h5
 }
 
+function isEnableUniPushV1 (manifestJson, platform) {
+  if (!manifestJson) {
+    manifestJson = getManifestJson()
+  }
+  if (isEnableUniPushV2(manifestJson, platform)) {
+    return false
+  }
+  if (platform === 'app-plus') {
+    const platformOptions = manifestJson[platform]
+    const sdkConfigs = platformOptions && platformOptions.distribute && platformOptions.distribute.sdkConfigs
+    const push = sdkConfigs && sdkConfigs.push
+    if (push && hasOwn(push, 'unipush')) {
+      return true
+    }
+  }
+  return false
+}
+
 function isEnableUniPushV2 (manifestJson, platform) {
   if (!manifestJson) {
     manifestJson = getManifestJson()
@@ -121,14 +142,15 @@ function isUniPushOffline (manifestJson) {
   const platformOptions = manifestJson['app-plus']
   const sdkConfigs = platformOptions && platformOptions.distribute && platformOptions.distribute.sdkConfigs
   const unipush = sdkConfigs && sdkConfigs.push && sdkConfigs.push.unipush
-  return unipush && unipush.offline === true
+  return unipush && unipush.offline === true
 }
 
 module.exports = {
   getManifestJson,
   parseManifestJson,
   getNetworkTimeout,
-  getH5Options,
+  getH5Options,
+  isEnableUniPushV1,
   isEnableUniPushV2,
   isUniPushOffline
 }

package/lib/platform.js

@@ -168,13 +168,20 @@ module.exports = {
       : 'import \'@dcloudio/uni-stat/dist/uni-stat.es.js\';'
   },
   getPlatformPush () {
-    if (process.env.UNI_PUSH_V2_OFFLINE) {
+    if (process.env.UNI_PUSH_V2_OFFLINE || process.env.UNI_PUSH_V1) {
       return ';import \'@dcloudio/vue-cli-plugin-uni/packages/uni-push/dist/uni-push.plus.es.js\';'
     } else if (process.env.UNI_PUSH_V2) {
       return ';import \'@dcloudio/vue-cli-plugin-uni/packages/uni-push/dist/uni-push.es.js\';'
     }
     return ''
   },
+  getPlatformUniCloud () {
+    if (JSON.parse(process.env.UNI_CLOUD_PROVIDER || '[]').length) {
+      const uniCloudLibPath = '@dcloudio/vue-cli-plugin-uni/packages/uni-cloud/dist/index.js'
+      return `import '${uniCloudLibPath}';`
+    }
+    return ''
+  },
   getBabelParserOptions () {
     return {
       sourceType: 'module',

package/lib/source-map.js

@@ -28,11 +28,11 @@ function getSourceRoot () {
 }
 
 function moduleFilenameTemplate (info) {
-  if (
+  if (
     info.resourcePath &&
     (
       !info.allLoaders ||
-      info.query.includes('type=script&lang=ts') ||
+      info.query.includes('type=script&lang=ts') ||
       info.resourcePath.endsWith('.ts')
     )
   ) {
@@ -46,14 +46,15 @@ function moduleFilenameTemplate (info) {
 const exclude = [/pages\.json/, /node_modules/, /vue&type=template/, /vue&type=style/]
 
 module.exports = {
-  createSourceMapDevToolPlugin (filename = false) {
+  createSourceMapDevToolPlugin (filename = false, args) {
     const options = {
       test: [/\.js$/],
       exclude,
-      moduleFilenameTemplate
+      moduleFilenameTemplate,
+      ...args
     }
     if (filename) {
-      options.filename = '../.sourcemap/' + process.env.UNI_PLATFORM + '/[name].js.map'
+      options.filename = '../.sourcemap/' + process.env.UNI_PLATFORM + '/[file].map'
     }
     return new webpack.SourceMapDevToolPlugin(options)
   },
@@ -64,4 +65,4 @@ module.exports = {
       moduleFilenameTemplate
     })
   }
-}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "2.0.1-34920220609002",
+  "version": "2.0.1-35320220729002",
   "description": "uni-cli-shared",
   "main": "lib/index.js",
   "repository": {
@@ -23,5 +23,5 @@
     "postcss-urlrewrite": "^0.2.2",
     "strip-json-comments": "^2.0.1"
   },
-  "gitHead": "d28c71d8a044635b27fbbb7cffb66b59424248d3"
+  "gitHead": "99c489d7a19425ade612162abd21b441260e7ba7"
 }