@dcloudio/uni-cli-shared 3.0.0-4020420240722002 → 3.0.0-4020820240925001

package/LICENSE

@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

package/dist/easycom.js

@@ -115,20 +115,13 @@ function initEasycom({ isX, dirs, rootDir, custom, extensions, }) {
                 if (path_1.default.isAbsolute(source) && source.startsWith(rootDir)) {
                     source = '@/' + (0, utils_1.normalizePath)(path_1.default.relative(rootDir, source));
                 }
-                let imported = '';
                 // 加密插件easycom类型导入
                 if (source.includes('?uts-proxy')) {
                     const moduleId = path_1.default.basename(source.split('?uts-proxy')[0]);
                     source = `uts.sdk.modules.${(0, shared_1.camelize)(moduleId)}`;
-                    imported = genUTSComponentPublicInstanceImported(rootDir, `@/uni_modules/${moduleId}/components/${tagName}/${tagName}`);
                 }
-                else {
-                    imported = genUTSComponentPublicInstanceImported(rootDir, source);
-                }
-                addUTSEasyComAutoImports(source, [
-                    imported,
-                    genUTSComponentPublicInstanceIdent(tagName),
-                ]);
+                const ident = genUTSComponentPublicInstanceIdent(tagName);
+                addUTSEasyComAutoImports(source, [ident, ident]);
             });
         }
         (0, shared_1.extend)(easycomsObj, autoEasyComObj);

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/json/manifest.d.ts

@@ -30,6 +30,7 @@ export declare function getRouterOptions(manifestJson: Record<string, any>): {
 };
 export declare function isEnableTreeShaking(manifestJson: Record<string, any>): boolean;
 export declare function getDevServerOptions(manifestJson: Record<string, any>): any;
+export declare function getPlatformManifestJson(manifestJson: any, platform?: UniApp.PLATFORM): any;
 export declare function getPlatformManifestJsonOnce(): any;
 export declare function validateThemeValue(value: string): boolean;
 export {};

