@primate/svelte 0.5.2 → 0.6.1

package/package.json

@@ -1,20 +1,25 @@
 {
   "name": "@primate/svelte",
-  "version": "0.5.2",
-  "bugs": "https://github.com/primatejs/svelte/issues",
-  "repository": "https://github.com/primatejs/svelte",
+  "version": "0.6.1",
   "description": "Primate Svelte module",
+  "bugs": "https://github.com/primatejs/packages/issues",
   "license": "MIT",
+  "files": [
+    "src/**",
+    "!src/**/*.spec.js"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/primatejs/packages",
+    "directory": "packages/svelte"
+  },
   "dependencies": {
-    "runtime-compat": "^0.15.0",
+    "runtime-compat": "^0.15.1",
     "svelte": "^3.58.0"
   },
-  "devDependencies": {
-    "maximin": "^0.1.2"
-  },
   "peerDependencies": {
     "primate": "0.15"
   },
   "type": "module",
-  "exports": "./exports.js"
+  "exports": "./src/exports.js"
 }

package/src/exports.js

@@ -0,0 +1 @@
+export {default} from "./module.js";

package/src/module.js

@@ -9,13 +9,13 @@ const endings = {
 const type = "module";
 
 const handler = path => (component, props = {}, {status = 200} = {}) =>
-  async (env, headers) => {
+  async (app, headers) => {
     const {html: body} = (await import(`${path.join(`${component}.js`)}`))
       .default.render(props);
 
     const name = component.slice(0, -endings.svelte.length);
     // create an entry point
-    const entry = `import {${name} as Component} from "./dist.js";
+    const entry = `import {${name} as Component} from "./${app.dist}.js";
       const props = JSON.parse(${JSON.stringify(JSON.stringify(props))});
       new Component({
         target: document.body,
@@ -24,13 +24,13 @@ const handler = path => (component, props = {}, {status = 200} = {}) =>
       });
     `;
     const inline = true;
-    const integrity = await env.publish({code: entry, type, inline});
+    const integrity = await app.publish({code: entry, type, inline});
     // hacky, CSP should be a map that gets flattened in the end
     headers["Content-Security-Policy"] = headers["Content-Security-Policy"]
       .replace("script-src 'self' ", `script-src 'self' '${integrity}' `);
 
     // -> spread into new Response()
-    return [await env.render({body}), {
+    return [await app.render({body}), {
       status,
       headers: {...headers, "Content-Type": "text/html"},
     }];
@@ -38,12 +38,12 @@ const handler = path => (component, props = {}, {status = 200} = {}) =>
 
 const {svelte, js} = endings;
 export default ({directory, entryPoints} = {}) => ({
-  register(env, next) {
-    env.register("svelte", handler(directory ?? env.paths.components));
-    return next(env);
+  register(app, next) {
+    app.register("svelte", handler(directory ?? app.paths.components));
+    return next(app);
   },
-  async compile(env, next) {
-    const path = directory ?? env.paths.components;
+  async compile(app, next) {
+    const path = directory ?? app.paths.components;
     const options = {generate: "ssr", hydratable: true};
     const components = await path.list(filename => filename.endsWith(svelte));
     await Promise.all(components.map(async component => {
@@ -53,38 +53,47 @@ export default ({directory, entryPoints} = {}) => ({
       await File.write(`${component.path}.js`, compiled);
     }));
 
-    return next(env);
+    return next(app);
   },
-  async publish(env, next) {
-    const path = directory ?? env.paths.components;
+  async publish(app, next) {
+    const path = directory ?? app.paths.components;
     const options = {
       generate: "dom",
       hydratable: true,
-      css: false,
       sveltePath: "./svelte",
     };
     const components = await path.list(filename => filename.endsWith(svelte));
-    const scriptPath = ["node_modules", "svelte", "internal", "index.mjs"];
-    // publish svelte itself
-    const code = await Path.resolve().join(...scriptPath).file.read();
-    await env.publish({src: "svelte/internal.js", code, type});
+    {
+      const scriptPath = ["node_modules", "svelte", "internal", "index.mjs"];
+      // import.meta.resolve is more reliable, use it if available
+      const _path = import.meta.resolve === undefined
+        ? await Path.resolve().join(...scriptPath)
+        : new Path(await import.meta.resolve("svelte/internal"));
+      // publish svelte itself
+      const code = await _path.file.read();
+      await app.publish({src: "svelte/internal.js", code, type});
+    }
     await Promise.all(components.map(async component => {
       const file = await component.file.read();
       const client = compiler.compile(file, options);
+      const css = client.css.code;
       const compiled = client.js.code
         .replaceAll(svelte, js)
         .replace("./svelte/internal", "./svelte/internal.js");
-      await env.publish({src: `${component.name}.js`, code: compiled, type});
+      await app.publish({src: `${component.name}.js`, code: compiled, type});
+      if (css !== null) {
+        const name = `${component.name}.css`;
+        await app.publish({src: name, code: css, type: "style"});
+        app.bootstrap({type: "style", code: `import "./${name}";`});
+      }
     }));
-    // create a pseudo entry to allow bundlers to bundle relevant code until
-    // proper path-splitting has been implemented
     if (entryPoints !== undefined) {
-      const code = entryPoints.map(entry => {
+      entryPoints.forEach(entry => {
         const name = entry.slice(0, -endings.svelte.length);
-        return `export {default as ${name}} from "./${entry}.js";`
-      }).join("");
-      await env.publish({src: "dist.js", code, type, main: true});
+        const code = `export {default as ${name}} from "./${entry}.js";`;
+        app.bootstrap({type: "script", code});
+      });
     }
-    return next(env);
+    return next(app);
   },
 });

package/LICENSE

@@ -1,19 +0,0 @@
-Copyright (c) Terrablue <terrablue@proton.me> and contributors.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.

package/eslint.config.js

@@ -1 +0,0 @@
-export {default} from "maximin";

package/exports.js

@@ -1 +0,0 @@
-export {default} from "./src/module.js";