@dcloudio/uni-cli-shared 3.0.0-alpha-3060420220922006 → 3.0.0-alpha-3060420220922008

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

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

package/dist/json/mp/jsonFile.js

@@ -124,8 +124,14 @@ function findMiniProgramUsingComponents({ filename, inputDir, 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) {
-        (0, shared_1.extend)(miniProgramComponents, findMiniProgramUsingComponent(jsonFile.usingComponents, componentsDir));
+    if (jsonFile) {
+        if (jsonFile.usingComponents) {
+            (0, shared_1.extend)(miniProgramComponents, findMiniProgramUsingComponent(jsonFile.usingComponents, componentsDir));
+        }
+        // mp-baidu 特有
+        if (jsonFile.usingSwanComponents) {
+            (0, shared_1.extend)(miniProgramComponents, findMiniProgramUsingComponent(jsonFile.usingSwanComponents, componentsDir));
+        }
     }
     return miniProgramComponents;
 }
@@ -136,6 +142,9 @@ function findMiniProgramUsingComponent(usingComponents, componentsDir) {
         if (path.includes('plugin://')) {
             res[name] = 'plugin';
         }
+        else if (path.includes('dynamicLib://')) {
+            res[name] = 'dynamicLib';
+        }
         else if (componentsDir && path.includes(componentsDir + '/')) {
             res[name] = 'component';
         }

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

@@ -21,6 +21,7 @@ export interface PageWindowOptions extends ShareWindowOptions {
     component?: true;
     disableScroll?: boolean;
     usingComponents?: UsingComponents;
+    usingSwanComponents?: UsingComponents;
     initialRenderingCache?: 'static' | string;
     style?: Style;
     singlePage?: SinglePage;

package/dist/mp/template.d.ts

@@ -1,4 +1,13 @@
-import { EmittedAsset } from 'rollup';
+import type { EmittedAsset } from 'rollup';
+import type { ElementNode } from '@vue/compiler-core';
+declare type LazyElementFn = (node: ElementNode, context: {
+    isMiniProgramComponent(name: string): 'plugin' | 'component' | 'dynamicLib' | undefined;
+}) => {
+    [name: string]: {
+        name: 'on' | 'bind';
+        arg: string[];
+    }[];
+} | boolean;
 export interface MiniProgramCompilerOptions {
     /**
      * 需要延迟渲染的组件，通常是某个组件的某个事件会立刻触发，需要延迟到首次 render 之后，比如微信 editor 的 ready 事件，快手 switch 的 change
@@ -8,7 +17,7 @@ export interface MiniProgramCompilerOptions {
             name: 'on' | 'bind';
             arg: string[];
         }[];
-    };
+    } | LazyElementFn;
     event?: {
         key?: boolean;
         format?(name: string, opts: {

package/dist/uni_modules.js

@@ -6,9 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseDefines = exports.parseExports = exports.genUniModulesExports = void 0;
 const path_1 = __importDefault(require("path"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
-const shared_1 = require("@vue/shared");
 const merge_1 = require("merge");
-const json_1 = require("./json");
 function genUniModulesExports() {
     const uniModulesDir = path_1.default.resolve(process.env.UNI_INPUT_DIR, 'uni_modules');
     if (!fs_extra_1.default.existsSync(uniModulesDir)) {
@@ -22,7 +20,7 @@ function genUniModulesExports() {
         if (!fs_extra_1.default.existsSync(pkgPath)) {
             return;
         }
-        const exports = (_b = (_a = (0, json_1.parseJson)(fs_extra_1.default.readFileSync(pkgPath, 'utf8'))) === null || _a === void 0 ? void 0 : _a.uni_modules) === null || _b === void 0 ? void 0 : _b.exports;
+        const exports = (_b = (_a = JSON.parse(fs_extra_1.default.readFileSync(pkgPath, 'utf8'))) === null || _a === void 0 ? void 0 : _a.uni_modules) === null || _b === void 0 ? void 0 : _b.exports;
         if (exports) {
             const [exportsImportCodes, exportsAssignCodes] = parseExports(process.env.UNI_PLATFORM === 'h5' ? 'web' : process.env.UNI_PLATFORM, `@/uni_modules/${uniModuleDir}`, exports);
             importCodes.push(...exportsImportCodes);
@@ -86,17 +84,17 @@ exports.parseDefines = parseDefines;
 function parseDefine(source, globalObject, define) {
     const importCodes = [];
     const assignCodes = [];
-    if ((0, shared_1.isString)(define)) {
+    if (typeof define === 'string') {
         importCodes.push(`import ${define} from '${source}'`);
         assignCodes.push(`${globalObject}.${define} = ${define}`);
     }
-    else if ((0, shared_1.isArray)(define)) {
+    else if (Array.isArray(define)) {
         importCodes.push(`import { ${define.join(', ')} } from '${source}'`);
         define.forEach((d) => {
             assignCodes.push(`${globalObject}.${d} = ${d}`);
         });
     }
-    else if ((0, shared_1.isPlainObject)(define)) {
+    else {
         const keys = Object.keys(define);
         const specifiers = [];
         keys.forEach((d) => {

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

@@ -36,6 +36,7 @@ const crypto_1 = require("crypto");
 const utils_1 = require("../utils");
 const utils_2 = require("../../../../vite/utils/utils");
 const shared_1 = require("@vue/shared");
+const utils_3 = require("../../../../utils");
 exports.assetUrlRE = /__VITE_ASSET__([a-z\d]{8})__(?:\$_(.*?)__)?/g;
 // urls in JS must be quoted as strings, so when replacing them we need
 // a different regex
@@ -248,7 +249,8 @@ function fileToBuiltUrl(id, config, pluginContext, skipPublicCheck = false, canI
         const postfix = (search || '') + (hash || '');
         const inputDir = (0, utils_1.normalizePath)(process.env.UNI_INPUT_DIR);
         let fileName = file.startsWith(inputDir)
-            ? path_1.default.posix.relative(inputDir, file)
+            ? // 需要处理 HBuilderX 项目中的 node_modules 目录
+                (0, utils_3.normalizeNodeModules)(path_1.default.posix.relative(inputDir, file))
             : assetFileNamesToFileName(path_1.default.posix.join(config.build.assetsDir, '[name].[hash][extname]'), file, contentHash, content);
         if (!map.has(contentHash)) {
             map.set(contentHash, fileName);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "3.0.0-alpha-3060420220922006",
+  "version": "3.0.0-alpha-3060420220922008",
   "description": "@dcloudio/uni-cli-shared",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -25,8 +25,8 @@
     "@babel/core": "^7.18.13",
     "@babel/parser": "^7.18.13",
     "@babel/types": "^7.17.0",
-    "@dcloudio/uni-i18n": "3.0.0-alpha-3060420220922006",
-    "@dcloudio/uni-shared": "3.0.0-alpha-3060420220922006",
+    "@dcloudio/uni-i18n": "3.0.0-alpha-3060420220922008",
+    "@dcloudio/uni-shared": "3.0.0-alpha-3060420220922008",
     "@intlify/core-base": "9.1.9",
     "@intlify/shared": "9.1.9",
     "@intlify/vue-devtools": "9.1.9",