package/dist/json/manifest.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.validateThemeValue = exports.getPlatformManifestJsonOnce = exports.getDevServerOptions = exports.isEnableTreeShaking = exports.getRouterOptions = exports.isUniPushOffline = exports.hasPushModule = exports.isEnableSecureNetwork = exports.isEnableUniPushV2 = exports.isEnableUniPushV1 = exports.getUniStatistics = exports.normalizeNetworkTimeout = exports.parseCompatConfigOnce = exports.parseRpx2UnitOnce = exports.parseManifestJsonOnce = exports.parseManifestJson = void 0;
+exports.validateThemeValue = exports.getPlatformManifestJsonOnce = exports.getPlatformManifestJson = exports.getDevServerOptions = exports.isEnableTreeShaking = exports.getRouterOptions = exports.isUniPushOffline = exports.hasPushModule = exports.isEnableSecureNetwork = exports.isEnableUniPushV2 = exports.isEnableUniPushV1 = exports.getUniStatistics = exports.normalizeNetworkTimeout = exports.parseCompatConfigOnce = exports.parseRpx2UnitOnce = exports.parseManifestJsonOnce = exports.parseManifestJson = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const shared_1 = require("@vue/shared");
@@ -24,7 +24,8 @@ exports.parseRpx2UnitOnce = (0, uni_shared_1.once)((inputDir, platform = 'h5') =
     const rpx2unit = platform === 'h5' || platform === 'app' || platform === 'app-harmony'
         ? uni_shared_1.defaultRpx2Unit
         : uni_shared_1.defaultMiniProgramRpx2Unit;
-    const platformOptions = (0, exports.parseManifestJsonOnce)(inputDir)[platform];
+    const manifestJson = (0, exports.parseManifestJsonOnce)(inputDir);
+    let platformOptions = getPlatformManifestJson(manifestJson, platform);
     if (platformOptions && platformOptions.rpx) {
         return (0, shared_1.extend)({}, rpx2unit, platformOptions);
     }
@@ -50,10 +51,8 @@ function normalizeNetworkTimeout(networkTimeout) {
 exports.normalizeNetworkTimeout = normalizeNetworkTimeout;
 function getUniStatistics(inputDir, platform) {
     const manifest = (0, exports.parseManifestJsonOnce)(inputDir);
-    if (platform === 'app') {
-        platform = 'app-plus';
-    }
-    return (0, shared_1.extend)({}, manifest.uniStatistics, manifest[platform] && manifest[platform].uniStatistics);
+    let platformManifest = getPlatformManifestJson(manifest, platform);
+    return (0, shared_1.extend)({}, manifest.uniStatistics, platformManifest && platformManifest.uniStatistics);
 }
 exports.getUniStatistics = getUniStatistics;
 function isEnableUniPushV1(inputDir, platform) {
@@ -72,19 +71,20 @@ function isEnableUniPushV1(inputDir, platform) {
 exports.isEnableUniPushV1 = isEnableUniPushV1;
 function isEnableUniPushV2(inputDir, platform) {
     const manifest = (0, exports.parseManifestJsonOnce)(inputDir);
+    const platformManifest = getPlatformManifestJson(manifest, platform);
     if (platform === 'app') {
-        return (manifest['app-plus']?.distribute?.sdkConfigs?.push?.unipush?.version ==
-            '2');
+        return (platformManifest?.distribute?.sdkConfigs?.push?.unipush?.version == '2');
     }
-    return manifest[platform]?.unipush?.enable === true;
+    return platformManifest?.unipush?.enable === true;
 }
 exports.isEnableUniPushV2 = isEnableUniPushV2;
 function isEnableSecureNetwork(inputDir, platform) {
     const manifest = (0, exports.parseManifestJsonOnce)(inputDir);
+    const platformManifest = getPlatformManifestJson(manifest, platform);
     if (platform === 'app') {
-        return !!manifest['app-plus']?.modules?.SecureNetwork;
+        return !!platformManifest?.modules?.SecureNetwork;
     }
-    return manifest[platform]?.secureNetwork?.enable === true;
+    return platformManifest?.secureNetwork?.enable === true;
 }
 exports.isEnableSecureNetwork = isEnableSecureNetwork;
 function hasPushModule(inputDir) {
@@ -99,7 +99,7 @@ function isUniPushOffline(inputDir) {
 }
 exports.isUniPushOffline = isUniPushOffline;
 function getRouterOptions(manifestJson) {
-    return (0, shared_1.extend)({}, manifestJson.h5?.router);
+    return (0, shared_1.extend)({}, getPlatformManifestJson(manifestJson, 'h5')?.router);
 }
 exports.getRouterOptions = getRouterOptions;
 function isEnableTreeShaking(manifestJson) {
@@ -107,18 +107,33 @@ function isEnableTreeShaking(manifestJson) {
     if (process.env.UNI_AUTOMATOR_WS_ENDPOINT) {
         return false;
     }
-    return manifestJson.h5?.optimization?.treeShaking?.enable !== false;
+    const platformManifest = getPlatformManifestJson(manifestJson, 'h5');
+    return platformManifest?.optimization?.treeShaking?.enable !== false;
 }
 exports.isEnableTreeShaking = isEnableTreeShaking;
 function getDevServerOptions(manifestJson) {
-    return (0, shared_1.extend)({}, manifestJson.h5?.devServer);
+    const platformManifest = getPlatformManifestJson(manifestJson, 'h5');
+    return (0, shared_1.extend)({}, platformManifest?.devServer);
 }
 exports.getDevServerOptions = getDevServerOptions;
+function getPlatformManifestJson(manifestJson, platform) {
+    if (!platform) {
+        platform = process.env.UNI_PLATFORM;
+    }
+    if (platform === 'app') {
+        return manifestJson['app-plus'] || manifestJson['plus'] || {};
+    }
+    if (platform === 'h5') {
+        return manifestJson.web || manifestJson.h5 || {};
+    }
+    return manifestJson[platform] || {};
+}
+exports.getPlatformManifestJson = getPlatformManifestJson;
 function getPlatformManifestJsonOnce() {
-    const platform = process.env.UNI_PLATFORM === 'app' ? 'app-plus' : process.env.UNI_PLATFORM;
-    return !process.env.UNI_INPUT_DIR
+    const manifestJson = !process.env.UNI_INPUT_DIR
         ? {}
-        : (0, exports.parseManifestJsonOnce)(process.env.UNI_INPUT_DIR)[platform] || {};
+        : (0, exports.parseManifestJsonOnce)(process.env.UNI_INPUT_DIR);
+    return getPlatformManifestJson(manifestJson);
 }
 exports.getPlatformManifestJsonOnce = getPlatformManifestJsonOnce;
 const themeValues = ['dark', 'light', 'auto'];

package/dist/json/mp/index.d.ts

@@ -1,4 +1,4 @@
 export * from './jsonFile';
-export { AppJson, ComponentJson } from './types';
+export { AppJson, ComponentJson, MiniProgramComponentsType } from './types';
 export { mergeMiniProgramAppJson, parseMiniProgramPagesJson } from './pages';
 export { parseMiniProgramProjectJson } from './project';

package/dist/json/mp/jsonFile.d.ts

@@ -1,4 +1,4 @@
-import type { ComponentJson, PageWindowOptions, UsingComponents } from './types';
+import type { ComponentJson, MiniProgramComponentsType, PageWindowOptions, UsingComponents } from './types';
 export declare function isMiniProgramPageFile(file: string, inputDir?: string): boolean;
 export declare function isMiniProgramPageSfcFile(file: string, inputDir?: string): boolean;
 export declare function hasJsonFile(filename: string): boolean;
@@ -17,11 +17,12 @@ export declare function isMiniProgramUsingComponent(name: string, options: {
     componentsDir?: string;
 }): boolean;
 interface MiniProgramComponents {
-    [name: string]: 'plugin' | 'component' | 'dynamicLib' | 'ext';
+    [name: string]: MiniProgramComponentsType;
 }
 export declare function findMiniProgramUsingComponents({ filename, inputDir, componentsDir, }: {
     filename: string;
     inputDir: string;
     componentsDir?: string;
 }): MiniProgramComponents;
+export declare function findUsingComponentsJson(pathInpages: string, componentsDir: string): Record<any, any>;
 export {};

package/dist/json/mp/jsonFile.js

@@ -3,8 +3,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.findMiniProgramUsingComponents = exports.isMiniProgramUsingComponent = exports.addMiniProgramUsingComponents = exports.addMiniProgramComponentJson = exports.addMiniProgramPageJson = exports.addMiniProgramAppJson = exports.findChangedJsonFiles = exports.normalizeJsonFilename = exports.findUsingComponents = exports.findJsonFile = exports.getComponentJsonFilenames = exports.hasJsonFile = exports.isMiniProgramPageSfcFile = exports.isMiniProgramPageFile = void 0;
+exports.findUsingComponentsJson = exports.findMiniProgramUsingComponents = exports.isMiniProgramUsingComponent = exports.addMiniProgramUsingComponents = exports.addMiniProgramComponentJson = exports.addMiniProgramPageJson = exports.addMiniProgramAppJson = exports.findChangedJsonFiles = exports.normalizeJsonFilename = exports.findUsingComponents = exports.findJsonFile = exports.getComponentJsonFilenames = exports.hasJsonFile = exports.isMiniProgramPageSfcFile = exports.isMiniProgramPageFile = void 0;
 const path_1 = __importDefault(require("path"));
+const fs_1 = __importDefault(require("fs"));
 const shared_1 = require("@vue/shared");
 const utils_1 = require("../../utils");
 const resolve_1 = require("../../resolve");
@@ -152,9 +153,39 @@ function findMiniProgramUsingComponent(usingComponents, componentsDir) {
             // mp-toutiao
             res[name] = 'ext';
         }
+        else if (componentsDir &&
+            path.includes(componentsDir + '/') &&
+            findUsingComponentsJson(path, componentsDir).renderer === 'xr-frame') {
+            // mp-weixin & x-frame
+            res[name] = 'xr-frame';
+        }
         else if (componentsDir && path.includes(componentsDir + '/')) {
             res[name] = 'component';
         }
         return res;
     }, {});
 }
+function findUsingComponentsJson(pathInpages, componentsDir) {
+    // 兼容test case
+    if (!process.env.UNI_INPUT_DIR)
+        return {};
+    let [, dir] = pathInpages.split(componentsDir);
+    if (dir === '') {
+        console.warn(`${pathInpages} 路径里没有找到对应的 ${componentsDir} 目录`);
+        return {};
+    }
+    dir = '.' + dir;
+    const fulldir = path_1.default.resolve(process.env.UNI_INPUT_DIR, componentsDir, dir);
+    let filename = path_1.default.parse(pathInpages).name + '.json';
+    let jsonPath = path_1.default.resolve(fulldir, filename);
+    if (fs_1.default.existsSync(jsonPath)) {
+        return require(jsonPath);
+    }
+    jsonPath = path_1.default.resolve(fulldir, 'index.json');
+    if (fs_1.default.existsSync(jsonPath)) {
+        return require(jsonPath);
+    }
+    console.warn(`${pathInpages} 路径下没有找到对应的json文件`);
+    return {};
+}
+exports.findUsingComponentsJson = findUsingComponentsJson;

package/dist/json/mp/types.d.ts

@@ -119,4 +119,5 @@ export interface AppJson {
     restartStrategy?: RestartStrategy;
     [name: string]: unknown;
 }
+export type MiniProgramComponentsType = 'plugin' | 'component' | 'dynamicLib' | 'ext' | 'xr-frame';
 export {};

package/dist/json/pages.js

@@ -377,14 +377,12 @@ const DEFAULT_TAB_BAR = {
     iconWidth: '24px',
     spacing: '3px',
     height: uni_shared_1.TABBAR_HEIGHT + 'px',
+    list: [],
 };
 function normalizeTabBar(tabBar, platform) {
-    const { list, midButton } = tabBar;
-    if (!list || !list.length) {
-        return;
-    }
+    const { midButton } = tabBar;
     tabBar = (0, shared_1.extend)({}, DEFAULT_TAB_BAR, tabBar);
-    list.forEach((item) => {
+    tabBar.list.forEach((item) => {
         if (item.iconPath) {
             item.iconPath = normalizeFilepath(item.iconPath);
         }

package/dist/json/theme.js

@@ -8,6 +8,7 @@ const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const json_1 = require("./json");
 const uni_shared_1 = require("@dcloudio/uni-shared");
+const manifest_1 = require("./manifest");
 function hasThemeJson(themeLocation) {
     if (!fs_1.default.existsSync(themeLocation)) {
         return false;
@@ -47,7 +48,7 @@ const parseThemeJsonIconPath = (themeConfig, curPathThemeJsonKey) => {
 function normalizeUniConfigThemeJsonIconPath(themeConfig, pagesJson) {
     // 处理 tabbar 下 list -> item -> iconPath、selectedIconPath; midButton -> backgroundImage 路径 / 不开头的情况
     const tabBar = pagesJson.tabBar;
-    if (tabBar) {
+    if (tabBar && tabBar.list && tabBar.list.length) {
         tabBar.list.forEach((item) => {
             if (item.iconPath && item.iconPath.indexOf('@') === 0) {
                 parseThemeJsonIconPath(themeConfig, item.iconPath.replace(/^@/, ''));
@@ -84,7 +85,7 @@ exports.normalizeThemeConfigOnce = (0, uni_shared_1.once)((manifestJsonPlatform
 });
 function initTheme(manifestJson, pagesJson) {
     const platform = process.env.UNI_PLATFORM === 'app' ? 'app-plus' : process.env.UNI_PLATFORM;
-    const manifestPlatform = manifestJson['plus'] || manifestJson[platform] || {};
+    const manifestPlatform = (0, manifest_1.getPlatformManifestJson)(manifestJson, platform) || {};
     const themeConfig = (0, exports.normalizeThemeConfigOnce)(manifestPlatform);
     return (0, uni_shared_1.normalizeStyles)(pagesJson, themeConfig);
 }

package/dist/mp/template.d.ts

@@ -1,7 +1,8 @@
 import type { EmittedAsset } from 'rollup';
 import type { ElementNode } from '@vue/compiler-core';
+import type { MiniProgramComponentsType } from '../json/mp/types';
 type LazyElementFn = (node: ElementNode, context: {
-    isMiniProgramComponent(name: string): 'plugin' | 'component' | 'dynamicLib' | 'ext' | undefined;
+    isMiniProgramComponent(name: string): MiniProgramComponentsType | undefined;
 }) => {
     [name: string]: {
         name: 'on' | 'bind';

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

@@ -30,9 +30,11 @@ function relativeFile(from, to) {
 }
 exports.relativeFile = relativeFile;
 exports.resolveMainPathOnce = (0, uni_shared_1.once)((inputDir) => {
-    const mainUTSPath = path_1.default.resolve(inputDir, 'main.uts');
-    if (fs_1.default.existsSync(mainUTSPath)) {
-        return (0, utils_1.normalizePath)(mainUTSPath);
+    if (process.env.UNI_APP_X === 'true') {
+        const mainUTSPath = path_1.default.resolve(inputDir, 'main.uts');
+        if (fs_1.default.existsSync(mainUTSPath)) {
+            return (0, utils_1.normalizePath)(mainUTSPath);
+        }
     }
     const mainTsPath = path_1.default.resolve(inputDir, 'main.ts');
     if (fs_1.default.existsSync(mainTsPath)) {
@@ -111,7 +113,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.d.ts

@@ -92,6 +92,7 @@ interface EncryptPackageJson {
     id: string;
     version: string;
     uni_modules: {
+        dependencies: string[];
         artifacts: {
             env: {
                 compilerVersion: string;

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() {
@@ -287,11 +287,13 @@ function genEncryptEasyComModuleIndex(platform, components) {
     Object.keys(components).forEach((component) => {
         const id = (0, exports.capitalize)((0, exports.camelize)(component));
         ids.push(id);
+        let instance = '';
         if (platform === 'app-android') {
+            instance = (0, easycom_1.genUTSComponentPublicInstanceIdent)(component);
             // 类型
-            ids.push((0, easycom_1.genUTSComponentPublicInstanceIdent)(component));
+            ids.push(instance);
         }
-        imports.push(`import ${id} from './components/${component}/${component}${components[component]}'`);
+        imports.push(`import ${id}${instance ? `, { ${instance} }` : ''} from './components/${component}/${component}${components[component]}'`);
     });
     return `
 ${imports.join('\n')}
@@ -496,7 +498,7 @@ function findLastIndex(array, predicate) {
 }
 let encryptUniModules = {};
 function resolveEncryptUniModule(id, platform, isX = true) {
-    const parts = id.split('/');
+    const parts = id.split('?', 2)[0].split('/');
     const index = findLastIndex(parts, (part) => part === 'uni_modules');
     if (index !== -1) {
         const uniModuleId = parts[index + 1];

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; } });
@@ -146,9 +147,11 @@ function isAppVue(filename) {
 }
 exports.isAppVue = isAppVue;
 function resolveAppVue(inputDir) {
-    const appUVue = path_1.default.resolve(inputDir, 'App.uvue');
-    if (fs_1.default.existsSync(appUVue)) {
-        return normalizePath(appUVue);
+    if (process.env.UNI_APP_X === 'true') {
+        const appUVue = path_1.default.resolve(inputDir, 'App.uvue');
+        if (fs_1.default.existsSync(appUVue)) {
+            return normalizePath(appUVue);
+        }
     }
     return normalizePath(path_1.default.resolve(inputDir, 'App.vue'));
 }
@@ -176,11 +179,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/cloud.js

@@ -143,15 +143,38 @@ function uniEncryptUniModulesPlugin() {
             const compiler = (0, uts_1.resolveUTSCompiler)();
             for (const uniModule of tempUniModules) {
                 const pluginDir = path_1.default.resolve(tempUniModulesDir, uniModule);
+                // TODO 待优化autoImports，目前 uni-app x 的编译，autoImport 是在js层处理过，rust层基本不再使用
+                // 但uts插件目前还是使用的rust层的autoImports
+                const autoImports = {};
+                const allAutoImports = (0, easycom_1.getUTSEasyComAutoImports)();
+                Object.keys(allAutoImports).forEach((source) => {
+                    if (!source.startsWith(`@/uni_modules/${uniModule}/components/`)) {
+                        autoImports[source] = allAutoImports[source];
+                    }
+                });
+                const uni_modules = [];
+                const pkgJson = path_1.default.resolve(process.env.UNI_INPUT_DIR, 'uni_modules', uniModule, 'package.json');
+                if (fs_extra_1.default.existsSync(pkgJson)) {
+                    try {
+                        const pkg = require(pkgJson);
+                        if (pkg.uni_modules?.dependencies) {
+                            uni_modules.push(...pkg.uni_modules.dependencies);
+                        }
+                    }
+                    catch (e) {
+                        console.error(e);
+                    }
+                }
                 const result = await compiler.compile(pluginDir, {
                     isX: process.env.UNI_APP_X === 'true',
                     isSingleThread: true,
                     isPlugin: false,
                     sourceMap: false,
-                    uni_modules: [],
+                    uni_modules,
                     transform: {
                         uvueClassNamePrefix: 'Gen',
-                        autoImports: (0, easycom_1.getUTSEasyComAutoImports)(),
+                        autoImports,
+                        uvueGenDefaultAs: '__sfc__',
                     },
                 });
                 if (result) {
@@ -277,6 +300,7 @@ function genUniModulesPackageJson(uniModuleId, inputDir, artifacts) {
         id: pkg.id,
         version: pkg.version,
         uni_modules: {
+            dependencies: pkg.uni_modules?.dependencies || [],
             artifacts,
         },
     }, null, 2);

package/dist/vite/features.js

@@ -135,9 +135,10 @@ function initManifestFeature({ manifestJson, command, platform, }) {
         // features.wxs = false
         // features.longpress = false
     }
-    if (manifestJson.h5 &&
-        manifestJson.h5.router &&
-        manifestJson.h5.router.mode === 'history') {
+    const webManifest = manifestJson.web || manifestJson.h5;
+    if (webManifest &&
+        webManifest.router &&
+        webManifest.router.mode === 'history') {
         features.routerMode = '"history"';
     }
     // TODO other features

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 {
@@ -22,31 +22,25 @@ function uniViteCopyPlugin({ targets, verbose, }) {
                 return;
             }
             initialized = true;
+            const is_prod = process.env.NODE_ENV !== 'development' ||
+                process.env.UNI_AUTOMATOR_CONFIG;
+            const onChange = is_prod
+                ? undefined
+                : (0, uni_shared_1.debounce)(() => {
+                    (0, logs_1.resetOutput)('log');
+                    (0, logs_1.output)('log', messages_1.M['dev.watching.end']);
+                }, 100, { setTimeout, clearTimeout });
             return new Promise((resolve) => {
                 Promise.all(targets.map(({ watchOptions, ...target }) => {
                     return new Promise((resolve) => {
-                        // 防抖，可能短时间触发很多次add,unlink
-                        const onChange = (0, uni_shared_1.debounce)(() => {
-                            (0, logs_1.resetOutput)('log');
-                            (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,
+                            persistent: is_prod ? false : true,
                             ...watchOptions,
-                        }, (watcher) => {
-                            if (process.env.NODE_ENV !== 'development' ||
-                                process.env.UNI_AUTOMATOR_CONFIG) {
-                                // 生产或自动化测试模式下，延迟 close，否则会影响 chokidar 初始化的 add 等事件
-                                setTimeout(() => {
-                                    watcher.close().then(() => resolve(void 0));
-                                }, 2000);
-                            }
-                            else {
-                                resolve(void 0);
-                            }
+                        }, () => {
+                            resolve(void 0);
                         }, onChange);
                     });
                 })).then(() => resolve());

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/plugins/uts/uni_modules.js

@@ -55,6 +55,11 @@ function uniUTSAppUniModulesPlugin(options = {}) {
             return compiler.compileArkTS(pluginDir, {
                 isX: !!options.x,
                 isExtApi,
+                transform: {
+                    uniExtApiProviderName: extApiProvider?.name,
+                    uniExtApiProviderService: extApiProvider?.service,
+                    uniExtApiProviderServicePlugin,
+                },
             });
         }
         return compiler.compile(pluginDir, {
@@ -76,7 +81,14 @@ function uniUTSAppUniModulesPlugin(options = {}) {
         // 获取 provider 扩展(编译所有uni)
         const plugins = (0, uni_modules_1.getUniExtApiPlugins)().filter((provider) => !utsPlugins.has(provider.plugin));
         for (const plugin of plugins) {
-            const result = await compilePlugin(path_1.default.resolve(inputDir, 'uni_modules', plugin.plugin));
+            const pluginDir = path_1.default.resolve(inputDir, 'uni_modules', plugin.plugin);
+            // 如果是 app-js 环境
+            if (process.env.UNI_APP_X_UVUE_SCRIPT_ENGINE === 'js') {
+                if (fs_1.default.existsSync(path_1.default.resolve(pluginDir, 'utssdk', 'app-js', 'index.uts'))) {
+                    continue;
+                }
+            }
+            const result = await compilePlugin(pluginDir);
             if (result) {
                 // 时机不对，不能addWatch
                 // result.deps.forEach((dep) => {

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,24 +5,23 @@ 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;
+        readyTimeout?: number;
     }, onReady?: (watcher: FSWatcher) => void, onChange?: () => void): FSWatcher;
     add(paths: string | ReadonlyArray<string>): FSWatcher;
     unwatch(paths: string | ReadonlyArray<string>): FSWatcher;
     close(): Promise<void>;
-    copy(from: string): Promise<void | undefined>;
-    remove(from: string): Promise<void | undefined>;
+    copy(from: string): void;
+    remove(from: string): void;
     info(type: 'close' | 'copy' | 'remove' | 'add' | 'unwatch', msg?: string | unknown): void;
     from(from: string): string;
     to(from: string): string;

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) {
@@ -22,17 +23,26 @@ class FileWatcher {
             const remove = this.remove.bind(this);
             // escape chokidar cwd
             const src = this.src.map((src) => (0, utils_1.pathToGlob)(path_1.default.resolve(watchOptions.cwd), src));
+            let closeTimer;
+            const checkReady = () => {
+                if (closeTimer) {
+                    clearTimeout(closeTimer);
+                }
+                closeTimer = setTimeout(() => {
+                    onReady && onReady(this.watcher);
+                    // 等首次change完，触发完ready，在切换到真实的onChange
+                    this.onChange = onChange;
+                }, watchOptions.readyTimeout || 300);
+            };
+            this.onChange = checkReady;
             this.watcher = (0, chokidar_1.watch)(src, watchOptions)
                 .on('add', copy)
-                .on('addDir', copy)
+                // .on('addDir', copy)
                 .on('change', copy)
                 .on('unlink', remove)
-                .on('unlinkDir', remove)
+                // .on('unlinkDir', remove)
                 .on('ready', () => {
-                onReady && onReady(this.watcher);
-                setTimeout(() => {
-                    this.onChange = onChange;
-                }, 1000);
+                checkReady();
             })
                 .on('error', (e) => console.error('watch', e));
         }
@@ -59,32 +69,21 @@ class FileWatcher {
             content = this.transform(fs_extra_1.default.readFileSync(filename), filename);
         }
         if (content) {
-            return fs_extra_1.default
-                .outputFile(to, content)
-                .catch(() => {
-                // this.info('copy', e)
-            })
-                .then(() => this.onChange && this.onChange());
+            fs_extra_1.default.outputFileSync(to, content);
+            this.onChange && this.onChange();
+            return;
         }
-        return fs_extra_1.default
-            .copy(this.from(from), to, { overwrite: true })
-            .catch(() => {
-            // this.info('copy', e)
-        })
-            .then(() => this.onChange && this.onChange());
+        fs_extra_1.default.copySync(this.from(from), to, { overwrite: true });
+        this.onChange && this.onChange();
     }
     remove(from) {
         const to = this.to(from);
         this.info('remove', from + '=>' + to);
-        return fs_extra_1.default
-            .remove(to)
-            .catch(() => {
-            // this.info('remove', e)
-        })
-            .then(() => this.onChange && this.onChange());
+        fs_extra_1.default.removeSync(to);
+        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/license.md

@@ -0,0 +1 @@
+[https://uniapp.dcloud.net.cn/license.html ](https://uniapp.dcloud.net.cn/license.html )

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "3.0.0-4020420240722002",
+  "version": "3.0.0-4020820240925001",
   "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-4020420240722002",
-    "@dcloudio/uni-shared": "3.0.0-4020420240722002",
+    "@dcloudio/uni-i18n": "3.0.0-4020820240925001",
+    "@dcloudio/uni-shared": "3.0.0-4020820240925001",
     "@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-4020420240722002",
+    "@dcloudio/uni-uts-v1": "3.0.0-4020820240925001",
     "@types/adm-zip": "^0.5.5",
     "@types/babel__code-frame": "^7.0.6",
     "@types/babel__core": "^7.1.19",
@@ -87,7 +87,7 @@
     "@types/stylus": "^0.48.36",
     "code-frame": "link:@types/@babel/code-frame",
     "postcss": "^8.4.21",
-    "unplugin-auto-import": "^0.16.7",
+    "unimport": "^3.9.0",
     "vue": "3.4.21"
   }
 }