@dcloudio/uni-cli-shared 3.0.0-alpha-3060720221018006 → 3.0.0-alpha-3060820221026001

package/dist/hbx/env.js

@@ -21,7 +21,8 @@ exports.isInHBuilderX = (0, uni_shared_1.once)(() => {
     return false;
 });
 exports.runByHBuilderX = (0, uni_shared_1.once)(() => {
-    return !!process.env.UNI_HBUILDERX_PLUGINS && !!process.env.RUN_BY_HBUILDERX;
+    return (!!process.env.UNI_HBUILDERX_PLUGINS &&
+        (!!process.env.RUN_BY_HBUILDERX || !!process.env.HX_Version));
 });
 /**
  * 增加 node_modules

package/dist/index.d.ts

@@ -5,6 +5,7 @@ export * from './env';
 export * from './hbx';
 export * from './ssr';
 export * from './vue';
+export * from './uts';
 export * from './logs';
 export * from './i18n';
 export * from './deps';

package/dist/index.js

@@ -22,6 +22,7 @@ __exportStar(require("./env"), exports);
 __exportStar(require("./hbx"), exports);
 __exportStar(require("./ssr"), exports);
 __exportStar(require("./vue"), exports);
+__exportStar(require("./uts"), exports);
 __exportStar(require("./logs"), exports);
 __exportStar(require("./i18n"), exports);
 __exportStar(require("./deps"), exports);

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

@@ -8,7 +8,7 @@ function initCheckSystemWebview(manifestJson) {
         manifestJson.plus['uni-app'].webView = plusWebView;
         delete manifestJson.plus.webView;
     }
-    if (process.env.NODE_ENV === 'development' && !plusWebView) {
+    else {
         manifestJson.plus['uni-app'].webView = {
             minUserAgentVersion: '49.0',
         };

package/dist/resolve.d.ts

@@ -1,4 +1,3 @@
-import * as UTSCompiler from '@dcloudio/uni-uts-v1';
 export declare function requireResolve(filename: string, basedir: string): string;
 export declare function relativeFile(from: string, to: string): string;
 export declare const resolveMainPathOnce: (inputDir: string) => string;
@@ -6,13 +5,3 @@ 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 resolveUtsModuleProxyFile(id: string, importer: string): string | undefined;
-export declare function resolveUtsModule(id: string, importer: string, platform: typeof process.env.UNI_UTS_PLATFORM): string | undefined;
-export declare function resolveUTSCompiler(): typeof UTSCompiler;

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.resolveUTSCompiler = exports.resolveUtsModule = exports.resolveUtsModuleProxyFile = exports.resolveUtsAppModule = exports.resolveComponentsLibPath = exports.resolveVueI18nRuntime = exports.resolveBuiltIn = exports.getBuiltInPaths = exports.resolveMainPathOnce = exports.relativeFile = exports.requireResolve = void 0;
+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,96 +104,3 @@ 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') {
-            const basedir = parentDir === 'uni_modules' ? 'utssdk' : '';
-            if (fs_1.default.existsSync(path_1.default.resolve(id, basedir, 'index.uts'))) {
-                return id;
-            }
-            const resolvePlatformDir = (p) => {
-                return path_1.default.resolve(id, basedir, p);
-            };
-            const extname = ['.uts'];
-            if (resolveUtsFile(resolvePlatformDir('app-android'), extname)) {
-                return id;
-            }
-            if (resolveUtsFile(resolvePlatformDir('app-ios'), extname)) {
-                return id;
-            }
-        }
-    }
-}
-exports.resolveUtsAppModule = resolveUtsAppModule;
-function resolveUtsModuleProxyFile(id, importer) {
-    const file = resolveUtsAppModule(id, importer);
-    if (file) {
-        return '\0' + file + '?uts-proxy';
-    }
-}
-exports.resolveUtsModuleProxyFile = resolveUtsModuleProxyFile;
-// 仅限 root/uni_modules/test-plugin | root/utssdk/test-plugin 格式
-function resolveUtsModule(id, importer, platform) {
-    if (process.env.UNI_PLATFORM === 'app') {
-        return 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') {
-            const basedir = parentDir === 'uni_modules' ? 'utssdk' : '';
-            const resolvePlatformDir = (p) => {
-                return path_1.default.resolve(id, basedir, p);
-            };
-            let index = resolveUtsFile(resolvePlatformDir(platform));
-            if (index) {
-                return index;
-            }
-            index = path_1.default.resolve(id, basedir, 'index.uts');
-            if (fs_1.default.existsSync(index)) {
-                return index;
-            }
-        }
-    }
-}
-exports.resolveUtsModule = resolveUtsModule;
-function resolveUtsFile(dir, extensions = ['.uts', '.ts', '.js']) {
-    for (let i = 0; i < extensions.length; i++) {
-        const indexFile = path_1.default.join(dir, 'index' + extensions[i]);
-        if (fs_1.default.existsSync(indexFile)) {
-            return indexFile;
-        }
-    }
-}
-function resolveUTSCompiler() {
-    let compilerPath = '';
-    if ((0, env_1.isInHBuilderX)()) {
-        try {
-            compilerPath = require.resolve(path_1.default.resolve(process.env.UNI_HBUILDERX_PLUGINS, 'uniapp-uts'));
-        }
-        catch (e) { }
-    }
-    if (!compilerPath) {
-        try {
-            compilerPath = require.resolve('@dcloudio/uni-uts-v1', {
-                paths: [process.env.UNI_CLI_CONTEXT],
-            });
-        }
-        catch (e) { }
-    }
-    if (!compilerPath) {
-        throw 'uts compiler is not found';
-    }
-    return require(compilerPath);
-}
-exports.resolveUTSCompiler = resolveUTSCompiler;

package/dist/uni_modules.js

@@ -25,10 +25,7 @@ function parseUniExtApis(vite = true) {
         }
         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(vite, process.env.UNI_PLATFORM === 'h5' ? 'web' : process.env.UNI_PLATFORM, `@/uni_modules/${uniModuleDir}` +
-                (vite || !process.env.UNI_UTS_PLATFORM
-                    ? ''
-                    : `/utssdk/${process.env.UNI_UTS_PLATFORM}/index`), exports));
+            Object.assign(injects, parseInjects(vite, process.env.UNI_PLATFORM === 'h5' ? 'web' : process.env.UNI_PLATFORM, `@/uni_modules/${uniModuleDir}`, exports));
         }
     });
     return injects;

package/dist/uts.d.ts

@@ -0,0 +1,10 @@
+import * as UTSCompiler from '@dcloudio/uni-uts-v1';
+/**
+ * 解析 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): string | undefined;
+export declare function resolveUTSCompiler(): typeof UTSCompiler;

package/dist/uts.js

@@ -0,0 +1,97 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveUTSCompiler = exports.resolveUtsModule = exports.resolveUtsAppModule = void 0;
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+const hbx_1 = require("./hbx");
+const utils_1 = require("./utils");
+/**
+ * 解析 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') {
+            const basedir = parentDir === 'uni_modules' ? 'utssdk' : '';
+            if (fs_1.default.existsSync(path_1.default.resolve(id, basedir, 'index.uts'))) {
+                return id;
+            }
+            const resolvePlatformDir = (p) => {
+                return path_1.default.resolve(id, basedir, 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) {
+    if (process.env.UNI_PLATFORM === 'app' ||
+        process.env.UNI_PLATFORM === 'app-plus') {
+        return 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') {
+            const basedir = parentDir === 'uni_modules' ? 'utssdk' : '';
+            const resolvePlatformDir = (p) => {
+                return path_1.default.resolve(id, basedir, p);
+            };
+            let index = resolveUtsFile(resolvePlatformDir(process.env.UNI_UTS_PLATFORM));
+            if (index) {
+                return index;
+            }
+            index = path_1.default.resolve(id, basedir, 'index.uts');
+            if (fs_1.default.existsSync(index)) {
+                return index;
+            }
+        }
+    }
+}
+exports.resolveUtsModule = resolveUtsModule;
+function resolveUtsFile(dir, extensions = ['.uts', '.ts', '.js']) {
+    for (let i = 0; i < extensions.length; i++) {
+        const indexFile = path_1.default.join(dir, 'index' + extensions[i]);
+        if (fs_1.default.existsSync(indexFile)) {
+            return indexFile;
+        }
+    }
+}
+function resolveUTSCompiler() {
+    let compilerPath = '';
+    if ((0, hbx_1.isInHBuilderX)()) {
+        try {
+            compilerPath = require.resolve(path_1.default.resolve(process.env.UNI_HBUILDERX_PLUGINS, 'uniapp-uts-v1'));
+        }
+        catch (e) { }
+    }
+    if (!compilerPath) {
+        try {
+            compilerPath = require.resolve('@dcloudio/uni-uts-v1', {
+                paths: [process.env.UNI_CLI_CONTEXT],
+            });
+        }
+        catch (e) { }
+    }
+    if (!compilerPath) {
+        throw 'uts compiler is not found';
+    }
+    return require(compilerPath);
+}
+exports.resolveUTSCompiler = resolveUTSCompiler;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "3.0.0-alpha-3060720221018006",
+  "version": "3.0.0-alpha-3060820221026001",
   "description": "@dcloudio/uni-cli-shared",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -25,8 +25,8 @@
     "@babel/core": "^7.18.13",
     "@babel/parser": "^7.18.13",
     "@babel/types": "^7.17.0",
-    "@dcloudio/uni-i18n": "3.0.0-alpha-3060720221018006",
-    "@dcloudio/uni-shared": "3.0.0-alpha-3060720221018006",
+    "@dcloudio/uni-i18n": "3.0.0-alpha-3060820221026001",
+    "@dcloudio/uni-shared": "3.0.0-alpha-3060820221026001",
     "@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-3060720221018006",
+    "@dcloudio/uni-uts-v1": "3.0.0-alpha-3060820221026001",
     "@types/babel__core": "^7.1.19",
     "@types/debug": "^4.1.7",
     "@types/estree": "^0.0.51",