Add lit deps to importmap

Author: jlukic

scripts/assets/templates/cdn/create-dev-importmap.js.template

@@ -26,18 +26,50 @@ try {
   const importmapText = fs.readFileSync(importmapPath, 'utf8');
   const importmap = JSON.parse(importmapText);
 
-  // Create a development version by modifying paths
-  const devImportmapText = importmapText
-    .replace(new RegExp(`/lit/${litVersion}/`, 'g'), `/lit/${litVersion}/development/`)
-    .replace(new RegExp(`/(@semantic-ui/[^/]+/[^/]+)/([^"]+)`, 'g'), '/$1/development/$2');
-  
-  // Parse back to object to make sure it's valid JSON
-  const devImportmap = JSON.parse(devImportmapText);
-  
+  // Create a development version by modifying paths for all entries
+  const devImportmap = {
+    imports: {}
+  };
+
+  // Process each import and replace with development version if available
+  for (const [key, value] of Object.entries(importmap.imports)) {
+    // For Lit modules
+    if (key === 'lit' || value.includes(`/lit/${litVersion}/`)) {
+      devImportmap.imports[key] = value.replace(`/lit/${litVersion}/`, `/lit/${litVersion}/development/`);
+    }
+    // For @semantic-ui packages
+    else if (key.startsWith('@semantic-ui/')) {
+      const parts = key.split('/');
+      const packageName = parts[1];
+      const packageVersion = value.match(/\/@semantic-ui\/[^\/]+\/([^\/]+)/)[1];
+
+      // Update to use development folder if it exists
+      devImportmap.imports[key] = value.replace(
+        `/@semantic-ui/${packageName}/${packageVersion}/`,
+        `/@semantic-ui/${packageName}/${packageVersion}/development/`
+      );
+    }
+    // For Lit dependencies and other packages
+    else {
+      // Attempt to add /development/ to path if it's a dependency
+      const match = value.match(/\/([^\/]+)\/([^\/]+)\/([^\/]+)/);
+      if (match) {
+        const [, packageName, packageVersion, entry] = match;
+        devImportmap.imports[key] = value.replace(
+          `/${packageName}/${packageVersion}/`,
+          `/${packageName}/${packageVersion}/development/`
+        );
+      } else {
+        // If we can't determine structure, just copy as-is
+        devImportmap.imports[key] = value;
+      }
+    }
+  }
+
   // Write the development importmap
   fs.writeFileSync(path.join('./cdn', `importmap-${version}-dev.json`), JSON.stringify(devImportmap, null, 2));
   console.log(`Created importmap-${version}-dev.json`);
-  
+
   // If this is not a pre-release, also update the latest-dev.json
   if (!version.includes('-')) {
     fs.writeFileSync(path.join('./cdn', 'importmap-latest-dev.json'), JSON.stringify(devImportmap, null, 2));
@@ -47,6 +79,10 @@ try {
     fs.writeFileSync(path.join('./cdn', 'importmap-latest-dev.json'), JSON.stringify(devImportmap, null, 2));
     console.log('Created initial importmap-latest-dev.json');
   }
+
+  // Log the final imports for verification
+  console.log('Final development importmap imports:');
+  console.log(JSON.stringify(devImportmap.imports, null, 2));
 } catch (err) {
   console.error('Error creating development importmap:', err.message);
   process.exit(1);

scripts/assets/templates/cdn/generate-importmap.js.template

@@ -1,7 +1,6 @@
 import fs from 'fs';
 import path from 'path';
 import { fileURLToPath } from 'url';
-import { resolveEntry } from './resolve-entry.js';
 
 // Set up dirname equivalent for ES modules
 const __filename = fileURLToPath(import.meta.url);
@@ -12,6 +11,9 @@ const coreVersion = process.env.CORE_VERSION;
 const version = process.env.VERSION;
 const litVersion = process.env.LIT_VERSION || '3.2.1';
 
+// Import the entry resolver
+import { resolveEntry } from './resolve-entry.js';
+
 // Create the importmap object
 const importmap = {
   imports: {
@@ -52,24 +54,61 @@ try {
 
 // Add Lit dependencies to importmap
 try {
+  // Get Lit dependencies directly from node_modules directory contents
+  const litDepsDirPath = './node_modules/lit/node_modules';
+  if (fs.existsSync(litDepsDirPath)) {
+    const potentialDeps = fs.readdirSync(litDepsDirPath)
+      .filter(dir => fs.statSync(path.join(litDepsDirPath, dir)).isDirectory())
+      .filter(dir => !dir.startsWith('.'));
+
+    console.log(`Found potential direct Lit dependencies: ${potentialDeps.join(', ')}`);
+
+    for (const dep of potentialDeps) {
+      try {
+        const depPath = path.join(litDepsDirPath, dep, 'package.json');
+        if (fs.existsSync(depPath)) {
+          const depPkgText = fs.readFileSync(depPath, 'utf8');
+          const depPkg = JSON.parse(depPkgText);
+
+          const depVersion = depPkg.version;
+          const depEntry = resolveEntry(depPkg);
+
+          importmap.imports[dep] = `https://cdn.semantic-ui.com/${dep}/${depVersion}/${depEntry}`;
+          console.log(`Added direct Lit dependency: ${dep}@${depVersion} (${depEntry}) to importmap`);
+        }
+      } catch (err) {
+        console.error(`Error processing direct dependency ${dep}:`, err.message);
+      }
+    }
+  } else {
+    console.log('Lit dependencies not found in node_modules subdirectory, trying package.json');
+  }
+
+  // Also check package.json in case dependencies are hoisted
   const litPkgPath = './node_modules/lit/package.json';
   if (fs.existsSync(litPkgPath)) {
     const litPkgText = fs.readFileSync(litPkgPath, 'utf8');
     const litPkg = JSON.parse(litPkgText);
 
     if (litPkg.dependencies) {
+      console.log(`Found dependencies in lit package.json: ${Object.keys(litPkg.dependencies).join(', ')}`);
+
       for (const [dep, depVersionReq] of Object.entries(litPkg.dependencies)) {
         try {
-          const depPath = path.join('./node_modules', dep, 'package.json');
-          if (fs.existsSync(depPath)) {
-            const depPkgText = fs.readFileSync(depPath, 'utf8');
+          // Try to find at root node_modules first (hoisted dependencies)
+          const depRootPath = path.join('./node_modules', dep, 'package.json');
+          if (fs.existsSync(depRootPath)) {
+            const depPkgText = fs.readFileSync(depRootPath, 'utf8');
             const depPkg = JSON.parse(depPkgText);
 
             const depVersion = depPkg.version;
             const depEntry = resolveEntry(depPkg);
 
-            importmap.imports[dep] = `https://cdn.semantic-ui.com/${dep}/${depVersion}/${depEntry}`;
-            console.log(`Added Lit dependency: ${dep}@${depVersion} (${depEntry}) to importmap`);
+            // Only add if not already in importmap
+            if (!importmap.imports[dep]) {
+              importmap.imports[dep] = `https://cdn.semantic-ui.com/${dep}/${depVersion}/${depEntry}`;
+              console.log(`Added hoisted Lit dependency: ${dep}@${depVersion} (${depEntry}) to importmap`);
+            }
           }
         } catch (err) {
           console.error(`Error processing dependency ${dep}:`, err.message);
@@ -85,6 +124,10 @@ try {
 fs.writeFileSync(`cdn/importmap-${version}.json`, JSON.stringify(importmap, null, 2));
 console.log(`Created importmap-${version}.json`);
 
+// Log the final imports for verification
+console.log('Final importmap imports:');
+console.log(JSON.stringify(importmap.imports, null, 2));
+
 // Optionally update the latest importmap if this is a release version (not a test/pre-release)
 if (!version.includes('-')) {
   console.log('This is a release version, updating latest importmap');