actionview-svelte-handler 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa87ed29fb4384fb377c10cf448128bc375891b09f4c4e5cc27e9ed61cca05f8
-  data.tar.gz: 29a5cc3725715e988248c8a34ff81828455ead0d654006ca9beced87a4654017
+  metadata.gz: 8922d6a1d3f8de0c4b5791db1ebff8a91fb7b9ca87c9cad43da53983774a501e
+  data.tar.gz: 23b8c4d8349c796d36ac0df28682c7e2fa7a409ab1d080a0f307076c6b0f548d
 SHA512:
-  metadata.gz: ef8416ff83fcfb265e32508a18f6461d360312384c1b230717cce0913e646939d014683ee86df0e25e5ad48d51720192b084693d835b70eb9456d617058cb59d
-  data.tar.gz: 2c1af7eda9cfed6602c2aa7d2994efd94a535d75812a018348ec32bea9028a66474763f53bf0b0c6d249c456b6be848156dfca72b01cf8d33312eee1139139f6
+  metadata.gz: 2ca3596dad051fb946f5f086c742a6270ff21e780123bb64f7a9fd6442fcd28ec784096cd9af26bdf08d97819ae9c2b8846b583aa0ae6af9a1bbdcf807bcd9fa
+  data.tar.gz: fa4d376aceaf9edbd5d997f51654f7249799907e4bb6194d9c7ecb3e0066870571b5f8be55c101c1f32f7045941baa3b0b2524ef994a2c99eff4c7d4542f428c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    actionview-svelte-handler (0.8.0)
+    actionview-svelte-handler (0.8.1)
       rails (~> 7.0)
       zeitwerk (~> 2)
 

data/lib/svelte/handler.rb

@@ -59,7 +59,7 @@ module Svelte
           
           content_for(:head, (result.dig(:server, :head) || "").html_safe)
           
-          ERB.new(File.read("#{Svelte.gem_dir}/lib/svelte/templates/island.html.erb")).result_with_hash({ result:, locals: local_assigns, digest: "#{digest}", bind: binding })
+          ERB.new(File.read("#{Svelte.gem_dir}/lib/svelte/templates/island.html.erb")).result_with_hash({ result:, locals: local_assigns, digest: "#{digest}", bind: binding }).html_safe
           
         end
       RUBY

data/lib/svelte/js/builder.js

@@ -56,18 +56,14 @@ class Builder {
     } else {
       entry = `
         import App from "${this.path}"; 
-        import { hydrate } from "svelte";
+        import { hydrate, flushSync } from "svelte";
         
-        function hydrateApp() {
-          const app = hydrate(App, {
-            target: document.getElementById("hydratee-${this.digest}"),
-            props: JSON.parse('${JSON.stringify(this.props)}')
-          })
-          
-          app.flushSync();
-        }
+        hydrate(App, {
+          target: document.getElementById("hydratee-${this.digest}"),
+          props: JSON.parse('${JSON.stringify(this.props)}')
+        })
         
-        export default hydrateApp;
+        flushSync();
       `;
     }
     const bundle = (await (await rollup({
@@ -133,32 +129,11 @@ class Builder {
     });
     return `//# sourceMappingURL=${bundle[0].map.toUrl()}
 //# sourceURL=${path.relative(this.path, this.root) + "/" + path.relative(this.root, this.path)}
-${bundle[0].code}`.trim();
+${bundle[0].code}`.trim().replace(/\n.*$/, "");
   }
   async client() {
     return this.compiled?.client || await this.bundle("dom");
   }
-  // standardizeClient (code: string): string {
-  //   const ast = recast.parse(code)
-  //   let name: string | undefined
-  //   recast.visit(ast, {
-  //     visitExportNamedDeclaration: (path) => {
-  //       const stagingName: any = path.node?.specifiers?.[0].local?.name
-  //       name = typeof stagingName !== 'string' ? '' : stagingName
-  //       path.prune()
-  //       return false
-  //     }
-  //   })
-  //   recast.visit(ast, {
-  //     visitIdentifier: (path) => {
-  //       if (path.node.name === name) {
-  //         path.node.name = 'App'
-  //       }
-  //       return false
-  //     }
-  //   })
-  //   return recast.print(ast).code
-  // }s
   async server() {
     const output = this.compiled?.server || await this.bundle("ssr");
     const { html, css, head } = importFromStringSync(output).default;

data/lib/svelte/templates/island.html.erb

@@ -7,6 +7,8 @@
     <%= result.dig(:server, :css) %>
   </style>
   <template data-island>
-    <script type="module">(<%= result.dig(:client).strip %>)();</script>
+    <script type="module">
+      <%= result.dig(:client).strip %>      
+    </script>
   </template>
 </is-land>

data/lib/svelte/version.rb

@@ -1,3 +1,3 @@
 module Svelte
-  VERSION = "0.8.0"
+  VERSION = "0.8.1"
 end

data/lib/ts/builder.ts

@@ -95,18 +95,14 @@ class Builder {
     } else {
       entry = `
         import App from "${this.path}"; 
-        import { hydrate } from "svelte";
+        import { hydrate, flushSync } from "svelte";
         
-        function hydrateApp() {
-          const app = hydrate(App, {
-            target: document.getElementById("hydratee-${this.digest}"),
-            props: JSON.parse('${JSON.stringify(this.props)}')
-          })
-          
-          app.flushSync();
-        }
+        hydrate(App, {
+          target: document.getElementById("hydratee-${this.digest}"),
+          props: JSON.parse('${JSON.stringify(this.props)}')
+        })
         
-        export default hydrateApp;
+        flushSync();
       `
     }
     
@@ -171,7 +167,7 @@ class Builder {
       return path.relative(this.path, this.root) + "/" + path.relative(this.root, el)
     })
     
-    return `//# sourceMappingURL=${bundle[0].map!.toUrl()}\n//# sourceURL=${path.relative(this.path, this.root) + "/" +  path.relative(this.root, this.path) }\n${bundle[0].code}`.trim()
+    return `//# sourceMappingURL=${bundle[0].map!.toUrl()}\n//# sourceURL=${path.relative(this.path, this.root) + "/" +  path.relative(this.root, this.path) }\n${bundle[0].code}`.trim().replace(/\n.*$/, '')
   }
 
   async client (): Promise<string> {
@@ -180,32 +176,6 @@ class Builder {
     )
   }
 
-  // standardizeClient (code: string): string {
-  //   const ast = recast.parse(code)
-
-  //   let name: string | undefined
-
-  //   recast.visit(ast, {
-  //     visitExportNamedDeclaration: (path) => {
-  //       const stagingName: any = path.node?.specifiers?.[0].local?.name
-  //       name = typeof stagingName !== 'string' ? '' : stagingName
-  //       path.prune()
-  //       return false
-  //     }
-  //   })
-
-  //   recast.visit(ast, {
-  //     visitIdentifier: (path) => {
-  //       if (path.node.name === name) {
-  //         path.node.name = 'App'
-  //       }
-  //       return false
-  //     }
-  //   })
-    
-  //   return recast.print(ast).code
-  // }s
-
   async server (): Promise<{ output: string, html: string, css: string, head: string }> {
     const output = this.compiled?.server || (await this.bundle('ssr')) // eslint-disable-line
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: actionview-svelte-handler
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - reesericci