@spicemod/creator 0.0.31 → 0.0.33

package/dist/bin.mjs

@@ -145,7 +145,7 @@ const injectCSSFilePath = dist("templates/injectCSS.js", import.meta.url);
 //#endregion
 //#region package.json
 var name = "@spicemod/creator";
-var version = "0.0.31";
+var version = "0.0.33";
 
 //#endregion
 //#region src/utils/common.ts
@@ -343,7 +343,7 @@ const CUSTOM_APP_NAME_LOCALES = [
 //#region src/config/schema.ts
 const ServerConfigSchema = v.object({
 	port: v.optional(v.number()),
-	serveDir: v.string(),
+	serveDir: v.optional(v.string()),
 	hmrPath: v.optional(v.string())
 });
 const EntryFileSchema = v.string();
@@ -594,11 +594,22 @@ async function loadConfig(cb) {
 		defaults: CONFIG_DEFAULTS,
 		configFileRequired: true,
 		packageJson: true,
-		async onUpdate({ newConfig }) {
+		async onUpdate({ oldConfig, newConfig }) {
 			try {
-				await runCb(await getResolvedConfig(newConfig.config, { exitOnError: false }), true);
-			} catch {
+				logger$1.debug("Config update triggered", {
+					oldConfig,
+					newConfig
+				});
+				const resolved = await getResolvedConfig(newConfig.config, { exitOnError: false });
+				logger$1.debug("Resolved config", { resolved });
+				try {
+					await runCb(resolved, true);
+				} catch (error) {
+					logger$1.error(error);
+				}
+			} catch (err) {
 				logger$1.error(pc.red("Config validation failed, keeping previous configuration"));
+				if (err instanceof Error) logger$1.error(pc.dim(" └─ ") + err.message);
 			}
 		}
 	});
@@ -1047,7 +1058,6 @@ function wrapWithLoader({ config, cache, outFiles, server, dev = false, logger =
 					const outdir = resolve(build$3.initialOptions.outdir || "./dist");
 					const bundledCss = getBundledCss(res.outputFiles, outdir, type, dev);
 					const minify = build$3.initialOptions.minify;
-					const slug = varSlugify(`${name}_${version}`);
 					const currentFilePaths = /* @__PURE__ */ new Set();
 					for (const file of res.outputFiles) {
 						const isJs = file.path.endsWith(".js");
@@ -1146,7 +1156,6 @@ function wrapWithLoader({ config, cache, outFiles, server, dev = false, logger =
 							define: {
 								__ESBUILD__HAS_CSS: JSON.stringify(type !== "theme" && bundledCss.length !== 0),
 								__ESBUILD__INJECTED_CSS: JSON.stringify(bundledCss),
-								__ESBUILD__APP_SLUG: JSON.stringify(slug),
 								__ESBUILD__APP_TYPE: JSON.stringify(type),
 								__ESBUILD__APP_ID: JSON.stringify(varSlugify(name)),
 								__ESBUILD__APP_VERSION: JSON.stringify(version)
@@ -2095,14 +2104,16 @@ async function createHmrServer(config, logger = createLogger("hmrServer")) {
 			});
 		}),
 		stop: async () => new Promise((resolve, reject) => {
-			if (!isRunning) return resolve();
-			for (const client of clients) client.terminate();
-			clients.clear();
-			wss.close();
-			if ("closeAllConnections" in httpServer) httpServer.closeAllConnections();
+			if (!isRunning || !httpServer.listening) {
+				isRunning = false;
+				return resolve();
+			}
 			httpServer.close((err) => {
-				if (err) return reject(err);
 				isRunning = false;
+				if (err) {
+					if (err.code === "ERR_SERVER_NOT_RUNNING") return resolve();
+					return reject(err);
+				}
 				logger.debug(`${pc.yellow("! ")} ${pc.gray("HTTP server stopped")}`);
 				resolve();
 			});
@@ -2263,6 +2274,8 @@ async function dev$1(options) {
 		if (isNewUpdate) {
 			logger$2.clear();
 			logger$2.info(pc.green("Config updated, reloading..."));
+			await server?.stop();
+			server = void 0;
 		}
 		try {
 			server = await createHmrServer({
@@ -2314,8 +2327,7 @@ function getJSDevOptions(config, options) {
 			minify,
 			buildOptions: {
 				copy: true,
-				apply: false,
-				applyOnce: false,
+				apply: true,
 				remove: config.template !== "custom-app",
 				outDir
 			},

package/dist/index.d.mts

@@ -15,12 +15,12 @@ declare const FileOptionsSchema: v.IntersectSchema<[Omit<v.ObjectSchema<{
   readonly esbuildOptions: v.GenericSchema<ESBuildOptions>;
   readonly serverConfig: Omit<v.ObjectSchema<{
     readonly port: v.OptionalSchema<v.NumberSchema<undefined>, undefined>;
-    readonly serveDir: v.StringSchema<undefined>;
+    readonly serveDir: v.OptionalSchema<v.StringSchema<undefined>, undefined>;
     readonly hmrPath: v.OptionalSchema<v.StringSchema<undefined>, undefined>;
   }, undefined>, "~types" | "~run" | "~standard" | "entries"> & {
     readonly entries: {
       readonly port: v.OptionalSchema<v.OptionalSchema<v.NumberSchema<undefined>, undefined>, undefined>;
-      readonly serveDir: v.OptionalSchema<v.StringSchema<undefined>, undefined>;
+      readonly serveDir: v.OptionalSchema<v.OptionalSchema<v.StringSchema<undefined>, undefined>, undefined>;
       readonly hmrPath: v.OptionalSchema<v.OptionalSchema<v.StringSchema<undefined>, undefined>, undefined>;
     };
     readonly "~standard": v.StandardProps<{
@@ -61,12 +61,12 @@ declare const FileOptionsSchema: v.IntersectSchema<[Omit<v.ObjectSchema<{
     readonly esbuildOptions: v.OptionalSchema<v.GenericSchema<ESBuildOptions>, undefined>;
     readonly serverConfig: v.OptionalSchema<Omit<v.ObjectSchema<{
       readonly port: v.OptionalSchema<v.NumberSchema<undefined>, undefined>;
-      readonly serveDir: v.StringSchema<undefined>;
+      readonly serveDir: v.OptionalSchema<v.StringSchema<undefined>, undefined>;
       readonly hmrPath: v.OptionalSchema<v.StringSchema<undefined>, undefined>;
     }, undefined>, "~types" | "~run" | "~standard" | "entries"> & {
       readonly entries: {
         readonly port: v.OptionalSchema<v.OptionalSchema<v.NumberSchema<undefined>, undefined>, undefined>;
-        readonly serveDir: v.OptionalSchema<v.StringSchema<undefined>, undefined>;
+        readonly serveDir: v.OptionalSchema<v.OptionalSchema<v.StringSchema<undefined>, undefined>, undefined>;
         readonly hmrPath: v.OptionalSchema<v.OptionalSchema<v.StringSchema<undefined>, undefined>, undefined>;
       };
       readonly "~standard": v.StandardProps<{

package/dist/templates/wrapper.js

@@ -6,16 +6,9 @@ __ESBUILD__HAS_CSS &&
       style.setAttribute("data-app", __ESBUILD__APP_ID);
       style.textContent = css;
       document.head.appendChild(style);
-    } catch {}
+    } catch { }
   })();
 (async () => {
-  const _ID = `${__ESBUILD__APP_SLUG}-${__ESBUILD__APP_TYPE}`;
-  if (!window.SpiceGlobals) window.SpiceGlobals = {};
-  window.SpiceGlobals[_ID] = {
-    id: __ESBUILD__APP_ID,
-    version: __ESBUILD__APP_VERSION,
-  };
-  const { id: appId, version: v } = window.SpiceGlobals[_ID];
   const _wait = (p, a = 0) =>
     new Promise((res, rej) => {
       const i = setInterval(() => {
@@ -29,7 +22,7 @@ __ESBUILD__HAS_CSS &&
     if (S.Events?.webpackLoaded?.on) await new Promise((r) => S.Events.webpackLoaded.on(r));
     await _wait(() => S?.React && S?.ReactJSX && S?.ReactDOM && S?.Platform && S?.Player);
     // oxfmt-ignore
-    console.info(`%c[${appId}] %cv${v} %cinitialized`, "color: #1DB954; font-weight: bold", "color: #888", "color: unset");
+    console.info(`%c[${__ESBUILD__APP_ID}:${__ESBUILD__APP_TYPE}] %cv${__ESBUILD__APP_VERSION} %cinitialized`, "color: #1DB954; font-weight: bold", "color: #888", "color: unset");
     // oxfmt-ignore
     "{{INJECT_START_COMMENT}}"
       (async function () {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spicemod/creator",
-  "version": "0.0.31",
+  "version": "0.0.33",
   "description": "Easily make Spicetify extensions and themes",
   "keywords": [
     "cli",
@@ -58,6 +58,7 @@
     "esbuild-plugin-sass": "^1.0.1",
     "esbuild-sass-plugin": "^3.6.0",
     "ini": "^6.0.0",
+    "lodash-es": "^4.17.23",
     "nanostores": "^1.1.0",
     "picocolors": "^1.1.1",
     "postcss": "^8.5.6",
@@ -70,6 +71,7 @@
   },
   "devDependencies": {
     "@types/ini": "^4.1.1",
+    "@types/lodash-es": "^4.17.12",
     "@types/node": "^25.2.0",
     "@types/postcss-import": "^14.0.3",
     "@types/ws": "^8.18.1",

package/templates/wrapper.js

@@ -6,16 +6,9 @@ __ESBUILD__HAS_CSS &&
       style.setAttribute("data-app", __ESBUILD__APP_ID);
       style.textContent = css;
       document.head.appendChild(style);
-    } catch {}
+    } catch { }
   })();
 (async () => {
-  const _ID = `${__ESBUILD__APP_SLUG}-${__ESBUILD__APP_TYPE}`;
-  if (!window.SpiceGlobals) window.SpiceGlobals = {};
-  window.SpiceGlobals[_ID] = {
-    id: __ESBUILD__APP_ID,
-    version: __ESBUILD__APP_VERSION,
-  };
-  const { id: appId, version: v } = window.SpiceGlobals[_ID];
   const _wait = (p, a = 0) =>
     new Promise((res, rej) => {
       const i = setInterval(() => {
@@ -29,7 +22,7 @@ __ESBUILD__HAS_CSS &&
     if (S.Events?.webpackLoaded?.on) await new Promise((r) => S.Events.webpackLoaded.on(r));
     await _wait(() => S?.React && S?.ReactJSX && S?.ReactDOM && S?.Platform && S?.Player);
     // oxfmt-ignore
-    console.info(`%c[${appId}] %cv${v} %cinitialized`, "color: #1DB954; font-weight: bold", "color: #888", "color: unset");
+    console.info(`%c[${__ESBUILD__APP_ID}:${__ESBUILD__APP_TYPE}] %cv${__ESBUILD__APP_VERSION} %cinitialized`, "color: #1DB954; font-weight: bold", "color: #888", "color: unset");
     // oxfmt-ignore
     "{{INJECT_START_COMMENT}}"
       (async function () {