@bouygues-telecom/staticjs 1.0.1 → 1.0.3

package/_build/scripts/cli.js

@@ -84,7 +84,8 @@ program
     try {
         console.log('🚀 Starting development server...');
         const serverEntrypoint = path.join(libDir, 'server', 'index.js');
-        const devCommand = `NODE_ENV=development tsx ${serverEntrypoint}`;
+        // Use tsx to enable loading user's TypeScript/TSX files at runtime
+        const devCommand = `NODE_ENV=development npx tsx ${serverEntrypoint}`;
         execSync(devCommand, {
             stdio: 'inherit',
             cwd: projectRoot

package/_build/server/config/index.js

@@ -77,13 +77,27 @@ const validateUserConfig = (rawConfig) => {
     return validatedConfig;
 };
 /**
- * Load user configuration from static.config.ts in the project root
+ * Load user configuration from static.config.js or static.config.ts in the project root
  * Validates all loaded values against a strict schema
  */
 const loadUserConfig = async () => {
     const projectRoot = path.resolve(process.cwd());
-    const configPath = path.join(projectRoot, 'static.config.ts');
-    if (!fs.existsSync(configPath)) {
+    // Check for config files in order of preference (JS first, then TS)
+    const configFiles = [
+        { path: path.join(projectRoot, 'static.config.js'), name: 'static.config.js' },
+        { path: path.join(projectRoot, 'static.config.mjs'), name: 'static.config.mjs' },
+        { path: path.join(projectRoot, 'static.config.ts'), name: 'static.config.ts' },
+    ];
+    let configPath = null;
+    let configName = '';
+    for (const config of configFiles) {
+        if (fs.existsSync(config.path)) {
+            configPath = config.path;
+            configName = config.name;
+            break;
+        }
+    }
+    if (!configPath) {
         return {};
     }
     try {
@@ -92,12 +106,20 @@ const loadUserConfig = async () => {
         // Validate and sanitize the loaded configuration
         const validatedConfig = validateUserConfig(rawConfig);
         if (Object.keys(validatedConfig).length > 0) {
-            console.log('[Config] Loaded user configuration from static.config.ts');
+            console.log(`[Config] Loaded user configuration from ${configName}`);
         }
         return validatedConfig;
     }
     catch (error) {
-        console.warn(`[Config] Failed to load static.config.ts: ${error.message}`);
+        const errorMessage = error.message;
+        // Provide helpful message for TypeScript loading errors
+        if (configName.endsWith('.ts') && errorMessage.includes('Unknown file extension')) {
+            console.warn(`[Config] Cannot load ${configName} - TypeScript files require tsx runtime.`);
+            console.warn(`[Config] Either rename to static.config.js, or ensure tsx is installed.`);
+        }
+        else {
+            console.warn(`[Config] Failed to load ${configName}: ${errorMessage}`);
+        }
         return {};
     }
 };

package/_build/server/config/vite.config.js

@@ -1,8 +1,8 @@
 import path from "path";
 import { defineConfig } from "vite";
-import { addHydrationCodePlugin } from "./vite.plugin";
+import { addHydrationCodePlugin } from "./vite.plugin.js";
 import { loadCacheEntries } from "../../helpers/cachePages.js";
-import { CONFIG } from "./index";
+import { CONFIG } from "./index.js";
 // Load cache entries using the refactored helper function
 const entries = loadCacheEntries(CONFIG.PROJECT_ROOT);
 // Sanitize entry keys for Rollup: strip dynamic segments [param] and use parent folder name

package/_build/server/index.js

@@ -113,16 +113,13 @@ export const startStaticJSServer = async () => {
 export { CONFIG, DEFAULT_CONFIG, isDevelopment } from "./config/index.js";
 export { initializeViteServer } from "./utils/vite.js";
 export { setupProcessHandlers, startServer } from "./utils/startup.js";
-// Only start the server when this module is run directly (not when imported)
+// Start server when this module is run directly
 let app;
-// Check if this module is being run directly
-if (import.meta.url === `file://${process.argv[1]}`) {
-    console.log('[Server] Module executed directly, starting server...');
+// Check if running as main entry point (works with node, tsx, and other runtimes)
+const isMainModule = process.argv[1]?.includes('server/index');
+if (isMainModule) {
     app = await startStaticJSServer();
 }
-else {
-    console.log('[Server] Module imported, not starting server automatically');
-}
 // Default export is the app creation function
 export default app;
 // Named export for the main function (for backwards compatibility)

package/_build/server/utils/vite.js

@@ -3,10 +3,11 @@
  * Handles Vite server initialization and JavaScript serving for development mode
  */
 import { createServer as createViteServer } from "vite";
-import { isDevelopment } from "../config/index.js";
+import { isDevelopment, CONFIG } from "../config/index.js";
 import { registerJavaScriptMiddleware, registerCSSMiddleware } from "../middleware/runtime.js";
+import { loadCacheEntries } from "../../helpers/cachePages.js";
+import { addHydrationCodePlugin } from "../config/vite.plugin.js";
 import path from "path";
-import { fileURLToPath } from "url";
 let viteServer = null;
 /**
  * Initialize Vite server for development mode
@@ -19,12 +20,15 @@ export const initializeViteServer = async (app) => {
             return viteServer;
         }
         try {
-            // Initializing Vite server
-            // Get the absolute path to the vite config file within the package
-            const __filename = fileURLToPath(import.meta.url);
-            const __dirname = path.dirname(__filename);
-            const configPath = path.resolve(__dirname, '../config/vite.config.js');
+            // Load cache entries for build input
+            const entries = loadCacheEntries(CONFIG.PROJECT_ROOT);
+            // Sanitize entry keys for Rollup: strip dynamic segments [param]
+            const sanitizedEntries = Object.fromEntries(Object.entries(entries).map(([key, value]) => [
+                key.replace(/\/\[[^\]]+\]$/, ''),
+                value
+            ]));
             // Create Vite server for development mode JS compilation
+            // Using inline config to avoid path resolution issues when installed as a dependency
             viteServer = await createViteServer({
                 server: {
                     middlewareMode: true,
@@ -33,7 +37,33 @@ export const initializeViteServer = async (app) => {
                     }
                 },
                 appType: 'custom',
-                configFile: configPath
+                configFile: false, // Don't load external config file
+                resolve: {
+                    alias: {
+                        "@": path.resolve(CONFIG.PROJECT_ROOT, "src")
+                    },
+                },
+                css: {
+                    devSourcemap: true,
+                    preprocessorOptions: {
+                        scss: {
+                            api: "modern-compiler",
+                            loadPaths: [path.resolve(CONFIG.PROJECT_ROOT, "src")],
+                        },
+                    },
+                },
+                build: {
+                    outDir: path.resolve(CONFIG.PROJECT_ROOT, CONFIG.BUILD_DIR),
+                    emptyOutDir: false,
+                    rollupOptions: {
+                        input: sanitizedEntries,
+                        output: {
+                            entryFileNames: "[name].js",
+                            chunkFileNames: "assets/vendor-[hash].js",
+                        },
+                    },
+                },
+                plugins: [addHydrationCodePlugin(entries)],
             });
             // Vite server initialized
             // Add Vite's middleware to handle dependency requests

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bouygues-telecom/staticjs",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "type": "module",
   "main": "./_build/server/index.js",
   "exports": {
@@ -38,11 +38,12 @@
     "path": "^0.12.7",
     "readline": "^1.3.0",
     "rimraf": "^6.0.1",
-    "sass": "^1.77.0",
     "ws": "^8.18.0"
   },
   "peerDependencies": {
-    "vite": "^5.0.0 || ^6.0.0"
+    "vite": "^6.0.0 || ^7.0.0",
+    "sass": "^1.77.0",
+    "tsx": "^4.0.0"
   },
   "engines": {
     "node": ">=18.0.0"