@dcloudio/uni-cli-shared 3.0.0-4080720251210001 → 3.0.0-5000420260317001

package/dist/mp/usingComponents.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.transformDynamicImports = exports.parseScriptDescriptor = exports.parseTemplateDescriptor = exports.updateMiniProgramComponentsByMainFilename = exports.updateMiniProgramGlobalComponents = exports.updateMiniProgramComponentsByTemplateFilename = exports.updateMiniProgramComponentsByScriptFilename = exports.parseMainDescriptor = void 0;
+exports.transformDynamicImports = exports.parseScriptDescriptor = exports.parseTemplateDescriptor = exports.updateMiniProgramComponentsByMainFilename = exports.updateMiniProgramGlobalComponents = exports.updateMiniProgramComponentsByTemplateFilename = exports.updateMiniProgramComponentsByScriptFilename = exports.parseMainDescriptor = exports.getGlobalComponentSource = void 0;
 const types_1 = require("@babel/types");
 const estree_walker_1 = require("estree-walker");
 const magic_string_1 = __importDefault(require("magic-string"));
@@ -17,6 +17,12 @@ const jsonFile_1 = require("../json/mp/jsonFile");
 const mainDescriptors = new Map();
 const scriptDescriptors = new Map();
 const templateDescriptors = new Map();
