d1s 0.2.1 → 0.2.2

package/dist/d1-studio.js

@@ -16,9 +16,6 @@ import { findWranglerConfig } from '../src/lib/find-wrangler-config.js';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 
-// console.log(chalk.blue('Resolved __filename:'), __filename);
-// console.log(chalk.blue('Resolved __dirname:'), __dirname);
-
 // License validation utilities
 class LicenseError extends Error {
   constructor(message, type = 'VALIDATION_ERROR') {
@@ -123,14 +120,18 @@ async function saveLicenseFile(licenseData) {
 async function startServer(port, projectDirectory) {
   return new Promise((resolvePromise, rejectPromise) => {
     const dev = process.env.NODE_ENV === 'development';
-    // Point to the parent directory that contains both app and .next
-    const dir = join(__dirname, '..');
+
+    // Determine the directory where Next.js build is located:
+    // In production (published package), __dirname is in the 'dist' folder so we use it directly.
+    // In development, we assume the structure is different and go one level up.
+    const isProduction = process.env.NODE_ENV !== 'development';
+    const nextAppDir = isProduction ? __dirname : join(__dirname, '..');
+
     const app = next({ 
       dev,
-      dir,
+      dir: nextAppDir,
       conf: {
         distDir: '.next',
-        // Ensure app directory is correctly set for routing
         experimental: {
           appDir: true
         }
@@ -214,7 +215,6 @@ async function startStudio() {
       console.log(chalk.blue('Entered license information:'), answers);
 
       const hardwareId = await generateHardwareId();
-      // console.log(chalk.blue('Generated hardware ID:'), hardwareId);
 
       try {
         const validation = await validateLicenseRemote(
@@ -242,7 +242,6 @@ async function startStudio() {
     // Get wrangler configuration
     try {
       const userProjectPath = process.cwd();
-      // console.log(chalk.blue('Current working directory:'), userProjectPath);
     
       if (!userProjectPath) {
         console.error(chalk.red('Error: Could not determine project directory'));
@@ -250,7 +249,6 @@ async function startStudio() {
       }
     
       const wranglerResult = await findWranglerConfig(userProjectPath);
-      // console.log(chalk.blue('Wrangler config result:'), wranglerResult);
     
       if (!wranglerResult || !wranglerResult.config) {
         console.error(chalk.red('\nError: No wrangler.toml found in current directory'));
@@ -260,7 +258,6 @@ async function startStudio() {
       }
     
       const { config, projectPath } = wranglerResult;
-      // console.log(chalk.blue('Resolved wrangler.toml project path:'), projectPath);
     
       if (!config.d1_databases?.length) {
         console.error(chalk.red('\nError: No D1 databases configured in wrangler.toml'));
@@ -341,4 +338,4 @@ process.on('SIGTERM', () => {
 startStudio().catch((error) => {
   console.error(chalk.red('\nFailed to start D1 Studio:'), error);
   process.exit(1);
-});
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "d1s",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "type": "module",
   "description": "D1 Studio – a native studio for managing Cloudflare D1 databases.",
   "main": "./dist/d1-studio.js",

package/scripts/studio.js

@@ -16,9 +16,6 @@ import { findWranglerConfig } from '../src/lib/find-wrangler-config.js';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 
-// console.log(chalk.blue('Resolved __filename:'), __filename);
-// console.log(chalk.blue('Resolved __dirname:'), __dirname);
-
 // License validation utilities
 class LicenseError extends Error {
   constructor(message, type = 'VALIDATION_ERROR') {
@@ -123,14 +120,18 @@ async function saveLicenseFile(licenseData) {
 async function startServer(port, projectDirectory) {
   return new Promise((resolvePromise, rejectPromise) => {
     const dev = process.env.NODE_ENV === 'development';
-    // Point to the parent directory that contains both app and .next
-    const dir = join(__dirname, '..');
+
+    // Determine the directory where Next.js build is located:
+    // In production (published package), __dirname is in the 'dist' folder so we use it directly.
+    // In development, we assume the structure is different and go one level up.
+    const isProduction = process.env.NODE_ENV !== 'development';
+    const nextAppDir = isProduction ? __dirname : join(__dirname, '..');
+
     const app = next({ 
       dev,
-      dir,
+      dir: nextAppDir,
       conf: {
         distDir: '.next',
-        // Ensure app directory is correctly set for routing
         experimental: {
           appDir: true
         }
@@ -214,7 +215,6 @@ async function startStudio() {
       console.log(chalk.blue('Entered license information:'), answers);
 
       const hardwareId = await generateHardwareId();
-      // console.log(chalk.blue('Generated hardware ID:'), hardwareId);
 
       try {
         const validation = await validateLicenseRemote(
@@ -242,7 +242,6 @@ async function startStudio() {
     // Get wrangler configuration
     try {
       const userProjectPath = process.cwd();
-      // console.log(chalk.blue('Current working directory:'), userProjectPath);
     
       if (!userProjectPath) {
         console.error(chalk.red('Error: Could not determine project directory'));
@@ -250,7 +249,6 @@ async function startStudio() {
       }
     
       const wranglerResult = await findWranglerConfig(userProjectPath);
-      // console.log(chalk.blue('Wrangler config result:'), wranglerResult);
     
       if (!wranglerResult || !wranglerResult.config) {
         console.error(chalk.red('\nError: No wrangler.toml found in current directory'));
@@ -260,7 +258,6 @@ async function startStudio() {
       }
     
       const { config, projectPath } = wranglerResult;
-      // console.log(chalk.blue('Resolved wrangler.toml project path:'), projectPath);
     
       if (!config.d1_databases?.length) {
         console.error(chalk.red('\nError: No D1 databases configured in wrangler.toml'));
@@ -341,4 +338,4 @@ process.on('SIGTERM', () => {
 startStudio().catch((error) => {
   console.error(chalk.red('\nFailed to start D1 Studio:'), error);
   process.exit(1);
-});
+});