@primate/svelte 0.6.1 → 0.7.0

package/package.json

@@ -1,8 +1,9 @@
 {
   "name": "@primate/svelte",
-  "version": "0.6.1",
+  "version": "0.7.0",
   "description": "Primate Svelte module",
-  "bugs": "https://github.com/primatejs/packages/issues",
+  "homepage": "https://primatejs.com/modules/svelte",
+  "bugs": "https://github.com/primatejs/primate/issues",
   "license": "MIT",
   "files": [
     "src/**",
@@ -10,15 +11,15 @@
   ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/primatejs/packages",
+    "url": "https://github.com/primatejs/primate",
     "directory": "packages/svelte"
   },
   "dependencies": {
-    "runtime-compat": "^0.15.1",
+    "runtime-compat": "^0.16.3",
     "svelte": "^3.58.0"
   },
   "peerDependencies": {
-    "primate": "0.15"
+    "primate": "0.16"
   },
   "type": "module",
   "exports": "./src/exports.js"

package/src/module.js

@@ -14,8 +14,10 @@ const handler = path => (component, props = {}, {status = 200} = {}) =>
       .default.render(props);
 
     const name = component.slice(0, -endings.svelte.length);
+
+    const src = new Path(app.config.http.static.root, app.config.dist);
     // create an entry point
-    const entry = `import {${name} as Component} from "./${app.dist}.js";
+    const entry = `import {${name} as Component} from "${src}.js";
       const props = JSON.parse(${JSON.stringify(JSON.stringify(props))});
       new Component({
         target: document.body,
@@ -56,30 +58,23 @@ export default ({directory, entryPoints} = {}) => ({
     return next(app);
   },
   async publish(app, next) {
+    const _path = ["node_modules", "svelte", "package.json"];
+    const j = await Path.resolve().join(..._path).json();
+    app.resolve(j, "svelte");
+
     const path = directory ?? app.paths.components;
     const options = {
       generate: "dom",
       hydratable: true,
-      sveltePath: "./svelte",
     };
     const components = await path.list(filename => filename.endsWith(svelte));
-    {
-      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");
+      const compiled = client.js.code.replaceAll(svelte, js);
+
       await app.publish({src: `${component.name}.js`, code: compiled, type});
       if (css !== null) {
         const name = `${component.name}.css`;
@@ -87,6 +82,7 @@ export default ({directory, entryPoints} = {}) => ({
         app.bootstrap({type: "style", code: `import "./${name}";`});
       }
     }));
+
     if (entryPoints !== undefined) {
       entryPoints.forEach(entry => {
         const name = entry.slice(0, -endings.svelte.length);