Attempt to fix builds in CI

MaddyGuthridge · Aug 30, 2024 · 2b6be8a · 2b6be8a
1 parent c6f9e6d
commit 2b6be8a
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/package.json b/package.json
@@ -5,7 +5,7 @@
 	"license": "GPL-3.0-only",
 	"scripts": {
 		"dev": "vite dev",
-		"build": "vite build",
+		"build": "svelte-kit sync && vite build",
 		"preview": "vite preview",
 		"test": "vitest",
 		"check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",

diff --git a/src/lib/server/data/config.ts b/src/lib/server/data/config.ts
@@ -4,7 +4,7 @@ import { getDataDir } from './dataDir';
 import { version } from '$app/environment';
 
 /** Path to config.json */
-const CONFIG_JSON = `${getDataDir()}/config.json`;
+const CONFIG_JSON = () => `${getDataDir()}/config.json`;
 
 /** Validator for config.json file */
 export const ConfigJsonStruct = object({
@@ -34,15 +34,15 @@ export type ConfigJson = Infer<typeof ConfigJsonStruct>;
  * This does not validate any of the data.
  */
 export async function getConfigVersion(): Promise<string> {
-  const data = JSON.parse(await readFile(CONFIG_JSON, { encoding: 'utf-8' }));
+  const data = JSON.parse(await readFile(CONFIG_JSON(), { encoding: 'utf-8' }));
 
   // Note: v0.1.0 did not have a version number in the file
   return data.version ?? '0.1.0';
 }
 
 /** Return the configuration, stored in `/data/config.json` */
 export async function getConfig(): Promise<ConfigJson> {
-  const data = await readFile(CONFIG_JSON, { encoding: 'utf-8' });
+  const data = await readFile(CONFIG_JSON(), { encoding: 'utf-8' });
 
   // Validate data
   const [err, parsed] = validate(JSON.parse(data), ConfigJsonStruct);
@@ -57,7 +57,7 @@ export async function getConfig(): Promise<ConfigJson> {
 
 /** Update the configuration, stored in `/data/config.json` */
 export async function setConfig(newConfig: ConfigJson) {
-  await writeFile(CONFIG_JSON, JSON.stringify(newConfig, undefined, 2));
+  await writeFile(CONFIG_JSON(), JSON.stringify(newConfig, undefined, 2));
 }
 
 /** Set up the default server configuration */

diff --git a/src/lib/server/data/group.ts b/src/lib/server/data/group.ts
@@ -3,7 +3,7 @@
  */
 
 import { mkdir, readdir, readFile, writeFile } from 'fs/promises';
-import { array, enums, intersection, nullable, object, string, type, validate, type Infer } from 'superstruct';
+import { array, nullable, string, type, validate, type Infer } from 'superstruct';
 import { getDataDir } from './dataDir';
 import { rimraf } from 'rimraf';
 import formatTemplate from '../formatTemplate';

diff --git a/src/lib/server/data/item.ts b/src/lib/server/data/item.ts
@@ -3,7 +3,7 @@
  */
 
 import { mkdir, readdir, readFile, writeFile } from 'fs/promises';
-import { array, intersection, object, optional, nullable, string, tuple, type, validate, type Infer, enums } from 'superstruct';
+import { array, intersection, object, nullable, string, tuple, type, validate, type Infer, enums } from 'superstruct';
 import { getDataDir } from './dataDir';
 import { rimraf } from 'rimraf';
 import { RepoInfoStruct } from './itemRepo';

diff --git a/src/lib/server/data/localConfig.ts b/src/lib/server/data/localConfig.ts
@@ -3,7 +3,7 @@ import { nullable, number, object, record, string, validate, type Infer } from '
 import { getDataDir } from './dataDir';
 
 /** Path to config.local.json */
-const CONFIG_LOCAL_JSON = `${getDataDir()}/config.local.json`;
+const CONFIG_LOCAL_JSON = () => `${getDataDir()}/config.local.json`;
 
 /**
  * Validator for config.local.json file
@@ -63,7 +63,7 @@ export async function getLocalConfig(): Promise<ConfigLocalJson> {
   if (localConfigCache) {
     return localConfigCache;
   }
-  const data = await readFile(CONFIG_LOCAL_JSON, { encoding: 'utf-8' });
+  const data = await readFile(CONFIG_LOCAL_JSON(), { encoding: 'utf-8' });
 
   // Validate data
   const [err, parsed] = validate(JSON.parse(data), ConfigLocalJsonStruct);
@@ -81,7 +81,7 @@ export async function getLocalConfig(): Promise<ConfigLocalJson> {
 /** Update the local configuration, stored in `/data/config.local.json` */
 export async function setLocalConfig(newConfig: ConfigLocalJson) {
   localConfigCache = newConfig;
-  await writeFile(CONFIG_LOCAL_JSON, JSON.stringify(newConfig, undefined, 2));
+  await writeFile(CONFIG_LOCAL_JSON(), JSON.stringify(newConfig, undefined, 2));
 }
 
 /**

diff --git a/src/lib/server/data/readme.ts b/src/lib/server/data/readme.ts
@@ -12,16 +12,16 @@ want to [learn Markdown](https://www.markdownguide.org/basic-syntax/).
 `.trimStart();
 
 /** Path to README.md */
-const README_MD = `${getDataDir()}/README.md`;
+const README_MD = () => `${getDataDir()}/README.md`;
 
 /** Return the readme file */
 export async function getReadme(): Promise<string> {
-  return readFile(README_MD, { encoding: 'utf-8' });
+  return readFile(README_MD(), { encoding: 'utf-8' });
 }
 
 /** Update the readme file */
 export async function setReadme(newReadme: string) {
-  await writeFile(README_MD, newReadme);
+  await writeFile(README_MD(), newReadme);
 }
 
 /** Set up the default server README */