@epublishing/grunt-epublishing 1.2.3 → 1.2.4

package/lib/concat-minify.js

@@ -296,6 +296,129 @@ async function processMinify(config, options = {}) {
   return results;
 }
 
+/**
+ * Concatenate application.js from the jade hierarchy (jade -> jade_* -> site)
+ * into <siteRoot>/public/javascripts/application.js.
+ *
+ * The jade helper `javascript_include_defaults` emits
+ *   <script src="/javascripts/application.js" defer>
+ * whenever `Jade[ 'public/javascripts/application.js' ]` resolves.  In the
+ * legacy Grunt world, this file was served directly from an engine's
+ * public dir through the StaticJade* middleware chain; that path still
+ * exists in production but depends on every engine's middleware firing
+ * in the right order, which has been fragile under Rails 8 / Propshaft.
+ *
+ * The simple, deterministic fix is to produce a real file at the site's
+ * own public path during build — concatenating any application.js files
+ * found in the jade hierarchy so inheritance is preserved.  If no sources
+ * exist, the step is a no-op.  If the site has its own application.js at
+ * the destination path, we don't self-concat into oblivion.
+ *
+ * This runs as a built-in step of `runConcatMinify`; sites do not need to
+ * declare an `application` concat target in build.config.js for it to
+ * happen.  If a user-defined `concat.application` target IS present, that
+ * wins (the built-in step bows out).
+ *
+ * @param {Object} config - Full build configuration
+ * @param {Object} options - Build options
+ * @returns {Promise<Object|null>} Result object or null if skipped
+ */
+async function concatApplicationJs(config, options = {}) {
+  const { verbose = false } = options;
+  const paths = config.paths || {};
+  const siteRoot = paths.site || process.cwd();
+  const jsDir = paths.js || 'public/javascripts';
+
+  // If the user already declared `concat.application`, they own the
+  // target — don't stomp it.
+  if (config.concat && config.concat.application) {
+    if (verbose) {
+      console.log('  Skipping built-in application.js bundler: user defined concat.application');
+    }
+    return { target: 'application', success: true, skipped: true, reason: 'user-defined' };
+  }
+
+  const destPath = path.resolve(siteRoot, jsDir, 'application.js');
+
+  // Walk the jade hierarchy in inheritance order: jade engine first,
+  // then any jade_* child gem (jade_bnp, jade_sosland, etc.), then the
+  // site's own file.  Later files override earlier behavior via the
+  // natural order of script evaluation.
+  const candidateSources = [];
+
+  if (paths.jade) {
+    candidateSources.push(path.join(paths.jade, jsDir, 'application.js'));
+  }
+
+  for (const key of Object.keys(paths)) {
+    // `jadechild` is an alias for the primary child gem and duplicates
+    // one of the `jade_*` entries; skip it to avoid double-including.
+    if (key === 'jadechild') continue;
+    if (!key.startsWith('jade_')) continue;
+    const childPath = paths[key];
+    if (!childPath || typeof childPath !== 'string') continue;
+    candidateSources.push(path.join(childPath, jsDir, 'application.js'));
+  }
+
+  // Site's own application.js (typically the destination path itself if
+  // it exists from a previous build; real site sources would live at
+  // app/js/application.js or similar and would already be handled by
+  // user-defined concat targets, so we only read the destination).
+  const siteSource = path.resolve(siteRoot, jsDir, 'application.js');
+
+  // De-dupe (jadechild alias could sneak through different keys) and
+  // keep only existing files.
+  const seen = new Set();
+  const sources = candidateSources
+    .filter(src => {
+      if (seen.has(src)) return false;
+      seen.add(src);
+      return true;
+    })
+    .filter(src => fs.existsSync(src));
+
+  // Include the site's own application.js if it's a real source file
+  // (i.e., not just the destination we're about to overwrite).
+  if (fs.existsSync(siteSource) && siteSource !== destPath) {
+    sources.push(siteSource);
+  }
+
+  if (sources.length === 0) {
+    if (verbose) {
+      console.log('  No application.js sources found in jade hierarchy — skipping');
+    }
+    return { target: 'application', success: true, skipped: true, reason: 'no-sources' };
+  }
+
+  try {
+    const content = await concatFiles(sources, { separator: ';\n', stripBanners: false });
+    await fs.promises.mkdir(path.dirname(destPath), { recursive: true });
+    await fs.promises.writeFile(destPath, content);
+
+    if (verbose) {
+      console.log(`  Bundled application.js from ${sources.length} source(s):`);
+      for (const src of sources) {
+        console.log(`    ${src}`);
+      }
+      console.log(`  -> ${destPath}`);
+    }
+
+    return {
+      target: 'application',
+      dest: destPath,
+      sources,
+      success: true,
+    };
+  } catch (error) {
+    return {
+      target: 'application',
+      dest: destPath,
+      success: false,
+      error,
+    };
+  }
+}
+
 /**
  * Run full concat + minify pipeline
  * @param {Object} config - Full build configuration
@@ -310,6 +433,15 @@ async function runConcatMinify(config, options = {}) {
   }
   const concatResults = await processConcat(config, options);
 
+  // Built-in bundler for the legacy jade `application.js` file.
+  if (verbose) {
+    console.log('Bundling application.js from jade hierarchy...');
+  }
+  const applicationResult = await concatApplicationJs(config, options);
+  if (applicationResult && !applicationResult.skipped) {
+    concatResults.push(applicationResult);
+  }
+
   if (verbose) {
     console.log('Running minify...');
   }
@@ -327,6 +459,7 @@ module.exports = {
   generateBanner,
   processConcat,
   processMinify,
+  concatApplicationJs,
   runConcatMinify,
 };
 

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.2.3",
+  "version": "1.2.4",
   "homepage": "https://www.epublishing.com",
   "contributors": [
     {
@@ -58,6 +58,7 @@
     "prettyjson": "^1.2.5",
     "read-pkg": "^5.2.0",
     "sass-embedded": "^1.80.0",
+    "sass-embedded-linux-x64": "^1.80.0",
     "style-loader": "^4.0.0",
     "susy": "^2.2.14",
     "swc-loader": "^0.2.6",
@@ -73,7 +74,6 @@
     "@swc/core-linux-arm64-gnu": "^1.7.0",
     "sass-embedded-darwin-arm64": "^1.80.0",
     "sass-embedded-darwin-x64": "^1.80.0",
-    "sass-embedded-linux-x64": "^1.80.0",
     "sass-embedded-linux-arm64": "^1.80.0"
   },
   "keywords": [