@dcloudio/uni-cli-shared 3.0.0-alpha-3060720221018001 → 3.0.0-alpha-3060720221018003

package/dist/hbx/env.js

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

package/dist/resolve.d.ts

@@ -1,3 +1,4 @@
+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;
@@ -14,3 +15,4 @@ export declare function resolveComponentsLibPath(): string;
 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.resolveUtsModule = exports.resolveUtsModuleProxyFile = exports.resolveUtsAppModule = exports.resolveComponentsLibPath = exports.resolveVueI18nRuntime = exports.resolveBuiltIn = exports.getBuiltInPaths = exports.resolveMainPathOnce = exports.relativeFile = exports.requireResolve = void 0;
+exports.resolveUTSCompiler = exports.resolveUtsModule = exports.resolveUtsModuleProxyFile = 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"));
@@ -175,3 +175,12 @@ function resolveUtsFile(dir, extensions = ['.uts', '.ts', '.js']) {
         }
     }
 }
+function resolveUTSCompiler() {
+    if ((0, env_1.isInHBuilderX)()) {
+        return require(path_1.default.resolve(process.env.UNI_HBUILDERX_PLUGINS, 'uniapp-uts'));
+    }
+    return require(require.resolve('@dcloudio/uni-uts-v1', {
+        paths: [process.env.UNI_CLI_CONTEXT],
+    }));
+}
+exports.resolveUTSCompiler = resolveUTSCompiler;

package/dist/uni_modules.d.ts

@@ -5,7 +5,7 @@ declare type Defines = {
 interface Exports {
     [name: string]: Define | Defines | false;
 }
-export declare function parseUniExtApis(): Injects;
+export declare function parseUniExtApis(vite?: boolean): Injects;
 declare type Injects = {
     [name: string]: string | string[] | false;
 };
@@ -30,6 +30,6 @@ declare type Injects = {
  * @param define
  * @returns
  */
-export declare function parseInjects(platform: UniApp.PLATFORM, source: string, exports?: Exports): Injects;
-export declare function parseInject(source: string, globalObject: string, define: Define): Injects;
+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 {};

package/dist/uni_modules.js

@@ -7,7 +7,7 @@ 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() {
+function parseUniExtApis(vite = true) {
     const uniModulesDir = path_1.default.resolve(process.env.UNI_INPUT_DIR, 'uni_modules');
     if (!fs_extra_1.default.existsSync(uniModulesDir)) {
         return {};
@@ -25,7 +25,10 @@ function parseUniExtApis() {
         }
         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));
+            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));
         }
     });
     return injects;
@@ -52,7 +55,7 @@ exports.parseUniExtApis = parseUniExtApis;
  * @param define
  * @returns
  */
-function parseInjects(platform, source, exports = {}) {
+function parseInjects(vite = true, platform, source, exports = {}) {
     let rootDefines = {};
     Object.keys(exports).forEach((name) => {
         if (name.startsWith('uni')) {
@@ -69,18 +72,18 @@ function parseInjects(platform, source, exports = {}) {
     }
     const injects = {};
     for (const key in rootDefines) {
-        Object.assign(injects, parseInject(source, 'uni', rootDefines[key]));
+        Object.assign(injects, parseInject(vite, source, 'uni', rootDefines[key]));
     }
     return injects;
 }
 exports.parseInjects = parseInjects;
-function parseInject(source, globalObject, define) {
+function parseInject(vite = true, source, globalObject, define) {
     const injects = {};
     if (define === false) {
     }
     else if (typeof define === 'string') {
         // {'uni.getBatteryInfo' : '@dcloudio/uni-getbatteryinfo'}
-        injects[globalObject + '.' + define] = source;
+        injects[globalObject + '.' + define] = vite ? source : [source, 'default'];
     }
     else if (Array.isArray(define)) {
         // {'uni.getBatteryInfo' : ['@dcloudio/uni-getbatteryinfo','getBatteryInfo]}

package/dist/vite/utils/url.js

@@ -59,7 +59,7 @@ function isJsFile(id) {
     if (isJs) {
         return true;
     }
-    const isVueJs = constants_1.EXTNAME_VUE.includes(path_1.default.extname(filename)) && !query.vue;
+    const isVueJs = constants_1.EXTNAME_VUE.includes(path_1.default.extname(filename)) && (!query.vue || query.setup);
     if (isVueJs) {
         return true;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "3.0.0-alpha-3060720221018001",
+  "version": "3.0.0-alpha-3060720221018003",
   "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-3060720221018001",
-    "@dcloudio/uni-shared": "3.0.0-alpha-3060720221018001",
+    "@dcloudio/uni-i18n": "3.0.0-alpha-3060720221018003",
+    "@dcloudio/uni-shared": "3.0.0-alpha-3060720221018003",
     "@intlify/core-base": "9.1.9",
     "@intlify/shared": "9.1.9",
     "@intlify/vue-devtools": "9.1.9",
@@ -64,6 +64,7 @@
   },
   "gitHead": "33e807d66e1fe47e2ee08ad9c59247e37b8884da",
   "devDependencies": {
+    "@dcloudio/uni-uts-v1": "3.0.0-alpha-3060720221018003",
     "@types/babel__core": "^7.1.19",
     "@types/debug": "^4.1.7",
     "@types/estree": "^0.0.51",