+// 存储全局组件名到完整源文件路径的映射
+const globalComponentSourceMap = new Map();
+function getGlobalComponentSource(componentName) {
+    return globalComponentSourceMap.get(componentName);
+}
+exports.getGlobalComponentSource = getGlobalComponentSource;
 function findImportTemplateSource(ast) {
     const importDeclaration = ast.body.find((node) => (0, types_1.isImportDeclaration)(node) &&
         node.source.value.includes('vue&type=template'));
@@ -84,6 +90,16 @@ function findMainFilenameByTemplateFilename(templateFilename) {
 }
 async function updateMiniProgramGlobalComponents(filename, ast, { inputDir, resolve, normalizeComponentName, }) {
     const { bindingComponents, imports } = await parseGlobalDescriptor(filename, ast, resolve);
+    // 存储全局组件名到完整源文件路径的映射
+    imports.forEach(({ source: { value }, specifiers: [specifier] }) => {
+        const { name } = specifier.local;
+        if (!bindingComponents[name]) {
+            return;
+        }
+        if (!globalComponentSourceMap.has(bindingComponents[name].tag)) {
+            globalComponentSourceMap.set(bindingComponents[name].tag, value);
+        }
+    });
     (0, jsonFile_1.addMiniProgramUsingComponents)('app', createUsingComponents(bindingComponents, imports, inputDir, normalizeComponentName));
     return {
         imports,

package/dist/postcss/index.d.ts

@@ -1,9 +1,11 @@
 import type { Plugin } from 'postcss';
 import type { Options } from 'autoprefixer';
 import uniPostcssScopedPlugin from './plugins/stylePluginScoped';
+import uniPostcssExternalPlugin from './plugins/stylePluginExternal';
 import uniPostcssPlugin, { type UniAppCssProcessorOptions } from './plugins/uniapp';
 export { uniPostcssPlugin };
 export { uniPostcssScopedPlugin };
+export { uniPostcssExternalPlugin };
 export declare function initPostcssPlugin({ uniApp, autoprefixer, }?: {
     uniApp?: UniAppCssProcessorOptions;
     autoprefixer?: Options | false;

package/dist/postcss/index.js

@@ -3,9 +3,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.initPostcssPlugin = exports.uniPostcssScopedPlugin = exports.uniPostcssPlugin = void 0;
+exports.initPostcssPlugin = exports.uniPostcssExternalPlugin = exports.uniPostcssScopedPlugin = exports.uniPostcssPlugin = void 0;
 const stylePluginScoped_1 = __importDefault(require("./plugins/stylePluginScoped"));
 exports.uniPostcssScopedPlugin = stylePluginScoped_1.default;
+const stylePluginExternal_1 = __importDefault(require("./plugins/stylePluginExternal"));
+exports.uniPostcssExternalPlugin = stylePluginExternal_1.default;
 const uniapp_1 = __importDefault(require("./plugins/uniapp"));
 exports.uniPostcssPlugin = uniapp_1.default;
 function initPostcssPlugin({ uniApp, autoprefixer, } = {}) {

package/dist/postcss/plugins/stylePluginExternal.d.ts

@@ -0,0 +1,17 @@
+import type { PluginCreator } from 'postcss';
+/**
+ * PostCSS plugin to boost specificity for page CSS based on externalClasses usage
+ *
+ * For mini-program platforms (mp-*):
+ *   - If page has no externalClasses usage: no transformation
+ *   - If page has dynamic externalClasses: all selectors get page prefix
+ *     .a -> page .a
+ *   - If page has only static externalClasses: only matching selectors get page prefix
+ *     .foo -> page .foo (if "foo" is in staticClasses)
+ *     .bar -> .bar (unchanged, if "bar" is not in staticClasses)
+ *
+ * This ensures page styles have higher specificity than component styles
+ * while minimizing unnecessary transformations for performance
+ */
+declare const externalPlugin: PluginCreator<void>;
+export default externalPlugin;

package/dist/postcss/plugins/stylePluginExternal.js

@@ -0,0 +1,127 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const postcss_selector_parser_1 = __importDefault(require("postcss-selector-parser"));
+const pages_1 = require("../../json/pages");
+const externalClasses_1 = require("../../mp/externalClasses");
+/**
+ * PostCSS plugin to boost specificity for page CSS based on externalClasses usage
+ *
+ * For mini-program platforms (mp-*):
+ *   - If page has no externalClasses usage: no transformation
+ *   - If page has dynamic externalClasses: all selectors get page prefix
+ *     .a -> page .a
+ *   - If page has only static externalClasses: only matching selectors get page prefix
+ *     .foo -> page .foo (if "foo" is in staticClasses)
+ *     .bar -> .bar (unchanged, if "bar" is not in staticClasses)
+ *
+ * This ensures page styles have higher specificity than component styles
+ * while minimizing unnecessary transformations for performance
+ */
+const externalPlugin = () => {
+    return {
+        postcssPlugin: 'uni-external',
+        prepare() {
+            const processedRules = new WeakSet();
+            return {
+                OnceExit(root) {
+                    // Only mini-program platforms need page selector prepend
+                    const platform = process.env.UNI_PLATFORM || '';
+                    if (!platform.startsWith('mp-')) {
+                        return;
+                    }
+                    // Get file path from postcss source
+                    const filePath = root.source?.input?.file;
+                    if (!filePath) {
+                        return;
+                    }
+                    // Only process page files
+                    if (!(0, pages_1.isUniPageFile)(filePath)) {
+                        return;
+                    }
+                    // Get page's externalClasses info
+                    const externalClassesInfo = (0, externalClasses_1.findPageExternalClasses)(filePath);
+                    let staticClasses = new Set();
+                    let hasDynamic = false;
+                    if (process.env.NODE_ENV === 'development') {
+                        hasDynamic = true;
+                    }
+                    else if (externalClassesInfo) {
+                        staticClasses = externalClassesInfo.staticClasses;
+                        if (externalClassesInfo.hasDynamic ||
+                            externalClassesInfo.hasAppAndPageStyle) {
+                            hasDynamic = true;
+                        }
+                    }
+                    // If no static classes and no dynamic, skip processing
+                    if (staticClasses.size === 0 && !hasDynamic) {
+                        return;
+                    }
+                    root.walkRules((rule) => {
+                        processRule(rule, processedRules, staticClasses, hasDynamic);
+                    });
+                },
+            };
+        },
+    };
+};
+function processRule(rule, processedRules, staticClasses, hasDynamic) {
+    // Skip already processed rules
+    if (processedRules.has(rule)) {
+        return;
+    }
+    // Skip keyframes rules
+    if (rule.parent &&
+        rule.parent.type === 'atrule' &&
+        /-?keyframes$/.test(rule.parent.name)) {
+        return;
+    }
+    processedRules.add(rule);
+    // Process selector based on externalClasses info
+    rule.selector = (0, postcss_selector_parser_1.default)((selectorRoot) => {
+        selectorRoot.each((selector) => {
+            if (hasDynamic) {
+                // Dynamic externalClasses: prepend page to all selectors
+                prependPageSelector(selector);
+            }
+            else {
+                // Static only: only prepend page if selector contains any staticClasses
+                if (selectorContainsClasses(selector, staticClasses)) {
+                    prependPageSelector(selector);
+                }
+            }
+        });
+    }).processSync(rule.selector);
+}
+/**
+ * Check if selector contains any of the specified classes
+ */
+function selectorContainsClasses(selector, classes) {
+    let found = false;
+    selector.walk((node) => {
+        if (node.type === 'class' && classes.has(node.value)) {
+            found = true;
+            return false; // stop walking
+        }
+    });
+    return found;
+}
+/**
+ * Prepend 'page' selector for mini-program platforms
+ * .a -> page .a
+ * .b .c -> page .b .c
+ */
+function prependPageSelector(selector) {
+    // Skip if selector already starts with 'page'
+    const firstNode = selector.first;
+    if (firstNode && firstNode.type === 'tag' && firstNode.value === 'page') {
+        return;
+    }
+    // Insert 'page' tag and a combinator (space) at the beginning
+    selector.prepend(postcss_selector_parser_1.default.combinator({ value: ' ' }));
+    selector.prepend(postcss_selector_parser_1.default.tag({ value: 'page' }));
+}
+externalPlugin.postcss = true;
+exports.default = externalPlugin;

package/dist/postcss/plugins/stylePluginScoped.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const postcss_selector_parser_1 = __importDefault(require("postcss-selector-parser"));
+const uni_shared_1 = require("@dcloudio/uni-shared");
 const scopedPlugin = () => {
     return {
         postcssPlugin: 'uni-sfc-scoped',
@@ -26,14 +27,43 @@ function processRule(rule, hasVueSfcScoped) {
         return;
     }
     processedRules.add(rule);
+    const isXWeb = process.env.UNI_APP_X === 'true' && process.env.UNI_UTS_PLATFORM === 'web';
     rule.selector = (0, postcss_selector_parser_1.default)((selectorRoot) => {
         selectorRoot.each((selector) => {
             hasVueSfcScoped
                 ? rewriteDeprecatedSelector(selector)
                 : rewriteSelector(selector, selectorRoot);
+            if (isXWeb) {
+                rewritePartSelector(selector, selectorRoot);
+            }
         });
     }).processSync(rule.selector);
 }
+function rewritePartSelector(selector, selectorRoot) {
+    if (selector.some((n) => {
+        return n.type === 'pseudo' && n.value === '::part';
+    })) {
+        const uniPartSelector = selector.clone();
+        _rewritePartSelector(uniPartSelector, selectorRoot);
+        selectorRoot.insertAfter(selector, uniPartSelector);
+    }
+}
+function _rewritePartSelector(selector, selectorRoot) {
+    selector.each((n) => {
+        if (n.type === 'pseudo' && n.value === '::part') {
+            const partClass = (0, uni_shared_1.getPartClass)(n.nodes[0].toString());
+            selector.insertAfter(n, postcss_selector_parser_1.default.pseudo({
+                value: ':deep',
+                nodes: [
+                    postcss_selector_parser_1.default.className({
+                        value: partClass,
+                    }),
+                ],
+            }));
+            selector.removeChild(n);
+        }
+    });
+}
 /**
  * @param selector
  * @returns

package/dist/preprocess/context.js

@@ -37,6 +37,7 @@ const DEFAULT_KEYS = [
     'VUE2',
     'VUE3',
     'WEB',
+    'VUE3_VAPOR',
 ];
 const preVueContext = Object.create(null);
 const preNVueContext = Object.create(null);
@@ -66,6 +67,7 @@ function initScopedPreContext(platform, userPreContext, utsPlatform, isX) {
     vueContext.VUE3 = true;
     nvueContext.VUE3 = true;
     uvueContext.VUE3 = true;
+    uvueContext.VUE3_VAPOR = process.env.UNI_APP_X_DOM2 === 'true';
     if (isX) {
         vueContext.UNI_APP_X = true;
         nvueContext.UNI_APP_X = true;

package/dist/preprocess/index.d.ts

@@ -1,13 +1,16 @@
 export { initPreContext } from './context';
-export declare function preJs(jsCode: string, filename: string): any;
-export declare function preHtml(htmlCode: string, filename: string): any;
+export interface PreprocessOptions {
+    unbalanced?: 'error' | 'skip' | 'skip-lazy';
+}
+export declare function preJs(jsCode: string, filename: string, options?: PreprocessOptions): any;
+export declare function preHtml(htmlCode: string, filename: string, options?: PreprocessOptions): any;
 export declare const preCss: typeof preJs;
 export declare const preJson: typeof preJs;
-export declare function preNVueJs(jsCode: string, filename: string): any;
-export declare function preNVueHtml(htmlCode: string, filename: string): any;
+export declare function preNVueJs(jsCode: string, filename: string, options?: PreprocessOptions): any;
+export declare function preNVueHtml(htmlCode: string, filename: string, options?: PreprocessOptions): any;
 export declare const preNVueCss: typeof preNVueJs;
 export declare const preNVueJson: typeof preNVueJs;
-export declare function preUVueJs(jsCode: string, filename: string): any;
-export declare function preUVueHtml(htmlCode: string, filename: string): any;
+export declare function preUVueJs(jsCode: string, filename: string, options?: PreprocessOptions): any;
+export declare function preUVueHtml(htmlCode: string, filename: string, options?: PreprocessOptions): any;
 export declare const preUVueCss: typeof preUVueJs;
 export declare const preUVueJson: typeof preUVueJs;

package/dist/preprocess/index.js

@@ -7,6 +7,7 @@ exports.preUVueJson = exports.preUVueCss = exports.preUVueHtml = exports.preUVue
 const path_1 = __importDefault(require("path"));
 const utils_1 = require("../utils");
 const context_1 = require("./context");
+const utils_2 = require("../vite/plugins/vitejs/utils");
 /* eslint-disable no-restricted-globals */
 const { preprocess: preprocessLib } = require('../../lib/preprocess');
 var context_2 = require("./context");
@@ -23,55 +24,61 @@ function normalizeFilename(filename) {
         }
     };
 }
-function preJs(jsCode, filename) {
+function preJs(jsCode, filename, options) {
     if (process.env.UNI_APP_X === 'true') {
-        return preUVueJs(jsCode, filename);
+        return preUVueJs(jsCode, filename, options);
     }
     return preprocess(jsCode, (0, context_1.getPreVueContext)(), {
         type: 'js',
         filename: normalizeFilename(filename),
+        unbalanced: options?.unbalanced,
     });
 }
 exports.preJs = preJs;
-function preHtml(htmlCode, filename) {
+function preHtml(htmlCode, filename, options) {
     if (process.env.UNI_APP_X === 'true') {
-        return preUVueHtml(htmlCode, filename);
+        return preUVueHtml(htmlCode, filename, options);
     }
     return preprocess(htmlCode, (0, context_1.getPreVueContext)(), {
         type: 'html',
         filename: normalizeFilename(filename),
+        unbalanced: options?.unbalanced,
     });
 }
 exports.preHtml = preHtml;
 exports.preCss = preJs;
 exports.preJson = preJs;
-function preNVueJs(jsCode, filename) {
+function preNVueJs(jsCode, filename, options) {
     return preprocess(jsCode, (0, context_1.getPreNVueContext)(), {
         type: 'js',
         filename: normalizeFilename(filename),
+        unbalanced: options?.unbalanced,
     });
 }
 exports.preNVueJs = preNVueJs;
-function preNVueHtml(htmlCode, filename) {
+function preNVueHtml(htmlCode, filename, options) {
     return preprocess(htmlCode, (0, context_1.getPreNVueContext)(), {
         type: 'html',
         filename: normalizeFilename(filename),
+        unbalanced: options?.unbalanced,
     });
 }
 exports.preNVueHtml = preNVueHtml;
 exports.preNVueCss = preNVueJs;
 exports.preNVueJson = preNVueJs;
-function preUVueJs(jsCode, filename) {
+function preUVueJs(jsCode, filename, options) {
     return preprocess(jsCode, (0, context_1.getPreUVueContext)(), {
         type: 'js',
         filename: normalizeFilename(filename),
+        unbalanced: options?.unbalanced,
     });
 }
 exports.preUVueJs = preUVueJs;
-function preUVueHtml(htmlCode, filename) {
+function preUVueHtml(htmlCode, filename, options) {
     return preprocess(htmlCode, (0, context_1.getPreUVueContext)(), {
         type: 'html',
         filename: normalizeFilename(filename),
+        unbalanced: options?.unbalanced,
     });
 }
 exports.preUVueHtml = preUVueHtml;
@@ -105,6 +112,24 @@ function preprocess(code, context, options) {
         return preprocessLib(code, context, options);
     }
     catch (e) {
+        // `Unbalanced left delimiter found in string at position 1520`
+        // `Unbalanced right delimiter found in string at position 1520`
+        if (e.message) {
+            const msg = e.message;
+            // 正则匹配left/right及position
+            const unbalancedMatch = msg.match(/Unbalanced (left|right) delimiter found in string at position (\d+)/);
+            if (unbalancedMatch) {
+                const errorDirective = unbalancedMatch[1] === 'left' ? '#ifdef/#ifndef' : '#endif';
+                const missedDirective = unbalancedMatch[1] === 'left' ? '#endif' : '#ifdef/#ifndef';
+                const position = parseInt(unbalancedMatch[2], 10);
+                const filename = options.filename?.() || '';
+                const { line } = (0, utils_2.offsetToLineColumn)(code, position);
+                console.error(`条件编译失败: ${errorDirective} 缺少配对的 ${missedDirective}`);
+                console.error(`${filename.split(':')[0]}:${line}`);
+                console.log((0, utils_2.generateCodeFrame)(code, position));
+                return code;
+            }
+        }
         const msg = ERRORS[options.type];
         if (msg) {
             console.error(msg.replace('%FILENAME%', options.filename?.() || ''));

package/dist/resolve.js

@@ -109,7 +109,11 @@ exports.resolveVueI18nRuntime = resolveVueI18nRuntime;
 let componentsLibPath = '';
 function resolveComponentsLibPath() {
     if (!componentsLibPath) {
-        const dir = process.env.UNI_APP_X === 'true' ? '../lib-x' : '../lib';
+        const dir = process.env.UNI_APP_X_DOM2 === 'true'
+            ? '../lib-x-vapor'
+            : 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'), dir);
         }

package/dist/uni_modules.js

@@ -351,9 +351,25 @@ exports.capitalize = cacheStringFunction((str) => str.charAt(0).toUpperCase() +
  */
 function parseUTSModuleDeps(deps, inputDir) {
     const modulesDir = path_1.default.resolve(inputDir, 'uni_modules');
-    return deps.filter((dep) => {
-        const depName = dep.includes(':') ? dep.split(':')[1] : dep;
-        return fs_extra_1.default.existsSync(path_1.default.resolve(modulesDir, depName, 'utssdk'));
-    });
+    return deps
+        .map((dep) => {
+        let depName = '';
+        if (dep.includes(':')) {
+            const parts = dep.split(':');
+            if (process.env.UNI_UTS_PLATFORM &&
+                process.env.UNI_UTS_PLATFORM === parts[0]) {
+                depName = parts[1];
+            }
+        }
+        else {
+            depName = dep;
+        }
+        if (depName &&
+            fs_extra_1.default.existsSync(path_1.default.resolve(modulesDir, depName, 'utssdk'))) {
+            return depName;
+        }
+        return '';
+    })
+        .filter(Boolean);
 }
 exports.parseUTSModuleDeps = parseUTSModuleDeps;

package/dist/utils.d.ts

@@ -23,8 +23,8 @@ export declare function pathToGlob(pathString: string, glob: string, options?: {
 export declare function resolveSourceMapPath(outputDir?: string, platform?: UniApp.PLATFORM): string;
 export declare function installDepTips(type: 'dependencies' | 'devDependencies', module: string, version?: string): string;
 /**
- * 根据路径判断是否为 App.(u?)vue
- * @param {string} filename 相对、绝对路径
+ * 根据环境变量 UNI_INPUT_DIR 路径判断是否为 App.(u?)vue
+ * @param {string} filename
  * @returns
  */
 export declare function isAppVue(filename: string): boolean;

package/dist/utils.js

@@ -137,13 +137,13 @@ Please run \`${picocolors_1.default.cyan(`${getInstallCommand(process.cwd())} ${
 }
 exports.installDepTips = installDepTips;
 /**
- * 根据路径判断是否为 App.(u?)vue
- * @param {string} filename 相对、绝对路径
+ * 根据环境变量 UNI_INPUT_DIR 路径判断是否为 App.(u?)vue
+ * @param {string} filename
  * @returns
  */
 function isAppVue(filename) {
-    const _filePath = normalizePath(filename);
-    return /(\/|\\)app\.(u?)vue$/.test(_filePath.toLowerCase());
+    const appVue = resolveAppVue(process.env.UNI_INPUT_DIR);
+    return appVue === normalizePath(filename);
 }
 exports.isAppVue = isAppVue;
 function resolveAppVue(inputDir) {
@@ -179,8 +179,11 @@ function enableSourceMap() {
 }
 exports.enableSourceMap = enableSourceMap;
 function requireUniHelpers() {
-    require(path_1.default.resolve(process.env.UNI_HBUILDERX_PLUGINS, 'uni_helpers/lib/bytenode'));
-    return require(path_1.default.join(process.env.UNI_HBUILDERX_PLUGINS, 'uni_helpers'));
+    if (process.env.UNI_HBUILDERX_PLUGINS) {
+        require(path_1.default.resolve(process.env.UNI_HBUILDERX_PLUGINS, 'uni_helpers/lib/bytenode'));
+    }
+    return require(process.env.UNI_HELPERS_DIR ??
+        path_1.default.join(process.env.UNI_HBUILDERX_PLUGINS, 'uni_helpers'));
 }
 exports.requireUniHelpers = requireUniHelpers;
 function normalizeEmitAssetFileName(fileName) {

package/dist/utsUtils.d.ts

@@ -1,2 +1,3 @@
 export declare function matchUTSComponent(tag: string): boolean;
 export declare function genUTSClassName(fileName: string, prefix?: string): string;
+export declare function verifySymbol(s: string): string;

package/dist/utsUtils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.genUTSClassName = exports.matchUTSComponent = void 0;
+exports.verifySymbol = exports.genUTSClassName = exports.matchUTSComponent = void 0;
 const easycom_1 = require("./easycom");
 const utils_1 = require("./utils");
 function matchUTSComponent(tag) {
@@ -42,3 +42,4 @@ function verifySymbol(s) {
     }
     return buf.join('');
 }
+exports.verifySymbol = verifySymbol;