Run svelte-kit sync #1063

Author: joepio

browser/cli/src/generateIndex.ts

@@ -33,6 +33,10 @@ export const generateIndex = (
   const names = ontologies.map(x => {
     const res = store.getResourceLoading(x);
 
+    if (res.error) {
+      throw new Error('error getting ontology');
+    }
+
     return camelCaseify(res.title);
   });
 
@@ -43,10 +47,8 @@ export const generateIndex = (
   const importLines = names.map(createImportLine).join('\n');
   const registerArgs = names.join(', ');
 
-  const content = TEMPLATE.replaceAll(
-    Inserts.MODULE_ALIAS,
-    atomicConfig.moduleAlias ?? '@tomic/lib',
-  )
+  const moduleAlias = atomicConfig.moduleAlias ?? '@tomic/lib';
+  const content = TEMPLATE.replaceAll(Inserts.MODULE_ALIAS, moduleAlias)
     .replace(Inserts.IMPORTS, importLines)
     .replace(Inserts.REGISTER_ARGS, registerArgs);
 

browser/cli/src/utils.ts

@@ -9,7 +9,14 @@ export const dedupe = <T>(array: T[]): T[] => {
   return Array.from(new Set(array));
 };
 
-export const getExtension = () =>
-  getTsconfig()?.config.compilerOptions?.moduleResolution === 'Bundler'
-    ? ''
-    : '.js';
+export const getExtension = () => {
+  try {
+    return getTsconfig()?.config.compilerOptions?.moduleResolution === 'Bundler'
+      ? ''
+      : '.js';
+  } catch (e) {
+    console.warn('Something went wrong getting TS Config / file extension', e);
+
+    return '.js';
+  }
+};

browser/create-template/src/postprocess.ts

@@ -35,7 +35,7 @@ export async function postProcess(context: PostProcessContext) {
       switch (ontology.error.type) {
         case ErrorType.NotFound:
           console.error(
-            `\nThe ${baseTemplate.name} template does not exist on your drive. To get the template go to the Create Resource page and select the ${baseTemplate.name} template`,
+            `\nThe '${baseTemplate.name}' template does not exist on your drive on '${ontologySubject}'. To get the template go to the Create Resource page and select the ${baseTemplate.name} template.`,
           );
           break;
         case ErrorType.Unauthorized:

browser/e2e/tests/template.spec.ts

@@ -13,28 +13,46 @@ import fs from 'node:fs';
 import { spawn, type ChildProcess } from 'node:child_process';
 import path from 'node:path';
 import kill from 'kill-port';
-import { promisify } from 'util';
 import { log } from 'node:console';
 
-const execAsync = promisify(exec);
+const execAsync = async (
+  command: Parameters<typeof exec>[0],
+  options?: Parameters<typeof exec>[1],
+) => {
+  return new Promise((resolve, reject) => {
+    exec(command, options, (err, stdout, stderr) => {
+      console.log(stdout, stderr);
+
+      if (err) {
+        reject(new Error(err.message));
+      }
+
+      if (stderr) {
+        reject(new Error(stderr.toString()));
+      }
+
+      resolve(stdout.toString());
+    });
+  });
+};
+
 const TEMPLATE_DIR_NAME = 'template-tests';
 // test.describe.configure({ mode: 'serial' });
 
 async function setupTemplateSite(
-  templateDir: string,
   serverUrl: string,
-  siteType: string,
+  siteType: 'nextjs-site' | 'sveltekit-site',
 ) {
-  if (!fs.existsSync(templateDir)) {
-    fs.mkdirSync(templateDir);
+  if (!fs.existsSync(TEMPLATE_DIR_NAME)) {
+    fs.mkdirSync(TEMPLATE_DIR_NAME);
   }
 
   await execAsync('pnpm link ../create-template');
   await execAsync(
-    `pnpm exec create-template ${templateDir}/${siteType} --template ${siteType} --server-url ${serverUrl}`,
+    `pnpm exec create-template ${TEMPLATE_DIR_NAME}/${siteType} --template ${siteType} --server-url ${serverUrl}`,
   );
 
-  const sitePath = `${templateDir}/${siteType}`;
+  const sitePath = `${TEMPLATE_DIR_NAME}/${siteType}`;
   await execAsync('pnpm install', { cwd: sitePath });
   await execAsync('pnpm link ../../../cli', { cwd: sitePath });
   await execAsync('pnpm link ../../../lib', { cwd: sitePath });
@@ -43,6 +61,7 @@ async function setupTemplateSite(
     await execAsync('pnpm link ../../../react', { cwd: sitePath });
   } else if (siteType === 'sveltekit-site') {
     await execAsync('pnpm link ../../../svelte', { cwd: sitePath });
+    await execAsync('pnpm svelte-kit sync', { cwd: sitePath });
   }
 
   await execAsync('pnpm update-ontologies', { cwd: sitePath });
@@ -123,7 +142,7 @@ test.describe('Create Next.js Template', () => {
     });
     await applyTemplateButton.click();
 
-    await setupTemplateSite(TEMPLATE_DIR_NAME, drive.driveURL, 'nextjs-site');
+    await setupTemplateSite(drive.driveURL, 'nextjs-site');
 
     try {
       //start server
@@ -202,11 +221,7 @@ test.describe('Create SvelteKit Template', () => {
     });
     await applyTemplateButton.click();
 
-    await setupTemplateSite(
-      TEMPLATE_DIR_NAME,
-      drive.driveURL,
-      'sveltekit-site',
-    );
+    await setupTemplateSite(drive.driveURL, 'sveltekit-site');
 
     try {
       const child = startServer(TEMPLATE_DIR_NAME, 'sveltekit-site');