cayo 1.2.1 → 1.3.0

package/dist/cayo.svelte.js

@@ -1,4 +1,4 @@
-import { create_ssr_component, compute_rest_props, add_attribute } from 'svelte/internal';
+import { create_ssr_component, compute_rest_props, spread, escape_object, escape_attribute_value } from 'svelte/internal';
 
 function getWarnings(src, badProps) {
   const warnings = {};
@@ -38,11 +38,12 @@ function checkBadProps(warnings, src, keys) {
   }
 }
 
-/* src/cayo.svelte generated by Svelte v3.49.0 */
+/* src/cayo.svelte generated by Svelte v3.59.2 */
 
 const Cayo = create_ssr_component(($$result, $$props, $$bindings, slots) => {
-	let $$restProps = compute_rest_props($$props, ["src"]);
+	let $$restProps = compute_rest_props($$props, ["src","attributes"]);
 	let { src } = $$props;
+	let { attributes } = $$props;
 
 	// Save unserializable prop keys (during stringification)
 	// so we can report them later
@@ -74,8 +75,23 @@ const Cayo = create_ssr_component(($$result, $$props, $$bindings, slots) => {
 	}
 
 	if ($$props.src === void 0 && $$bindings.src && src !== void 0) $$bindings.src(src);
-
-	return `<div${add_attribute("data-cayo-id", cayoInstanceData['data-cayo-id'], 0)}${add_attribute("data-cayo-src", cayoInstanceData['data-cayo-src'], 0)}${add_attribute("data-cayo-warn", cayoInstanceData['data-cayo-warn'], 0)}>
+	if ($$props.attributes === void 0 && $$bindings.attributes && attributes !== void 0) $$bindings.attributes(attributes);
+
+	return `<div${spread(
+		[
+			escape_object(attributes),
+			{
+				"data-cayo-id": escape_attribute_value(cayoInstanceData['data-cayo-id'])
+			},
+			{
+				"data-cayo-src": escape_attribute_value(cayoInstanceData['data-cayo-src'])
+			},
+			{
+				"data-cayo-warn": escape_attribute_value(cayoInstanceData['data-cayo-warn'])
+			}
+		],
+		{}
+	)}>
   ${`<script data-cayo-props type="application/json">${props}</script>`}
   ${slots.default ? slots.default({}) : ``}
 </div>`;

package/dist/entry.svelte.js

@@ -1,6 +1,6 @@
 import { create_ssr_component, add_attribute } from 'svelte/internal';
 
-/* src/entry.svelte generated by Svelte v3.49.0 */
+/* src/entry.svelte generated by Svelte v3.59.2 */
 
 const Entry = create_ssr_component(($$result, $$props, $$bindings, slots) => {
 	let { src } = $$props;

package/lib/core/bundle.js

@@ -1,6 +1,7 @@
 import fs, { pathExists } from 'fs-extra';
 import { rollup } from 'rollup';
 import svelte from 'rollup-plugin-svelte';
+import resolve from '@rollup/plugin-node-resolve';
 import css from 'rollup-plugin-import-css';
 import json from '@rollup/plugin-json';
 
@@ -36,9 +37,14 @@ export async function getDeps(input, config) {
           ...preprocessors,
         ],
       }), 
+      resolve({
+        browser: true,
+        exportConditions: ['svelte'],
+        extensions: ['.svelte']
+      }),
       ...defaultRollupPlugins(),
       ...userRollupPlugins(config),
-    ]
+    ],
   }
   try {
     // Create a bundle

package/lib/core/codegen.js

@@ -7,7 +7,6 @@ export function generateGetProps() {
 `
 function getProps(cayoElement) {
   const json = cayoElement.querySelector('[data-cayo-props]').innerHTML;
-  console.log('json', json);
   return JSON.parse(json);
 }
 `
@@ -75,12 +74,19 @@ export function generateComponentInstance(cayoId, componentName) {
   return (
 ` 
   cayos['${cayoId}'] = {};
+  cayos['${cayoId}'].id = '${cayoId}';
   cayos['${cayoId}'].target = document.querySelector('[data-cayo-id="${cayoId}"]');
   cayos['${cayoId}'].instance = new ${componentName}({
     target: target(cayos['${cayoId}'].target),
     hydrate: true,
     props: getProps(cayos['${cayoId}'].target),
   });
+  cayos['${cayoId}'].event = new CustomEvent('cayo:init', {
+    detail: {
+      cayo: cayos['${cayoId}'],
+    },
+  });
+  document.dispatchEvent(cayos['${cayoId}'].event);
 `
   );
 }

package/lib/core/render/prerender.js

@@ -248,12 +248,12 @@ export async function processPage(content, page, _cayo, logger) {
 }
 
 function tagsExist(source) {
-  const doctype = source.match(/<!DOCTYPE[\s\S]*>/);
+  const doctype = source.match(/(?<doctype><!DOCTYPE[\s\S]*?>)/);
   const head = source.match(/<head[\s\S]*>(?<innerHTML>[\s\S]*)<\/head>/);
   const body = source.match(/<body[\s\S]*>(?<innerHTML>[\s\S]*)<\/body>/);
   const html = source.match(/<html[\s\S]*>(?<innerHTML>[\s\S]*)<\/html>/);
   return {
-    doctype: doctype === null ? false : doctype,
+    doctype: doctype === null ? false : doctype.groups.doctype,
     html: html === null ? false : html.groups,
     head: head === null ? false : head.groups,
     body: body === null ? false : body.groups,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cayo",
-  "version": "1.2.1",
+  "version": "1.3.0",
   "type": "module",
   "scripts": {
     "start": "node cayo dev --projectRoot test",
@@ -31,6 +31,7 @@
   "homepage": "https://github.com/matthew-ia/cayo#readme",
   "dependencies": {
     "@rollup/plugin-json": "^4.1.0",
+    "@rollup/plugin-node-resolve": "^16.0.0",
     "chalk": "^2.4.2",
     "chokidar": "^3.5.2",
     "deepmerge": "^4.2.2",

package/src/cayo.svelte

@@ -1,6 +1,7 @@
 <script>
-  export let src;
   import { getWarnings } from './cayo-warnings.js';
+  export let src;
+  export let attributes;
 
   // Save unserializable prop keys (during stringification)
   // so we can report them later
@@ -31,6 +32,7 @@
 </script>
 
 <div 
+  {...attributes}
   data-cayo-id={cayoInstanceData['data-cayo-id']}
   data-cayo-src={cayoInstanceData['data-cayo-src']}
   data-cayo-warn={cayoInstanceData['data-cayo-warn']}

package/template/package.json

@@ -5,6 +5,6 @@
     "build": "cayo build"
   },
   "devDependencies": {
-    "cayo": "^1.0.0"
+    "cayo": "^1.3.0"
   }
 }

package/template/src/__template.svelte

@@ -1,4 +1,3 @@
-<!DOCTYPE html>
 <html lang="en">
   <head>
     <meta charset="UTF-8" />