ultimate-jekyll-manager 0.0.184 → 0.0.185

package/dist/commands/clean.js

@@ -1,7 +1,7 @@
 // Libraries
 const Manager = new (require('../build.js'));
 const logger = Manager.logger('clean');
-const path = require('path');
+const { execSync } = require('child_process');
 const jetpack = require('fs-jetpack');
 
 // Load package
@@ -32,8 +32,12 @@ module.exports = async function (options) {
   try {
     // Loop through dirs
     dirsToClean.forEach((dir) => {
-      // Remove
-      jetpack.remove(dir);
+      // Remove (use rm -rf on Unix for speed, fallback to jetpack on Windows)
+      if (process.platform !== 'win32') {
+        execSync(`rm -rf ${dir}`, { stdio: 'ignore' });
+      } else {
+        jetpack.remove(dir);
+      }
 
       // Create empty dir
       jetpack.dir(dir);

package/dist/commands/setup.js

@@ -43,6 +43,7 @@ module.exports = async function (options) {
   options.publishGitHubToken = options.publishGitHubToken !== 'false';
   options.updateGitHubPages = options.updateGitHubPages !== 'false';
   options.deduplicatePosts = options.deduplicatePosts !== 'false';
+  options.migrate = options.migrate !== 'false';
 
   // Log
   logger.log(`Welcome to ${package.name} v${package.version}!`);
@@ -56,6 +57,11 @@ module.exports = async function (options) {
     // Log current working directory
     await logCWD();
 
+    // Run migrations
+    if (options.migrate) {
+      await migrate();
+    }
+
     // Detect GitHub repository early so it's available to all tasks/functions
     await detectGitHubRepository(logger);
 
@@ -780,3 +786,57 @@ async function deduplicatePosts() {
     logger.log('✅ No duplicate posts found');
   }
 }
+
+// Run migrations based on installed version
+async function migrate() {
+  const installedVersion = project.devDependencies[package.name] || '0.0.0';
+
+  // Skip if using local version
+  if (installedVersion.startsWith('file:')) {
+    return;
+  }
+
+  // Migrate hooks to nested structure (for versions <= 0.0.184)
+  if (version.is(installedVersion, '<=', '0.0.184')) {
+    await migrateHooksToNestedStructure();
+  }
+}
+
+// Migrate old hook files to new nested structure
+async function migrateHooksToNestedStructure() {
+  const hooksDir = path.join(rootPathProject, 'hooks');
+
+  // Map of old file names to new paths
+  const migrations = [
+    { old: 'build:post.js', new: 'build/post.js' },
+    { old: 'build:pre.js', new: 'build/pre.js' },
+    { old: 'middleware:request.js', new: 'middleware/request.js' },
+  ];
+
+  let migratedCount = 0;
+
+  for (const migration of migrations) {
+    const oldPath = path.join(hooksDir, migration.old);
+    const newPath = path.join(hooksDir, migration.new);
+
+    // Check if old file exists
+    if (!jetpack.exists(oldPath)) {
+      continue;
+    }
+
+    // Check if new file already exists
+    if (jetpack.exists(newPath)) {
+      logger.warn(`⚠️  Cannot migrate ${migration.old}: ${migration.new} already exists`);
+      continue;
+    }
+
+    // Move the file
+    jetpack.move(oldPath, newPath);
+    logger.log(`✅ Migrated hook: ${migration.old} → ${migration.new}`);
+    migratedCount++;
+  }
+
+  if (migratedCount > 0) {
+    logger.log(`✅ Migrated ${migratedCount} hook file(s) to new nested structure`);
+  }
+}

package/dist/defaults/dist/_layouts/themes/classy/frontend/pages/extension/installed.html

@@ -185,4 +185,4 @@ steps:
   </div>
 </section>
 
-{{ content | uj_content_format }}
+{{ content | uj_content_format }}

package/dist/gulp/tasks/jekyll.js

@@ -77,7 +77,7 @@ async function jekyll(complete) {
     }
 
     // Run buildpre hook
-    await hook('build:pre', index);
+    await hook('build/pre', index);
 
     // Build Jekyll
     const command = [
@@ -97,6 +97,8 @@ async function jekyll(complete) {
         Manager.isBuildMode() ? '' : '.temp/_config_browsersync.yml',
         // Add development config IF BUILD_MODE is not true
         Manager.isBuildMode() ? '' : `./node_modules/${package.name}/dist/config/_config_development.yml`,
+        // Add project-level dev config IF it exists and BUILD_MODE is not true
+        (!Manager.isBuildMode() && jetpack.exists('dist/_config.dev.yml')) ? 'dist/_config.dev.yml' : '',
       ].join(','),
       '--incremental',
       (Manager.isBuildMode() || argv.profile) ? ' --profile' : '',
@@ -120,7 +122,7 @@ async function jekyll(complete) {
     await fixBlogIndex();
 
     // Run buildpost hook
-    await hook('build:post', index);
+    await hook('build/post', index);
 
     // Create build JSON with runtime config
     await createBuildJSON();

package/dist/gulp/tasks/sass.js

@@ -100,9 +100,15 @@ function sass(complete) {
         // So we can use "@use 'ultimate-jekyll-manager' as *;"
         path.resolve(rootPathPackage, 'dist/assets/css'),
 
-        // So we can use "@use 'themes/{theme}' as *;" in the project
+        // Project theme FIRST (higher priority) - allows consuming projects to define custom themes
+        path.resolve(rootPathProject, 'src/assets/themes', config.theme.id),
+
+        // UJM theme as fallback - for built-in themes like "classy", "bootstrap"
         path.resolve(rootPathPackage, 'dist/assets/themes', config.theme.id),
 
+        // UJM themes root - allows themes to reference sibling themes (e.g., ../bootstrap)
+        path.resolve(rootPathPackage, 'dist/assets/themes'),
+
         // So we can load _pages.scss from the project's dist
         path.resolve(rootPathProject, 'dist/assets/css'),
 
@@ -132,10 +138,14 @@ function sass(complete) {
       // Exclude test pages that include components we don't normally use (would prevent PurgeCSS from working)
       `!${rootPathPackage}/dist/defaults/**/pages/test/**/*.{html,liquid,md}`,
 
-      // Include ONLY the active theme's files
+      // Include ONLY the active theme's files from UJM
       `${rootPathPackage}/dist/defaults/**/_includes/themes/${config.theme.id}/**/*.{html,liquid,md}`,
       `${rootPathPackage}/dist/defaults/**/_layouts/themes/${config.theme.id}/**/*.{html,liquid,md}`,
 
+      // Project theme layouts/includes (for project-defined themes)
+      `src/_layouts/themes/${config.theme.id}/**/*.{html,liquid,md}`,
+      `src/_includes/themes/${config.theme.id}/**/*.{html,liquid,md}`,
+
       // Project HTML
       'src/**/*.{html,liquid,md}',
       'dist/**/*.{html,liquid,md}',
@@ -144,7 +154,10 @@ function sass(complete) {
       `${rootPathPackage}/dist/assets/js/**/*.js`,
       `${rootPathPackage}/node_modules/web-manager/**/*.js`,
 
-      // Theme JS
+      // Project theme JS (for project-defined themes)
+      `src/assets/themes/${config.theme.id}/**/*.js`,
+
+      // UJM theme JS
       `${rootPathPackage}/dist/assets/themes/${config.theme.id}/**/*.js`,
 
       // Project JS

package/dist/gulp/tasks/serve.js

@@ -277,7 +277,7 @@ async function processRequestMiddleware(req, res, next) {
   }
 
   // Run middleware:request hook to allow custom URL rewriting
-  await hook('middleware:request', { req, res, pathname });
+  await hook('middleware/request', { req, res, pathname });
 
   // Process the post request
   if (pathname.match(/\/_process/)) {

package/dist/gulp/tasks/webpack.js

@@ -140,8 +140,13 @@ function getSettings() {
         '__main_assets__': path.resolve(rootPathPackage, 'dist/assets'),
         '__project_assets__': path.resolve(process.cwd(), 'src/assets'),
 
-        // For importing the theme
-        '__theme__': path.resolve(rootPathPackage, 'dist/assets/themes', config.theme.id),
+        // For importing the theme - project theme takes priority over UJM theme
+        '__theme__': (() => {
+          const projectThemePath = path.resolve(rootPathProject, 'src/assets/themes', config.theme.id);
+          const ujmThemePath = path.resolve(rootPathPackage, 'dist/assets/themes', config.theme.id);
+          // Use project theme if it exists, otherwise fall back to UJM theme
+          return jetpack.exists(projectThemePath) ? projectThemePath : ujmThemePath;
+        })(),
       },
       // Add module resolution paths for local web-manager
       modules: [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ultimate-jekyll-manager",
-  "version": "0.0.184",
+  "version": "0.0.185",
   "description": "Ultimate Jekyll dependency manager",
   "main": "dist/index.js",
   "exports": {