@dcloudio/uni-cli-shared 3.0.0-alpha-3090220231010001 → 3.0.0-alpha-3090320231017002

package/dist/index.d.ts

@@ -21,7 +21,7 @@ export * from './esbuild';
 export * from './resolve';
 export * from './scripts';
 export * from './platform';
-export { parseUniExtApis, parseInjects } from './uni_modules';
+export { parseUniExtApis, parseInjects, Define, DefineOptions, Defines, } from './uni_modules';
 export { M } from './messages';
 export * from './exports';
 export { checkUpdate } from './checkUpdate';

package/dist/mp/usingComponents.js

@@ -185,7 +185,7 @@ async function parseTemplateDescriptor(filename, ast, options) {
 exports.parseTemplateDescriptor = parseTemplateDescriptor;
 async function parseGlobalDescriptor(filename, ast, resolve) {
     // 外置时查找所有 vue component import
-    const imports = (await parseVueComponentImports(filename, ast.body.filter((node) => (0, types_1.isImportDeclaration)(node)), resolve)).filter((item) => !(0, utils_2.cleanUrl)(item.source.value).endsWith('App.vue'));
+    const imports = (await parseVueComponentImports(filename, ast.body.filter((node) => (0, types_1.isImportDeclaration)(node)), resolve)).filter((item) => !(0, utils_1.isAppVue)((0, utils_2.cleanUrl)(item.source.value)));
     return {
         bindingComponents: parseGlobalComponents(ast),
         imports,

package/dist/resolve.js

@@ -102,11 +102,12 @@ exports.resolveVueI18nRuntime = resolveVueI18nRuntime;
 let componentsLibPath = '';
 function resolveComponentsLibPath() {
     if (!componentsLibPath) {
+        const dir = process.env.UNI_APP_X === 'true' ? '../lib-x' : '../lib';
         if ((0, env_1.isInHBuilderX)()) {
-            componentsLibPath = path_1.default.join(resolveBuiltIn('@dcloudio/uni-components/package.json'), '../lib');
+            componentsLibPath = path_1.default.join(resolveBuiltIn('@dcloudio/uni-components/package.json'), dir);
         }
         else {
-            componentsLibPath = path_1.default.join(resolveWithSymlinks('@dcloudio/uni-components/package.json', process.env.UNI_INPUT_DIR), '../lib');
+            componentsLibPath = path_1.default.join(resolveWithSymlinks('@dcloudio/uni-components/package.json', process.env.UNI_INPUT_DIR), dir);
         }
     }
     return componentsLibPath;

package/dist/uni_modules.d.ts

@@ -1,5 +1,5 @@
 import type { UTSTargetLanguage } from './uts';
-type DefineOptions = {
+export type DefineOptions = {
     name?: string;
     app?: boolean | {
         js?: boolean;
@@ -8,8 +8,8 @@ type DefineOptions = {
     };
     [key: string]: any;
 };
-type Define = string | string[] | Record<string, string | DefineOptions> | false;
-type Defines = {
+export type Define = string | string[] | Record<string, string | DefineOptions> | false;
+export type Defines = {
     [name: string]: Define;
 };
 export interface Exports {

package/dist/utils.d.ts

@@ -18,3 +18,5 @@ export declare function pathToGlob(pathString: string, glob: string, options?: {
 }): string;
 export declare function resolveSourceMapPath(outputDir?: string, platform?: UniApp.PLATFORM): string;
 export declare function installDepTips(type: 'dependencies' | 'devDependencies', module: string, version?: string): string;
+export declare function isAppVue(filename: string): boolean;
+export declare function resolveAppVue(inputDir: 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.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.version = exports.hash = void 0;
+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.isRunningWithYarnPnp = exports.version = exports.hash = void 0;
 const fs_1 = __importDefault(require("fs"));
 const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
@@ -112,3 +112,15 @@ function installDepTips(type, module, version) {
 Please run \`${picocolors_1.default.cyan(`${getInstallCommand(process.cwd())} ${module + (version ? '@' + version : '')}${type === 'devDependencies' ? ' -D' : ''}`)}\` and try again.`;
 }
 exports.installDepTips = installDepTips;
+function isAppVue(filename) {
+    return filename.endsWith('App.vue') || filename.endsWith('App.uvue');
+}
+exports.isAppVue = isAppVue;
+function resolveAppVue(inputDir) {
+    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'));
+}
+exports.resolveAppVue = resolveAppVue;

package/dist/vite/plugins/copy.js

@@ -37,8 +37,9 @@ function uniViteCopyPlugin({ targets, verbose, }) {
                             cwd: process.env.UNI_INPUT_DIR,
                             ...watchOptions,
                         }, (watcher) => {
-                            if (process.env.NODE_ENV !== 'development') {
-                                // 生产模式下，延迟 close，否则会影响 chokidar 初始化的 add 等事件
+                            if (process.env.NODE_ENV !== 'development' ||
+                                process.env.UNI_AUTOMATOR_CONFIG) {
+                                // 生产或自动化测试模式下，延迟 close，否则会影响 chokidar 初始化的 add 等事件
                                 setTimeout(() => {
                                     watcher.close().then(() => resolve(void 0));
                                 }, 2000);

package/dist/vite/plugins/cssScoped.js

@@ -9,6 +9,7 @@ const debug_1 = __importDefault(require("debug"));
 const constants_1 = require("../../constants");
 const preprocess_1 = require("../../preprocess");
 const parse_1 = require("../../vue/parse");
+const utils_1 = require("../../utils");
 const debugScoped = (0, debug_1.default)('uni:scoped');
 const SCOPED_RE = /<style\s[^>]*scoped[^>]*>/i;
 function addScoped(code) {
@@ -60,7 +61,7 @@ function uniCssScopedPlugin({ filter } = { filter: () => false }) {
             if (!constants_1.EXTNAME_VUE.includes(path_1.default.extname(ctx.file))) {
                 return;
             }
-            const scoped = !ctx.file.endsWith('App.vue');
+            const scoped = !(0, utils_1.isAppVue)(ctx.file);
             debugScoped('hmr', ctx.file);
             const oldRead = ctx.read;
             ctx.read = async () => {

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

@@ -5,7 +5,8 @@ export * from './mainJs';
 export * from './jsonJs';
 export * from './console';
 export * from './dynamicImportPolyfill';
-export * from './utsPlugin';
+export * from './uts/app';
+export * from './uts/h5';
 export { assetPlugin, parseAssets, getAssetHash } from './vitejs/plugins/asset';
 export { isCSSRequest, cssPlugin, cssPostPlugin, minifyCSS, cssLangRE, commonjsProxyRE, } from './vitejs/plugins/css';
 export { generateCodeFrame, locToStartAndEnd } from './vitejs/utils';

package/dist/vite/plugins/index.js

@@ -22,7 +22,8 @@ __exportStar(require("./mainJs"), exports);
 __exportStar(require("./jsonJs"), exports);
 __exportStar(require("./console"), exports);
 __exportStar(require("./dynamicImportPolyfill"), exports);
-__exportStar(require("./utsPlugin"), exports);
+__exportStar(require("./uts/app"), exports);
+__exportStar(require("./uts/h5"), exports);
 var asset_1 = require("./vitejs/plugins/asset");
 Object.defineProperty(exports, "assetPlugin", { enumerable: true, get: function () { return asset_1.assetPlugin; } });
 Object.defineProperty(exports, "parseAssets", { enumerable: true, get: function () { return asset_1.parseAssets; } });

package/dist/vite/plugins/{utsPlugin.d.ts → uts/app.d.ts}

@@ -4,5 +4,5 @@ interface UniUTSPluginOptions {
     extApis?: Record<string, [string, string]>;
 }
 export declare const utsPlugins: Set<string>;
-export declare function uniUTSPlugin(options?: UniUTSPluginOptions): Plugin;
+export declare function uniUTSAppPlugin(options?: UniUTSPluginOptions): Plugin;
 export {};

package/dist/vite/plugins/{utsPlugin.js → uts/app.js}

@@ -3,18 +3,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.uniUTSPlugin = exports.utsPlugins = void 0;
+exports.uniUTSAppPlugin = exports.utsPlugins = void 0;
 const path_1 = __importDefault(require("path"));
 const uni_shared_1 = require("@dcloudio/uni-shared");
-const uts_1 = require("../../uts");
-const utils_1 = require("../utils");
+const uts_1 = require("../../../uts");
+const utils_1 = require("../../utils");
 const UTSProxyRE = /\?uts-proxy$/;
 function isUTSProxy(id) {
     return UTSProxyRE.test(id);
 }
 const utsModuleCaches = new Map();
 exports.utsPlugins = new Set();
-function uniUTSPlugin(options = {}) {
+function uniUTSAppPlugin(options = {}) {
     process.env.UNI_UTS_USING_ROLLUP = 'true';
     return {
         name: 'uni:uts',
@@ -86,4 +86,4 @@ function uniUTSPlugin(options = {}) {
         },
     };
 }
-exports.uniUTSPlugin = uniUTSPlugin;
+exports.uniUTSAppPlugin = uniUTSAppPlugin;

package/dist/vite/plugins/uts/h5.d.ts

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

package/dist/vite/plugins/uts/h5.js

@@ -0,0 +1,33 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.uniUTSJsPlugin = void 0;
+const vue_1 = require("../../../vue");
+function uniUTSJsPlugin(options = {}) {
+    process.env.UNI_UTS_USING_ROLLUP = 'true';
+    return {
+        name: 'uni:uts',
+        enforce: 'pre',
+        configResolved(config) {
+            // 移除自带的 esbuild 处理 ts 文件
+            const index = config.plugins.findIndex((p) => p.name === 'vite:esbuild');
+            if (index > -1) {
+                // @ts-expect-error
+                config.plugins.splice(index, 1);
+            }
+        },
+        transform(code, id) {
+            if (!(0, vue_1.isVueSfcFile)(id)) {
+                return;
+            }
+            return code.replace(/<script([^>]*)>/gi, (match, attributes) => {
+                // 如果 <script> 标签中没有 lang 属性，添加 lang="uts"
+                if (!/lang=["']?[^"']*["']?/.test(attributes)) {
+                    return `<script${attributes} lang="uts">`;
+                }
+                // 否则，将现有的 lang 属性替换为 lang="uts"
+                return match.replace(/lang=["']?ts["']?/, 'lang="uts"');
+            });
+        },
+    };
+}
+exports.uniUTSJsPlugin = uniUTSJsPlugin;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "3.0.0-alpha-3090220231010001",
+  "version": "3.0.0-alpha-3090320231017002",
   "description": "@dcloudio/uni-cli-shared",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -25,8 +25,8 @@
     "@babel/core": "^7.21.3",
     "@babel/parser": "^7.16.4",
     "@babel/types": "^7.20.7",
-    "@dcloudio/uni-i18n": "3.0.0-alpha-3090220231010001",
-    "@dcloudio/uni-shared": "3.0.0-alpha-3090220231010001",
+    "@dcloudio/uni-i18n": "3.0.0-alpha-3090320231017002",
+    "@dcloudio/uni-shared": "3.0.0-alpha-3090320231017002",
     "@intlify/core-base": "9.1.9",
     "@intlify/shared": "9.1.9",
     "@intlify/vue-devtools": "9.1.9",
@@ -64,7 +64,7 @@
   },
   "gitHead": "33e807d66e1fe47e2ee08ad9c59247e37b8884da",
   "devDependencies": {
-    "@dcloudio/uni-uts-v1": "3.0.0-alpha-3090220231010001",
+    "@dcloudio/uni-uts-v1": "3.0.0-alpha-3090320231017002",
     "@types/babel__core": "^7.1.19",
     "@types/debug": "^4.1.7",
     "@types/estree": "^0.0.51",