@dcloudio/uni-cli-shared 3.0.0-alpha-3071220230324001 → 3.0.0-alpha-3071220230331002

package/dist/i18n.js

@@ -17,7 +17,7 @@ function initI18nOptions(platform, inputDir, warning = false, withMessages = tru
         return;
     }
     const manifestJson = (0, json_1.parseManifestJsonOnce)(inputDir);
-    const fallbackLocale = manifestJson.fallbackLocale || manifestJson.locale;
+    let fallbackLocale = manifestJson.fallbackLocale || 'en';
     const locale = resolveI18nLocale(platform, Object.keys(locales), fallbackLocale);
     if (warning) {
         if (!fallbackLocale) {

package/dist/json/app/manifest/nvue.js

@@ -31,11 +31,10 @@ exports.getNVueStyleCompiler = getNVueStyleCompiler;
 const flexDirs = ['row', 'row-reverse', 'column', 'column-reverse'];
 function getNVueFlexDirection(manifestJson) {
     let flexDir = 'column';
-    if (manifestJson['app-plus']?.nvue?.['flex-direction']) {
-        flexDir = manifestJson['app-plus'].nvue['flex-direction'];
-        if (flexDirs.indexOf(flexDir) === -1) {
-            flexDir = 'column';
-        }
+    const appPlusJson = manifestJson['app-plus'] || manifestJson['plus'];
+    if (appPlusJson?.nvue?.['flex-direction'] &&
+        flexDirs.includes(appPlusJson?.nvue?.['flex-direction'])) {
+        flexDir = appPlusJson.nvue['flex-direction'];
     }
     return flexDir;
 }

package/dist/json/app/pages/uniConfig.js

@@ -32,6 +32,7 @@ function normalizeAppUniConfig(pagesJson, manifestJson) {
         ...parseEntryPagePath(pagesJson),
         networkTimeout: (0, manifest_1.normalizeNetworkTimeout)(manifestJson.networkTimeout),
         tabBar: pagesJson.tabBar,
+        fallbackLocale: manifestJson.fallbackLocale,
         locales: (0, i18n_1.initLocales)(path_1.default.join(process.env.UNI_INPUT_DIR, 'locale')),
         darkmode: platformConfig.darkmode || false,
         themeConfig: (0, theme_1.normalizeThemeConfigOnce)(platformConfig),

package/dist/mp/style.js

@@ -1,9 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.transformScopedCss = void 0;
+const tags_1 = require("./tags");
+const logs_1 = require("../logs");
 function transformScopedCss(cssCode) {
+    checkHtmlTagSelector(cssCode);
     return cssCode.replace(/\[(data-v-[a-f0-9]{8})\]/gi, (_, scopedId) => {
         return '.' + scopedId;
     });
 }
 exports.transformScopedCss = transformScopedCss;
+function checkHtmlTagSelector(cssCode) {
+    for (const tag in tags_1.HTML_TO_MINI_PROGRAM_TAGS) {
+        if (new RegExp(`( |\n|\t|,|})${tag}( *)(,|{)`, 'g').test(cssCode)) {
+            (0, logs_1.output)('warn', `小程序端 style 暂不支持 ${tag} 标签选择器，推荐使用 class 选择器，详情参考：https://uniapp.dcloud.net.cn/tutorial/migration-to-vue3.html#style`);
+            break;
+        }
+    }
+}

package/dist/uni_modules.d.ts

@@ -1,13 +1,22 @@
-type Define = string | string[] | Record<string, string> | false;
+type DefineOptions = {
+    name?: string;
+    app?: boolean | {
+        js?: boolean;
+        kotlin?: boolean;
+        swift?: boolean;
+    };
+    [key: string]: any;
+};
+type Define = string | string[] | Record<string, string | DefineOptions> | false;
 type Defines = {
     [name: string]: Define;
 };
-interface Exports {
+export interface Exports {
     [name: string]: Define | Defines | false;
 }
 export declare function parseUniExtApis(vite?: boolean): Injects;
 type Injects = {
-    [name: string]: string | string[] | false;
+    [name: string]: string | [string, string] | [string, string, DefineOptions['app']] | false;
 };
 /**
  *  uni:'getBatteryInfo'
@@ -31,5 +40,5 @@ type Injects = {
  * @returns
  */
 export declare function parseInjects(vite: boolean | undefined, platform: UniApp.PLATFORM, source: string, exports?: Exports): Injects;
-export declare function parseInject(vite: boolean | undefined, source: string, globalObject: string, define: Define): Injects;
+export declare function parseInject(vite: boolean | undefined, platform: UniApp.PLATFORM, source: string, globalObject: string, define: Define): Injects;
 export {};

package/dist/uni_modules.js

@@ -12,6 +12,13 @@ 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) => {
         // 必须以 uni- 开头
@@ -26,9 +33,19 @@ function parseUniExtApis(vite = true) {
             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) { }
@@ -74,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) {
     }
@@ -96,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "3.0.0-alpha-3071220230324001",
+  "version": "3.0.0-alpha-3071220230331002",
   "description": "@dcloudio/uni-cli-shared",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -25,8 +25,8 @@
     "@babel/core": "^7.20.5",
     "@babel/parser": "^7.20.5",
     "@babel/types": "^7.20.7",
-    "@dcloudio/uni-i18n": "3.0.0-alpha-3071220230324001",
-    "@dcloudio/uni-shared": "3.0.0-alpha-3071220230324001",
+    "@dcloudio/uni-i18n": "3.0.0-alpha-3071220230331002",
+    "@dcloudio/uni-shared": "3.0.0-alpha-3071220230331002",
     "@intlify/core-base": "9.1.9",
     "@intlify/shared": "9.1.9",
     "@intlify/vue-devtools": "9.1.9",
@@ -64,7 +64,7 @@
   },
   "gitHead": "33e807d66e1fe47e2ee08ad9c59247e37b8884da",
   "devDependencies": {
-    "@dcloudio/uni-uts-v1": "3.0.0-alpha-3071220230324001",
+    "@dcloudio/uni-uts-v1": "3.0.0-alpha-3071220230331002",
     "@types/babel__core": "^7.1.19",
     "@types/debug": "^4.1.7",
     "@types/estree": "^0.0.51",