@dcloudio/uni-cli-shared 3.0.0-alpha-4020320240629001 → 3.0.0-alpha-4020520240719001

package/dist/json/app/manifest/nvue.d.ts

@@ -1,4 +1,4 @@
 export declare function initNVue(manifestJson: Record<string, any>, pagesJson: UniApp.PagesJson): void;
-export declare function getNVueCompiler(manifestJson: Record<string, any>): "uni-app" | "weex" | "vue" | "vite";
+export declare function getNVueCompiler(manifestJson: Record<string, any>): "uni-app" | "vue" | "weex" | "vite";
 export declare function getNVueStyleCompiler(manifestJson: Record<string, any>): "uni-app" | "weex";
 export declare function getNVueFlexDirection(manifestJson: Record<string, any>): "column" | "row" | "row-reverse" | "column-reverse";

package/dist/platform.js

@@ -4,6 +4,9 @@ exports.isMiniProgramPlatform = exports.getPlatformDir = exports.getPlatforms =
 const BUILT_IN_PLATFORMS = [
     'app',
     'app-plus',
+    'app-harmony',
+    'app-ios',
+    'app-android',
     'h5',
     'web',
     'mp-360',

package/dist/resolve.js

@@ -111,7 +111,12 @@ function resolveComponentsLibPath() {
                 componentsLibPath = path_1.default.join(resolveWithSymlinks('@dcloudio/uni-components/package.json', process.env.UNI_INPUT_DIR), dir);
             }
             catch (e) {
-                componentsLibPath = path_1.default.join(resolveWithSymlinks('@dcloudio/uni-components/package.json', process.cwd()), dir);
+                try {
+                    componentsLibPath = path_1.default.join(resolveWithSymlinks('@dcloudio/uni-components/package.json', process.cwd()), dir);
+                }
+                catch (e) {
+                    console.log(e);
+                }
             }
         }
     }

package/dist/uni_modules.js

