@dcloudio/uni-cli-shared 3.0.0-alpha-3041020220516001 → 3.0.0-alpha-3041120220520001

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,32 @@ 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/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-3041020220516001",
+  "version": "3.0.0-alpha-3041120220520001",
   "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-3041020220516001",
-    "@dcloudio/uni-shared": "3.0.0-alpha-3041020220516001",
+    "@dcloudio/uni-i18n": "3.0.0-alpha-3041120220520001",
+    "@dcloudio/uni-shared": "3.0.0-alpha-3041120220520001",
     "@intlify/core-base": "9.1.9",
     "@intlify/shared": "9.1.9",
     "@intlify/vue-devtools": "9.1.9",