@dcloudio/uni-cli-shared 2.0.2-3071120230427001 → 2.0.2-3080420230530001

package/lib/cache.js

@@ -78,8 +78,10 @@ const supportGlobalUsingComponents = process.env.UNI_PLATFORM === 'mp-weixin' ||
 function updateComponentJson (name, jsonObj, usingComponents = true, type = 'Component') {
   if (type === 'Component') {
     jsonObj.component = true
-  }
-  if (type === 'Page') {
+    if (process.env.UNI_PLATFORM === 'mp-alipay') {
+      jsonObj.styleIsolation = 'apply-shared'
+    }
+  } else if (type === 'Page') {
     if (process.env.UNI_PLATFORM === 'mp-baidu') {
       jsonObj.component = true
     }
@@ -162,6 +164,9 @@ function updateUsingComponents (name, usingComponents, type) {
     const jsonObj = JSON.parse(oldJsonStr)
     if (type === 'Component') {
       jsonObj.component = true
+      if (process.env.UNI_PLATFORM === 'mp-alipay') {
+        jsonObj.styleIsolation = 'apply-shared'
+      }
     } else if (type === 'Page') {
       if (process.env.UNI_PLATFORM === 'mp-baidu') {
         jsonObj.component = true
@@ -179,6 +184,9 @@ function updateUsingComponents (name, usingComponents, type) {
     }
     if (type === 'Component') {
       jsonObj.component = true
+      if (process.env.UNI_PLATFORM === 'mp-alipay') {
+        jsonObj.styleIsolation = 'apply-shared'
+      }
     } else if (type === 'Page') {
       if (process.env.UNI_PLATFORM === 'mp-baidu') {
         jsonObj.component = true
@@ -322,7 +330,7 @@ module.exports = {
     if (!fs.existsSync(filepath)) {
       try {
         clearCache()
-      } catch (e) {}
+      } catch (e) { }
       return
     }
     const pagesJsonPath = path.resolve(process.env.UNI_INPUT_DIR, 'pages.json')
@@ -331,7 +339,7 @@ module.exports = {
     if (jsonCache.mtimeMs !== mtimeMs) {
       try {
         clearCache()
-      } catch (e) {}
+      } catch (e) { }
       return
     }
     jsonFileMap = new Map(jsonCache.files)
@@ -366,4 +374,4 @@ module.exports = {
   getChangedJsonFileMap,
   getSpecialMethods,
   supportGlobalUsingComponents
-}
+}

package/lib/i18n.js

@@ -84,7 +84,7 @@ function resolveI18nLocale (platfrom, locales, locale) {
     return locale
   }
   const defaultLocales = ['zh-Hans', 'zh-Hant']
-  if (platfrom === 'app' || platfrom === 'h5') {
+  if (platfrom === 'app-plus' || platfrom === 'h5') {
     defaultLocales.unshift('en')
   } else {
     // 小程序
@@ -96,4 +96,4 @@ function resolveI18nLocale (platfrom, locales, locale) {
 module.exports = {
   initLocales,
   initI18nOptions
-}
+}

package/lib/index.js

@@ -34,7 +34,8 @@ const {
   convertStaticStyle,
   getTemplatePath,
   createSource,
-  deleteAsset
+  deleteAsset,
+  showRunPrompt
 } = require('./util')
 
 const {
@@ -112,6 +113,7 @@ module.exports = {
   getTemplatePath,
   createSource,
   deleteAsset,
+  showRunPrompt,
   jsPreprocessOptions,
   cssPreprocessOptions,
   htmlPreprocessOptions,

package/lib/uni_modules/uni_modules.js

@@ -12,9 +12,15 @@ function parseUniExtApis(vite = true) {
     if (!fs_extra_1.default.existsSync(uniModulesDir)) {
         return {};
     }
+    let platform = process.env.UNI_PLATFORM;
+    if (platform === 'h5') {
+        platform = 'web';
+    }
+    else if (platform === 'app-plus') {
+        platform = 'app';
+    }
     const injects = {};
     fs_extra_1.default.readdirSync(uniModulesDir).forEach((uniModuleDir) => {
-        var _a, _b;
         // 必须以 uni- 开头
         if (!uniModuleDir.startsWith('uni-')) {
             return;
@@ -24,13 +30,25 @@ function parseUniExtApis(vite = true) {
             return;
         }
         try {
-            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'];
+            const exports = JSON.parse(fs_extra_1.default.readFileSync(pkgPath, 'utf8'))
+                ?.uni_modules?.['uni-ext-api'];
             if (exports) {
-                Object.assign(injects, parseInjects(vite, process.env.UNI_PLATFORM === 'h5' ? 'web' : process.env.UNI_PLATFORM, `@/uni_modules/${uniModuleDir}`, exports));
+                const curInjects = parseInjects(vite, platform, `@/uni_modules/${uniModuleDir}`, exports);
+                if (platform === 'app') {
+                    Object.keys(curInjects).forEach((name) => {
+                        const options = curInjects[name];
+                        // js 平台禁用了
+                        if (Array.isArray(options) && options.length === 3) {
+                            if (options[2] && options[2].js === false) {
+                                delete curInjects[name];
+                            }
+                        }
+                    });
+                }
+                Object.assign(injects, curInjects);
             }
         }
-        catch (e) {
-        }
+        catch (e) { }
     });
     return injects;
 }
@@ -73,12 +91,12 @@ function parseInjects(vite = true, platform, source, exports = {}) {
     }
     const injects = {};
     for (const key in rootDefines) {
-        Object.assign(injects, parseInject(vite, source, 'uni', rootDefines[key]));
+        Object.assign(injects, parseInject(vite, platform, source, 'uni', rootDefines[key]));
     }
     return injects;
 }
 exports.parseInjects = parseInjects;
-function parseInject(vite = true, source, globalObject, define) {
+function parseInject(vite = true, platform, source, globalObject, define) {
     const injects = {};
     if (define === false) {
     }
@@ -95,7 +113,24 @@ function parseInject(vite = true, source, globalObject, define) {
     else {
         const keys = Object.keys(define);
         keys.forEach((d) => {
-            injects[globalObject + '.' + d] = [source, define[d]];
+            if (typeof define[d] === 'string') {
+                injects[globalObject + '.' + d] = [source, define[d]];
+            }
+            else {
+                const defineOptions = define[d];
+                if (defineOptions[platform] !== false) {
+                    if (platform === 'app') {
+                        injects[globalObject + '.' + d] = [
+                            source,
+                            defineOptions.name || d,
+                            defineOptions.app,
+                        ];
+                    }
+                    else {
+                        injects[globalObject + '.' + d] = [source, defineOptions.name || d];
+                    }
+                }
+            }
         });
     }
     return injects;

package/lib/util.js

@@ -5,6 +5,7 @@ const crypto = require('crypto')
 const escapeStringRegexp = require('escape-string-regexp')
 const escapeGlob = require('glob-escape')
 const webpack = require('webpack')
+const uniI18n = require('@dcloudio/uni-cli-i18n')
 
 const isWin = /^win/.test(process.platform)
 
@@ -179,6 +180,34 @@ function deleteAsset (compilation, name) {
   }
 }
 
+/**
+ * cli 项目增加运行方式提示 https://ask.dcloud.net.cn/question/165071
+ * App 端存在多次编译问题(vue 2 nvue 3)，故做防抖处理
+ * @param delay
+ * @returns
+ */
+let runPromptTimer = null
+function showRunPrompt (delay = 300) {
+  if (runPromptTimer) {
+    clearTimeout(runPromptTimer)
+  }
+  runPromptTimer = setTimeout(() => {
+    if (!isInHBuilderX) {
+      const chalk = require('chalk')
+      const outputDir = path.relative(
+        process.env.UNI_CLI_CONTEXT,
+        process.env.UNI_OUTPUT_DIR
+      )
+      const platform = process.env.UNI_PLATFORM.startsWith('quickapp-webview') && process.env.UNI_SUB_PLATFORM ? process.env.UNI_SUB_PLATFORM : process.env.UNI_PLATFORM
+      console.log(uniI18n.__('prompt.run.message', {
+        devtools: uniI18n.__(`prompt.run.devtools.${platform}`),
+        outputDir: chalk.cyan(outputDir)
+      }))
+    }
+    runPromptTimer = null
+  }, delay)
+}
+
 module.exports = {
   isNormalPage,
   isInHBuilderX,
@@ -220,5 +249,6 @@ module.exports = {
     return path.join(__dirname, '../template')
   },
   createSource,
-  deleteAsset
+  deleteAsset,
+  showRunPrompt
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "2.0.2-3071120230427001",
+  "version": "2.0.2-3080420230530001",
   "description": "uni-cli-shared",
   "main": "lib/index.js",
   "repository": {
@@ -26,5 +26,5 @@
     "postcss-urlrewrite": "^0.2.2",
     "strip-json-comments": "^2.0.1"
   },
-  "gitHead": "9eec36832c08c90ba3c80bc9021768487b79a8ea"
+  "gitHead": "a7f9b00100b54f72f05ad00205f98a5353bd7a4c"
 }