@dcloudio/uni-cli-shared 3.0.0-alpha-4020520240731001 → 3.0.0-alpha-4020620240820001

package/dist/vite/cloud.js

@@ -152,12 +152,25 @@ function uniEncryptUniModulesPlugin() {
                         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,

package/dist/vite/plugins/copy.js

@@ -22,30 +22,25 @@ function uniViteCopyPlugin({ targets, }) {
                 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({
                             ...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/watcher.d.ts

@@ -15,12 +15,13 @@ export declare class FileWatcher {
     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

@@ -23,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));
         }
@@ -60,29 +69,18 @@ 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) {
         debugWatcher.enabled && debugWatcher(type, msg);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "3.0.0-alpha-4020520240731001",
+  "version": "3.0.0-alpha-4020620240820001",
   "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-4020520240731001",
-    "@dcloudio/uni-shared": "3.0.0-alpha-4020520240731001",
+    "@dcloudio/uni-i18n": "3.0.0-alpha-4020620240820001",
+    "@dcloudio/uni-shared": "3.0.0-alpha-4020620240820001",
     "@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-4020520240731001",
+    "@dcloudio/uni-uts-v1": "3.0.0-alpha-4020620240820001",
     "@types/adm-zip": "^0.5.5",
     "@types/babel__code-frame": "^7.0.6",
     "@types/babel__core": "^7.1.19",