svelte-bundle 0.0.22 → 0.0.24

package/bundle.js

@@ -1,3 +1,4 @@
+// bundle.js
 import fs from 'fs/promises';
 import path from 'path';
 import { rollup } from 'rollup';
@@ -10,18 +11,13 @@ import postcss from 'postcss';
 import tailwindcss from 'tailwindcss';
 import autoprefixer from 'autoprefixer';
 import cssnano from 'cssnano';
-import { createRequire } from 'module';
 import { fileURLToPath } from 'url';
+import { createRequire } from 'module';
 
 const require = createRequire(import.meta.url);
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
-// Function to find the CLI's node_modules directory
-const findCliNodeModules = () => {
-  return path.resolve(__dirname, 'node_modules');
-};
-
 export async function buildStaticFile(svelteFilePath, outputDir, options = {}) {
   const { useTailwind = false, tailwindConfig = null } = options;
 
@@ -29,9 +25,6 @@ export async function buildStaticFile(svelteFilePath, outputDir, options = {}) {
     // Ensure output directory exists
     await fs.mkdir(outputDir, { recursive: true });
 
-    // Get CLI's node_modules path
-    const cliNodeModules = findCliNodeModules();
-
     let cssText = '';
     
     // Setup PostCSS plugins based on whether Tailwind is enabled
@@ -75,6 +68,9 @@ export async function buildStaticFile(svelteFilePath, outputDir, options = {}) {
         .process(tailwindCss, { from: undefined });
       globalCssText = processedCss.css;
     }
+
+    // Get the absolute path to svelte/internal
+    const svelteInternalPath = require.resolve('svelte/internal');
     
     // Create temporary SSR bundle
     const ssrBundle = await rollup({
@@ -104,52 +100,31 @@ export async function buildStaticFile(svelteFilePath, outputDir, options = {}) {
         resolve({
           browser: true,
           dedupe: ['svelte'],
-          preferBuiltins: false,
-          moduleDirectories: ['node_modules'],
-          modulePaths: [cliNodeModules],
-          rootDir: cliNodeModules
+          modulePaths: [path.join(__dirname, 'node_modules')],
+          rootDir: __dirname
         }),
         commonjs()
-      ]
+      ],
+      external: ['svelte/internal']
     });
 
-    // Create a temporary directory for SSR
-    const tempDir = path.join(path.dirname(svelteFilePath), '.temp');
+    // Create a temporary directory in the CLI package directory
+    const tempDir = path.join(__dirname, '.temp');
     await fs.mkdir(tempDir, { recursive: true });
-    
-    // Create package.json for the temp directory
-    await fs.writeFile(
-      path.join(tempDir, 'package.json'),
-      JSON.stringify({ 
-        type: 'module',
-        dependencies: {
-          svelte: require(path.join(cliNodeModules, 'svelte', 'package.json')).version
-        }
-      }),
-      'utf-8'
-    );
-
-    // Create symlink to CLI's node_modules
-    const tempNodeModules = path.join(tempDir, 'node_modules');
-    try {
-      await fs.symlink(cliNodeModules, tempNodeModules, 'junction');
-    } catch (error) {
-      if (error.code !== 'EEXIST') {
-        throw error;
-      }
-    }
-
-    const tempSSRFile = path.join(tempDir, 'ssr-bundle.mjs');
+    const tempSSRFile = path.join(tempDir, 'ssr-bundle.js');
 
-    // Generate SSR bundle
+    // Generate SSR bundle as ESM
     await ssrBundle.write({
       file: tempSSRFile,
       format: 'es',
-      exports: 'default'
+      exports: 'default',
+      paths: {
+        'svelte/internal': svelteInternalPath
+      }
     });
 
-    // Import the SSR bundle
-    const { default: App } = await import(`file://${tempSSRFile}`);
+    // Import the SSR bundle using dynamic import
+    const { default: App } = await import(/* @vite-ignore */`file://${tempSSRFile}`);
     const { html: initialHtml } = App.render();
 
     // Clean up temp files
@@ -182,9 +157,8 @@ export async function buildStaticFile(svelteFilePath, outputDir, options = {}) {
         resolve({
           browser: true,
           dedupe: ['svelte'],
-          moduleDirectories: ['node_modules'],
-          modulePaths: [cliNodeModules],
-          rootDir: cliNodeModules
+          modulePaths: [path.join(__dirname, 'node_modules')],
+          rootDir: __dirname
         }),
         commonjs(),
         terser()
@@ -200,7 +174,7 @@ export async function buildStaticFile(svelteFilePath, outputDir, options = {}) {
     });
 
     // Create the final HTML
-    const finalHtml = `<!DOCTYPE html><html lang="en"><head><meta charset="UTF-8"><meta name="viewport" content="width=device-width,initial-scale=1"><title>Static Svelte App</title><style>${globalCssText}${cssText}</style></head><body><div id="app">${initialHtml}</div><script src="https://unpkg.com/svelte@3.58.0/internal/index.js"></script><script>${clientCode}const app=new App({target:document.getElementById("app"),hydrate:!0});</script></body></html>`;
+    const finalHtml = `<!DOCTYPE html><html lang="en"><head><meta charset="UTF-8"><meta name="viewport" content="width=device-width,initial-scale=1"><title>Static Svelte App</title><style>${globalCssText}${cssText}</style></head><body><div id="app">${initialHtml}</div><script>${clientCode}const app=new App({target:document.getElementById("app"),hydrate:!0});</script></body></html>`;
 
     // Write the output file
     const outputPath = path.join(outputDir, 'output.html');

package/cli.js

@@ -26,6 +26,14 @@ const rl = createInterface({
 
 const question = (query) => new Promise((resolve) => rl.question(query, resolve));
 
+// Add check for node version
+const nodeVersion = process.versions.node;
+const [major] = nodeVersion.split('.').map(Number);
+if (major < 18) {
+  console.error(chalk.red(`Error: Node.js version 18 or higher is required. Current version: ${nodeVersion}`));
+  process.exit(1);
+}
+
 program
   .name('svelte-bundle')
   .description(packageJson.description)
@@ -132,6 +140,9 @@ async function validateAndProcess() {
   } catch (error) {
     console.error(chalk.red('\nBuild failed:'));
     console.error(chalk.red(error.message));
+    if (error.stack) {
+      console.error(chalk.gray(error.stack));
+    }
     process.exit(1);
   } finally {
     rl.close();

package/package.json

@@ -1,20 +1,23 @@
 {
   "name": "svelte-bundle",
-  "version": "0.0.22",
-  "description": "CLI tool to easily bundle a .svelte file into a single .html file",
+  "version": "0.0.24",
+  "description": "Bundle Svelte files into static HTML files",
   "type": "module",
+  "title": "svelte-bundle",
+  "url": "https://github.com/uhteddy/svelte-bundle",
+  "repository": "https://github.com/uhteddy/svelte-bundle",
+  "description": "CLI tool to easily bundle a .svelte file into a single .html file",
   "npm": "svelte-bundle",
+  "categories": [
+    "build-plugins"
+  ],
   "bin": {
-    "svelte-bundle": "./cli.js"
+    "svelte-bundle": "cli.js"
   },
   "files": [
     "cli.js",
     "bundle.js"
   ],
-  "categories": [
-		"build-plugins",
-		"integrations"
-	],
   "keywords": [
     "svelte",
     "bundle",
@@ -64,4 +67,4 @@
   "engines": {
     "node": ">=18"
   }
-}
+}