@dcloudio/uni-cli-shared 3.0.0-alpha-3060920221114001 → 3.0.0-alpha-3060920221117002

package/dist/checkUpdate.js

@@ -157,6 +157,7 @@ function getMac() {
             else if (
             // Node >= v18
             typeof item.family === 'number' &&
+                // @ts-ignore
                 (item.family === 4 || item.family === 6)) {
                 mac = item.mac;
                 break;

package/dist/esbuild.d.ts

@@ -1,3 +1,3 @@
-import { BuildOptions } from 'esbuild';
+import type { BuildOptions } from 'esbuild';
 export declare function transformWithEsbuild(code: string, filename: string, options: BuildOptions): Promise<import("esbuild").BuildResult>;
 export declare function esbuild(options: BuildOptions): Promise<import("esbuild").BuildResult>;

package/dist/hbx/env.d.ts

@@ -4,3 +4,4 @@ export declare const runByHBuilderX: () => boolean;
  * 增加 node_modules
  */
 export declare function initModulePaths(): void;
+export declare function fixBinaryPath(): void;

package/dist/hbx/env.js

@@ -3,10 +3,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.initModulePaths = exports.runByHBuilderX = exports.isInHBuilderX = void 0;
+exports.fixBinaryPath = exports.initModulePaths = exports.runByHBuilderX = exports.isInHBuilderX = void 0;
 const path_1 = __importDefault(require("path"));
 const module_1 = __importDefault(require("module"));
 const uni_shared_1 = require("@dcloudio/uni-shared");
+const resolve_1 = require("../resolve");
+const utils_1 = require("../utils");
 exports.isInHBuilderX = (0, uni_shared_1.once)(() => {
     try {
         const { name } = require(path_1.default.resolve(process.cwd(), '../about/package.json'));
@@ -43,3 +45,30 @@ function initModulePaths() {
     };
 }
 exports.initModulePaths = initModulePaths;
+function resolveEsbuildModule(name) {
+    try {
+        return path_1.default.dirname(require.resolve(name + '/package.json', {
+            paths: [path_1.default.dirname((0, resolve_1.resolveBuiltIn)('esbuild/package.json'))],
+        }));
+    }
+    catch (e) { }
+    return '';
+}
+function fixBinaryPath() {
+    // cli 工程在 HBuilderX 中运行
+    if (!(0, exports.isInHBuilderX)() && (0, exports.runByHBuilderX)()) {
+        if (utils_1.isWindows) {
+            const win64 = resolveEsbuildModule('esbuild-windows-64');
+            if (win64) {
+                process.env.ESBUILD_BINARY_PATH = path_1.default.join(win64, 'esbuild.exe');
+            }
+        }
+        else {
+            const arm64 = resolveEsbuildModule('esbuild-darwin-arm64');
+            if (arm64) {
+                process.env.ESBUILD_BINARY_PATH = path_1.default.join(arm64, 'bin/esbuild');
+            }
+        }
+    }
+}
+exports.fixBinaryPath = fixBinaryPath;

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

@@ -2,8 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.initAppStatusbar = void 0;
 function initAppStatusbar(manifestJson, pagesJson) {
-    var _a;
-    const { titleColor = '#000000', backgroundColor = '#000000' } = ((_a = pagesJson.globalStyle) === null || _a === void 0 ? void 0 : _a.navigationBar) || {};
+    const titleColor = pagesJson.pages[0].style.navigationBar.titleColor ||
+        pagesJson.globalStyle.navigationBar.titleColor ||
+        '#ffffff';
+    const backgroundColor = pagesJson.globalStyle.navigationBar.backgroundColor || '#000000';
     manifestJson.plus.statusbar = {
         immersed: 'supportedDevice',
         style: titleColor === '#000000' ? 'dark' : 'light',

package/dist/platform.d.ts

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

package/dist/platform.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPlatformDir = exports.getPlatforms = exports.registerPlatform = void 0;
+exports.isMiniProgramPlatform = exports.getPlatformDir = exports.getPlatforms = exports.registerPlatform = void 0;
 const BUILT_IN_PLATFORMS = [
     'app',
     'app-plus',
@@ -33,3 +33,7 @@ function getPlatformDir() {
     return process.env.UNI_SUB_PLATFORM || process.env.UNI_PLATFORM;
 }
 exports.getPlatformDir = getPlatformDir;
+function isMiniProgramPlatform() {
+    return !['app', 'app-plus', 'h5', 'web'].includes(process.env.UNI_PLATFORM);
+}
+exports.isMiniProgramPlatform = isMiniProgramPlatform;

package/dist/resolve.js

@@ -51,7 +51,7 @@ function resolveNodeModulePath(modulePath) {
     return nodeModulesPaths;
 }
 function initPaths() {
-    const cliContext = process.env.UNI_CLI_CONTEXT;
+    const cliContext = process.env.UNI_CLI_CONTEXT || process.cwd();
     if (cliContext) {
         const pathSet = new Set();
         pathSet.add(path_1.default.join(cliContext, 'node_modules'));

package/dist/utils.d.ts

@@ -16,3 +16,4 @@ export declare function pathToGlob(pathString: string, glob: string, options?: {
     escape?: boolean;
 }): string;
 export declare function resolveSourceMapPath(outputDir?: string, platform?: UniApp.PLATFORM): string;
+export declare function installDepTips(type: 'dependencies' | 'devDependencies', module: string, version?: string): string;

package/dist/utils.js

@@ -3,10 +3,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveSourceMapPath = exports.pathToGlob = exports.normalizeParsePlugins = exports.normalizeMiniProgramFilename = exports.normalizeNodeModules = exports.removeExt = exports.normalizePagePath = exports.normalizeIdentifier = exports.checkElementNodeTag = exports.normalizePath = exports.isWindows = exports.isRunningWithYarnPnp = exports.hash = void 0;
+exports.installDepTips = exports.resolveSourceMapPath = exports.pathToGlob = exports.normalizeParsePlugins = exports.normalizeMiniProgramFilename = exports.normalizeNodeModules = exports.removeExt = exports.normalizePagePath = exports.normalizeIdentifier = exports.checkElementNodeTag = exports.normalizePath = exports.isWindows = exports.isRunningWithYarnPnp = exports.hash = void 0;
 const fs_1 = __importDefault(require("fs"));
 const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
+const picocolors_1 = __importDefault(require("picocolors"));
 const shared_1 = require("@vue/shared");
 var hash_sum_1 = require("hash-sum");
 Object.defineProperty(exports, "hash", { enumerable: true, get: function () { return __importDefault(hash_sum_1).default; } });
@@ -91,3 +92,21 @@ function resolveSourceMapPath(outputDir, platform) {
     return path_1.default.resolve(outputDir || process.env.UNI_OUTPUT_DIR, '../.sourcemap/' + (platform || (0, platform_1.getPlatformDir)()));
 }
 exports.resolveSourceMapPath = resolveSourceMapPath;
+function hasProjectYarn(cwd) {
+    return fs_1.default.existsSync(path_1.default.join(cwd, 'yarn.lock'));
+}
+function hasProjectPnpm(cwd) {
+    return fs_1.default.existsSync(path_1.default.join(cwd, 'pnpm-lock.yaml'));
+}
+function getInstallCommand(cwd) {
+    return hasProjectYarn(cwd)
+        ? 'yarn add'
+        : hasProjectPnpm(cwd)
+            ? 'pnpm i'
+            : 'npm i';
+}
+function installDepTips(type, module, version) {
+    return `Cannot find module: ${module}
+Please run \`${picocolors_1.default.cyan(`${getInstallCommand(process.cwd())} ${module + (version ? '@' + version : '')}${type === 'devDependencies' ? ' -D' : ''}`)}\` and try again.`;
+}
+exports.installDepTips = installDepTips;

package/dist/uts.js

@@ -87,10 +87,14 @@ function resolveUTSCompiler() {
                 paths: [process.env.UNI_CLI_CONTEXT],
             });
         }
-        catch (e) { }
-    }
-    if (!compilerPath) {
-        throw 'uts compiler is not found';
+        catch (e) {
+            let version = require('@dcloudio/uni-cli-shared/package.json').version;
+            if (version.startsWith('2.0.')) {
+                version = '^3.0.0-alpha-3060920221117001';
+            }
+            console.error((0, utils_1.installDepTips)('devDependencies', '@dcloudio/uni-uts-v1', version));
+            process.exit(0);
+        }
     }
     return require(compilerPath);
 }

package/dist/vite/plugins/vitejs/plugins/css.js

@@ -36,7 +36,6 @@ const pluginutils_1 = require("@rollup/pluginutils");
 const utils_1 = require("../utils");
 const asset_1 = require("./asset");
 const magic_string_1 = __importDefault(require("magic-string"));
-const esbuild_1 = require("esbuild");
 const preprocess_1 = require("../../../../preprocess");
 const constants_1 = require("../../../../constants");
 const cleanString_1 = require("../cleanString");
@@ -644,20 +643,26 @@ async function doImportCSSReplace(rawUrl, matched, replacer) {
 }
 async function minifyCSS(css, config) {
     try {
-        const { code, warnings } = await (0, esbuild_1.transform)(css, {
-            loader: 'css',
-            minify: true,
-            target: config.build.cssTarget || undefined,
+        const { code, warnings } = await Promise.resolve().then(() => __importStar(require('esbuild'))).then(({ transform }) => {
+            return transform(css, {
+                loader: 'css',
+                minify: true,
+                target: config.build.cssTarget || undefined,
+            });
         });
         if (warnings.length) {
-            const msgs = await (0, esbuild_1.formatMessages)(warnings, { kind: 'warning' });
+            const msgs = await Promise.resolve().then(() => __importStar(require('esbuild'))).then(({ formatMessages }) => {
+                return formatMessages(warnings, { kind: 'warning' });
+            });
             config.logger.warn(picocolors_1.default.yellow(`warnings when minifying css:\n${msgs.join('\n')}`));
         }
         return code;
     }
     catch (e) {
         if (e.errors) {
-            const msgs = await (0, esbuild_1.formatMessages)(e.errors, { kind: 'error' });
+            const msgs = await Promise.resolve().then(() => __importStar(require('esbuild'))).then(({ formatMessages }) => {
+                return formatMessages(e.errors, { kind: 'error' });
+            });
             e.frame = '\n' + msgs.join('\n');
             e.loc = e.errors[0].location;
         }

package/dist/vite/plugins/vitejs/utils.js

@@ -112,7 +112,7 @@ async function processSrcSet(srcs, replacer) {
         const src = s.replace(escapedSpaceCharacters, ' ').trim();
         const [url] = imageSetUrlRE.exec(src) || [];
         return {
-            url,
+            url: url,
             descriptor: src === null || src === void 0 ? void 0 : src.slice(url.length).trim(),
         };
     })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "3.0.0-alpha-3060920221114001",
+  "version": "3.0.0-alpha-3060920221117002",
   "description": "@dcloudio/uni-cli-shared",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -25,17 +25,17 @@
     "@babel/core": "^7.19.6",
     "@babel/parser": "^7.19.6",
     "@babel/types": "^7.20.0",
-    "@dcloudio/uni-i18n": "3.0.0-alpha-3060920221114001",
-    "@dcloudio/uni-shared": "3.0.0-alpha-3060920221114001",
+    "@dcloudio/uni-i18n": "3.0.0-alpha-3060920221117002",
+    "@dcloudio/uni-shared": "3.0.0-alpha-3060920221117002",
     "@intlify/core-base": "9.1.9",
     "@intlify/shared": "9.1.9",
     "@intlify/vue-devtools": "9.1.9",
     "@rollup/pluginutils": "^4.2.0",
-    "@vue/compiler-core": "3.2.41",
-    "@vue/compiler-dom": "3.2.41",
-    "@vue/compiler-sfc": "3.2.41",
-    "@vue/server-renderer": "3.2.41",
-    "@vue/shared": "3.2.41",
+    "@vue/compiler-core": "3.2.45",
+    "@vue/compiler-dom": "3.2.45",
+    "@vue/compiler-sfc": "3.2.45",
+    "@vue/server-renderer": "3.2.45",
+    "@vue/shared": "3.2.45",
     "autoprefixer": "^10.4.13",
     "base64url": "^3.0.1",
     "chokidar": "^3.5.3",
@@ -64,7 +64,7 @@
   },
   "gitHead": "33e807d66e1fe47e2ee08ad9c59247e37b8884da",
   "devDependencies": {
-    "@dcloudio/uni-uts-v1": "3.0.0-alpha-3060920221114001",
+    "@dcloudio/uni-uts-v1": "3.0.0-alpha-3060920221117002",
     "@types/babel__core": "^7.1.19",
     "@types/debug": "^4.1.7",
     "@types/estree": "^0.0.51",
@@ -77,6 +77,6 @@
     "@types/sass": "^1.43.1",
     "@types/stylus": "^0.48.36",
     "postcss": "^8.4.16",
-    "vue": "3.2.41"
+    "vue": "3.2.45"
   }
 }