@@ -27,7 +27,7 @@ function formatExtApiProviderName(service, name) {
     if (service === 'oauth') {
         service = 'OAuth';
     }
-    return `Uni${(0, exports.capitalize)((0, exports.camelize)(service))}${(0, exports.capitalize)((0, exports.camelize)(name))}Provider`;
+    return `Uni${(0, exports.capitalize)((0, exports.camelize)(service))}${(0, exports.capitalize)((0, exports.camelize)(name))}ProviderImpl`;
 }
 exports.formatExtApiProviderName = formatExtApiProviderName;
 function getUniExtApiProviderRegisters() {

package/dist/utils.d.ts

@@ -34,3 +34,4 @@ export declare function createResolveErrorMsg(source: string, importer: string):
 export declare function enableSourceMap(): boolean;
 export declare function requireUniHelpers(): any;
 export declare function normalizeEmitAssetFileName(fileName: string): string;
+export declare function createShadowImageUrl(cdn: number, type?: string): string;

package/dist/utils.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.normalizeEmitAssetFileName = exports.requireUniHelpers = exports.enableSourceMap = exports.createResolveErrorMsg = exports.parseImporter = exports.resolveAppVue = exports.isAppVue = 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.isArray = exports.capitalize = exports.camelize = exports.hash = void 0;
+exports.createShadowImageUrl = exports.normalizeEmitAssetFileName = exports.requireUniHelpers = exports.enableSourceMap = exports.createResolveErrorMsg = exports.parseImporter = exports.resolveAppVue = exports.isAppVue = 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.isArray = exports.capitalize = exports.camelize = exports.hash = void 0;
 const fs_1 = __importDefault(require("fs"));
 const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
@@ -15,6 +15,7 @@ const constants_1 = require("./constants");
 const compiler_core_1 = require("@vue/compiler-core");
 const platform_1 = require("./platform");
 const hbx_1 = require("./hbx");
+const json_1 = require("./json");
 // 专为 uts.ts 服务
 var shared_2 = require("@vue/shared");
 Object.defineProperty(exports, "camelize", { enumerable: true, get: function () { return shared_2.camelize; } });
@@ -176,11 +177,37 @@ function requireUniHelpers() {
 }
 exports.requireUniHelpers = requireUniHelpers;
 function normalizeEmitAssetFileName(fileName) {
+    const extname = path_1.default.extname(fileName);
     if (process.env.UNI_APP_X_TSC === 'true') {
-        if (path_1.default.extname(fileName) !== '.ts') {
+        if (extname !== '.ts') {
             return fileName + '.ts';
         }
     }
+    else {
+        // logo.png、pages.json 等
+        if (!['.ts', '.uts', '.uvue', '.vue'].includes(extname)) {
+            fileName = fileName + '.uts';
+        }
+    }
     return fileName;
 }
 exports.normalizeEmitAssetFileName = normalizeEmitAssetFileName;
+function createIdent() {
+    if (process.env.UNI_INPUT_DIR) {
+        const manifestJson = (0, json_1.parseManifestJsonOnce)(process.env.UNI_INPUT_DIR);
+        const id = (manifestJson.appid || '').replace('__UNI__', '');
+        if (id) {
+            return Buffer.from(Buffer.from(id).toString('base64')).toString('hex');
+        }
+    }
+    return '';
+}
+function createShadowImageUrl(cdn, type = 'grey') {
+    let identStr = '';
+    if (process.env.UNI_PLATFORM !== 'h5' && process.env.UNI_PLATFORM !== 'web') {
+        const ident = createIdent();
+        identStr = ident ? `${ident}/` : '';
+    }
+    return `https://cdn${(cdn || 0) + (process.env.UNI_APP_X === 'true' ? 1000 : 0) || ''}.dcloud.net.cn/${identStr}img/shadow-${type}.png`;
+}
+exports.createShadowImageUrl = createShadowImageUrl;

package/dist/uts.d.ts

@@ -12,6 +12,7 @@ export declare function resolveUTSAppModule(platform: typeof process.env.UNI_UTS
 export declare function resolveUTSModule(id: string, importer: string, includeUTSSDK?: boolean): string | undefined;
 export declare function resolveUTSCompiler(): typeof UTSCompiler;
 export declare function isUTSComponent(name: string): boolean;
+export declare function getUTSComponentAutoImports(): Record<string, [[string]]>;
 export declare function parseUTSComponent(name: string, type: 'kotlin' | 'swift'): {
     className: string;
     namespace: string;

package/dist/uts.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.resolveUniTypeScript = exports.parseUniExtApiNamespacesJsOnce = exports.parseUniExtApiNamespacesOnce = exports.parseSwiftPackageWithPluginId = exports.parseKotlinPackageWithPluginId = exports.initUTSComponents = exports.parseUTSComponent = exports.isUTSComponent = exports.resolveUTSCompiler = exports.resolveUTSModule = exports.resolveUTSAppModule = void 0;
+exports.resolveUniTypeScript = exports.parseUniExtApiNamespacesJsOnce = exports.parseUniExtApiNamespacesOnce = exports.parseSwiftPackageWithPluginId = exports.parseKotlinPackageWithPluginId = exports.initUTSComponents = exports.parseUTSComponent = exports.getUTSComponentAutoImports = exports.isUTSComponent = exports.resolveUTSCompiler = exports.resolveUTSModule = exports.resolveUTSAppModule = void 0;
 // 重要，该文件编译后的 js 需要同步到 vue2 编译器 uni-cli-shared/lib/uts
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
@@ -47,10 +47,11 @@ function resolveUTSAppModule(platform, id, importer, includeUTSSDK = true) {
             if (fs_1.default.existsSync(path_1.default.resolve(id, basedir, 'index.uts'))) {
                 return id;
             }
+            const fileName = id.split('?')[0];
             const resolvePlatformDir = (p) => {
-                return path_1.default.resolve(id, basedir, p);
+                return path_1.default.resolve(fileName, basedir, p);
             };
-            const extname = ['.uts'];
+            const extname = ['.uts', '.vue', '.uvue'];
             if (platform === 'app-harmony') {
                 if (resolveUTSFile(resolvePlatformDir(platform), extname)) {
                     return id;
@@ -145,6 +146,22 @@ function isUTSComponent(name) {
     return utsComponents.has(name);
 }
 exports.isUTSComponent = isUTSComponent;
+function getUTSComponentAutoImports() {
+    const utsComponentAutoImports = {};
+    utsComponents.forEach(({ kotlinPackage }, name) => {
+        const className = (0, utils_1.capitalize)((0, utils_1.camelize)(name)) + 'Element';
+        if (!utsComponentAutoImports[kotlinPackage]) {
+            utsComponentAutoImports[kotlinPackage] = [[className]];
+        }
+        else {
+            if (!utsComponentAutoImports[kotlinPackage].find((item) => item[0] === className)) {
+                utsComponentAutoImports[kotlinPackage].push([className]);
+            }
+        }
+    });
+    return utsComponentAutoImports;
+}
+exports.getUTSComponentAutoImports = getUTSComponentAutoImports;
 function parseUTSComponent(name, type) {
     const meta = utsComponents.get(name);
     if (meta) {
@@ -184,9 +201,12 @@ function initUTSComponents(inputDir, platform) {
                     }
                 }
                 if (name) {
-                    const importDir = (0, utils_1.normalizePath)(is_uni_modules_utssdk ? path_1.default.dirname(dir) : dir);
+                    const source = '@/' +
+                        (0, utils_1.normalizePath)(isApp
+                            ? path_1.default.relative(inputDir, is_uni_modules_utssdk ? path_1.default.dirname(dir) : dir)
+                            : path_1.default.relative(inputDir, file));
                     easycomsObj[`^${name}$`] = {
-                        source: isApp ? `${importDir}?uts-proxy` : (0, utils_1.normalizePath)(file),
+                        source: isApp ? `${source}?uts-proxy` : source,
                         kotlinPackage: parseKotlinPackageWithPluginId(pluginId, is_uni_modules_utssdk),
                         swiftModule: parseSwiftPackageWithPluginId(pluginId, is_uni_modules_utssdk),
                     };

package/dist/vite/plugins/copy.d.ts

@@ -6,6 +6,5 @@ export type UniViteCopyPluginTarget = Omit<FileWatcherOptions, 'verbose'> & {
 };
 export interface UniViteCopyPluginOptions {
     targets: UniViteCopyPluginTarget[];
-    verbose: boolean;
 }
-export declare function uniViteCopyPlugin({ targets, verbose, }: UniViteCopyPluginOptions): Plugin;
+export declare function uniViteCopyPlugin({ targets, }: UniViteCopyPluginOptions): Plugin;

package/dist/vite/plugins/copy.js

@@ -5,7 +5,7 @@ const watcher_1 = require("../../watcher");
 const messages_1 = require("../../messages");
 const logs_1 = require("../../logs");
 const uni_shared_1 = require("@dcloudio/uni-shared");
-function uniViteCopyPlugin({ targets, verbose, }) {
+function uniViteCopyPlugin({ targets, }) {
     let resolvedConfig;
     let initialized = false;
     return {
@@ -31,7 +31,6 @@ function uniViteCopyPlugin({ targets, verbose, }) {
                             (0, logs_1.output)('log', messages_1.M['dev.watching.end']);
                         }, 100, { setTimeout, clearTimeout });
                         new watcher_1.FileWatcher({
-                            verbose,
                             ...target,
                         }).watch({
                             cwd: process.env.UNI_INPUT_DIR,

package/dist/vite/plugins/index.d.ts

@@ -9,6 +9,7 @@ export * from './uts/uni_modules';
 export * from './uts/uvue';
 export * from './uts/ext-api';
 export * from './easycom';
+export * from './json';
 export { uniViteSfcSrcImportPlugin } from './sfc';
 export { assetPlugin, parseAssets, getAssetHash } from './vitejs/plugins/asset';
 export { isCSSRequest, cssPlugin, cssPostPlugin, minifyCSS, cssLangRE, commonjsProxyRE, rewriteScssReadFileSync, } from './vitejs/plugins/css';

package/dist/vite/plugins/index.js

@@ -26,6 +26,7 @@ __exportStar(require("./uts/uni_modules"), exports);
 __exportStar(require("./uts/uvue"), exports);
 __exportStar(require("./uts/ext-api"), exports);
 __exportStar(require("./easycom"), exports);
+__exportStar(require("./json"), exports);
 var sfc_1 = require("./sfc");
 Object.defineProperty(exports, "uniViteSfcSrcImportPlugin", { enumerable: true, get: function () { return sfc_1.uniViteSfcSrcImportPlugin; } });
 var asset_1 = require("./vitejs/plugins/asset");

package/dist/vite/plugins/json.d.ts

@@ -0,0 +1,2 @@
+import type { Plugin } from 'vite';
+export declare function uniJsonPlugin(): Plugin;

package/dist/vite/plugins/json.js

@@ -0,0 +1,26 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.uniJsonPlugin = void 0;
+const path_1 = __importDefault(require("path"));
+const json_1 = require("../../json");
+const preprocess_1 = require("../../preprocess");
+const utils_1 = require("../utils");
+function uniJsonPlugin() {
+    return {
+        name: 'uni:json',
+        enforce: 'pre',
+        transform(code, id) {
+            if (path_1.default.extname((0, utils_1.parseVueRequest)(id).filename) !== '.json') {
+                return;
+            }
+            return {
+                code: JSON.stringify((0, json_1.parseJson)((0, preprocess_1.preJson)(code)), null, 2),
+                map: null,
+            };
+        },
+    };
+}
+exports.uniJsonPlugin = uniJsonPlugin;

package/dist/vite/utils/url.d.ts

@@ -1,7 +1,7 @@
 export interface VueQuery {
     vue?: boolean;
     src?: boolean;
-    type?: 'script' | 'template' | 'style' | 'custom';
+    type?: 'script' | 'template' | 'style' | 'custom' | 'page';
     index?: number;
     lang?: string;
     raw?: boolean;

package/dist/watcher.d.ts

@@ -5,16 +5,14 @@ export interface FileWatcherOptions {
     src: string | string[];
     dest: string;
     transform?: FileTransform;
-    verbose?: boolean;
 }
 export declare class FileWatcher {
     private src;
     private dest;
     private transform?;
-    private verbose?;
     private watcher;
     private onChange?;
-    constructor({ src, dest, transform, verbose }: FileWatcherOptions);
+    constructor({ src, dest, transform }: FileWatcherOptions);
     watch(watchOptions: WatchOptions & {
         cwd: string;
     }, onReady?: (watcher: FSWatcher) => void, onChange?: () => void): FSWatcher;

package/dist/watcher.js

@@ -6,15 +6,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.FileWatcher = void 0;
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const path_1 = __importDefault(require("path"));
+const debug_1 = __importDefault(require("debug"));
 const chokidar_1 = require("chokidar");
 const shared_1 = require("@vue/shared");
 const utils_1 = require("./utils");
+const debugWatcher = (0, debug_1.default)('uni:watcher');
 class FileWatcher {
-    constructor({ src, dest, transform, verbose }) {
+    constructor({ src, dest, transform }) {
         this.src = !(0, shared_1.isArray)(src) ? [src] : src;
         this.dest = dest;
         this.transform = transform;
-        this.verbose = verbose;
     }
     watch(watchOptions, onReady, onChange) {
         if (!this.watcher) {
@@ -84,7 +85,7 @@ class FileWatcher {
             .then(() => this.onChange && this.onChange());
     }
     info(type, msg) {
-        this.verbose && console.log(type, msg);
+        debugWatcher.enabled && debugWatcher(type, msg);
     }
     from(from) {
         return path_1.default.join(this.watcher.options.cwd, from);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "3.0.0-alpha-4020320240629001",
+  "version": "3.0.0-alpha-4020520240719001",
   "description": "@dcloudio/uni-cli-shared",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -26,8 +26,8 @@
     "@babel/core": "^7.23.3",
     "@babel/parser": "^7.23.9",
     "@babel/types": "^7.20.7",
-    "@dcloudio/uni-i18n": "3.0.0-alpha-4020320240629001",
-    "@dcloudio/uni-shared": "3.0.0-alpha-4020320240629001",
+    "@dcloudio/uni-i18n": "3.0.0-alpha-4020520240719001",
+    "@dcloudio/uni-shared": "3.0.0-alpha-4020520240719001",
     "@intlify/core-base": "9.1.9",
     "@intlify/shared": "9.1.9",
     "@intlify/vue-devtools": "9.1.9",
@@ -71,7 +71,7 @@
   },
   "gitHead": "33e807d66e1fe47e2ee08ad9c59247e37b8884da",
   "devDependencies": {
-    "@dcloudio/uni-uts-v1": "3.0.0-alpha-4020320240629001",
+    "@dcloudio/uni-uts-v1": "3.0.0-alpha-4020520240719001",
     "@types/adm-zip": "^0.5.5",
     "@types/babel__code-frame": "^7.0.6",
     "@types/babel__core": "^7.1.19",