@dcloudio/uni-cli-shared 3.0.0-alpha-3060320220919001 → 3.0.0-alpha-3060320220919002

package/dist/platform.d.ts

@@ -1,3 +1,3 @@
 export declare function registerPlatform(platform: string): void;
 export declare function getPlatforms(): string[];
-export declare function getPlatformDir(): string;
+export declare function getPlatformDir(): "quickapp-webview-huawei" | "quickapp-webview-union";

package/dist/platform.js

@@ -30,9 +30,6 @@ function getPlatforms() {
 }
 exports.getPlatforms = getPlatforms;
 function getPlatformDir() {
-    if (process.env.UNI_PLATFORM === 'app' && process.env.UNI_APP_PLATFORM) {
-        return process.env.UNI_PLATFORM + '-' + process.env.UNI_APP_PLATFORM;
-    }
     return process.env.UNI_SUB_PLATFORM || process.env.UNI_PLATFORM;
 }
 exports.getPlatformDir = getPlatformDir;

package/dist/preprocess/context.js

@@ -55,16 +55,6 @@ function initPreContext(platform, userPreContext) {
         vueContext.APP_VUE = true;
         nvueContext.APP_NVUE = true;
         nvueContext.APP_PLUS_NVUE = true;
-        if (process.env.UNI_APP_PLATFORM === 'android') {
-            defaultContext.APP_ANDROID = true;
-        }
-        else if (process.env.UNI_APP_PLATFORM === 'ios') {
-            defaultContext.APP_IOS = true;
-        }
-        else {
-            defaultContext.APP_ANDROID = true;
-            defaultContext.APP_IOS = true;
-        }
     }
     else if (platform.startsWith('mp-')) {
         defaultContext.MP = true;

package/dist/resolve.d.ts

@@ -5,4 +5,11 @@ export declare function getBuiltInPaths(): string[];
 export declare function resolveBuiltIn(path: string): string;
 export declare function resolveVueI18nRuntime(): string;
 export declare function resolveComponentsLibPath(): string;
+/**
+ * 解析 app 平台的 uts 插件，任意平台（android|ios）存在即可
+ * @param id
+ * @param importer
+ * @returns
+ */
+export declare function resolveUtsAppModule(id: string, importer: string): string | undefined;
 export declare function resolveUtsModule(id: string, importer: string, platform: typeof process.env.UNI_UTS_PLATFORM): string | undefined;

package/dist/resolve.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveUtsModule = exports.resolveComponentsLibPath = exports.resolveVueI18nRuntime = exports.resolveBuiltIn = exports.getBuiltInPaths = exports.resolveMainPathOnce = exports.relativeFile = exports.requireResolve = void 0;
+exports.resolveUtsModule = exports.resolveUtsAppModule = exports.resolveComponentsLibPath = exports.resolveVueI18nRuntime = exports.resolveBuiltIn = exports.getBuiltInPaths = exports.resolveMainPathOnce = exports.relativeFile = exports.requireResolve = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const debug_1 = __importDefault(require("debug"));
@@ -104,24 +104,56 @@ function resolveComponentsLibPath() {
     return componentsLibPath;
 }
 exports.resolveComponentsLibPath = resolveComponentsLibPath;
+/**
+ * 解析 app 平台的 uts 插件，任意平台（android|ios）存在即可
+ * @param id
+ * @param importer
+ * @returns
+ */
+function resolveUtsAppModule(id, importer) {
+    id = path_1.default.resolve(importer, id);
+    if (id.includes('utssdk') || id.includes('uni_modules')) {
+        const parts = (0, utils_1.normalizePath)(id).split('/');
+        const parentDir = parts[parts.length - 2];
+        if (parentDir === 'uni_modules' || parentDir === 'utssdk') {
+            if (fs_1.default.existsSync(path_1.default.resolve(id, 'index.uts'))) {
+                return id;
+            }
+            const resolvePlatformDir = (p) => {
+                return path_1.default.resolve(id, parentDir === 'uni_modules' ? 'utssdk' : '', p);
+            };
+            const extname = ['.uts'];
+            if (resolveUtsFile(resolvePlatformDir('app-android'), extname)) {
+                return id;
+            }
+            if (resolveUtsFile(resolvePlatformDir('app-ios'), extname)) {
+                return id;
+            }
+        }
+    }
+}
+exports.resolveUtsAppModule = resolveUtsAppModule;
 // 仅限 root/uni_modules/test-plugin | root/utssdk/test-plugin 格式
 function resolveUtsModule(id, importer, platform) {
+    if (process.env.UNI_PLATFORM === 'app') {
+        return;
+    }
     id = path_1.default.resolve(importer, id);
     if (id.includes('utssdk') || id.includes('uni_modules')) {
         const parts = (0, utils_1.normalizePath)(id).split('/');
         const parentDir = parts[parts.length - 2];
         if (parentDir === 'uni_modules' || parentDir === 'utssdk') {
-            const index = path_1.default.resolve(id, 'index.uts');
-            if (fs_1.default.existsSync(index)) {
+            const resolvePlatformDir = (p) => {
+                return path_1.default.resolve(id, parentDir === 'uni_modules' ? 'utssdk' : '', p);
+            };
+            let index = resolveUtsFile(resolvePlatformDir(platform));
+            if (index) {
                 return index;
             }
-            if (parentDir === 'uni_modules' &&
-                !fs_1.default.existsSync(path_1.default.join(id, 'utssdk'))) {
-                // uni_modules/test-plugin/utssdk不存在
-                return;
+            index = path_1.default.resolve(id, 'index.uts');
+            if (fs_1.default.existsSync(index)) {
+                return index;
             }
-            const platformDir = path_1.default.resolve(id, parentDir === 'uni_modules' ? 'utssdk' : '', platform);
-            return resolveUtsFile(platformDir);
         }
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "3.0.0-alpha-3060320220919001",
+  "version": "3.0.0-alpha-3060320220919002",
   "description": "@dcloudio/uni-cli-shared",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -22,8 +22,8 @@
     "@babel/core": "^7.17.9",
     "@babel/parser": "^7.17.9",
     "@babel/types": "^7.17.0",
-    "@dcloudio/uni-i18n": "3.0.0-alpha-3060320220919001",
-    "@dcloudio/uni-shared": "3.0.0-alpha-3060320220919001",
+    "@dcloudio/uni-i18n": "3.0.0-alpha-3060320220919002",
+    "@dcloudio/uni-shared": "3.0.0-alpha-3060320220919002",
     "@intlify/core-base": "9.1.9",
     "@intlify/shared": "9.1.9",
     "@intlify/vue-devtools": "9.1.9",
@@ -33,7 +33,7 @@
     "@vue/compiler-sfc": "3.2.39",
     "@vue/server-renderer": "3.2.39",
     "@vue/shared": "3.2.39",
-    "autoprefixer": "^10.4.9",
+    "autoprefixer": "^10.4.11",
     "base64url": "^3.0.1",
     "chokidar": "^3.5.3",
     "compare-versions": "^3.6.0",