@epublishing/grunt-epublishing 1.1.2 → 1.1.4

package/lib/cli.js

@@ -65,15 +65,25 @@ function printOptions(options) {
  */
 async function runNpmInstall(config, options) {
   const paths = config.paths || {};
-  const resolver = new Resolver({ ...paths }, { includeSite: false });
-  resolver.removePath('site');
-
+  // Build paths object with ONLY jade and jade child gem directories (absolute paths)
+  const gemPaths = {};
+  if (paths.jade && path.isAbsolute(paths.jade)) {
+    gemPaths.jade = paths.jade;
+  }
+  if (paths.jadechild && path.isAbsolute(paths.jadechild)) {
+    gemPaths.jadechild = paths.jadechild;
+  }
+  for (const [key, value] of Object.entries(paths)) {
+    if (key.startsWith('jade_') && value && path.isAbsolute(value)) {
+      gemPaths[key] = value;
+    }
+  }
+  const resolver = new Resolver(gemPaths, { includeSite: false });
   const packages = resolver.find('package.json');
   if (!packages || packages.length === 0) {
     return;
   }
 
-  const origCwd = process.cwd();
   const dirs = [...new Set(packages.map((p) => path.dirname(p)))];
 
   for (const dir of dirs) {
@@ -84,13 +94,12 @@ async function runNpmInstall(config, options) {
       const hasLock = fs.existsSync(path.join(dir, 'package-lock.json'));
       const cmd = hasLock ? 'ci' : 'install';
       await new Promise((resolve, reject) => {
-        process.chdir(dir);
         const proc = spawn('npm', [cmd], {
+          cwd: dir,
           stdio: options.verbose ? 'inherit' : 'pipe',
           shell: true,
         });
         proc.on('close', (code) => {
-          process.chdir(origCwd);
           if (code === 0) {
             spinner.succeed(`npm ${cmd} completed in ${basename}`);
             resolve();
@@ -100,13 +109,11 @@ async function runNpmInstall(config, options) {
           }
         });
         proc.on('error', (err) => {
-          process.chdir(origCwd);
           spinner.fail(`npm ${cmd} failed in ${basename}`);
           reject(err);
         });
       });
     } catch (err) {
-      process.chdir(origCwd);
       throw err;
     }
   }
@@ -412,6 +419,9 @@ async function run(argv) {
   const options = program.opts();
   const task = program.args[0] || 'all';
 
+  // Debug: print paths and webpack alias (with -v or DEBUG=1)
+  const debug = options.verbose || process.env.DEBUG;
+
   // Set NODE_ENV if specified
   if (options.env) {
     process.env.NODE_ENV = options.env;
@@ -437,6 +447,15 @@ async function run(argv) {
     throw error;
   }
 
+  if (debug && config.paths) {
+    console.log(chalk.gray('  Paths: jade=') + (config.paths.jade || '(none)'));
+    console.log(chalk.gray('  Paths: jadechild=') + (config.paths.jadechild || '(none)'));
+    const jadeChildKeys = Object.keys(config.paths).filter((k) => k.startsWith('jade_'));
+    jadeChildKeys.forEach((k) => {
+      console.log(chalk.gray(`  Paths: ${k}=`) + config.paths[k]);
+    });
+  }
+
   // Install npm packages from jade hierarchy (jade, jadechild) before build
   if (task === 'webpack' || task === 'all') {
     try {

package/lib/config-loader.js

@@ -11,8 +11,8 @@
 
 const fs = require('fs');
 const path = require('path');
+const { spawn } = require('child_process');
 const _ = require('lodash');
-const getGemPaths = require('@epublishing/get-gem-paths');
 const { resolveConfig, resolveTemplates } = require('./template-resolver');
 
 /**
@@ -41,6 +41,43 @@ function getFilename(fullPath) {
   return path.basename(fullPath);
 }
 
+/**
+ * Get gem paths by running the get-gem-paths Ruby script via bundle exec.
+ * This ensures Bundler has loaded the site's Gemfile and gem specs.
+ * @param {string} sitePath - Path to the site (with Gemfile)
+ * @param {string} pattern - Gem name pattern (e.g. 'jade')
+ * @returns {Promise<Array<{name: string, path: string, version: string}>>}
+ */
+function getGemPathsFromBundler(sitePath, pattern = 'jade') {
+  return new Promise((resolve, reject) => {
+    const rubyScript = path.join(
+      path.dirname(require.resolve('@epublishing/get-gem-paths')),
+      'scripts',
+      'get-gem-paths.rb'
+    );
+    const proc = spawn('bundle', ['exec', 'ruby', rubyScript, pattern], {
+      cwd: sitePath || process.cwd(),
+      stdio: ['ignore', 'pipe', 'pipe'],
+    });
+    let stdout = '';
+    let stderr = '';
+    proc.stdout.on('data', (d) => { stdout += d; });
+    proc.stderr.on('data', (d) => { stderr += d; });
+    proc.on('close', (code) => {
+      if (code !== 0) {
+        reject(new Error(`get-gem-paths failed (${code}): ${stderr || stdout}`));
+        return;
+      }
+      try {
+        resolve(JSON.parse(stdout));
+      } catch (e) {
+        reject(new Error(`get-gem-paths invalid JSON: ${stdout}`));
+      }
+    });
+    proc.on('error', reject);
+  });
+}
+
 /**
  * Custom merger for lodash merge
  * Handles array merging with JS file override logic
@@ -127,8 +164,8 @@ async function loadConfig(sitePath = process.cwd(), options = {}) {
   const jadeChildPaths = {};
   
   try {
-    const gems = await getGemPaths('jade_?', sitePath);
-    
+    const gems = await getGemPathsFromBundler(sitePath, 'jade');
+
     for (const gem of gems) {
       if (gem.name === 'jade') {
         jadePath = gem.path;

package/lib/webpack.config.js

@@ -86,6 +86,22 @@ function createWebpackConfig(config, options = {}) {
   // Build module paths for resolve.modules
   const modulePaths = buildModulePaths(paths);
 
+  // Aliases for jade hierarchy (jade-child in jadechild gem, jade-engine in jade gem)
+  const resolveAlias = {
+    lodash: lodashDir,
+  };
+  const jadeChildPath = paths.jadechild || (() => {
+    const jadeChildKey = Object.keys(paths).find((k) => k.startsWith('jade_') && k !== 'jadechild');
+    return jadeChildKey ? paths[jadeChildKey] : null;
+  })();
+  if (jadeChildPath && typeof jadeChildPath === 'string') {
+    const jadeChildJs = path.resolve(jadeChildPath, paths.js_src || 'app/js', 'jade-child.js');
+    resolveAlias['jade-child'] = jadeChildJs;
+  }
+  if (paths.jade && typeof paths.jade === 'string') {
+    resolveAlias['jade-engine'] = path.resolve(paths.jade, paths.js_src || 'app/js', 'jade-engine.js');
+  }
+
   // Build plugins array
   const plugins = [
     // Environment variables
@@ -243,9 +259,7 @@ function createWebpackConfig(config, options = {}) {
     resolve: {
       modules: modulePaths,
       extensions: ['.js', '.jsx', '.ts', '.tsx', '.json', '.hbs'],
-      alias: {
-        lodash: lodashDir,
-      },
+      alias: resolveAlias,
     },
 
     resolveLoader: {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@epublishing/grunt-epublishing",
   "description": "Modern front-end build tools for ePublishing Jade and client sites.",
-  "version": "1.1.2",
+  "version": "1.1.4",
   "homepage": "https://www.epublishing.com",
   "contributors": [
     {