@dcloudio/uni-cli-shared 2.0.1-alpha-36320220919002 → 2.0.1-alpha-36720221017001

package/components/ad.mixin.js

@@ -54,12 +54,14 @@ class AdBase {
     })
     ad.onError(({
       code,
-      message
+      message,
+      detail
     }) => {
       this._isLoading = false
       const data = {
         code: code,
-        errMsg: message
+        errMsg: message,
+        detail: detail
       }
 
       if (this._retry && code === -5008) {

package/lib/cache.js

@@ -1,6 +1,9 @@
 const fs = require('fs')
 const path = require('path')
 const crypto = require('crypto')
+const {
+  isNormalPage
+} = require('./util')
 /**
  * 1.page-loader 缓存基础的  app.json page.json project.config.json
  * 2.main-loader 缓存 app.json 中的 usingComponents 节点
@@ -49,7 +52,9 @@ function getJsonFile (name) {
 function getChangedJsonFileMap (clear = true) {
   const changedJsonFileMap = new Map()
   for (const name of changedJsonFileSet.values()) {
-    changedJsonFileMap.set(name + '.json', jsonFileMap.get(name))
+    if (isNormalPage(name)) {
+      changedJsonFileMap.set(name + '.json', jsonFileMap.get(name))
+    }
   }
   clear && changedJsonFileSet.clear()
   return changedJsonFileMap
@@ -361,4 +366,4 @@ module.exports = {
   getChangedJsonFileMap,
   getSpecialMethods,
   supportGlobalUsingComponents
-}
+}

package/lib/file-loader.js

@@ -1,17 +1,16 @@
 const path = require('path')
-
-const isWin = /^win/.test(process.platform)
-
-const normalizePath = path => (isWin ? path.replace(/\\/g, '/') : path)
+const {
+  normalizeNodeModules
+} = require('./util')
 
 module.exports = {
   loader: 'file-loader',
   options: {
     publicPath (url, resourcePath, context) {
-      return '/' + normalizePath(path.relative(process.env.UNI_INPUT_DIR, resourcePath))
+      return '/' + normalizeNodeModules(path.relative(process.env.UNI_INPUT_DIR, resourcePath))
     },
     outputPath (url, resourcePath, context) {
-      return normalizePath(path.relative(process.env.UNI_INPUT_DIR, resourcePath))
+      return normalizeNodeModules(path.relative(process.env.UNI_INPUT_DIR, resourcePath))
     }
   }
 }

package/lib/index.js

@@ -113,4 +113,4 @@ module.exports = {
   getPlatformStat,
   getPlatformPush,
   getPlatformUniCloud
-}
+}

package/lib/manifest.js

@@ -108,7 +108,7 @@ function isEnableUniPushV1 (manifestJson, platform) {
   if (isEnableUniPushV2(manifestJson, platform)) {
     return false
   }
-  if (platform === 'app-plus') {
+  if (platform === 'app-plus') {
     const platformOptions = manifestJson[platform]
     const sdkConfigs = platformOptions && platformOptions.distribute && platformOptions.distribute.sdkConfigs
     const push = sdkConfigs && sdkConfigs.push
@@ -135,6 +135,19 @@ function isEnableUniPushV2 (manifestJson, platform) {
   return platformOptions && platformOptions.unipush && platformOptions.unipush.enable === true
 }
 
+function isEnableSecureNetwork (manifestJson, platform) {
+  if (!manifestJson) {
+    manifestJson = getManifestJson()
+  }
+  const platformOptions = manifestJson[platform]
+  if (platform === 'app-plus') {
+    return !!(
+      platformOptions && platformOptions.modules && platformOptions.modules.SecureNetwork
+    )
+  }
+  return platformOptions && platformOptions.secureNetwork && platformOptions.secureNetwork.enable === true
+}
+
 function isUniPushOffline (manifestJson) {
   if (!manifestJson) {
     manifestJson = getManifestJson()
@@ -149,8 +162,9 @@ module.exports = {
   getManifestJson,
   parseManifestJson,
   getNetworkTimeout,
-  getH5Options,
+  getH5Options,
   isEnableUniPushV1,
   isEnableUniPushV2,
-  isUniPushOffline
-}
+  isUniPushOffline,
+  isEnableSecureNetwork
+}

package/lib/pages.js

@@ -6,7 +6,8 @@ const {
   removeExt,
   normalizePath,
   camelize,
-  capitalize
+  capitalize,
+  isNormalPage
 } = require('./util')
 
 const {
@@ -113,7 +114,9 @@ function isNVuePage (page, root = '') {
 
 function isValidPage (page, root = '') {
   if (typeof page === 'string' || !page.path) { // 不合法的配置
-    console.warn(uniI18n.__('cliShared.pagesJsonError', { 0: 'https://uniapp.dcloud.io/collocation/pages?id=pages' }))
+    console.warn(uniI18n.__('cliShared.pagesJsonError', {
+      0: 'https://uniapp.dcloud.io/collocation/pages?id=pages'
+    }))
     return false
   }
   let pagePath = page.path
@@ -213,7 +216,10 @@ function parseEntry (pagesJson) {
   const weixinConfig = manifestConfig['mp-weixin'] || {}
   const independentSwitch = !!weixinConfig.independent
   if (independentSwitch) {
-    Object.values(process.UNI_SUBPACKAGES).forEach(({ root, independent = false }) => {
+    Object.values(process.UNI_SUBPACKAGES).forEach(({
+      root,
+      independent = false
+    }) => {
       if (root && independent) {
         const pkgRootMainJsKey = `${root}/common/main`
         // const pkgRootMainJsPath = `${process.env.UNI_INPUT_DIR}/${root}/main.js`;
@@ -239,7 +245,9 @@ function parseEntry (pagesJson) {
 
   // pages
   pagesJson.pages.forEach(page => {
-    process.UNI_ENTRY[page.path] = getMainJsPath(page.path)
+    if (isNormalPage(page.path)) {
+      process.UNI_ENTRY[page.path] = getMainJsPath(page.path)
+    }
   })
   // subPackages
   if (Array.isArray(pagesJson.subPackages) && pagesJson.subPackages.length) {
@@ -404,7 +412,11 @@ function initAutoComponents () {
   })
   if (conflictFiles.length > 0) {
     conflictFiles.forEach(files => {
-      console.warn(uniI18n.__('cliShared.easycomConflict', { 0: '[' + files.map((file, index) => { return file }).join(',') + ']' }))
+      console.warn(uniI18n.__('cliShared.easycomConflict', {
+        0: '[' + files.map((file, index) => {
+          return file
+        }).join(',') + ']'
+      }))
       console.log('\n')
     })
   }
@@ -519,7 +531,9 @@ function parseUsingAutoImportComponents (usingAutoImportComponents) {
 
 const BUILT_IN_COMPONENTS = ['page-meta', 'navigation-bar', 'uni-match-media']
 
-const BUILT_IN_EASYCOMS = ['unicloud-db', 'uniad', 'ad-rewarded-video', 'ad-fullscreen-video', 'ad-interstitial', 'ad-interactive']
+const BUILT_IN_EASYCOMS = ['unicloud-db', 'uniad', 'ad-rewarded-video', 'ad-fullscreen-video', 'ad-interstitial',
+  'ad-interactive'
+]
 
 function isBuiltInComponent (name) { // uni-template-compiler/lib/util.js 识别微信内置组件
   return BUILT_IN_COMPONENTS.includes(name)
@@ -551,4 +565,4 @@ module.exports = {
   getGlobalUsingComponentsCode,
   parseUsingAutoImportComponents,
   generateGlobalUsingComponentsCode
-}
+}

package/lib/uni_modules/uni_modules.js

@@ -0,0 +1,99 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseInject = exports.parseInjects = exports.parseUniExtApis = void 0;
+const path_1 = __importDefault(require("path"));
+const fs_extra_1 = __importDefault(require("fs-extra"));
+const merge_1 = require("merge");
+function parseUniExtApis() {
+    const uniModulesDir = path_1.default.resolve(process.env.UNI_INPUT_DIR, 'uni_modules');
+    if (!fs_extra_1.default.existsSync(uniModulesDir)) {
+        return {};
+    }
+    const injects = {};
+    fs_extra_1.default.readdirSync(uniModulesDir).forEach((uniModuleDir) => {
+        var _a, _b;
+        // 必须以 uni- 开头
+        if (!uniModuleDir.startsWith('uni-')) {
+            return;
+        }
+        const pkgPath = path_1.default.resolve(uniModulesDir, uniModuleDir, 'package.json');
+        if (!fs_extra_1.default.existsSync(pkgPath)) {
+            return;
+        }
+        const exports = (_b = (_a = JSON.parse(fs_extra_1.default.readFileSync(pkgPath, 'utf8'))) === null || _a === void 0 ? void 0 : _a.uni_modules) === null || _b === void 0 ? void 0 : _b['uni-ext-api'];
+        if (exports) {
+            Object.assign(injects, parseInjects(process.env.UNI_PLATFORM === 'h5' ? 'web' : process.env.UNI_PLATFORM, `@/uni_modules/${uniModuleDir}`, exports));
+        }
+    });
+    return injects;
+}
+exports.parseUniExtApis = parseUniExtApis;
+/**
+ *  uni:'getBatteryInfo'
+ * import getBatteryInfo from '..'
+ *
+ * uni:['getBatteryInfo']
+ * import { getBatteryInfo } from '..'
+ *
+ * uni:['openLocation','chooseLocation']
+ * import { openLocation, chooseLocation } from '..'
+ *
+ * uni:{
+ *  onUserCaptureScreen: "onCaptureScreen"
+ *  offUserCaptureScreen: "offCaptureScreen"
+ * }
+ *
+ * uni.getBatteryInfo = getBatteryInfo
+ * @param source
+ * @param globalObject
+ * @param define
+ * @returns
+ */
+function parseInjects(platform, source, exports = {}) {
+    let rootDefines = {};
+    Object.keys(exports).forEach((name) => {
+        if (name.startsWith('uni')) {
+            rootDefines[name] = exports[name];
+        }
+    });
+    const platformDefines = exports[platform];
+    // 该平台不支持
+    if (platformDefines === false) {
+        return {};
+    }
+    if (platformDefines) {
+        rootDefines = (0, merge_1.recursive)(true, rootDefines, platformDefines);
+    }
+    const injects = {};
+    for (const key in rootDefines) {
+        Object.assign(injects, parseInject(source, 'uni', rootDefines[key]));
+    }
+    return injects;
+}
+exports.parseInjects = parseInjects;
+function parseInject(source, globalObject, define) {
+    const injects = {};
+    if (define === false) {
+    }
+    else if (typeof define === 'string') {
+        // {'uni.getBatteryInfo' : '@dcloudio/uni-getbatteryinfo'}
+        injects[globalObject + '.' + define] = source;
+    }
+    else if (Array.isArray(define)) {
+        // {'uni.getBatteryInfo' : ['@dcloudio/uni-getbatteryinfo','getBatteryInfo]}
+        define.forEach((d) => {
+            injects[globalObject + '.' + d] = [source, d];
+        });
+    }
+    else {
+        const keys = Object.keys(define);
+        keys.forEach((d) => {
+            injects[globalObject + '.' + d] = [source, define[d]];
+        });
+    }
+    return injects;
+}
+exports.parseInject = parseInject;

package/lib/util.js

@@ -150,8 +150,17 @@ function pathToGlob (pathString, glob, options = {}) {
   }
   return path.posix.join(safeStr, glob)
 }
+/**
+ * 字节跳动小程序可以配置 ext:// 开头的插件页面模板，如 ext://microapp-trade-plugin/order-confirm
+ * @param pagePath
+ * @returns
+ */
+function isNormalPage (pagePath) {
+  return !pagePath.startsWith('ext://')
+}
 
 module.exports = {
+  isNormalPage,
   isInHBuilderX,
   isInHBuilderXAlpha,
   getCLIContext,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "2.0.1-alpha-36320220919002",
+  "version": "2.0.1-alpha-36720221017001",
   "description": "uni-cli-shared",
   "main": "lib/index.js",
   "repository": {
@@ -25,5 +25,5 @@
     "postcss-urlrewrite": "^0.2.2",
     "strip-json-comments": "^2.0.1"
   },
-  "gitHead": "b2851f78cf0ce4c18aa1e9c0033ab1bcc9306444"
+  "gitHead": "7d7030aaaffab530253dc4cf02f87a13023c0d1f"
 }