cayo 0.9.1 → 0.9.5

package/cayo.js

@@ -135,8 +135,8 @@ async function getTemplate(config) {
 }
 
 async function getPages(config) {
-  const { pages, cayoPath } = config;
-  return createPageManifest(pages, cayoPath)
+  const { src, pages, cayoPath } = config;
+  return createPageManifest(pages, cayoPath, src)
     .then(async () => await import(path.resolve(cayoPath, `./__cayo/pages.js?v=${hash()}`)))
     .then(({ pages }) => {
       data.pages = getPageModules(pages, config);
@@ -201,6 +201,13 @@ function watch(config) {
             let componentModule = Object.entries(components).find(([, { modulePath }]) => modulePath === filePath);
             handleCayoComponent(componentModule[0], componentModule[1].modulePath, config);
           })
+      } else if (filePath.includes('/components')) {
+        logChange('component');
+        getPages(config)
+          .then(() => {
+            prerenderPages(config);
+          })
+  
       // TODO: watch component changes
       // } else if (componentFileChanged) {
       // find out which pages are affected

package/lib/components/Cayo.svelte

@@ -19,6 +19,6 @@
   const json = JSON.stringify($$restProps);
 </script>
 
-<div data-cayo-id={name ? `${name}-${hash()}` : ''} data-cayo-props={json}>Cayo loading...<slot/></div>
+<div data-cayo-id={name ? `${name}-${hash()}` : ''} data-cayo-props={json}><slot/></div>
 <slot/>
 

package/lib/utils.js

@@ -59,8 +59,9 @@ export async function getComponentModulePaths(srcPath) {
   return await fg([path.resolve(srcPath, './components/**/*.cayo.svelte')]);
 }
 
-export async function createPageManifest(pagesPath, outDir) {
+export async function createPageManifest(pagesPath, outDir, srcPath) {
   const pagePaths = await getPageModulePaths(pagesPath);
+  const nonCayoComponentPaths = await fg([path.resolve(srcPath, './components/**/*!([.cayo]).svelte')]);
   let importPages = `import { createRequire } from 'module';\n`
   importPages += `const require = createRequire(import.meta.url);\n`
   importPages += `require('svelte/register');\n`;
@@ -73,6 +74,11 @@ export async function createPageManifest(pagesPath, outDir) {
     importPages += `  '${path}': page_${i},\n`;
   })
   importPages += '}\n';
+
+  nonCayoComponentPaths.forEach((path) => {
+    importPages += `delete require.cache['${path}'];\n`;
+  });
+  
   return await fs.outputFile(path.resolve(outDir, './__cayo/pages.js'), importPages);
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cayo",
-  "version": "0.9.1",
+  "version": "0.9.5",
   "type": "module",
   "scripts": {
     "start": "node cayo dev --projectRoot test"

package/test/src/components/Cool.cayo.svelte

@@ -1,4 +1,5 @@
 <script>
   export let beans = '';
 </script>
-<div>{beans}</div>
+<div>{beans}</div>
+<p>I prob change don't i</p>

package/test/src/components/Some.svelte

@@ -1 +1 @@
-a
+HUH?

package/test/src/pages/index.svelte

@@ -5,15 +5,18 @@
 </script>
 <script>
   import Cayo from '../../../lib/components/Cayo.svelte';
+
+  import Some from '../components/Some.svelte';
 </script>
 
+<Some />
 
 I'm index howdy ok<br>
 <a href="/howdy/">Howdy</a><br>
 <a href="/hey/" class="red">Hey</a>
 <a href="/some/page/" class="red">Some</a>
 
-<Cayo name="Cool" beans='ayo'></Cayo>
+<Cayo name="Cool" beans='ayo'>Whaaat</Cayo>
 <Cayo name="Cool" beans='beeeeaaaaasnnss' />
 <Cayo name="Cool" beans='NOT BEANS' />