@dcloudio/uni-cli-shared 3.0.0-alpha-3041020220513001 → 3.0.0-alpha-3041020220516004

package/dist/json/mp/jsonFile.d.ts

@@ -6,7 +6,7 @@ export declare function getComponentJsonFilenames(): string[];
 export declare function findJsonFile(filename: string): Record<string, any> | undefined;
 export declare function findUsingComponents(filename: string): UsingComponents | undefined;
 export declare function normalizeJsonFilename(filename: string): string;
-export declare function findChangedJsonFiles(): Map<string, string>;
+export declare function findChangedJsonFiles(supportGlobalUsingComponents?: boolean): Map<string, string>;
 export declare function addMiniProgramAppJson(appJson: Record<string, any>): void;
 export declare function addMiniProgramPageJson(filename: string, json: PageWindowOptions): void;
 export declare function addMiniProgramComponentJson(filename: string, json: ComponentJson): void;

package/dist/json/mp/jsonFile.js

@@ -50,24 +50,35 @@ function normalizeJsonFilename(filename) {
     return (0, utils_1.normalizeNodeModules)(filename);
 }
 exports.normalizeJsonFilename = normalizeJsonFilename;
-function findChangedJsonFiles() {
+function findChangedJsonFiles(supportGlobalUsingComponents = true) {
     const changedJsonFiles = new Map();
     function findChangedFile(filename, json) {
+        var _a;
         const newJson = JSON.parse(JSON.stringify(json));
         if (!newJson.usingComponents) {
             newJson.usingComponents = {};
         }
         (0, shared_1.extend)(newJson.usingComponents, jsonUsingComponentsCache.get(filename));
-        const usingComponents = newJson.usingComponents;
         // 格式化为相对路径，这样作为分包也可以直接运行
         // app.json mp-baidu 在 win 不支持相对路径。所有平台改用绝对路径
         if (filename !== 'app') {
+            let usingComponents = newJson.usingComponents;
+            const globalUsingComponents = (_a = appJsonCache === null || appJsonCache === void 0 ? void 0 : appJsonCache.usingComponents) !== null && _a !== void 0 ? _a : {};
+            // 如果小程序不支持 global 的 usingComponents
+            if (!supportGlobalUsingComponents) {
+                // 从 appJsonCache 中读取全局的 usingComponents 并补充到子组件 usingComponents 中
+                usingComponents = {
+                    ...globalUsingComponents,
+                    ...newJson.usingComponents,
+                };
+            }
             Object.keys(usingComponents).forEach((name) => {
                 const componentFilename = usingComponents[name];
                 if (componentFilename.startsWith('/')) {
                     usingComponents[name] = (0, resolve_1.relativeFile)(filename, componentFilename.slice(1));
                 }
             });
+            newJson.usingComponents = usingComponents;
         }
         const jsonStr = JSON.stringify(newJson, null, 2);
         if (jsonFilesCache.get(filename) !== jsonStr) {

package/dist/vite/plugins/vitejs/plugins/css.d.ts

@@ -40,6 +40,8 @@ export declare function cssPostPlugin(config: ResolvedConfig, { chunkCssFilename
 }): Plugin;
 export declare function formatPostcssSourceMap(rawMap: ExistingRawSourceMap, file: string): ExistingRawSourceMap;
 export declare const cssUrlRE: RegExp;
+export declare const cssDataUriRE: RegExp;
+export declare const importCssRE: RegExp;
 export declare function minifyCSS(css: string, config: ResolvedConfig): Promise<string>;
 export declare function hoistAtRules(css: string): Promise<string>;
 export interface StylePreprocessorResults {

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

@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.hoistAtRules = exports.minifyCSS = exports.cssUrlRE = exports.formatPostcssSourceMap = exports.cssPostPlugin = exports.cssPlugin = exports.isDirectCSSRequest = exports.isCSSRequest = exports.commonjsProxyRE = exports.cssLangRE = void 0;
+exports.hoistAtRules = exports.minifyCSS = exports.importCssRE = exports.cssDataUriRE = exports.cssUrlRE = exports.formatPostcssSourceMap = exports.cssPostPlugin = exports.cssPlugin = exports.isDirectCSSRequest = exports.isCSSRequest = exports.commonjsProxyRE = exports.cssLangRE = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const fast_glob_1 = __importDefault(require("fast-glob"));
@@ -516,6 +516,8 @@ async function resolvePostcssConfig(config) {
 }
 // https://drafts.csswg.org/css-syntax-3/#identifier-code-point
 exports.cssUrlRE = /(?<=^|[^\w\-\u0080-\uffff])url\(\s*('[^']+'|"[^"]+"|[^'")]+)\s*\)/;
+exports.cssDataUriRE = /(?<=^|[^\w\-\u0080-\uffff])data-uri\(\s*('[^']+'|"[^"]+"|[^'")]+)\s*\)/;
+exports.importCssRE = /@import ('[^']+\.css'|"[^"]+\.css"|[^'")]+\.css)/;
 const cssImageSetRE = /(?<=image-set\()((?:[\w\-]+\([^\)]*\)|[^)])*)(?=\))/;
 const UrlRewritePostcssPlugin = (opts) => {
     if (!opts) {
@@ -550,26 +552,44 @@ const UrlRewritePostcssPlugin = (opts) => {
 };
 UrlRewritePostcssPlugin.postcss = true;
 function rewriteCssUrls(css, replacer) {
-    return (0, utils_1.asyncReplace)(css, cssImageSetRE, async (match) => {
+    return (0, utils_1.asyncReplace)(css, exports.cssUrlRE, async (match) => {
+        const [matched, rawUrl] = match;
+        return await doUrlReplace(rawUrl, matched, replacer);
+    });
+}
+function rewriteCssDataUris(css, replacer) {
+    return (0, utils_1.asyncReplace)(css, exports.cssDataUriRE, async (match) => {
+        const [matched, rawUrl] = match;
+        return await doUrlReplace(rawUrl, matched, replacer, 'data-uri');
+    });
+}
+function rewriteImportCss(css, replacer) {
+    return (0, utils_1.asyncReplace)(css, exports.importCssRE, async (match) => {
+        const [matched, rawUrl] = match;
+        return await doImportCSSReplace(rawUrl, matched, replacer);
+    });
+}
+// TODO: image and cross-fade could contain a "url" that needs to be processed
+// https://drafts.csswg.org/css-images-4/#image-notation
+// https://drafts.csswg.org/css-images-4/#cross-fade-function
+const cssNotProcessedRE = /(gradient|element|cross-fade|image)\(/;
+async function rewriteCssImageSet(css, replacer) {
+    return await (0, utils_1.asyncReplace)(css, cssImageSetRE, async (match) => {
         const [, rawUrl] = match;
         const url = await (0, utils_1.processSrcSet)(rawUrl, async ({ url }) => {
             // the url maybe url(...)
             if (exports.cssUrlRE.test(url)) {
                 return await rewriteCssUrls(url, replacer);
             }
-            return await doUrlReplace(url, url, replacer);
+            if (!cssNotProcessedRE.test(url)) {
+                return await doUrlReplace(url, url, replacer);
+            }
+            return url;
         });
         return url;
     });
 }
-function rewriteCssImageSet(css, replacer) {
-    return (0, utils_1.asyncReplace)(css, cssImageSetRE, async (match) => {
-        const [matched, rawUrl] = match;
-        const url = await (0, utils_1.processSrcSet)(rawUrl, ({ url }) => doUrlReplace(url, matched, replacer));
-        return `image-set(${url})`;
-    });
-}
-async function doUrlReplace(rawUrl, matched, replacer) {
+async function doUrlReplace(rawUrl, matched, replacer, funcName = 'url') {
     let wrap = '';
     const first = rawUrl[0];
     if (first === `"` || first === `'`) {
@@ -582,7 +602,24 @@ async function doUrlReplace(rawUrl, matched, replacer) {
         varRE.test(rawUrl)) {
         return matched;
     }
-    return `url(${wrap}${await replacer(rawUrl)}${wrap})`;
+    const newUrl = await replacer(rawUrl);
+    if (wrap === '' && newUrl !== encodeURI(newUrl)) {
+        // The new url might need wrapping even if the original did not have it, e.g. if a space was added during replacement
+        wrap = "'";
+    }
+    return `${funcName}(${wrap}${newUrl}${wrap})`;
+}
+async function doImportCSSReplace(rawUrl, matched, replacer) {
+    let wrap = '';
+    const first = rawUrl[0];
+    if (first === `"` || first === `'`) {
+        wrap = first;
+        rawUrl = rawUrl.slice(1, -1);
+    }
+    if ((0, utils_1.isExternalUrl)(rawUrl) || (0, utils_1.isDataUrl)(rawUrl) || rawUrl.startsWith('#')) {
+        return matched;
+    }
+    return `@import ${wrap}${await replacer(rawUrl)}${wrap}`;
 }
 async function minifyCSS(css, config) {
     try {
@@ -734,8 +771,8 @@ function preprocessCss(content, isNVue = false) {
  */
 async function rebaseUrls(file, rootFile, alias, isNVue = false) {
     file = path_1.default.resolve(file); // ensure os-specific flashes
-    // 条件编译
-    const contents = preprocessCss(fs_1.default.readFileSync(file, 'utf-8'), isNVue);
+    // fixed by xxxxxx 条件编译
+    let contents = preprocessCss(fs_1.default.readFileSync(file, 'utf-8'), isNVue);
     // in the same dir, no need to rebase
     const fileDir = path_1.default.dirname(file);
     const rootDir = path_1.default.dirname(rootFile);
@@ -743,10 +780,16 @@ async function rebaseUrls(file, rootFile, alias, isNVue = false) {
         return { file, contents };
     }
     // no url()
-    if (!exports.cssUrlRE.test(contents)) {
+    const hasUrls = exports.cssUrlRE.test(contents);
+    // data-uri() calls
+    const hasDataUris = exports.cssDataUriRE.test(contents);
+    // no @import xxx.css
+    const hasImportCss = exports.importCssRE.test(contents);
+    if (!hasUrls && !hasDataUris && !hasImportCss) {
         return { file, contents };
     }
-    const rebased = await rewriteCssUrls(contents, (url) => {
+    let rebased;
+    const rebaseFn = (url) => {
         if (url.startsWith('/'))
             return url;
         // match alias, no need to rewrite
@@ -759,10 +802,20 @@ async function rebaseUrls(file, rootFile, alias, isNVue = false) {
         const absolute = path_1.default.resolve(fileDir, url);
         const relative = path_1.default.relative(rootDir, absolute);
         return (0, utils_1.normalizePath)(relative);
-    });
+    };
+    // fix css imports in less such as `@import "foo.css"`
+    if (hasImportCss) {
+        contents = await rewriteImportCss(contents, rebaseFn);
+    }
+    if (hasUrls) {
+        contents = await rewriteCssUrls(rebased || contents, rebaseFn);
+    }
+    if (hasDataUris) {
+        contents = await rewriteCssDataUris(rebased || contents, rebaseFn);
+    }
     return {
         file,
-        contents: rebased,
+        contents,
     };
 }
 // .less

package/dist/vue/parse.js

@@ -7,8 +7,8 @@ exports.parseWxsCode = exports.parseWxsNodes = exports.parseBlockCode = exports.
 const magic_string_1 = __importDefault(require("magic-string"));
 const ast_1 = require("../vite/utils/ast");
 const BLOCK_RE = /<\/block>/;
-const WXS_LANG_RE = /lang=["|'](renderjs|wxs)["|']/;
-const WXS_ATTRS = ['wxs', 'renderjs'];
+const WXS_LANG_RE = /lang=["|'](renderjs|wxs|sjs)["|']/;
+const WXS_ATTRS = ['wxs', 'renderjs', 'sjs'];
 function parseVueCode(code, isNVue = false) {
     const hasBlock = BLOCK_RE.test(code);
     const hasWxs = WXS_LANG_RE.test(code);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "3.0.0-alpha-3041020220513001",
+  "version": "3.0.0-alpha-3041020220516004",
   "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-3041020220513001",
-    "@dcloudio/uni-shared": "3.0.0-alpha-3041020220513001",
+    "@dcloudio/uni-i18n": "3.0.0-alpha-3041020220516004",
+    "@dcloudio/uni-shared": "3.0.0-alpha-3041020220516004",
     "@intlify/core-base": "9.1.9",
     "@intlify/shared": "9.1.9",
     "@intlify/vue-devtools": "9.1.9",