@dcloudio/uni-cli-shared 3.0.0-alpha-3021320211118002 → 3.0.0-alpha-3021320211119001

package/dist/hbx/alias.d.ts

@@ -1,3 +1,5 @@
 import type { Formatter } from '../logs/format';
 export declare function initModuleAlias(): void;
+export declare function installHBuilderXPlugin(plugin: string): void;
 export declare const moduleAliasFormatter: Formatter;
+export declare function formatInstallHBuilderXPluginTips(lang: string, preprocessor: string): string;

package/dist/hbx/alias.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.moduleAliasFormatter = exports.initModuleAlias = void 0;
+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 env_1 = require("./env");
@@ -25,9 +25,13 @@ exports.initModuleAlias = initModuleAlias;
 function supportAutoInstallPlugin() {
     return true;
 }
-function sendSignal(lang) {
-    return console.error(`%HXRunUniAPPPluginName%${lang}%HXRunUniAPPPluginName%`);
+function installHBuilderXPlugin(plugin) {
+    if (!supportAutoInstallPlugin()) {
+        return;
+    }
+    return console.error(`%HXRunUniAPPPluginName%${plugin}%HXRunUniAPPPluginName%`);
 }
+exports.installHBuilderXPlugin = installHBuilderXPlugin;
 exports.moduleAliasFormatter = {
     test(msg) {
         return msg.includes('Preprocessor dependency');
@@ -48,11 +52,14 @@ exports.moduleAliasFormatter = {
             preprocessor = 'compile-stylus';
         }
         if (lang) {
-            const autoInstall = supportAutoInstallPlugin();
-            autoInstall && sendSignal(preprocessor);
-            return `预编译器错误：代码使用了${lang}语言，但未安装相应的编译器插件，${autoInstall ? '正在从' : '请前往'}插件市场安装该插件:
-https://ext.dcloud.net.cn/plugin?name=${preprocessor}`;
+            installHBuilderXPlugin(preprocessor);
+            return formatInstallHBuilderXPluginTips(lang, preprocessor);
         }
         return msg;
     },
 };
+function formatInstallHBuilderXPluginTips(lang, preprocessor) {
+    return `预编译器错误：代码使用了${lang}语言，但未安装相应的编译器插件，${supportAutoInstallPlugin() ? '正在从' : '请前往'}插件市场安装该插件:
+https://ext.dcloud.net.cn/plugin?name=${preprocessor}`;
+}
+exports.formatInstallHBuilderXPluginTips = formatInstallHBuilderXPluginTips;

package/dist/hbx/index.d.ts

@@ -1,2 +1,2 @@
 export * from './env';
-export { initModuleAlias } from './alias';
+export { initModuleAlias, installHBuilderXPlugin, formatInstallHBuilderXPluginTips, } from './alias';

package/dist/hbx/index.js

@@ -10,7 +10,9 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.initModuleAlias = void 0;
+exports.formatInstallHBuilderXPluginTips = exports.installHBuilderXPlugin = exports.initModuleAlias = void 0;
 __exportStar(require("./env"), exports);
 var alias_1 = require("./alias");
 Object.defineProperty(exports, "initModuleAlias", { enumerable: true, get: function () { return alias_1.initModuleAlias; } });
+Object.defineProperty(exports, "installHBuilderXPlugin", { enumerable: true, get: function () { return alias_1.installHBuilderXPlugin; } });
+Object.defineProperty(exports, "formatInstallHBuilderXPluginTips", { enumerable: true, get: function () { return alias_1.formatInstallHBuilderXPluginTips; } });

package/dist/index.d.ts

@@ -16,6 +16,7 @@ export * from './preprocess';
 export * from './postcss';
 export * from './filter';
 export * from './esbuild';
+export * from './resolve';
 export { M } from './messages';
 export * from './exports';
 export { checkUpdate } from './checkUpdate';

package/dist/index.js

@@ -29,6 +29,7 @@ __exportStar(require("./preprocess"), exports);
 __exportStar(require("./postcss"), exports);
 __exportStar(require("./filter"), exports);
 __exportStar(require("./esbuild"), exports);
+__exportStar(require("./resolve"), exports);
 var messages_1 = require("./messages");
 Object.defineProperty(exports, "M", { enumerable: true, get: function () { return messages_1.M; } });
 __exportStar(require("./exports"), exports);

package/dist/json/mp/jsonFile.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.addMiniProgramUsingComponents = exports.addMiniProgramComponentJson = exports.addMiniProgramPageJson = exports.addMiniProgramAppJson = exports.findChangedJsonFiles = exports.normalizeJsonFilename = exports.hasJsonFile = exports.isPageFile = void 0;
 const shared_1 = require("@vue/shared");
 const utils_1 = require("../../utils");
+const resolve_1 = require("../../resolve");
 let appJsonCache = {};
 const jsonFilesCache = new Map();
 const jsonPagesCache = new Map();
@@ -33,7 +34,7 @@ function findChangedJsonFiles() {
         const usingComponents = newJson.usingComponents;
         // 格式化为相对路径，这样作为分包也可以直接运行
         Object.keys(usingComponents).forEach((name) => {
-            usingComponents[name] = (0, utils_1.relativeFile)(filename, usingComponents[name].slice(1));
+            usingComponents[name] = (0, resolve_1.relativeFile)(filename, usingComponents[name].slice(1));
         });
         const jsonStr = JSON.stringify(newJson, null, 2);
         if (jsonFilesCache.get(filename) !== jsonStr) {

package/dist/preprocess/context.js

@@ -18,6 +18,7 @@ const DEFAULT_KEYS = [
     'MP_TOUTIAO',
     'MP_WEIXIN',
     'MP_KUAISHOU',
+    'MP_JD',
     'QUICKAPP_NATIVE',
     'QUICKAPP_WEBVIEW',
     'QUICKAPP_WEBVIEW_HUAWEI',

package/dist/resolve.d.ts

@@ -0,0 +1,5 @@
+export declare function relativeFile(from: string, to: string): string;
+export declare const resolveMainPathOnce: (inputDir: string) => string;
+export declare function getBuiltInPaths(): string[];
+export declare function resolveBuiltIn(path: string): string;
+export declare function resolveComponentsLibPath(): string;

package/dist/resolve.js

@@ -0,0 +1,89 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveComponentsLibPath = exports.resolveBuiltIn = exports.getBuiltInPaths = exports.resolveMainPathOnce = exports.relativeFile = void 0;
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+const debug_1 = __importDefault(require("debug"));
+const resolve_1 = __importDefault(require("resolve"));
+const uni_shared_1 = require("@dcloudio/uni-shared");
+const utils_1 = require("./utils");
+const DEFAULT_EXTENSIONS = ['.mjs', '.js', '.ts', '.jsx', '.tsx', '.json'];
+function resolveWithSymlinks(id, basedir) {
+    return resolve_1.default.sync(id, {
+        basedir,
+        extensions: DEFAULT_EXTENSIONS,
+        // necessary to work with pnpm
+        preserveSymlinks: true,
+    });
+}
+function relativeFile(from, to) {
+    const relativePath = (0, utils_1.normalizePath)(path_1.default.relative(path_1.default.dirname(from), to));
+    return relativePath.startsWith('.') ? relativePath : './' + relativePath;
+}
+exports.relativeFile = relativeFile;
+exports.resolveMainPathOnce = (0, uni_shared_1.once)((inputDir) => {
+    const mainTsPath = path_1.default.resolve(inputDir, 'main.ts');
+    if (fs_1.default.existsSync(mainTsPath)) {
+        return (0, utils_1.normalizePath)(mainTsPath);
+    }
+    return (0, utils_1.normalizePath)(path_1.default.resolve(inputDir, 'main.js'));
+});
+const ownerModules = ['@dcloudio/uni-app', '@dcloudio/vite-plugin-uni'];
+const paths = [];
+function resolveNodeModulePath(modulePath) {
+    const nodeModulesPaths = [];
+    const nodeModulesPath = path_1.default.join(modulePath, 'node_modules');
+    if (fs_1.default.existsSync(nodeModulesPath)) {
+        nodeModulesPaths.push(nodeModulesPath);
+    }
+    const index = modulePath.lastIndexOf('node_modules');
+    if (index > -1) {
+        nodeModulesPaths.push(path_1.default.join(modulePath.substr(0, index), 'node_modules'));
+    }
+    return nodeModulesPaths;
+}
+function initPaths() {
+    const cliContext = process.env.UNI_CLI_CONTEXT;
+    if (cliContext) {
+        const pathSet = new Set();
+        pathSet.add(path_1.default.join(cliContext, 'node_modules'));
+        [`@dcloudio/uni-` + process.env.UNI_PLATFORM, ...ownerModules].forEach((ownerModule) => {
+            let pkgPath = '';
+            try {
+                pkgPath = require.resolve(ownerModule + '/package.json', {
+                    paths: [cliContext],
+                });
+            }
+            catch (e) { }
+            if (pkgPath) {
+                resolveNodeModulePath(path_1.default.dirname(pkgPath)).forEach((nodeModulePath) => {
+                    pathSet.add(nodeModulePath);
+                });
+            }
+        });
+        paths.push(...pathSet);
+        (0, debug_1.default)('uni-paths')(paths);
+    }
+}
+function getBuiltInPaths() {
+    if (!paths.length) {
+        initPaths();
+    }
+    return paths;
+}
+exports.getBuiltInPaths = getBuiltInPaths;
+function resolveBuiltIn(path) {
+    return require.resolve(path, { paths: getBuiltInPaths() });
+}
+exports.resolveBuiltIn = resolveBuiltIn;
+let componentsLibPath = '';
+function resolveComponentsLibPath() {
+    if (!componentsLibPath) {
+        componentsLibPath = path_1.default.join(resolveWithSymlinks('@dcloudio/uni-components/package.json', process.env.UNI_INPUT_DIR), '../lib');
+    }
+    return componentsLibPath;
+}
+exports.resolveComponentsLibPath = resolveComponentsLibPath;

package/dist/utils.d.ts

@@ -1,14 +1,10 @@
 export { default as hash } from 'hash-sum';
 import type { SFCTemplateCompileOptions } from '@vue/compiler-sfc';
 import { ElementNode, RootNode, TemplateChildNode } from '@vue/compiler-core';
+export declare let isRunningWithYarnPnp: boolean;
 export declare const isWindows: boolean;
 export declare function normalizePath(id: string): string;
-export declare function relativeFile(from: string, to: string): string;
 export declare function checkElementNodeTag(node: RootNode | TemplateChildNode | null | undefined, tag: string): node is ElementNode;
-export declare const resolveMainPathOnce: (inputDir: string) => string;
-export declare function resolveComponentsLibPath(): string;
-export declare function getBuiltInPaths(): string[];
-export declare function resolveBuiltIn(path: string): string;
 export declare function normalizeIdentifier(str: string): string;
 export declare function normalizePagePath(pagePath: string, platform: UniApp.PLATFORM): string | undefined;
 export declare function removeExt(str: string): string;

package/dist/utils.js

@@ -3,92 +3,27 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createUniVueTransformAssetUrls = exports.normalizeMiniProgramFilename = exports.normalizeNodeModules = exports.removeExt = exports.normalizePagePath = exports.normalizeIdentifier = exports.resolveBuiltIn = exports.getBuiltInPaths = exports.resolveComponentsLibPath = exports.resolveMainPathOnce = exports.checkElementNodeTag = exports.relativeFile = exports.normalizePath = exports.isWindows = exports.hash = void 0;
+exports.createUniVueTransformAssetUrls = 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"));
 const shared_1 = require("@vue/shared");
-const uni_shared_1 = require("@dcloudio/uni-shared");
 var hash_sum_1 = require("hash-sum");
 Object.defineProperty(exports, "hash", { enumerable: true, get: function () { return __importDefault(hash_sum_1).default; } });
-const debug_1 = __importDefault(require("debug"));
 const constants_1 = require("./constants");
+try {
+    exports.isRunningWithYarnPnp = Boolean(require('pnpapi'));
+}
+catch (_a) { }
 exports.isWindows = os_1.default.platform() === 'win32';
 function normalizePath(id) {
     return exports.isWindows ? id.replace(/\\/g, '/') : id;
 }
 exports.normalizePath = normalizePath;
-function relativeFile(from, to) {
-    return normalizePath(path_1.default.relative(path_1.default.dirname(from), to));
-}
-exports.relativeFile = relativeFile;
 function checkElementNodeTag(node, tag) {
     return !!node && node.type === 1 /* ELEMENT */ && node.tag === tag;
 }
 exports.checkElementNodeTag = checkElementNodeTag;
-exports.resolveMainPathOnce = (0, uni_shared_1.once)((inputDir) => {
-    const mainTsPath = path_1.default.resolve(inputDir, 'main.ts');
-    if (fs_1.default.existsSync(mainTsPath)) {
-        return normalizePath(mainTsPath);
-    }
-    return normalizePath(path_1.default.resolve(inputDir, 'main.js'));
-});
-let componentsLibPath = '';
-function resolveComponentsLibPath() {
-    if (!componentsLibPath) {
-        componentsLibPath = path_1.default.resolve(resolveBuiltIn('@dcloudio/uni-components/package.json'), '../lib');
-    }
-    return componentsLibPath;
-}
-exports.resolveComponentsLibPath = resolveComponentsLibPath;
-const ownerModules = ['@dcloudio/uni-app', '@dcloudio/vite-plugin-uni'];
-const paths = [];
-function resolveNodeModulePath(modulePath) {
-    const nodeModulesPaths = [];
-    const nodeModulesPath = path_1.default.join(modulePath, 'node_modules');
-    if (fs_1.default.existsSync(nodeModulesPath)) {
-        nodeModulesPaths.push(nodeModulesPath);
-    }
-    const index = modulePath.lastIndexOf('node_modules');
-    if (index > -1) {
-        nodeModulesPaths.push(path_1.default.join(modulePath.substr(0, index), 'node_modules'));
-    }
-    return nodeModulesPaths;
-}
-function initPaths() {
-    const cliContext = process.env.UNI_CLI_CONTEXT;
-    if (cliContext) {
-        const pathSet = new Set();
-        pathSet.add(path_1.default.join(cliContext, 'node_modules'));
-        [`@dcloudio/uni-` + process.env.UNI_PLATFORM, ...ownerModules].forEach((ownerModule) => {
-            let pkgPath = '';
-            try {
-                pkgPath = require.resolve(ownerModule + '/package.json', {
-                    paths: [cliContext],
-                });
-            }
-            catch (e) { }
-            if (pkgPath) {
-                resolveNodeModulePath(path_1.default.dirname(pkgPath)).forEach((nodeModulePath) => {
-                    pathSet.add(nodeModulePath);
-                });
-            }
-        });
-        paths.push(...pathSet);
-        (0, debug_1.default)('uni-paths')(paths);
-    }
-}
-function getBuiltInPaths() {
-    if (!paths.length) {
-        initPaths();
-    }
-    return paths;
-}
-exports.getBuiltInPaths = getBuiltInPaths;
-function resolveBuiltIn(path) {
-    return require.resolve(path, { paths: getBuiltInPaths() });
-}
-exports.resolveBuiltIn = resolveBuiltIn;
 function normalizeIdentifier(str) {
     return (0, shared_1.capitalize)((0, shared_1.camelize)(str.replace(/\//g, '-')));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "3.0.0-alpha-3021320211118002",
+  "version": "3.0.0-alpha-3021320211119001",
   "description": "@dcloudio/uni-cli-shared",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -20,8 +20,8 @@
   "dependencies": {
     "@babel/parser": "^7.15.0",
     "@babel/types": "^7.15.0",
-    "@dcloudio/uni-i18n": "3.0.0-alpha-3021320211118002",
-    "@dcloudio/uni-shared": "3.0.0-alpha-3021320211118002",
+    "@dcloudio/uni-i18n": "3.0.0-alpha-3021320211119001",
+    "@dcloudio/uni-shared": "3.0.0-alpha-3021320211119001",
     "@rollup/pluginutils": "^4.1.1",
     "@vue/compiler-core": "3.2.22",
     "@vue/compiler-dom": "3.2.22",
@@ -44,6 +44,7 @@
     "postcss-import": "^14.0.2",
     "postcss-load-config": "^3.1.0",
     "postcss-selector-parser": "^6.0.6",
+    "resolve": "^1.20.0",
     "rollup-plugin-copy": "^3.4.0",
     "tapable": "^2.2.0",
     "xregexp": "3.1.0"