@pure-ds/core 0.5.22 → 0.5.24

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pure-ds/core",
   "shortname": "pds",
-  "version": "0.5.22",
+  "version": "0.5.24",
   "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

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-import { readFile, writeFile, mkdir, access } from 'fs/promises';
+import { readFile, writeFile, mkdir, access, rename, rm } from 'fs/promises';
 import { existsSync } from 'fs';
 import path from 'path';
 import { spawn } from 'child_process';
@@ -546,8 +546,54 @@ async function runDevServer() {
 
 async function ensurePdsAssets() {
   const pdsAssetsDir = path.join(projectRoot, 'public', 'assets', 'pds');
+  const repoAssetsDir = path.join(projectRoot, 'assets', 'pds');
+  const repoAssetsRoot = path.join(projectRoot, 'assets');
+  const repoInstallJson = path.join(repoAssetsRoot, '.pds-install.json');
+  const publicAssetsRoot = path.join(projectRoot, 'public', 'assets');
+  const publicInstallJson = path.join(publicAssetsRoot, '.pds-install.json');
+
+  const normalizeAssetsLocation = async () => {
+    if (!existsSync(repoAssetsDir)) return;
+
+    if (!existsSync(pdsAssetsDir)) {
+      await ensureDir(path.dirname(pdsAssetsDir));
+      await rename(repoAssetsDir, pdsAssetsDir);
+      log('✅ Moved assets/pds to public/assets/pds');
+      return true;
+    }
+
+    await rm(repoAssetsDir, { recursive: true, force: true });
+    log('🧹 Removed duplicate assets/pds folder');
+    return false;
+  };
+
+  const moveInstallJson = async () => {
+    if (!existsSync(repoInstallJson)) return;
+    await ensureDir(publicAssetsRoot);
+    await rename(repoInstallJson, publicInstallJson);
+    log('✅ Moved assets/.pds-install.json to public/assets/.pds-install.json');
+  };
+
+  const cleanupAssetsRoot = async () => {
+    if (!existsSync(repoAssetsRoot)) return;
+    const remaining = ['pds', '.pds-install.json']
+      .map((name) => path.join(repoAssetsRoot, name))
+      .filter((target) => existsSync(target));
+    if (remaining.length === 0) {
+      await rm(repoAssetsRoot, { recursive: true, force: true });
+      log('🧹 Removed root assets folder');
+    }
+  };
+
+  const movedAssets = await normalizeAssetsLocation();
+  await moveInstallJson();
+  await cleanupAssetsRoot();
+  if (movedAssets) {
+    return;
+  }
+
   if (existsSync(pdsAssetsDir)) {
-    log('↪️  PDS assets already present');
+    log('↪️  public/assets/pds already present');
     return;
   }
 
@@ -566,6 +612,10 @@ async function ensurePdsAssets() {
       else reject(new Error(`npm run pds:build exited with code ${code}`));
     });
   });
+
+  await normalizeAssetsLocation();
+  await moveInstallJson();
+  await cleanupAssetsRoot();
 }
 
 async function main() {