@dcloudio/uni-cli-shared 3.0.0-alpha-4000120240201002 → 3.0.0-alpha-4000220240228001

package/dist/env/define.d.ts

@@ -12,6 +12,7 @@ export declare function initDefine(stringifyBoolean?: boolean): {
     'process.env.UNI_COMPILER_VERSION': string;
     'process.env.RUN_BY_HBUILDERX': string | boolean;
     'process.env.UNI_AUTOMATOR_WS_ENDPOINT': string;
+    'process.env.UNI_AUTOMATOR_APP_WEBVIEW_SRC': string;
     'process.env.UNI_CLOUD_PROVIDER': string;
     'process.env.UNICLOUD_DEBUG': string;
     'process.env.VUE_APP_PLATFORM': string;

package/dist/env/define.js

@@ -27,6 +27,7 @@ function initDefine(stringifyBoolean = false) {
             ? JSON.stringify(isRunByHBuilderX)
             : isRunByHBuilderX,
         'process.env.UNI_AUTOMATOR_WS_ENDPOINT': JSON.stringify(process.env.UNI_AUTOMATOR_WS_ENDPOINT || ''),
+        'process.env.UNI_AUTOMATOR_APP_WEBVIEW_SRC': JSON.stringify(process.env.UNI_AUTOMATOR_APP_WEBVIEW_SRC || ''),
         'process.env.UNI_CLOUD_PROVIDER': JSON.stringify(process.env.UNI_CLOUD_PROVIDER || ''),
         'process.env.UNICLOUD_DEBUG': JSON.stringify(process.env.UNICLOUD_DEBUG || ''),
         // 兼容旧版本

package/dist/hbx/alias.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.formatInstallHBuilderXPluginTips = exports.moduleAliasFormatter = exports.installHBuilderXPlugin = exports.initModuleAlias = void 0;
 const path_1 = __importDefault(require("path"));
 const module_alias_1 = __importDefault(require("module-alias"));
-const resolve_1 = __importDefault(require("resolve"));
 const env_1 = require("./env");
 const hbxPlugins = {
     // typescript: 'compile-typescript/node_modules/typescript',
@@ -38,14 +37,39 @@ function initModuleAlias() {
         Object.keys(hbxPlugins).forEach((name) => {
             module_alias_1.default.addAlias(name, path_1.default.resolve(process.env.UNI_HBUILDERX_PLUGINS, hbxPlugins[name]));
         });
-        // https://github.com/vitejs/vite/blob/892916d040a035edde1add93c192e0b0c5c9dd86/packages/vite/src/node/plugins/css.ts#L1481
-        const oldSync = resolve_1.default.sync;
-        resolve_1.default.sync = (id, opts) => {
-            if (hbxPlugins[id]) {
-                return path_1.default.resolve(process.env.UNI_HBUILDERX_PLUGINS, hbxPlugins[id]);
-            }
-            return oldSync(id, opts);
-        };
+        // web 平台用了 vite 内置 css 插件，该插件会加载预编译器如scss、less等，需要转向到 HBuilderX 的对应编译器插件
+        if (process.env.UNI_PLATFORM === 'h5' ||
+            process.env.UNI_PLATFORM === 'web') {
+            // https://github.com/vitejs/vite/blob/main/packages/vite/src/node/packages.ts#L92
+            // 拦截预编译器
+            const join = path_1.default.join;
+            path_1.default.join = function (...paths) {
+                if (paths.length === 4) {
+                    // path.join(basedir, 'node_modules', pkgName, 'package.json')
+                    // const basedir = paths[0]
+                    const nodeModules = paths[1]; // = node_modules
+                    const pkgName = paths[2];
+                    const packageJson = paths[3]; // = package.json
+                    if (nodeModules === 'node_modules' &&
+                        packageJson === 'package.json' &&
+                        hbxPlugins[pkgName]) {
+                        return path_1.default.resolve(process.env.UNI_HBUILDERX_PLUGINS, hbxPlugins[pkgName], packageJson);
+                    }
+                }
+                return join(...paths);
+            };
+            // https://github.com/vitejs/vite/blob/892916d040a035edde1add93c192e0b0c5c9dd86/packages/vite/src/node/plugins/css.ts#L1481
+            // const oldSync = resovle.sync
+            // resovle.sync = (id: string, opts?: SyncOpts) => {
+            //   if ((hbxPlugins as any)[id]) {
+            //     return path.resolve(
+            //       process.env.UNI_HBUILDERX_PLUGINS,
+            //       hbxPlugins[id as keyof typeof hbxPlugins]
+            //     )
+            //   }
+            //   return oldSync(id, opts)
+            // }
+        }
     }
 }
 exports.initModuleAlias = initModuleAlias;

package/dist/json/manifest.js

@@ -97,6 +97,10 @@ function getRouterOptions(manifestJson) {
 }
 exports.getRouterOptions = getRouterOptions;
 function isEnableTreeShaking(manifestJson) {
+    // 自动化测试时，一定不摇树
+    if (process.env.UNI_AUTOMATOR_WS_ENDPOINT) {
+        return false;
+    }
     return manifestJson.h5?.optimization?.treeShaking?.enable !== false;
 }
 exports.isEnableTreeShaking = isEnableTreeShaking;

package/dist/messages/en.d.ts

@@ -5,6 +5,7 @@ declare const _default: {
     readonly 'dev.exclusion': "Please configure the antivirus software to set up an exclusion list for scanning, reducing system resource consumption. [详情](https://uniapp.dcloud.net.cn/uni-app-x/compiler/#tips)";
     readonly 'dev.performance.nvue': "Especially the sourcemap of app-nvue has a greater impact";
     readonly 'dev.performance.mp': "To officially release, please click the release menu or use the cli release command to release";
+    readonly 'dev.performance.web': "\nVite is compiled on demand, and clicking on an uncompiled page at runtime will compile first and then load, resulting in a slower display, and there is no such problem after release.";
     readonly 'build.done': "DONE  Build complete.";
     readonly 'dev.watching.start': "Compiling...";
     readonly 'dev.watching.end': "DONE  Build complete. Watching for changes...";

package/dist/messages/en.js

@@ -7,6 +7,7 @@ exports.default = {
     'dev.exclusion': 'Please configure the antivirus software to set up an exclusion list for scanning, reducing system resource consumption. [详情](https://uniapp.dcloud.net.cn/uni-app-x/compiler/#tips)',
     'dev.performance.nvue': 'Especially the sourcemap of app-nvue has a greater impact',
     'dev.performance.mp': 'To officially release, please click the release menu or use the cli release command to release',
+    'dev.performance.web': '\nVite is compiled on demand, and clicking on an uncompiled page at runtime will compile first and then load, resulting in a slower display, and there is no such problem after release.',
     'build.done': 'DONE  Build complete.',
     'dev.watching.start': 'Compiling...',
     'dev.watching.end': 'DONE  Build complete. Watching for changes...',

package/dist/messages/index.d.ts

@@ -5,6 +5,7 @@ export declare const M: {
     readonly 'dev.exclusion': "请在杀毒软件中设置扫描排除名单，减少系统资源消耗。[详情](https://uniapp.dcloud.net.cn/uni-app-x/compiler/#tips)";
     readonly 'dev.performance.nvue': "尤其是 app-nvue 的 sourcemap 影响较大";
     readonly 'dev.performance.mp': "若要正式发布，请点击发行菜单或使用 cli 发布命令进行发布";
+    readonly 'dev.performance.web': "\nvite是按需编译，运行时点击某个未编译页面会先编译后加载，导致显示较慢，发行后无此问题。";
     readonly 'build.done': "DONE  Build complete.";
     readonly 'dev.watching.start': "开始差量编译...";
     readonly 'dev.watching.end': "DONE  Build complete. Watching for changes...";
@@ -49,6 +50,7 @@ export declare const M: {
     readonly 'dev.exclusion': "Please configure the antivirus software to set up an exclusion list for scanning, reducing system resource consumption. [详情](https://uniapp.dcloud.net.cn/uni-app-x/compiler/#tips)";
     readonly 'dev.performance.nvue': "Especially the sourcemap of app-nvue has a greater impact";
     readonly 'dev.performance.mp': "To officially release, please click the release menu or use the cli release command to release";
+    readonly 'dev.performance.web': "\nVite is compiled on demand, and clicking on an uncompiled page at runtime will compile first and then load, resulting in a slower display, and there is no such problem after release.";
     readonly 'build.done': "DONE  Build complete.";
     readonly 'dev.watching.start': "Compiling...";
     readonly 'dev.watching.end': "DONE  Build complete. Watching for changes...";

package/dist/messages/zh_CN.d.ts

@@ -5,6 +5,7 @@ declare const _default: {
     readonly 'dev.exclusion': "请在杀毒软件中设置扫描排除名单，减少系统资源消耗。[详情](https://uniapp.dcloud.net.cn/uni-app-x/compiler/#tips)";
     readonly 'dev.performance.nvue': "尤其是 app-nvue 的 sourcemap 影响较大";
     readonly 'dev.performance.mp': "若要正式发布，请点击发行菜单或使用 cli 发布命令进行发布";
+    readonly 'dev.performance.web': "\nvite是按需编译，运行时点击某个未编译页面会先编译后加载，导致显示较慢，发行后无此问题。";
     readonly 'build.done': "DONE  Build complete.";
     readonly 'dev.watching.start': "开始差量编译...";
     readonly 'dev.watching.end': "DONE  Build complete. Watching for changes...";

package/dist/messages/zh_CN.js

@@ -7,6 +7,7 @@ exports.default = {
     'dev.exclusion': '请在杀毒软件中设置扫描排除名单，减少系统资源消耗。[详情](https://uniapp.dcloud.net.cn/uni-app-x/compiler/#tips)',
     'dev.performance.nvue': '尤其是 app-nvue 的 sourcemap 影响较大',
     'dev.performance.mp': '若要正式发布，请点击发行菜单或使用 cli 发布命令进行发布',
+    'dev.performance.web': '\nvite是按需编译，运行时点击某个未编译页面会先编译后加载，导致显示较慢，发行后无此问题。',
     'build.done': 'DONE  Build complete.',
     'dev.watching.start': '开始差量编译...',
     'dev.watching.end': 'DONE  Build complete. Watching for changes...',

package/dist/uni_modules.d.ts

@@ -15,6 +15,12 @@ export type Defines = {
 export interface Exports {
     [name: string]: Define | Defines | false;
 }
+export declare function getUniExtApiProviders(): {
+    plugin: string;
+    service: string;
+    name?: string | undefined;
+    servicePlugin?: string | undefined;
+}[];
 export declare function parseUniExtApis(vite: boolean | undefined, platform: typeof process.env.UNI_UTS_PLATFORM, language?: UTSTargetLanguage): Injects;
 export type Injects = {
     [name: string]: string | [string, string] | [string, string, DefineOptions['app']] | false;

package/dist/uni_modules.js

@@ -3,10 +3,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseInjects = exports.parseUniExtApis = void 0;
+exports.parseInjects = exports.parseUniExtApis = exports.getUniExtApiProviders = void 0;
 // 重要：此文件编译后的js，需同步至 vue2 编译器中 uni-cli-shared/lib/uts/uni_modules.js
 const path_1 = __importDefault(require("path"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
+const extApiProviders = [];
+function getUniExtApiProviders() {
+    return extApiProviders;
+}
+exports.getUniExtApiProviders = getUniExtApiProviders;
 function parseUniExtApis(vite = true, platform, language = 'javascript') {
     if (!process.env.UNI_INPUT_DIR) {
         return {};
@@ -16,6 +21,7 @@ function parseUniExtApis(vite = true, platform, language = 'javascript') {
         return {};
     }
     const injects = {};
+    extApiProviders.length = 0;
     fs_extra_1.default.readdirSync(uniModulesDir).forEach((uniModuleDir) => {
         // 必须以 uni- 开头
         if (!uniModuleDir.startsWith('uni-')) {
@@ -33,6 +39,11 @@ function parseUniExtApis(vite = true, platform, language = 'javascript') {
                 exports = pkg.uni_modules['uni-ext-api'];
             }
             if (exports) {
+                const provider = exports.provider;
+                if (provider && provider.service) {
+                    provider.plugin = uniModuleDir;
+                    extApiProviders.push(provider);
+                }
                 const curInjects = parseInjects(vite, platform, language, `@/uni_modules/${uniModuleDir}`, uniModuleRootDir, exports);
                 Object.assign(injects, curInjects);
             }

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

@@ -6,4 +6,11 @@ interface UniUTSPluginOptions {
 }
 export declare const utsPlugins: Set<string>;
 export declare function uniUTSUniModulesPlugin(options?: UniUTSPluginOptions): Plugin;
+export declare function buildUniExtApiProviders(): Promise<void>;
+export declare function resolveExtApiProvider(pkg: Record<string, any>): {
+    name?: string | undefined;
+    plugin?: string | undefined;
+    service: string;
+    servicePlugin: string;
+} | undefined;
 export {};

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

@@ -3,19 +3,59 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.uniUTSUniModulesPlugin = exports.utsPlugins = void 0;
+exports.resolveExtApiProvider = exports.buildUniExtApiProviders = exports.uniUTSUniModulesPlugin = exports.utsPlugins = void 0;
+const fs_1 = __importDefault(require("fs"));
 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 uni_modules_1 = require("../../../uni_modules");
 const UTSProxyRE = /\?uts-proxy$/;
 function isUTSProxy(id) {
     return UTSProxyRE.test(id);
 }
 const utsModuleCaches = new Map();
 exports.utsPlugins = new Set();
+let uniExtApiCompiler = async () => { };
 function uniUTSUniModulesPlugin(options = {}) {
     process.env.UNI_UTS_USING_ROLLUP = 'true';
+    const compilePlugin = (pluginDir) => {
+        exports.utsPlugins.add(path_1.default.basename(pluginDir));
+        const pkgJson = require(path_1.default.join(pluginDir, 'package.json'));
+        const extApiProvider = resolveExtApiProvider(pkgJson);
+        // 如果是 provider 扩展，需要判断 provider 的宿主插件是否在本地，在的话，自动导入该宿主插件包名
+        let uniExtApiProviderServicePlugin = '';
+        if (extApiProvider?.servicePlugin) {
+            if (fs_1.default.existsSync(path_1.default.resolve(process.env.UNI_INPUT_DIR, 'uni_modules', extApiProvider.servicePlugin))) {
+                uniExtApiProviderServicePlugin = extApiProvider.servicePlugin;
+            }
+        }
+        return (0, uts_1.resolveUTSCompiler)().compile(pluginDir, {
+            isX: !!options.x,
+            isSingleThread: !!options.isSingleThread,
+            isPlugin: true,
+            extApis: options.extApis,
+            sourceMap: process.env.NODE_ENV === 'development',
+            transform: {
+                uniExtApiProviderName: extApiProvider?.name,
+                uniExtApiProviderService: extApiProvider?.service,
+                uniExtApiProviderServicePlugin,
+            },
+        });
+    };
+    uniExtApiCompiler = async () => {
+        // 获取 provider 扩展
+        const plugins = (0, uni_modules_1.getUniExtApiProviders)().filter((provider) => !exports.utsPlugins.has(provider.plugin));
+        for (const plugin of plugins) {
+            const result = await compilePlugin(path_1.default.resolve(process.env.UNI_INPUT_DIR, 'uni_modules', plugin.plugin));
+            if (result) {
+                // 时机不对，不能addWatch
+                // result.deps.forEach((dep) => {
+                //   this.addWatchFile(dep)
+                // })
+            }
+        }
+    };
     return {
         name: 'uni:uts-uni_modules',
         apply: 'build',
@@ -64,14 +104,7 @@ function uniUTSUniModulesPlugin(options = {}) {
                 });
             }
             const compile = (0, uni_shared_1.once)(() => {
-                exports.utsPlugins.add(path_1.default.basename(pluginDir));
-                return (0, uts_1.resolveUTSCompiler)().compile(pluginDir, {
-                    isX: !!options.x,
-                    isSingleThread: !!options.isSingleThread,
-                    isPlugin: true,
-                    extApis: options.extApis,
-                    sourceMap: process.env.NODE_ENV === 'development',
-                });
+                return compilePlugin(pluginDir);
             });
             utsModuleCaches.set(pluginDir, compile);
             const result = await compile();
@@ -87,6 +120,21 @@ function uniUTSUniModulesPlugin(options = {}) {
                 };
             }
         },
+        async generateBundle() { },
     };
 }
 exports.uniUTSUniModulesPlugin = uniUTSUniModulesPlugin;
+async function buildUniExtApiProviders() {
+    await uniExtApiCompiler();
+}
+exports.buildUniExtApiProviders = buildUniExtApiProviders;
+function resolveExtApiProvider(pkg) {
+    const provider = pkg.uni_modules?.['uni-ext-api']?.provider;
+    if (provider?.service) {
+        if (provider.name && !provider.servicePlugin) {
+            provider.servicePlugin = 'uni-' + provider.service;
+        }
+        return provider;
+    }
+}
+exports.resolveExtApiProvider = resolveExtApiProvider;

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

@@ -1110,6 +1110,7 @@ const preProcessors = Object.freeze({
 function isPreProcessor(lang) {
     return lang && lang in preProcessors;
 }
+const preCssExtNames = ['.scss', '.sass', '.styl', '.stylus'];
 /**
  * 重写 readFileSync
  * 目前主要解决 scss 文件被 @import 的条件编译
@@ -1119,8 +1120,8 @@ function rewriteScssReadFileSync() {
     fs_1.default.readFileSync = ((filepath, options) => {
         const content = readFileSync(filepath, options);
         if ((0, shared_1.isString)(filepath) &&
-            path_1.default.extname(filepath) === '.scss' &&
             (0, shared_1.isString)(content) &&
+            preCssExtNames.includes(path_1.default.extname(filepath)) &&
             content.includes('#endif')) {
             return (0, preprocess_1.preCss)(content);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "3.0.0-alpha-4000120240201002",
+  "version": "3.0.0-alpha-4000220240228001",
   "description": "@dcloudio/uni-cli-shared",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -26,8 +26,8 @@
     "@babel/core": "^7.21.3",
     "@babel/parser": "^7.23.5",
     "@babel/types": "^7.20.7",
-    "@dcloudio/uni-i18n": "3.0.0-alpha-4000120240201002",
-    "@dcloudio/uni-shared": "3.0.0-alpha-4000120240201002",
+    "@dcloudio/uni-i18n": "3.0.0-alpha-4000220240228001",
+    "@dcloudio/uni-shared": "3.0.0-alpha-4000220240228001",
     "@intlify/core-base": "9.1.9",
     "@intlify/shared": "9.1.9",
     "@intlify/vue-devtools": "9.1.9",
@@ -67,7 +67,7 @@
   },
   "gitHead": "33e807d66e1fe47e2ee08ad9c59247e37b8884da",
   "devDependencies": {
-    "@dcloudio/uni-uts-v1": "3.0.0-alpha-4000120240201002",
+    "@dcloudio/uni-uts-v1": "3.0.0-alpha-4000220240228001",
     "@types/babel__code-frame": "^7.0.6",
     "@types/babel__core": "^7.1.19",
     "@types/debug": "^4.1.7",