@pure-ds/core 0.5.35 → 0.5.38

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pure-ds/core",
   "shortname": "pds",
-  "version": "0.5.35",
+  "version": "0.5.38",
   "description": "Pure Design System - Why develop a Design System when you can generate one?",
   "repository": {
     "type": "git",

package/packages/pds-cli/bin/pds-bootstrap.js

@@ -104,26 +104,39 @@ async function copyTemplateDirectory(sourceDir, targetDir, options) {
   }
 }
 
-async function copyBootstrapTemplate({ version, generatedAt }) {
+async function copyBootstrapTemplate({ version, generatedAt, isModule }) {
   await copyTemplateDirectory(templateRoot, projectRoot, { version, generatedAt });
 
-  const esbuildSource = path.join(templateRoot, 'esbuild-dev.cjs');
-  const esbuildTarget = path.join(projectRoot, 'esbuild-dev.cjs');
-  await copyFileIfMissing(esbuildSource, esbuildTarget);
+  const esbuildCjsSource = path.join(templateRoot, 'esbuild-dev.cjs');
+  const esbuildCjsTarget = path.join(projectRoot, 'esbuild-dev.cjs');
+  await copyFileIfMissing(esbuildCjsSource, esbuildCjsTarget);
+
+  const esbuildMjsSource = path.join(templateRoot, 'esbuild-dev.mjs');
+  const esbuildMjsTarget = path.join(projectRoot, 'esbuild-dev.mjs');
+  await copyFileIfMissing(esbuildMjsSource, esbuildMjsTarget);
+
+  const esbuildJsTarget = path.join(projectRoot, 'esbuild-dev.js');
+  const esbuildJsSource = isModule ? esbuildMjsSource : esbuildCjsSource;
+  await copyFileIfMissing(esbuildJsSource, esbuildJsTarget);
 }
 
 async function ensurePackageScripts(pkg, pkgPath) {
   pkg.scripts = pkg.scripts || {};
   let changed = false;
 
-  if (!pkg.scripts.dev) {
-    if (existsSync(path.join(projectRoot, 'esbuild-dev.cjs'))) {
-      pkg.scripts.dev = 'node esbuild-dev.cjs';
-    } else if (existsSync(path.join(projectRoot, 'esbuild-dev.js'))) {
-      pkg.scripts.dev = 'node esbuild-dev.js';
-    } else {
-      pkg.scripts.dev = 'node esbuild-dev.cjs';
-    }
+  const devScript = pkg.scripts.dev;
+  const devScriptMatch = typeof devScript === 'string'
+    ? devScript.match(/esbuild-dev\.(mjs|cjs|js)/)
+    : null;
+  const devScriptFile = devScriptMatch?.[0];
+  const devScriptMissing = devScriptFile
+    ? !existsSync(path.join(projectRoot, devScriptFile))
+    : false;
+
+  if (!devScript || devScriptMissing) {
+    const candidates = ['esbuild-dev.js', 'esbuild-dev.mjs', 'esbuild-dev.cjs'];
+    const available = candidates.find((file) => existsSync(path.join(projectRoot, file)));
+    pkg.scripts.dev = `node ${available || 'esbuild-dev.cjs'}`;
     changed = true;
   }
 
@@ -267,14 +280,16 @@ async function main() {
   log('\n⚡ PDS Bootstrap\n');
 
   const { pkgPath, pkg } = await readPackageJson();
+  const isModule = pkg.type === 'module';
 
-  await ensurePackageScripts(pkg, pkgPath);
   await ensureEsbuildDependency(pkg, pkgPath);
 
   const version = await getPdsCoreVersion();
   const generatedAt = new Date().toLocaleString();
 
-  await copyBootstrapTemplate({ version, generatedAt });
+  await copyBootstrapTemplate({ version, generatedAt, isModule });
+
+  await ensurePackageScripts(pkg, pkgPath);
 
   await ensurePdsAssets();