@spicemod/creator 0.0.27 → 0.0.29

package/dist/bin.mjs

@@ -144,7 +144,7 @@ const customAppEntryFilePath = dist("templates/customAppEntry.js", import.meta.u
 //#endregion
 //#region package.json
 var name = "@spicemod/creator";
-var version = "0.0.27";
+var version = "0.0.29";
 
 //#endregion
 //#region src/utils/common.ts
@@ -409,7 +409,7 @@ const OptionsSchema$1 = v.intersect([
 //#region src/env.ts
 const isDev = process.env.IS_DEV === "true";
 const spicetifyBin = process.env.SPICETIFY_BIN || process.env.SPICE_BIN || "spicetify";
-const skipSpicetify = process.env.SPICETIFY_SKIP === "true" || process.env.CI === "true";
+const skipSpicetify = process.env.SPICETIFY_SKIP === "true" || !!process.env.CI;
 const env = {
 	isDev,
 	spicetifyBin,
@@ -509,6 +509,7 @@ const SpicetifyConfigSchema = v.object({
 //#endregion
 //#region src/utils/spicetify/index.ts
 function runSpice(args) {
+	if (env.skipSpicetify) throw new Error("Spicetify operations are disabled in CI");
 	validateSpicetify(env.spicetifyBin);
 	return spawnSync(env.spicetifyBin, args, { encoding: "utf-8" });
 }
@@ -516,6 +517,7 @@ const getCustomAppsDir = () => join(getSpiceDataPath(), "CustomApps");
 const getExtensionDir = () => join(getSpiceDataPath(), "Extensions");
 const getThemesDir = () => join(getSpiceDataPath(), "Themes");
 async function getSpicetifyConfig() {
+	if (env.skipSpicetify) throw new Error("Spicetify operations are disabled in CI");
 	const { stdout, stderr, error } = runSpice(["path", "-c"]);
 	if (error || stderr) throw new Error(`Failed to locate Spicetify config: ${stderr || error?.message}`);
 	const rawConfig = parse(await readFile(stdout.trim(), "utf-8"));
@@ -524,11 +526,13 @@ async function getSpicetifyConfig() {
 	else throw new Error("Spicetify Config Validation Failed:", v.flatten(result.issues).nested);
 }
 function getSpiceDataPath() {
+	if (env.skipSpicetify) throw new Error("Spicetify operations are disabled in CI");
 	const { stdout, stderr, error } = runSpice(["path", "userdata"]);
 	if (error || stderr) throw new Error(`Failed to locate Spicetify config: ${stderr || error?.message}`);
 	return stdout.trim();
 }
 function validateSpicetify(bin) {
+	if (env.skipSpicetify) return;
 	const result = spawnSync(bin, ["--version"], { encoding: "utf-8" });
 	if (result.error) throw result.error;
 	if (result.status !== 0) throw new Error(`Invalid spicetify binary "${bin}": ${result.stderr || "unknown error"}`);
@@ -922,50 +926,38 @@ const spicetifyHandler = ({ config, options, cache, logger = createLogger("plugi
 		const identifier = isExtension ? `${urlSlugify(config.name)}.js` : urlSlugify(getEnName(config.name));
 		const getDestDirs = () => {
 			const dirs = [resolve(outDir)];
-			if (copy) dirs.push(isExtension ? getExtensionDir() : isCustomApp ? resolve(getCustomAppsDir(), identifier) : resolve(getThemesDir(), identifier));
+			if (copy && !env.skipSpicetify) dirs.push(isExtension ? getExtensionDir() : isCustomApp ? resolve(getCustomAppsDir(), identifier) : resolve(getThemesDir(), identifier));
 			return dirs;
 		};
-		if (env.skipSpicetify) {
-			logger.info(pc.yellow("skipping spicetify operations"));
-			build.onEnd(async (result) => {
-				if (result.errors.length > 0) return;
-				const destDirs = getDestDirs();
-				await copyFiles(logger, destDirs, cache.files);
-				logger.debug(pc.green(`${CHECK} Built files written to ${outDir}`));
-				if (cache.removed.size > 0) {
-					await removeDeletedFiles(logger, destDirs, cache.removed);
-					cache.hasChanges = true;
+		if (env.skipSpicetify) logger.info(pc.yellow("Skipping Spicetify operations..."));
+		else {
+			const spiceConfig = await getSpicetifyConfig();
+			logger.debug(pc.green("Spicetify Config: "), spiceConfig);
+			if (apply) {
+				const defaultTheme = spiceConfig?.Setting?.current_theme || "SpicetifyDefault";
+				const spiceIdentifier = remove ? `${identifier}-` : identifier;
+				runSpice([
+					"config",
+					isExtension ? "extensions" : isCustomApp ? "custom_apps" : "current_theme",
+					spiceIdentifier
+				]);
+				if (!isExtension && !remove) {
+					const cleanup = () => {
+						if (isCustomApp) runSpice([
+							"config",
+							"custom_apps",
+							`${identifier}-`
+						]);
+						else runSpice([
+							"config",
+							"current_theme",
+							defaultTheme
+						]);
+						process.exit();
+					};
+					process.once("SIGINT", cleanup);
+					process.once("SIGTERM", cleanup);
 				}
-				cache.removed.clear();
-			});
-			return;
-		}
-		const spiceConfig = await getSpicetifyConfig();
-		logger.debug(pc.green("Spicetify Config: "), spiceConfig);
-		if (apply) {
-			const defaultTheme = spiceConfig?.Setting?.current_theme || "SpicetifyDefault";
-			const spiceIdentifier = remove ? `${identifier}-` : identifier;
-			runSpice([
-				"config",
-				isExtension ? "extensions" : isCustomApp ? "custom_apps" : "current_theme",
-				spiceIdentifier
-			]);
-			if (!isExtension && !remove) {
-				const cleanup = () => {
-					if (isCustomApp) runSpice([
-						"config",
-						"custom_apps",
-						`${identifier}-`
-					]);
-					else runSpice([
-						"config",
-						"current_theme",
-						defaultTheme
-					]);
-					process.exit();
-				};
-				process.once("SIGINT", cleanup);
-				process.once("SIGTERM", cleanup);
 			}
 		}
 		build.onEnd(async (result) => {
@@ -973,7 +965,7 @@ const spicetifyHandler = ({ config, options, cache, logger = createLogger("plugi
 			const destDirs = getDestDirs();
 			try {
 				await copyFiles(logger, destDirs, cache.files);
-				logger.debug(pc.green(`${CHECK} Changed files copied.`));
+				logger.debug(pc.green(`${CHECK} Built files written to ${outDir}`));
 			} catch (err) {
 				logger.error(pc.red(`${CROSS} Failed to copy files: ${err instanceof Error ? err.message : String(err)}`));
 				return;
@@ -983,6 +975,7 @@ const spicetifyHandler = ({ config, options, cache, logger = createLogger("plugi
 				cache.hasChanges = true;
 			}
 			cache.removed.clear();
+			if (env.skipSpicetify) return;
 			if (apply && cache.hasChanges && (!applyOnce || !hasAppliedOnce)) {
 				const { stdout, stderr, status } = runSpice(["apply"]);
 				if (status !== 0) logger.error(pc.red(`${CROSS} Spicetify apply failed:`), stdout, stderr);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spicemod/creator",
-  "version": "0.0.27",
+  "version": "0.0.29",
   "description": "Easily make Spicetify extensions and themes",
   "keywords": [
     "cli",