@dcloudio/uni-cli-shared 3.0.0-alpha-3050420220804008 → 3.0.0-alpha-3060020220830001

package/dist/preprocess/context.js

@@ -8,6 +8,8 @@ const DEFAULT_KEYS = [
     'APP_PLUS',
     'APP_PLUS_NVUE',
     'APP_VUE',
+    'APP_ANDROID',
+    'APP_IOS',
     'H5',
     'MP',
     'MP_360',
@@ -52,6 +54,16 @@ function initPreContext(platform, userPreContext) {
         vueContext.APP_VUE = true;
         nvueContext.APP_NVUE = true;
         nvueContext.APP_PLUS_NVUE = true;
+        if (process.env.UNI_APP_PLATFORM === 'android') {
+            defaultContext.APP_ANDROID = true;
+        }
+        else if (process.env.UNI_APP_PLATFORM === 'ios') {
+            defaultContext.APP_IOS = true;
+        }
+        else {
+            defaultContext.APP_ANDROID = true;
+            defaultContext.APP_IOS = true;
+        }
     }
     else if (platform.startsWith('mp-')) {
         defaultContext.MP = true;

package/dist/resolve.d.ts

@@ -5,3 +5,4 @@ export declare function getBuiltInPaths(): string[];
 export declare function resolveBuiltIn(path: string): string;
 export declare function resolveVueI18nRuntime(): string;
 export declare function resolveComponentsLibPath(): string;
+export declare function resolveUtsModule(id: string, importer: string, platform: typeof process.env.UNI_UTS_PLATFORM): string | undefined;

package/dist/resolve.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.resolveComponentsLibPath = exports.resolveVueI18nRuntime = exports.resolveBuiltIn = exports.getBuiltInPaths = exports.resolveMainPathOnce = exports.relativeFile = exports.requireResolve = void 0;
+exports.resolveUtsModule = exports.resolveComponentsLibPath = exports.resolveVueI18nRuntime = exports.resolveBuiltIn = exports.getBuiltInPaths = exports.resolveMainPathOnce = exports.relativeFile = exports.requireResolve = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const debug_1 = __importDefault(require("debug"));
@@ -22,18 +22,6 @@ function resolveWithSymlinks(id, basedir) {
         extensions: constants_1.extensions,
         // necessary to work with pnpm
         preserveSymlinks: true,
-        pathFilter(pkg, filepath, relativePath) {
-            if (pkg.uni_modules && pkg.uni_modules.type === 'uts') {
-                if (process.env.UNI_APP_PLATFORM === 'app-android' ||
-                    process.env.UNI_APP_PLATFORM === 'app-ios') {
-                    const file = process.env.UNI_APP_PLATFORM + '/index.uts';
-                    if (fs_1.default.existsSync(path_1.default.join(filepath.replace(relativePath, ''), file))) {
-                        return file;
-                    }
-                }
-            }
-            return relativePath;
-        },
     });
 }
 function relativeFile(from, to) {
@@ -116,3 +104,37 @@ function resolveComponentsLibPath() {
     return componentsLibPath;
 }
 exports.resolveComponentsLibPath = resolveComponentsLibPath;
+// 仅限 root/uni_modules/test-plugin | root/utssdk/test-plugin 格式
+function resolveUtsModule(id, importer, platform) {
+    id = path_1.default.resolve(importer, id);
+    if (id.includes('utssdk') || id.includes('uni_modules')) {
+        const parts = (0, utils_1.normalizePath)(id).split('/');
+        const parentDir = parts[parts.length - 2];
+        if (parentDir === 'uni_modules' || parentDir === 'utssdk') {
+            const index = path_1.default.resolve(id, 'index.uts');
+            if (fs_1.default.existsSync(index)) {
+                return index;
+            }
+            if (parentDir === 'uni_modules' &&
+                !fs_1.default.existsSync(path_1.default.join(id, 'utssdk'))) {
+                // uni_modules/test-plugin/utssdk不存在
+                return;
+            }
+            const platformDir = path_1.default.resolve(id, parentDir === 'uni_modules' ? 'utssdk' : '', platform);
+            // App平台仅支持 uts
+            if (platform === 'app-android' || platform === 'app-ios') {
+                return resolveUtsFile(platformDir, ['.uts']);
+            }
+            return resolveUtsFile(platformDir);
+        }
+    }
+}
+exports.resolveUtsModule = resolveUtsModule;
+function resolveUtsFile(dir, extensions = ['.uts', '.ts', '.js']) {
+    for (let i = 0; i < extensions.length; i++) {
+        const indexFile = path_1.default.join(dir, 'index' + extensions[i]);
+        if (fs_1.default.existsSync(indexFile)) {
+            return indexFile;
+        }
+    }
+}

package/dist/utils.d.ts

@@ -11,3 +11,8 @@ export declare function removeExt(str: string): string;
 export declare function normalizeNodeModules(str: string): string;
 export declare function normalizeMiniProgramFilename(filename: string, inputDir?: string): string;
 export declare function normalizeParsePlugins(importer: string, babelParserPlugins?: ParserPlugin[]): ParserPlugin[];
+export declare function pathToGlob(pathString: string, glob: string, options?: {
+    windows?: boolean;
+    escape?: boolean;
+}): string;
+export declare function resolveSourceMapPath(dir: string, platform: UniApp.PLATFORM): 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.normalizeParsePlugins = exports.normalizeMiniProgramFilename = exports.normalizeNodeModules = exports.removeExt = exports.normalizePagePath = exports.normalizeIdentifier = exports.checkElementNodeTag = exports.normalizePath = exports.isWindows = exports.isRunningWithYarnPnp = exports.hash = void 0;
+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.hash = void 0;
 const fs_1 = __importDefault(require("fs"));
 const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
@@ -78,3 +78,15 @@ function normalizeParsePlugins(importer, babelParserPlugins) {
     return plugins;
 }
 exports.normalizeParsePlugins = normalizeParsePlugins;
+function pathToGlob(pathString, glob, options = {}) {
+    const isWindows = 'windows' in options ? options.windows : /^win/.test(process.platform);
+    const useEscape = options.escape;
+    const str = isWindows ? pathString.replace(/\\/g, '/') : pathString;
+    let safeStr = str.replace(/[\\*?[\]{}()!]/g, isWindows || !useEscape ? '[$&]' : '\\$&');
+    return path_1.default.posix.join(safeStr, glob);
+}
+exports.pathToGlob = pathToGlob;
+function resolveSourceMapPath(dir, platform) {
+    return path_1.default.resolve(dir, '../.sourcemap/' + platform);
+}
+exports.resolveSourceMapPath = resolveSourceMapPath;

package/dist/watcher.js

@@ -8,6 +8,7 @@ const fs_extra_1 = __importDefault(require("fs-extra"));
 const path_1 = __importDefault(require("path"));
 const chokidar_1 = require("chokidar");
 const shared_1 = require("@vue/shared");
+const utils_1 = require("./utils");
 class FileWatcher {
     constructor({ src, dest, transform, verbose }) {
         this.src = !(0, shared_1.isArray)(src) ? [src] : src;
@@ -19,7 +20,9 @@ class FileWatcher {
         if (!this.watcher) {
             const copy = this.copy.bind(this);
             const remove = this.remove.bind(this);
-            this.watcher = (0, chokidar_1.watch)(this.src, watchOptions)
+            // escape chokidar cwd
+            const src = this.src.map((src) => (0, utils_1.pathToGlob)(path_1.default.resolve(watchOptions.cwd), src));
+            this.watcher = (0, chokidar_1.watch)(src, watchOptions)
                 .on('add', copy)
                 .on('addDir', copy)
                 .on('change', copy)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "3.0.0-alpha-3050420220804008",
+  "version": "3.0.0-alpha-3060020220830001",
   "description": "@dcloudio/uni-cli-shared",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -22,8 +22,8 @@
     "@babel/core": "^7.17.9",
     "@babel/parser": "^7.17.9",
     "@babel/types": "^7.17.0",
-    "@dcloudio/uni-i18n": "3.0.0-alpha-3050420220804008",
-    "@dcloudio/uni-shared": "3.0.0-alpha-3050420220804008",
+    "@dcloudio/uni-i18n": "3.0.0-alpha-3060020220830001",
+    "@dcloudio/uni-shared": "3.0.0-alpha-3060020220830001",
     "@intlify/core-base": "9.1.9",
     "@intlify/shared": "9.1.9",
     "@intlify/vue-devtools": "9.1.9",
@@ -33,7 +33,7 @@
     "@vue/compiler-sfc": "3.2.37",
     "@vue/server-renderer": "3.2.37",
     "@vue/shared": "3.2.37",
-    "autoprefixer": "^10.4.7",
+    "autoprefixer": "^10.4.8",
     "base64url": "^3.0.1",
     "chokidar": "^3.5.3",
     "compare-versions": "^3.6.0",