xmlui 0.11.22 → 0.11.24

package/dist/bin/index.cjs

@@ -488,7 +488,7 @@ var require_scan = /* @__PURE__ */ __commonJS({ "../node_modules/picomatch/lib/s
 		}
 		let base = str;
 		let prefix = "";
-		let glob$1 = "";
+		let glob$2 = "";
 		if (start$1 > 0) {
 			prefix = str.slice(0, start$1);
 			str = str.slice(start$1);
@@ -496,16 +496,16 @@ var require_scan = /* @__PURE__ */ __commonJS({ "../node_modules/picomatch/lib/s
 		}
 		if (base && isGlob === true && lastIndex > 0) {
 			base = str.slice(0, lastIndex);
-			glob$1 = str.slice(lastIndex);
+			glob$2 = str.slice(lastIndex);
 		} else if (isGlob === true) {
 			base = "";
-			glob$1 = str;
+			glob$2 = str;
 		} else base = str;
 		if (base && base !== "" && base !== "/" && base !== str) {
 			if (isPathSeparator(base.charCodeAt(base.length - 1))) base = base.slice(0, -1);
 		}
 		if (opts.unescape === true) {
-			if (glob$1) glob$1 = utils$2.removeBackslashes(glob$1);
+			if (glob$2) glob$2 = utils$2.removeBackslashes(glob$2);
 			if (base && backslashes === true) base = utils$2.removeBackslashes(base);
 		}
 		const state = {
@@ -513,7 +513,7 @@ var require_scan = /* @__PURE__ */ __commonJS({ "../node_modules/picomatch/lib/s
 			input,
 			start: start$1,
 			base,
-			glob: glob$1,
+			glob: glob$2,
 			isBrace,
 			isBracket,
 			isGlob,
@@ -1453,9 +1453,9 @@ var require_picomatch$1 = /* @__PURE__ */ __commonJS({ "../node_modules/picomatc
 	* @return {Function=} Returns a matcher function.
 	* @api public
 	*/
-	const picomatch = (glob$1, options, returnState = false) => {
-		if (Array.isArray(glob$1)) {
-			const fns = glob$1.map((input) => picomatch(input, options, returnState));
+	const picomatch = (glob$2, options, returnState = false) => {
+		if (Array.isArray(glob$2)) {
+			const fns = glob$2.map((input) => picomatch(input, options, returnState));
 			const arrayMatcher = (str) => {
 				for (const isMatch of fns) {
 					const state$1 = isMatch(str);
@@ -1465,11 +1465,11 @@ var require_picomatch$1 = /* @__PURE__ */ __commonJS({ "../node_modules/picomatc
 			};
 			return arrayMatcher;
 		}
-		const isState = isObject(glob$1) && glob$1.tokens && glob$1.input;
-		if (glob$1 === "" || typeof glob$1 !== "string" && !isState) throw new TypeError("Expected pattern to be a non-empty string");
+		const isState = isObject(glob$2) && glob$2.tokens && glob$2.input;
+		if (glob$2 === "" || typeof glob$2 !== "string" && !isState) throw new TypeError("Expected pattern to be a non-empty string");
 		const opts = options || {};
 		const posix$1 = utils.isWindows(options);
-		const regex = isState ? picomatch.compileRe(glob$1, options) : picomatch.makeRe(glob$1, options, false, true);
+		const regex = isState ? picomatch.compileRe(glob$2, options) : picomatch.makeRe(glob$2, options, false, true);
 		const state = regex.state;
 		delete regex.state;
 		let isIgnored = () => false;
@@ -1484,11 +1484,11 @@ var require_picomatch$1 = /* @__PURE__ */ __commonJS({ "../node_modules/picomatc
 		}
 		const matcher = (input, returnObject = false) => {
 			const { isMatch, match, output } = picomatch.test(input, regex, options, {
-				glob: glob$1,
+				glob: glob$2,
 				posix: posix$1
 			});
 			const result = {
-				glob: glob$1,
+				glob: glob$2,
 				state,
 				regex,
 				posix: posix$1,
@@ -1529,7 +1529,7 @@ var require_picomatch$1 = /* @__PURE__ */ __commonJS({ "../node_modules/picomatc
 	* @return {Object} Returns an object with matching info.
 	* @api public
 	*/
-	picomatch.test = (input, regex, options, { glob: glob$1, posix: posix$1 } = {}) => {
+	picomatch.test = (input, regex, options, { glob: glob$2, posix: posix$1 } = {}) => {
 		if (typeof input !== "string") throw new TypeError("Expected input to be a string");
 		if (input === "") return {
 			isMatch: false,
@@ -1537,11 +1537,11 @@ var require_picomatch$1 = /* @__PURE__ */ __commonJS({ "../node_modules/picomatc
 		};
 		const opts = options || {};
 		const format = opts.format || (posix$1 ? utils.toPosixSlashes : null);
-		let match = input === glob$1;
+		let match = input === glob$2;
 		let output = match && format ? format(input) : input;
 		if (match === false) {
 			output = format ? format(input) : input;
-			match = output === glob$1;
+			match = output === glob$2;
 		}
 		if (match === false || opts.capture === true) if (opts.matchBase === true || opts.basename === true) match = picomatch.matchBase(input, regex, options, posix$1);
 		else match = regex.exec(output);
@@ -1564,8 +1564,8 @@ var require_picomatch$1 = /* @__PURE__ */ __commonJS({ "../node_modules/picomatc
 	* @return {Boolean}
 	* @api public
 	*/
-	picomatch.matchBase = (input, glob$1, options, posix$1 = utils.isWindows(options)) => {
-		return (glob$1 instanceof RegExp ? glob$1 : picomatch.makeRe(glob$1, options)).test(path$2.basename(input));
+	picomatch.matchBase = (input, glob$2, options, posix$1 = utils.isWindows(options)) => {
+		return (glob$2 instanceof RegExp ? glob$2 : picomatch.makeRe(glob$2, options)).test(path$2.basename(input));
 	};
 	/**
 	* Returns true if **any** of the given glob `patterns` match the specified `string`.
@@ -5734,7 +5734,8 @@ function collectCodeBehindFromSource(moduleName, source) {
 	const result = {
 		vars: {},
 		moduleErrors: {},
-		functions: {}
+		functions: {},
+		hasInvalidStatements: false
 	};
 	const collectedFunctions = {};
 	const parsedModule = parseScriptModule(moduleName, source);
@@ -5756,7 +5757,7 @@ function collectCodeBehindFromSource(moduleName, source) {
 			case T_FUNCTION_DECLARATION:
 				addFunctionDeclaration(stmt);
 				break;
-			default: throw new Error(`Only reactive variable and function definitions are allowed in a code-behind module.`);
+			default: result.hasInvalidStatements = true;
 		}
 	});
 	return result;
@@ -7141,6 +7142,7 @@ const CORE_NS_KEY = "core-ns";
 const CORE_NAMESPACE_VALUE = "#xmlui-core-ns";
 const HelperNode = {
 	property: "property",
+	template: "template",
 	event: "event",
 	variable: "variable",
 	loaders: "loaders",
@@ -7289,6 +7291,7 @@ function nodeToComponentDef(node, originalGetText, fileId) {
 			}
 			switch (childName) {
 				case "property":
+				case "template":
 					collectElementHelper(usesStack$1, comp, child, (name) => isComponent(comp) ? comp.props?.[name] : void 0, (name, value) => {
 						if (!isComponent(comp)) return;
 						comp.props ??= {};
@@ -7334,6 +7337,7 @@ function nodeToComponentDef(node, originalGetText, fileId) {
 		try {
 			parser.parseStatements();
 			comp.scriptCollected = collectCodeBehindFromSource("Main", comp.script);
+			if (comp.scriptCollected.hasInvalidStatements) comp.scriptError = /* @__PURE__ */ new Error(`Only reactive variable and function definitions are allowed in a code-behind module.`);
 		} catch (err) {
 			if (parser.errors && parser.errors.length > 0) {
 				const errMsg = parser.errors[0];
@@ -7579,7 +7583,7 @@ function nodeToComponentDef(node, originalGetText, fileId) {
 	function prepNode(node$1) {
 		const childNodes = getChildNodes(node$1);
 		const tagName = getComponentName(node$1, getText);
-		const shouldUseTextNodeElement = !(tagName in HelperNode) || tagName === "property";
+		const shouldUseTextNodeElement = !(tagName in HelperNode) || tagName === "property" || tagName === "template";
 		const shouldCollapseWhitespace = tagName !== "event" && tagName !== "method";
 		const attrs = getAttributes(node$1);
 		desugarKeyOnlyAttrs(attrs);
@@ -8341,6 +8345,12 @@ function viteXmluiPlugin(pluginOptions = {}) {
 
 //#endregion
 //#region bin/viteConfig.ts
+const logger = (0, vite.createLogger)();
+const loggerWarn = logger.warn;
+logger.warn = (msg, options) => {
+	if (msg.includes("Failed to resolve \"remix:manifest\"")) return;
+	loggerWarn(msg, options);
+};
 async function getViteConfig({ flatDist = false, withRelativeRoot = false, flatDistUiPrefix = "" } = {}) {
 	let overrides = {};
 	try {
@@ -8354,6 +8364,7 @@ async function getViteConfig({ flatDist = false, withRelativeRoot = false, flatD
 			viteXmluiPlugin({}),
 			...overrides.plugins || []
 		],
+		customLogger: logger,
 		base: withRelativeRoot ? "" : void 0,
 		define: overrides.define,
 		resolve: {
@@ -8417,7 +8428,7 @@ dotenv.config({
 });
 async function getExportedJsObjects(path$5) {
 	return await new Promise((resolve$1, reject) => {
-		glob.glob(`${process.cwd()}/${path$5}`, (err, matches = []) => {
+		(0, glob.default)(`${process.cwd()}/${path$5}`, (err, matches = []) => {
 			resolve$1(Promise.all(matches.map(async (file) => {
 				return (await import(file)).default;
 			})));
@@ -8430,7 +8441,7 @@ async function convertResourcesDir(distRoot, flatDist, filePrefix) {
 	const resourcesDir = `${distRoot}/resources`;
 	if (!(0, fs.existsSync)(resourcesDir)) return;
 	const files = await new Promise((resolve$1, reject) => {
-		glob.glob(`${resourcesDir}/**/*`, (err, matches = []) => {
+		(0, glob.default)(`${resourcesDir}/**/*`, (err, matches = []) => {
 			resolve$1(matches);
 		});
 	});
@@ -8731,7 +8742,7 @@ function getStringArg(arg, defaultValue) {
 	if (arg === void 0) return defaultValue;
 	return dedupeArg(arg);
 }
-const argv = (0, yargs_yargs.default)((0, yargs_helpers.hideBin)(process.argv)).command("build", "Build the project", (yargs$1) => {
+(0, yargs_yargs.default)((0, yargs_helpers.hideBin)(process.argv)).command("build", "Build the project", (yargs$1) => {
 	return yargs$1.option("flatDist", {
 		type: "boolean",
 		description: "Create flat distribution"
@@ -8751,6 +8762,15 @@ const argv = (0, yargs_yargs.default)((0, yargs_helpers.hideBin)(process.argv)).
 		type: "boolean",
 		description: "Use relative root"
 	});
+}, (argv) => {
+	const { flatDist, prod, buildMode, withMock, withHostingMetaFiles, withRelativeRoot } = argv;
+	build({
+		buildMode: getStringArg(buildMode, prod ? "CONFIG_ONLY" : void 0),
+		withMock: getBoolArg(withMock, prod ? false : void 0),
+		withHostingMetaFiles: getBoolArg(withHostingMetaFiles, prod ? false : void 0),
+		withRelativeRoot: getBoolArg(withRelativeRoot, prod ? true : void 0),
+		flatDist: getBoolArg(flatDist, prod ? true : void 0)
+	});
 }).command("build-lib", "Build library", (yargs$1) => {
 	return yargs$1.option("watch", {
 		type: "boolean",
@@ -8759,6 +8779,12 @@ const argv = (0, yargs_yargs.default)((0, yargs_helpers.hideBin)(process.argv)).
 		type: "string",
 		description: "Build mode"
 	});
+}, (argv) => {
+	const { watch, mode } = argv;
+	buildLib({
+		watchMode: getBoolArg(watch, false),
+		mode: getStringArg(mode, "")
+	});
 }).command("start", "Start development server", (yargs$1) => {
 	return yargs$1.option("port", {
 		type: "number",
@@ -8770,11 +8796,21 @@ const argv = (0, yargs_yargs.default)((0, yargs_helpers.hideBin)(process.argv)).
 		type: "string",
 		description: "Proxy target"
 	});
+}, (argv) => {
+	const { port, withMock, proxy } = argv;
+	start({
+		port,
+		withMock: getBoolArg(withMock),
+		proxy
+	});
 }).command("preview", "Preview build", (yargs$1) => {
 	return yargs$1.option("proxy", {
 		type: "string",
 		description: "Proxy target"
 	});
+}, (argv) => {
+	const { proxy } = argv;
+	preview({ proxy });
 }).command("zip-dist", "Zip distribution", (yargs$1) => {
 	return yargs$1.option("target", {
 		type: "string",
@@ -8783,54 +8819,12 @@ const argv = (0, yargs_yargs.default)((0, yargs_helpers.hideBin)(process.argv)).
 		type: "string",
 		description: "Source directory"
 	});
-}).help().parseSync();
-const command = argv._[0];
-switch (command) {
-	case "build": {
-		const { flatDist, prod, buildMode, withMock, withHostingMetaFiles, withRelativeRoot } = argv;
-		build({
-			buildMode: getStringArg(buildMode, prod ? "CONFIG_ONLY" : void 0),
-			withMock: getBoolArg(withMock, prod ? false : void 0),
-			withHostingMetaFiles: getBoolArg(withHostingMetaFiles, prod ? false : void 0),
-			withRelativeRoot: getBoolArg(withRelativeRoot, prod ? true : void 0),
-			flatDist: getBoolArg(flatDist, prod ? true : void 0)
-		});
-		break;
-	}
-	case "build-lib": {
-		const { watch, mode } = argv;
-		buildLib({
-			watchMode: getBoolArg(watch, false),
-			mode: getStringArg(mode, "")
-		});
-		break;
-	}
-	case "start": {
-		const { port, withMock, proxy } = argv;
-		start({
-			port,
-			withMock: getBoolArg(withMock),
-			proxy
-		});
-		break;
-	}
-	case "preview": {
-		const { proxy } = argv;
-		preview({ proxy });
-		break;
-	}
-	case "zip-dist": {
-		const { target, source } = argv;
-		zipDist({
-			target,
-			source
-		});
-		break;
-	}
-	default:
-		console.log("Unknown command \"" + command + "\".");
-		console.log("Perhaps you need to update xmlui?");
-		process.exit(1);
-}
+}, (argv) => {
+	const { target, source } = argv;
+	zipDist({
+		target,
+		source
+	});
+}).strict().demandCommand(1, "You need to provide a command").help().parse();
 
 //#endregion

package/dist/bin/index.js

@@ -3,8 +3,8 @@ import { createRequire } from "node:module";
 import { cp, mkdir, rm, writeFile } from "fs/promises";
 import * as dotenv from "dotenv";
 import { existsSync } from "fs";
-import * as glob from "glob";
-import { build, createServer, defineConfig, loadEnv, preview } from "vite";
+import glob from "glob";
+import { build, createLogger, createServer, defineConfig, loadEnv, preview } from "vite";
 import react from "@vitejs/plugin-react";
 import svgr from "vite-plugin-svgr";
 import ViteYaml from "@modyfi/vite-plugin-yaml";
@@ -5722,7 +5722,8 @@ function collectCodeBehindFromSource(moduleName, source) {
 	const result = {
 		vars: {},
 		moduleErrors: {},
-		functions: {}
+		functions: {},
+		hasInvalidStatements: false
 	};
 	const collectedFunctions = {};
 	const parsedModule = parseScriptModule(moduleName, source);
@@ -5744,7 +5745,7 @@ function collectCodeBehindFromSource(moduleName, source) {
 			case T_FUNCTION_DECLARATION:
 				addFunctionDeclaration(stmt);
 				break;
-			default: throw new Error(`Only reactive variable and function definitions are allowed in a code-behind module.`);
+			default: result.hasInvalidStatements = true;
 		}
 	});
 	return result;
@@ -7129,6 +7130,7 @@ const CORE_NS_KEY = "core-ns";
 const CORE_NAMESPACE_VALUE = "#xmlui-core-ns";
 const HelperNode = {
 	property: "property",
+	template: "template",
 	event: "event",
 	variable: "variable",
 	loaders: "loaders",
@@ -7277,6 +7279,7 @@ function nodeToComponentDef(node, originalGetText, fileId) {
 			}
 			switch (childName) {
 				case "property":
+				case "template":
 					collectElementHelper(usesStack$1, comp, child, (name) => isComponent(comp) ? comp.props?.[name] : void 0, (name, value) => {
 						if (!isComponent(comp)) return;
 						comp.props ??= {};
@@ -7322,6 +7325,7 @@ function nodeToComponentDef(node, originalGetText, fileId) {
 		try {
 			parser.parseStatements();
 			comp.scriptCollected = collectCodeBehindFromSource("Main", comp.script);
+			if (comp.scriptCollected.hasInvalidStatements) comp.scriptError = /* @__PURE__ */ new Error(`Only reactive variable and function definitions are allowed in a code-behind module.`);
 		} catch (err) {
 			if (parser.errors && parser.errors.length > 0) {
 				const errMsg = parser.errors[0];
@@ -7567,7 +7571,7 @@ function nodeToComponentDef(node, originalGetText, fileId) {
 	function prepNode(node$1) {
 		const childNodes = getChildNodes(node$1);
 		const tagName = getComponentName(node$1, getText);
-		const shouldUseTextNodeElement = !(tagName in HelperNode) || tagName === "property";
+		const shouldUseTextNodeElement = !(tagName in HelperNode) || tagName === "property" || tagName === "template";
 		const shouldCollapseWhitespace = tagName !== "event" && tagName !== "method";
 		const attrs = getAttributes(node$1);
 		desugarKeyOnlyAttrs(attrs);
@@ -8329,6 +8333,12 @@ function viteXmluiPlugin(pluginOptions = {}) {
 
 //#endregion
 //#region bin/viteConfig.ts
+const logger = createLogger();
+const loggerWarn = logger.warn;
+logger.warn = (msg, options) => {
+	if (msg.includes("Failed to resolve \"remix:manifest\"")) return;
+	loggerWarn(msg, options);
+};
 async function getViteConfig({ flatDist = false, withRelativeRoot = false, flatDistUiPrefix = "" } = {}) {
 	let overrides = {};
 	try {
@@ -8342,6 +8352,7 @@ async function getViteConfig({ flatDist = false, withRelativeRoot = false, flatD
 			viteXmluiPlugin({}),
 			...overrides.plugins || []
 		],
+		customLogger: logger,
 		base: withRelativeRoot ? "" : void 0,
 		define: overrides.define,
 		resolve: {
@@ -8405,7 +8416,7 @@ dotenv.config({
 });
 async function getExportedJsObjects(path$5) {
 	return await new Promise((resolve, reject) => {
-		glob.glob(`${process.cwd()}/${path$5}`, (err, matches = []) => {
+		glob(`${process.cwd()}/${path$5}`, (err, matches = []) => {
 			resolve(Promise.all(matches.map(async (file) => {
 				return (await import(file)).default;
 			})));
@@ -8418,7 +8429,7 @@ async function convertResourcesDir(distRoot, flatDist, filePrefix) {
 	const resourcesDir = `${distRoot}/resources`;
 	if (!existsSync(resourcesDir)) return;
 	const files = await new Promise((resolve, reject) => {
-		glob.glob(`${resourcesDir}/**/*`, (err, matches = []) => {
+		glob(`${resourcesDir}/**/*`, (err, matches = []) => {
 			resolve(matches);
 		});
 	});
@@ -8719,7 +8730,7 @@ function getStringArg(arg, defaultValue) {
 	if (arg === void 0) return defaultValue;
 	return dedupeArg(arg);
 }
-const argv = yargs(hideBin(process.argv)).command("build", "Build the project", (yargs$1) => {
+yargs(hideBin(process.argv)).command("build", "Build the project", (yargs$1) => {
 	return yargs$1.option("flatDist", {
 		type: "boolean",
 		description: "Create flat distribution"
@@ -8739,6 +8750,15 @@ const argv = yargs(hideBin(process.argv)).command("build", "Build the project",
 		type: "boolean",
 		description: "Use relative root"
 	});
+}, (argv) => {
+	const { flatDist, prod, buildMode, withMock, withHostingMetaFiles, withRelativeRoot } = argv;
+	build$1({
+		buildMode: getStringArg(buildMode, prod ? "CONFIG_ONLY" : void 0),
+		withMock: getBoolArg(withMock, prod ? false : void 0),
+		withHostingMetaFiles: getBoolArg(withHostingMetaFiles, prod ? false : void 0),
+		withRelativeRoot: getBoolArg(withRelativeRoot, prod ? true : void 0),
+		flatDist: getBoolArg(flatDist, prod ? true : void 0)
+	});
 }).command("build-lib", "Build library", (yargs$1) => {
 	return yargs$1.option("watch", {
 		type: "boolean",
@@ -8747,6 +8767,12 @@ const argv = yargs(hideBin(process.argv)).command("build", "Build the project",
 		type: "string",
 		description: "Build mode"
 	});
+}, (argv) => {
+	const { watch, mode } = argv;
+	buildLib({
+		watchMode: getBoolArg(watch, false),
+		mode: getStringArg(mode, "")
+	});
 }).command("start", "Start development server", (yargs$1) => {
 	return yargs$1.option("port", {
 		type: "number",
@@ -8758,11 +8784,21 @@ const argv = yargs(hideBin(process.argv)).command("build", "Build the project",
 		type: "string",
 		description: "Proxy target"
 	});
+}, (argv) => {
+	const { port, withMock, proxy } = argv;
+	start({
+		port,
+		withMock: getBoolArg(withMock),
+		proxy
+	});
 }).command("preview", "Preview build", (yargs$1) => {
 	return yargs$1.option("proxy", {
 		type: "string",
 		description: "Proxy target"
 	});
+}, (argv) => {
+	const { proxy } = argv;
+	preview$1({ proxy });
 }).command("zip-dist", "Zip distribution", (yargs$1) => {
 	return yargs$1.option("target", {
 		type: "string",
@@ -8771,55 +8807,13 @@ const argv = yargs(hideBin(process.argv)).command("build", "Build the project",
 		type: "string",
 		description: "Source directory"
 	});
-}).help().parseSync();
-const command = argv._[0];
-switch (command) {
-	case "build": {
-		const { flatDist, prod, buildMode, withMock, withHostingMetaFiles, withRelativeRoot } = argv;
-		build$1({
-			buildMode: getStringArg(buildMode, prod ? "CONFIG_ONLY" : void 0),
-			withMock: getBoolArg(withMock, prod ? false : void 0),
-			withHostingMetaFiles: getBoolArg(withHostingMetaFiles, prod ? false : void 0),
-			withRelativeRoot: getBoolArg(withRelativeRoot, prod ? true : void 0),
-			flatDist: getBoolArg(flatDist, prod ? true : void 0)
-		});
-		break;
-	}
-	case "build-lib": {
-		const { watch, mode } = argv;
-		buildLib({
-			watchMode: getBoolArg(watch, false),
-			mode: getStringArg(mode, "")
-		});
-		break;
-	}
-	case "start": {
-		const { port, withMock, proxy } = argv;
-		start({
-			port,
-			withMock: getBoolArg(withMock),
-			proxy
-		});
-		break;
-	}
-	case "preview": {
-		const { proxy } = argv;
-		preview$1({ proxy });
-		break;
-	}
-	case "zip-dist": {
-		const { target, source } = argv;
-		zipDist({
-			target,
-			source
-		});
-		break;
-	}
-	default:
-		console.log("Unknown command \"" + command + "\".");
-		console.log("Perhaps you need to update xmlui?");
-		process.exit(1);
-}
+}, (argv) => {
+	const { target, source } = argv;
+	zipDist({
+		target,
+		source
+	});
+}).strict().demandCommand(1, "You need to provide a command").help().parse();
 
 //#endregion
 export {  };