fix(h5): file path with white space

.prettierignore

 dist
 packages/uni-app-vite/lib
 packages/uni-app-vue/lib
+packages/uni-automator/lib
 packages/uni-cli-nvue/lib
 packages/uni-cli-shared/lib
 packages/uni-components/lib

packages/uni-app-vite/src/plugin/build.ts

@@ -25,6 +25,9 @@ export function buildOptions(): UserConfig['build'] {
       output: {
         name: 'AppService',
         format: process.env.UNI_APP_CODE_SPLITING ? 'amd' : 'iife',
+        amd: {
+          autoId: true,
+        },
         entryFileNames: 'app-service.js',
         sourcemapPathTransform(relativeSourcePath, sourcemapPath) {
           const sourcePath = normalizePath(

packages/uni-automator/lib/uni.plugin.js

-'use strict'
-var __importDefault =
-  (this && this.__importDefault) ||
-  function (mod) {
-    return mod && mod.__esModule ? mod : { default: mod }
-  }
-Object.defineProperty(exports, '__esModule', { value: true })
-const fs_extra_1 = __importDefault(require('fs-extra'))
-const path_1 = __importDefault(require('path'))
-const uni_cli_shared_1 = require('@dcloudio/uni-cli-shared')
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const fs_extra_1 = __importDefault(require("fs-extra"));
+const path_1 = __importDefault(require("path"));
+const uni_cli_shared_1 = require("@dcloudio/uni-cli-shared");
 exports.default = [
-  uni_cli_shared_1.defineUniMainJsPlugin((opts) => {
-    return {
-      name: 'vite:uni-automator',
-      enforce: 'pre',
-      configResolved() {
-        if (!process.env.UNI_AUTOMATOR_WS_ENDPOINT) {
-          return
-        }
-        const pkg = JSON.parse(
-          fs_extra_1.default.readFileSync(
-            path_1.default.resolve(__dirname, '../package.json'),
-            'utf8'
-          )
-        )
-        const automatorJson = JSON.stringify({
-          version: pkg.version,
-          wsEndpoint: process.env.UNI_AUTOMATOR_WS_ENDPOINT,
-        })
-        fs_extra_1.default.outputFileSync(
-          path_1.default.resolve(
-            process.env.UNI_OUTPUT_DIR,
-            '../.automator/' + process.env.UNI_PLATFORM + '/.automator.json'
-          ),
-          automatorJson
-        )
-      },
-      transform(code, id) {
-        if (!process.env.UNI_AUTOMATOR_WS_ENDPOINT) {
-          return null
-        }
-        if (opts.filter(id)) {
-          const platform = process.env.UNI_PLATFORM
-          return {
-            code:
-              code +
-              `;import '@dcloudio/uni-${
-                platform === 'app' ? 'app-plus' : platform
-              }/lib/automator.js';`,
-            map: null,
-          }
-        }
-      },
-    }
-  }),
-]
+    uni_cli_shared_1.defineUniMainJsPlugin((opts) => {
+        return {
+            name: 'vite:uni-automator',
+            enforce: 'pre',
+            configResolved() {
+                if (!process.env.UNI_AUTOMATOR_WS_ENDPOINT) {
+                    return;
+                }
+                const pkg = JSON.parse(fs_extra_1.default.readFileSync(path_1.default.resolve(__dirname, '../package.json'), 'utf8'));
+                const automatorJson = JSON.stringify({
+                    version: pkg.version,
+                    wsEndpoint: process.env.UNI_AUTOMATOR_WS_ENDPOINT,
+                });
+                fs_extra_1.default.outputFileSync(path_1.default.resolve(process.env.UNI_OUTPUT_DIR, '../.automator/' + process.env.UNI_PLATFORM + '/.automator.json'), automatorJson);
+            },
+            transform(code, id) {
+                if (!process.env.UNI_AUTOMATOR_WS_ENDPOINT) {
+                    return null;
+                }
+                if (opts.filter(id)) {
+                    const platform = process.env.UNI_PLATFORM;
+                    return {
+                        code: code +
+                            `;import '@dcloudio/uni-${platform === 'app' ? 'app-plus' : platform}/lib/automator.js';`,
+                        map: null,
+                    };
+                }
+            },
+        };
+    }),
+];

packages/uni-h5/dist/uni-h5.es.js

@@ -683,6 +683,9 @@ function useCurrentPageId() {
   return getCurrentInstance().root.proxy.$page.id;
 }
 function getPageIdByVm(vm) {
+  if (vm.$page) {
+    return vm.$page.id;
+  }
   if (!vm.$) {
     return;
   }

packages/uni-shared/dist/uni-shared.cjs.js

@@ -396,7 +396,8 @@ function normalizeLog(type, filename, args) {
     return msgs.join('---COMMA---') + ' ' + filename;
 }
 function formatAppLog(type, filename, ...args) {
-    console[type](normalizeLog(type, filename, args));
+    const res = normalizeLog(type, filename, args);
+    res && console[type](res);
 }
 
 function plusReady(callback) {

packages/uni-shared/dist/uni-shared.es.js

@@ -392,7 +392,8 @@ function normalizeLog(type, filename, args) {
     return msgs.join('---COMMA---') + ' ' + filename;
 }
 function formatAppLog(type, filename, ...args) {
-    console[type](normalizeLog(type, filename, args));
+    const res = normalizeLog(type, filename, args);
+    res && console[type](res);
 }
 
 function plusReady(callback) {

packages/uni-shared/src/hbx/formatLog.ts

@@ -59,5 +59,6 @@ export function formatAppLog(
   filename: string,
   ...args: unknown[]
 ) {
-  console[type](normalizeLog(type, filename, args))
+  const res = normalizeLog(type, filename, args)
+  res && console[type](res)
 }

packages/uni-stat/dist/uni-stat.cjs.js

 'use strict';
 
-var version = "3.0.0-alpha-3000020210813002";
+var version = "3.0.0-alpha-3000020210826001";
 
 const STAT_VERSION = version;
 const STAT_URL = 'https://tongji.dcloud.io/uni/stat';

packages/uni-stat/dist/uni-stat.es.js

-var version = "3.0.0-alpha-3000020210813002";
+var version = "3.0.0-alpha-3000020210826001";
 
 const STAT_VERSION = version;
 const STAT_URL = 'https://tongji.dcloud.io/uni/stat';

packages/vite-plugin-uni/src/configResolved/plugins/resolveId.ts

@@ -2,8 +2,13 @@ import fs from 'fs'
 import path from 'path'
 import debug from 'debug'
 import { Plugin } from 'vite'
-
-import { parseVueRequest, resolveBuiltIn } from '@dcloudio/uni-cli-shared'
+import { unescape } from 'querystring'
+import {
+  isInHBuilderX,
+  normalizePath,
+  parseVueRequest,
+  resolveBuiltIn,
+} from '@dcloudio/uni-cli-shared'
 
 import { VitePluginUniResolvedOptions } from '../..'
 
@@ -22,6 +27,15 @@ const BUILT_IN_MODULES = {
 
 export type BuiltInModulesKey = keyof typeof BUILT_IN_MODULES
 
+const FS_PREFIX = `/@fs/`
+const VOLUME_RE = /^[A-Z]:/i
+function fsPathFromId(id: string) {
+  const fsPath = normalizePath(id.slice(FS_PREFIX.length))
+  return fsPath.startsWith('/') || fsPath.match(VOLUME_RE)
+    ? fsPath
+    : `/${fsPath}`
+}
+
 export function uniResolveIdPlugin(
   options: VitePluginUniResolvedOptions
 ): Plugin {
@@ -39,6 +53,13 @@ export function uniResolveIdPlugin(
           path.join(id, BUILT_IN_MODULES[id as BuiltInModulesKey])
         ))
       }
+      if (isInHBuilderX()) {
+        // 解决文件路径包含转义字符（空格）等
+        // /@fs/Applications/HBuilderX%20Alpha.app/Contents/HBuilderX/plugins/uniapp-cli-vite/node_modules/vite/dist/client/env.mjs
+        if (id.startsWith(FS_PREFIX) && id.includes('uniapp-cli-vite')) {
+          return fsPathFromId(unescape(id))
+        }
+      }
     },
     load(id) {
       if (options.command === 'build') {