@dimina/compiler 1.0.14 → 1.0.15

package/dist/bin/index.cjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-const require_env = require("../env-M-7lpbHL.cjs");
+const require_env = require("../env-Dmnqp9bD.cjs");
 const require_index = require("../index.cjs");
 let node_path = require("node:path");
 node_path = require_env.__toESM(node_path, 1);
@@ -10,7 +10,7 @@ chokidar = require_env.__toESM(chokidar, 1);
 let commander = require("commander");
 var package_default = {
 	name: "@dimina/compiler",
-	version: "1.0.14",
+	version: "1.0.15",
 	description: "星河编译工具",
 	main: "./dist/index.cjs",
 	module: "./dist/index.js",
@@ -64,7 +64,7 @@ var package_default = {
 		"commander": "^14.0.3",
 		"cssnano": "^8.0.1",
 		"esbuild": "^0.28.0",
-		"htmlparser2": "^10.1.0",
+		"htmlparser2": "^12.0.0",
 		"less": "^4.6.4",
 		"listr2": "^9.0.5",
 		"magic-string": "^0.30.21",

package/dist/bin/index.js

@@ -6,7 +6,7 @@ import chokidar from "chokidar";
 import { program } from "commander";
 var package_default = {
 	name: "@dimina/compiler",
-	version: "1.0.14",
+	version: "1.0.15",
 	description: "星河编译工具",
 	main: "./dist/index.cjs",
 	module: "./dist/index.js",
@@ -60,7 +60,7 @@ var package_default = {
 		"commander": "^14.0.3",
 		"cssnano": "^8.0.1",
 		"esbuild": "^0.28.0",
-		"htmlparser2": "^10.1.0",
+		"htmlparser2": "^12.0.0",
 		"less": "^4.6.4",
 		"listr2": "^9.0.5",
 		"magic-string": "^0.30.21",

package/dist/{compatibility-B_5UilxZ.js → compatibility-C_zWVjYl.js}

@@ -32,6 +32,7 @@ var supportedBuiltinComponents = [
 	"template",
 	"text",
 	"textarea",
+	"video",
 	"view",
 	"web-view",
 	"wxs",

package/dist/{compatibility-DCnJNS-s.cjs → compatibility-DlYbbw0F.cjs}

@@ -1,4 +1,4 @@
-require("./env-M-7lpbHL.cjs");
+require("./env-Dmnqp9bD.cjs");
 let htmlparser2 = require("htmlparser2");
 //#region src/common/compatibility-reference.js
 var supportedBuiltinComponents = [
@@ -33,6 +33,7 @@ var supportedBuiltinComponents = [
 	"template",
 	"text",
 	"textarea",
+	"video",
 	"view",
 	"web-view",
 	"wxs",

package/dist/core/logic-compiler.cjs

@@ -1,6 +1,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_env = require("../env-M-7lpbHL.cjs");
-const require_compatibility = require("../compatibility-DCnJNS-s.cjs");
+const require_env = require("../env-Dmnqp9bD.cjs");
+const require_compatibility = require("../compatibility-DlYbbw0F.cjs");
 let node_path = require("node:path");
 let node_worker_threads = require("node:worker_threads");
 let node_fs = require("node:fs");
@@ -396,9 +396,14 @@ function resolveDependencyId(specifier, modulePath, allowAbsolute) {
 	};
 	if (specifier.startsWith("@") || isBareModuleSpecifier(specifier)) {
 		const npmModuleId = resolveNpmModuleId(specifier, modulePath);
+		if (npmModuleId) return {
+			id: npmModuleId,
+			shouldProcess: true
+		};
+		const siblingModuleId = resolveBareSiblingModuleId(specifier, modulePath);
 		return {
-			id: npmModuleId || specifier,
-			shouldProcess: Boolean(npmModuleId)
+			id: siblingModuleId || specifier,
+			shouldProcess: Boolean(siblingModuleId)
 		};
 	}
 	return {
@@ -413,6 +418,9 @@ function resolveRelativeModuleId(specifier, modulePath) {
 	const relativeId = (0, node_path.resolve)(modulePath, `../${specifier}`).split(`${require_env.getWorkPath()}${node_path.sep}`)[1];
 	return normalizeModuleId(relativeId);
 }
+function resolveBareSiblingModuleId(specifier, modulePath) {
+	return resolveModuleIdToExistingPath(resolveRelativeModuleId(`./${specifier}`, modulePath));
+}
 function normalizeModuleId(moduleId) {
 	let normalized = moduleId.replace(/\.(js|ts)$/, "").replace(/\\/g, "/");
 	if (!normalized.startsWith("/")) normalized = `/${normalized}`;

package/dist/core/logic-compiler.js

@@ -1,5 +1,5 @@
-import { a as getContentByPath, d as resetStoreInfo, f as resolveAppAlias, g as hasCompileInfo, i as getComponent, l as getTargetPath, m as collectAssets, n as getAppId, o as getNpmResolver, t as getAppConfigInfo, u as getWorkPath } from "../env-DgCLbrQb.js";
-import { n as getWxMemberName, r as warnUnsupportedWxApi } from "../compatibility-B_5UilxZ.js";
+import { a as getContentByPath, d as resetStoreInfo, f as resolveAppAlias, g as hasCompileInfo, i as getComponent, l as getTargetPath, m as collectAssets, n as getAppId, o as getNpmResolver, t as getAppConfigInfo, u as getWorkPath } from "../env-p9Az8lv5.js";
+import { n as getWxMemberName, r as warnUnsupportedWxApi } from "../compatibility-C_zWVjYl.js";
 import { resolve, sep } from "node:path";
 import { isMainThread, parentPort } from "node:worker_threads";
 import fs from "node:fs";
@@ -393,9 +393,14 @@ function resolveDependencyId(specifier, modulePath, allowAbsolute) {
 	};
 	if (specifier.startsWith("@") || isBareModuleSpecifier(specifier)) {
 		const npmModuleId = resolveNpmModuleId(specifier, modulePath);
+		if (npmModuleId) return {
+			id: npmModuleId,
+			shouldProcess: true
+		};
+		const siblingModuleId = resolveBareSiblingModuleId(specifier, modulePath);
 		return {
-			id: npmModuleId || specifier,
-			shouldProcess: Boolean(npmModuleId)
+			id: siblingModuleId || specifier,
+			shouldProcess: Boolean(siblingModuleId)
 		};
 	}
 	return {
@@ -410,6 +415,9 @@ function resolveRelativeModuleId(specifier, modulePath) {
 	const relativeId = resolve(modulePath, `../${specifier}`).split(`${getWorkPath()}${sep}`)[1];
 	return normalizeModuleId(relativeId);
 }
+function resolveBareSiblingModuleId(specifier, modulePath) {
+	return resolveModuleIdToExistingPath(resolveRelativeModuleId(`./${specifier}`, modulePath));
+}
 function normalizeModuleId(moduleId) {
 	let normalized = moduleId.replace(/\.(js|ts)$/, "").replace(/\\/g, "/");
 	if (!normalized.startsWith("/")) normalized = `/${normalized}`;

package/dist/core/style-compiler.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_env = require("../env-M-7lpbHL.cjs");
+const require_env = require("../env-Dmnqp9bD.cjs");
 let node_path = require("node:path");
 node_path = require_env.__toESM(node_path, 1);
 let node_worker_threads = require("node:worker_threads");
@@ -79,11 +79,11 @@ async function buildCompileCss(module, depthChain = [], compiledPaths = /* @__PU
 	const currentPath = module.path || module.absolutePath;
 	if (depthChain.includes(currentPath)) {
 		console.warn("[style]", `检测到循环依赖: ${[...depthChain, currentPath].join(" -> ")}`);
-		return;
+		return "";
 	}
 	if (depthChain.length > 20) {
 		console.warn("[style]", `检测到深度依赖: ${[...depthChain, currentPath].join(" -> ")}`);
-		return;
+		return "";
 	}
 	if (compiledPaths.has(currentPath)) return "";
 	compiledPaths.add(currentPath);
@@ -92,15 +92,15 @@ async function buildCompileCss(module, depthChain = [], compiledPaths = /* @__PU
 	if (module.usingComponents) for (const componentInfo of Object.values(module.usingComponents)) {
 		const componentModule = require_env.getComponent(componentInfo);
 		if (!componentModule) continue;
-		result += await buildCompileCss(componentModule, depthChain, compiledPaths);
+		result += await buildCompileCss(componentModule, depthChain, compiledPaths) || "";
 	}
 	return result;
 }
 async function enhanceCSS(module) {
 	const absolutePath = module.absolutePath ? module.absolutePath : getAbsolutePath(module.path);
-	if (!absolutePath) return;
+	if (!absolutePath) return "";
 	const inputCSS = require_env.getContentByPath(absolutePath);
-	if (!inputCSS) return;
+	if (!inputCSS) return "";
 	if (compileRes.has(absolutePath)) return compileRes.get(absolutePath);
 	let processedCSS = normalizeRootStyleImports(inputCSS);
 	const ext = node_path.default.extname(absolutePath).toLowerCase();
@@ -158,7 +158,7 @@ async function enhanceCSS(module) {
 	const cleanedCode = await removeBaseComponentScope(scopedCode, moduleId);
 	const res = await (0, postcss.default)([(0, autoprefixer.default)({ overrideBrowserslist: ["cover 99.5%"] }), (0, cssnano.default)()]).process(cleanedCode, { from: void 0 });
 	const result = (await Promise.all(promises)).filter(Boolean).join("") + res.css;
-	compileRes.set(module.path, result);
+	compileRes.set(absolutePath, result);
 	return result;
 }
 function normalizeCssUrlValue(value, absolutePath) {

package/dist/core/style-compiler.js

@@ -1,4 +1,4 @@
-import { _ as tagWhiteList, a as getContentByPath, d as resetStoreInfo, i as getComponent, l as getTargetPath, m as collectAssets, n as getAppId, u as getWorkPath, v as transformRpx } from "../env-DgCLbrQb.js";
+import { _ as tagWhiteList, a as getContentByPath, d as resetStoreInfo, i as getComponent, l as getTargetPath, m as collectAssets, n as getAppId, u as getWorkPath, v as transformRpx } from "../env-p9Az8lv5.js";
 import path from "node:path";
 import { isMainThread, parentPort } from "node:worker_threads";
 import fs from "node:fs";
@@ -70,11 +70,11 @@ async function buildCompileCss(module, depthChain = [], compiledPaths = /* @__PU
 	const currentPath = module.path || module.absolutePath;
 	if (depthChain.includes(currentPath)) {
 		console.warn("[style]", `检测到循环依赖: ${[...depthChain, currentPath].join(" -> ")}`);
-		return;
+		return "";
 	}
 	if (depthChain.length > 20) {
 		console.warn("[style]", `检测到深度依赖: ${[...depthChain, currentPath].join(" -> ")}`);
-		return;
+		return "";
 	}
 	if (compiledPaths.has(currentPath)) return "";
 	compiledPaths.add(currentPath);
@@ -83,15 +83,15 @@ async function buildCompileCss(module, depthChain = [], compiledPaths = /* @__PU
 	if (module.usingComponents) for (const componentInfo of Object.values(module.usingComponents)) {
 		const componentModule = getComponent(componentInfo);
 		if (!componentModule) continue;
-		result += await buildCompileCss(componentModule, depthChain, compiledPaths);
+		result += await buildCompileCss(componentModule, depthChain, compiledPaths) || "";
 	}
 	return result;
 }
 async function enhanceCSS(module) {
 	const absolutePath = module.absolutePath ? module.absolutePath : getAbsolutePath(module.path);
-	if (!absolutePath) return;
+	if (!absolutePath) return "";
 	const inputCSS = getContentByPath(absolutePath);
-	if (!inputCSS) return;
+	if (!inputCSS) return "";
 	if (compileRes.has(absolutePath)) return compileRes.get(absolutePath);
 	let processedCSS = normalizeRootStyleImports(inputCSS);
 	const ext = path.extname(absolutePath).toLowerCase();
@@ -149,7 +149,7 @@ async function enhanceCSS(module) {
 	const cleanedCode = await removeBaseComponentScope(scopedCode, moduleId);
 	const res = await postcss([autoprefixer({ overrideBrowserslist: ["cover 99.5%"] }), cssnano()]).process(cleanedCode, { from: void 0 });
 	const result = (await Promise.all(promises)).filter(Boolean).join("") + res.css;
-	compileRes.set(module.path, result);
+	compileRes.set(absolutePath, result);
 	return result;
 }
 function normalizeCssUrlValue(value, absolutePath) {

package/dist/core/view-compiler.cjs

@@ -1,6 +1,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_env = require("../env-M-7lpbHL.cjs");
-const require_compatibility = require("../compatibility-DCnJNS-s.cjs");
+const require_env = require("../env-Dmnqp9bD.cjs");
+const require_compatibility = require("../compatibility-DlYbbw0F.cjs");
 let node_path = require("node:path");
 node_path = require_env.__toESM(node_path, 1);
 let node_worker_threads = require("node:worker_threads");

package/dist/core/view-compiler.js

@@ -1,5 +1,5 @@
-import { _ as tagWhiteList, a as getContentByPath, d as resetStoreInfo, h as getAbsolutePath, i as getComponent, l as getTargetPath, m as collectAssets, n as getAppId, u as getWorkPath, v as transformRpx } from "../env-DgCLbrQb.js";
-import { t as checkTemplateCompatibility } from "../compatibility-B_5UilxZ.js";
+import { _ as tagWhiteList, a as getContentByPath, d as resetStoreInfo, h as getAbsolutePath, i as getComponent, l as getTargetPath, m as collectAssets, n as getAppId, u as getWorkPath, v as transformRpx } from "../env-p9Az8lv5.js";
+import { t as checkTemplateCompatibility } from "../compatibility-C_zWVjYl.js";
 import path from "node:path";
 import { isMainThread, parentPort } from "node:worker_threads";
 import fs from "node:fs";

package/dist/{env-M-7lpbHL.cjs → env-Dmnqp9bD.cjs}

@@ -395,7 +395,7 @@ function storeProjectConfig() {
 function storeAppConfig() {
 	const content = parseContentByPath(`${pathInfo.workPath}/app.json`);
 	const newObj = {};
-	for (const key in content) if (Object.hasOwn(content, key)) if (key === "subpackages") newObj.subPackages = content[key];
+	for (const key in content) if (Object.prototype.hasOwnProperty.call(content, key)) if (key === "subpackages") newObj.subPackages = content[key];
 	else newObj[key] = content[key];
 	configInfo.appInfo = newObj;
 }

package/dist/{env-DgCLbrQb.js → env-p9Az8lv5.js}

@@ -369,7 +369,7 @@ function storeProjectConfig() {
 function storeAppConfig() {
 	const content = parseContentByPath(`${pathInfo.workPath}/app.json`);
 	const newObj = {};
-	for (const key in content) if (Object.hasOwn(content, key)) if (key === "subpackages") newObj.subPackages = content[key];
+	for (const key in content) if (Object.prototype.hasOwnProperty.call(content, key)) if (key === "subpackages") newObj.subPackages = content[key];
 	else newObj[key] = content[key];
 	configInfo.appInfo = newObj;
 }

package/dist/index.cjs

@@ -1,4 +1,4 @@
-const require_env = require("./env-M-7lpbHL.cjs");
+const require_env = require("./env-Dmnqp9bD.cjs");
 let node_path = require("node:path");
 node_path = require_env.__toESM(node_path, 1);
 let node_url = require("node:url");

package/dist/index.js

@@ -1,4 +1,4 @@
-import { c as getPages, l as getTargetPath, m as collectAssets, n as getAppId, p as storeInfo, r as getAppName, s as getPageConfigInfo, t as getAppConfigInfo, u as getWorkPath, y as art_default } from "./env-DgCLbrQb.js";
+import { c as getPages, l as getTargetPath, m as collectAssets, n as getAppId, p as storeInfo, r as getAppName, s as getPageConfigInfo, t as getAppConfigInfo, u as getWorkPath, y as art_default } from "./env-p9Az8lv5.js";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
 import { Worker } from "node:worker_threads";

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@dimina/compiler",
-	"version": "1.0.14",
+	"version": "1.0.15",
 	"description": "星河编译工具",
 	"main": "./dist/index.cjs",
 	"module": "./dist/index.js",
@@ -58,7 +58,7 @@
 		"commander": "^14.0.3",
 		"cssnano": "^8.0.1",
 		"esbuild": "^0.28.0",
-		"htmlparser2": "^10.1.0",
+		"htmlparser2": "^12.0.0",
 		"less": "^4.6.4",
 		"listr2": "^9.0.5",
 		"magic-string": "^0.30.21",