Run svelte-kit sync #1063

Author: joepio

browser/cli/src/generateIndex.ts

@@ -44,10 +44,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

@@ -11,14 +11,11 @@ export const dedupe = <T>(array: T[]): T[] => {
 
 export const getExtension = () => {
   try {
-    const tsconfig = getTsconfig();
-    if (!tsconfig) return '.js';
-    const moduleResolution = tsconfig.config.compilerOptions?.moduleResolution;
-    if (!moduleResolution) return '.js';
-
-    return moduleResolution === 'Bundler' ? '' : '.js';
-  } catch (error) {
-    console.error('Error getting extension:', error);
+    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

@@ -40,20 +40,19 @@ 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 });
@@ -62,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 });
@@ -142,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
@@ -221,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');