@dcloudio/uni-cli-shared 3.0.0-alpha-3030120211210002 → 3.0.0-alpha-3030120211215001

package/dist/hbx/alias.js

@@ -15,6 +15,16 @@ const hbxPlugins = {
     // pug: 'compile-pug-cli/node_modules/pug',
 };
 function initModuleAlias() {
+    const compilerSfcPath = require.resolve('@vue/compiler-sfc');
+    const serverRendererPath = require.resolve('@vue/server-renderer');
+    module_alias_1.default.addAliases({
+        '@vue/shared': require.resolve('@vue/shared'),
+        '@vue/compiler-dom': require.resolve('@vue/compiler-dom'),
+        '@vue/compiler-sfc': compilerSfcPath,
+        '@vue/server-renderer': serverRendererPath,
+        'vue/compiler-sfc': compilerSfcPath,
+        'vue/server-renderer': serverRendererPath,
+    });
     if ((0, env_1.isInHBuilderX)()) {
         Object.keys(hbxPlugins).forEach((name) => {
             module_alias_1.default.addAlias(name, path_1.default.resolve(process.env.UNI_HBUILDERX_PLUGINS, hbxPlugins[name]));

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

@@ -2,9 +2,20 @@ import { ComponentJson, PageWindowOptions, UsingComponents } from './types';
 export declare function isMiniProgramPageFile(file: string, inputDir?: string): boolean;
 export declare function isMiniProgramPageSfcFile(file: string, inputDir?: string): boolean;
 export declare function hasJsonFile(filename: string): boolean;
+export declare function findJsonFile(filename: string): Record<string, any> | undefined;
 export declare function normalizeJsonFilename(filename: string): string;
 export declare function findChangedJsonFiles(): 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;
 export declare function addMiniProgramUsingComponents(filename: string, json: UsingComponents): void;
+export declare function isMiniProgramUsingComponent(name: string, options: {
+    filename: string;
+    inputDir: string;
+    componentsDir?: string;
+}): boolean;
+export declare function findMiniProgramUsingComponents({ filename, inputDir, componentsDir, }: {
+    filename: string;
+    inputDir: string;
+    componentsDir?: string;
+}): string[];

package/dist/json/mp/jsonFile.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.addMiniProgramUsingComponents = exports.addMiniProgramComponentJson = exports.addMiniProgramPageJson = exports.addMiniProgramAppJson = exports.findChangedJsonFiles = exports.normalizeJsonFilename = exports.hasJsonFile = exports.isMiniProgramPageSfcFile = exports.isMiniProgramPageFile = void 0;
+exports.findMiniProgramUsingComponents = exports.isMiniProgramUsingComponent = exports.addMiniProgramUsingComponents = exports.addMiniProgramComponentJson = exports.addMiniProgramPageJson = exports.addMiniProgramAppJson = exports.findChangedJsonFiles = exports.normalizeJsonFilename = exports.findJsonFile = exports.hasJsonFile = exports.isMiniProgramPageSfcFile = exports.isMiniProgramPageFile = void 0;
 const path_1 = __importDefault(require("path"));
 const shared_1 = require("@vue/shared");
 const utils_1 = require("../../utils");
@@ -31,6 +31,13 @@ function hasJsonFile(filename) {
         jsonComponentsCache.has(filename));
 }
 exports.hasJsonFile = hasJsonFile;
+function findJsonFile(filename) {
+    if (filename === 'app') {
+        return appJsonCache;
+    }
+    return jsonPagesCache.get(filename) || jsonComponentsCache.get(filename);
+}
+exports.findJsonFile = findJsonFile;
 function normalizeJsonFilename(filename) {
     return (0, utils_1.normalizeNodeModules)(filename);
 }
@@ -38,7 +45,7 @@ exports.normalizeJsonFilename = normalizeJsonFilename;
 function findChangedJsonFiles() {
     const changedJsonFiles = new Map();
     function findChangedFile(filename, json) {
-        const newJson = (0, shared_1.extend)({}, json);
+        const newJson = JSON.parse(JSON.stringify(json));
         if (!newJson.usingComponents) {
             newJson.usingComponents = {};
         }
@@ -84,3 +91,29 @@ function addMiniProgramUsingComponents(filename, json) {
     jsonUsingComponentsCache.set(filename, json);
 }
 exports.addMiniProgramUsingComponents = addMiniProgramUsingComponents;
+function isMiniProgramUsingComponent(name, options) {
+    return findMiniProgramUsingComponents(options).includes(name);
+}
+exports.isMiniProgramUsingComponent = isMiniProgramUsingComponent;
+function findMiniProgramUsingComponents({ filename, inputDir, componentsDir, }) {
+    if (!componentsDir) {
+        return [];
+    }
+    const globalUsingComponents = appJsonCache && appJsonCache.usingComponents;
+    const miniProgramComponents = [];
+    if (globalUsingComponents) {
+        miniProgramComponents.push(...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));
+    }
+    return miniProgramComponents;
+}
+exports.findMiniProgramUsingComponents = findMiniProgramUsingComponents;
+function findMiniProgramUsingComponent(usingComponents, componentsDir) {
+    return Object.keys(usingComponents).filter((name) => {
+        const path = usingComponents[name];
+        return path.includes(componentsDir + '/');
+    });
+}

package/dist/json/mp/pages.js

@@ -84,7 +84,16 @@ function parsePagesJson(jsonStr, platform, { debug, darkmode, networkTimeout, su
     }
     // window
     if (pagesJson.globalStyle) {
-        appJson.window = (0, utils_1.parseWindowOptions)(pagesJson.globalStyle, platform, windowOptionsMap);
+        const windowOptions = (0, utils_1.parseWindowOptions)(pagesJson.globalStyle, platform, windowOptionsMap);
+        const { usingComponents } = windowOptions;
+        if (usingComponents) {
+            delete windowOptions.usingComponents;
+            appJson.usingComponents = usingComponents;
+        }
+        else {
+            delete appJson.usingComponents;
+        }
+        appJson.window = windowOptions;
     }
     // tabBar
     if (pagesJson.tabBar) {
@@ -94,7 +103,7 @@ function parsePagesJson(jsonStr, platform, { debug, darkmode, networkTimeout, su
         }
     }
     ;
-    ['preloadRule', 'workers', 'usingComponents'].forEach((name) => {
+    ['preloadRule', 'workers'].forEach((name) => {
         if ((0, shared_1.hasOwn)(pagesJson, name)) {
             appJson[name] = pagesJson[name];
         }

package/dist/mp/template.d.ts

@@ -40,6 +40,10 @@ export interface MiniProgramCompilerOptions {
         lang: string;
     };
     component?: {
+        /**
+         * 平台自定义组件目录，如 wxcomponents
+         */
+        dir?: string;
         /**
          * 自定义组件自定义 hidden 属性用于实现 v-show
          */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "3.0.0-alpha-3030120211210002",
+  "version": "3.0.0-alpha-3030120211215001",
   "description": "@dcloudio/uni-cli-shared",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -18,15 +18,16 @@
     "url": "https://github.com/dcloudio/uni-app/issues"
   },
   "dependencies": {
-    "@babel/parser": "^7.15.0",
-    "@babel/types": "^7.15.0",
-    "@dcloudio/uni-i18n": "3.0.0-alpha-3030120211210002",
-    "@dcloudio/uni-shared": "3.0.0-alpha-3030120211210002",
+    "@babel/parser": "^7.16.4",
+    "@babel/types": "^7.16.0",
+    "@dcloudio/uni-i18n": "3.0.0-alpha-3030120211215001",
+    "@dcloudio/uni-shared": "3.0.0-alpha-3030120211215001",
     "@rollup/pluginutils": "^4.1.1",
-    "@vue/compiler-core": "3.2.24",
-    "@vue/compiler-dom": "3.2.24",
-    "@vue/compiler-sfc": "3.2.24",
-    "@vue/shared": "3.2.24",
+    "@vue/compiler-core": "3.2.26",
+    "@vue/compiler-dom": "3.2.26",
+    "@vue/compiler-sfc": "3.2.26",
+    "@vue/server-renderer": "3.2.26",
+    "@vue/shared": "3.2.26",
     "base64url": "^3.0.1",
     "chalk": "^4.1.1",
     "chokidar": "^3.5.2",