@dcloudio/uni-cli-shared 3.0.0-alpha-3030820220114011 → 3.0.0-alpha-3031220220222002

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

@@ -16,8 +16,12 @@ export declare function isMiniProgramUsingComponent(name: string, options: {
     inputDir: string;
     componentsDir?: string;
 }): boolean;
+interface MiniProgramComponents {
+    [name: string]: 'plugin' | 'component';
+}
 export declare function findMiniProgramUsingComponents({ filename, inputDir, componentsDir, }: {
     filename: string;
     inputDir: string;
     componentsDir?: string;
-}): string[];
+}): MiniProgramComponents;
+export {};

package/dist/json/mp/jsonFile.js

@@ -103,28 +103,31 @@ function addMiniProgramUsingComponents(filename, json) {
 }
 exports.addMiniProgramUsingComponents = addMiniProgramUsingComponents;
 function isMiniProgramUsingComponent(name, options) {
-    return findMiniProgramUsingComponents(options).includes(name);
+    return !!findMiniProgramUsingComponents(options)[name];
 }
 exports.isMiniProgramUsingComponent = isMiniProgramUsingComponent;
 function findMiniProgramUsingComponents({ filename, inputDir, componentsDir, }) {
-    if (!componentsDir) {
-        return [];
-    }
     const globalUsingComponents = appJsonCache && appJsonCache.usingComponents;
-    const miniProgramComponents = [];
+    const miniProgramComponents = {};
     if (globalUsingComponents) {
-        miniProgramComponents.push(...findMiniProgramUsingComponent(globalUsingComponents, componentsDir));
+        (0, shared_1.extend)(miniProgramComponents, findMiniProgramUsingComponent(globalUsingComponents, componentsDir));
     }
     const jsonFile = findJsonFile((0, utils_1.removeExt)((0, utils_1.normalizeMiniProgramFilename)(filename, inputDir)));
     if (jsonFile === null || jsonFile === void 0 ? void 0 : jsonFile.usingComponents) {
-        miniProgramComponents.push(...findMiniProgramUsingComponent(jsonFile.usingComponents, componentsDir));
+        (0, shared_1.extend)(miniProgramComponents, findMiniProgramUsingComponent(jsonFile.usingComponents, componentsDir));
     }
     return miniProgramComponents;
 }
 exports.findMiniProgramUsingComponents = findMiniProgramUsingComponents;
 function findMiniProgramUsingComponent(usingComponents, componentsDir) {
-    return Object.keys(usingComponents).filter((name) => {
+    return Object.keys(usingComponents).reduce((res, name) => {
         const path = usingComponents[name];
-        return path.includes(componentsDir + '/');
-    });
+        if (componentsDir && path.includes(componentsDir + '/')) {
+            res[name] = 'component';
+        }
+        else if (path.includes('plugin://')) {
+            res[name] = 'plugin';
+        }
+        return res;
+    }, {});
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "3.0.0-alpha-3030820220114011",
+  "version": "3.0.0-alpha-3031220220222002",
   "description": "@dcloudio/uni-cli-shared",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -18,17 +18,17 @@
     "url": "https://github.com/dcloudio/uni-app/issues"
   },
   "dependencies": {
-    "@babel/core": "^7.16.12",
-    "@babel/parser": "^7.16.12",
+    "@babel/core": "^7.17.2",
+    "@babel/parser": "^7.16.4",
     "@babel/types": "^7.16.8",
-    "@dcloudio/uni-i18n": "3.0.0-alpha-3030820220114011",
-    "@dcloudio/uni-shared": "3.0.0-alpha-3030820220114011",
+    "@dcloudio/uni-i18n": "3.0.0-alpha-3031220220222002",
+    "@dcloudio/uni-shared": "3.0.0-alpha-3031220220222002",
     "@rollup/pluginutils": "^4.1.2",
-    "@vue/compiler-core": "3.2.30",
-    "@vue/compiler-dom": "3.2.30",
-    "@vue/compiler-sfc": "3.2.30",
-    "@vue/server-renderer": "3.2.30",
-    "@vue/shared": "3.2.30",
+    "@vue/compiler-core": "3.2.31",
+    "@vue/compiler-dom": "3.2.31",
+    "@vue/compiler-sfc": "3.2.31",
+    "@vue/server-renderer": "3.2.31",
+    "@vue/shared": "3.2.31",
     "autoprefixer": "^10.4.2",
     "base64url": "^3.0.1",
     "chokidar": "^3.5.3",