ghost 5.118.0 → 5.118.1

package/bin/minify-assets.js

@@ -0,0 +1,119 @@
+#!/usr/bin/env node
+
+/**
+ * Script to minify multiple JavaScript files using esbuild
+ * Supports per-file configuration for bundling and other options
+ *
+ * The tryghost/minifier package is not used because it is intended to be used at runtime,
+ * allowing for replacements to be made on the fly (e.g. for card-assets and theme activation).
+ *
+ * This script is intended to be run at build time, allowing for us to use the minified files
+ * in the production build and be able to utilize bundler benefits.
+ */
+
+/* eslint-disable no-console */
+const esbuild = require('esbuild');
+const path = require('path');
+const fs = require('fs');
+const logging = require('@tryghost/logging');
+
+// Determine the root directory by checking for common project files
+function findProjectRoot() {
+    let currentDir = process.cwd();
+
+    // Check if we're already in ghost/core
+    if (currentDir.endsWith('ghost/core') || currentDir.endsWith('ghost\\core')) {
+        return currentDir;
+    }
+
+    // Look for ghost/core directory
+    const ghostCorePath = path.join(currentDir, 'ghost', 'core');
+    if (fs.existsSync(ghostCorePath)) {
+        return ghostCorePath;
+    }
+
+    return currentDir;
+}
+
+const projectRoot = findProjectRoot();
+logging.debug(`Resolving paths from: ${projectRoot}`);
+
+// Helper to resolve paths relative to project root
+function resolvePath(filePath) {
+    return path.join(projectRoot, filePath);
+}
+
+// Define files to minify with their specific configuration
+const filesToMinify = [
+    {
+        src: 'core/frontend/src/comment-counts/comment-counts.js',
+        dest: 'core/frontend/public/comment-counts.min.js',
+        options: {
+            bundle: false
+        }
+    },
+    {
+        src: 'core/frontend/src/ghost-stats/ghost-stats.js',
+        dest: 'core/frontend/public/ghost-stats.min.js',
+        options: {
+            bundle: true,
+            format: 'iife',
+            target: ['es2020']
+        }
+    },
+    {
+        src: 'core/frontend/src/member-attribution/member-attribution.js',
+        dest: 'core/frontend/public/member-attribution.min.js',
+        options: {
+            bundle: true,
+            format: 'iife',
+            target: ['es2020']
+        }
+    },
+    {
+        src: 'core/frontend/src/admin-auth/message-handler.js',
+        dest: 'core/frontend/public/admin-auth/admin-auth.min.js',
+        options: {
+            bundle: false
+        }
+    }
+];
+
+// Process all files
+(async () => {
+    logging.debug('Starting JS minification...');
+
+    for (const file of filesToMinify) {
+        try {
+            const srcPath = resolvePath(file.src);
+            const destPath = resolvePath(file.dest);
+
+            // Ensure the destination directory exists
+            const destDir = path.dirname(destPath);
+            if (!fs.existsSync(destDir)) {
+                fs.mkdirSync(destDir, {recursive: true});
+            }
+
+            // Create build configuration by merging default options with file-specific options
+            const buildConfig = {
+                entryPoints: [srcPath],
+                outfile: destPath,
+                minify: true,
+                platform: 'browser',
+                // Apply file-specific options, with defaults
+                ...file.options
+            };
+
+            await esbuild.build(buildConfig);
+
+            // Show bundling status in output
+            const bundleStatus = buildConfig.bundle ? 'bundled + minified' : 'minified';
+            logging.debug(`✓ ${file.src} → ${file.dest} (${bundleStatus})`);
+        } catch (error) {
+            console.error(`✗ Error processing ${file.src}:`, error);
+            process.exit(1);
+        }
+    }
+
+    logging.debug('JS processing complete');
+})();

package/core/bridge.js

@@ -16,7 +16,7 @@ const logging = require('@tryghost/logging');
 const tpl = require('@tryghost/tpl');
 const themeEngine = require('./frontend/services/theme-engine');
 const appService = require('./frontend/services/apps');
-const {adminAuthAssets, cardAssets,commentCountsAssets, memberAttributionAssets} = require('./frontend/services/assets-minification');
+const {cardAssets} = require('./frontend/services/assets-minification');
 const routerManager = require('./frontend/services/routing').routerManager;
 const settingsCache = require('./shared/settings-cache');
 const urlService = require('./server/services/url');
@@ -51,10 +51,6 @@ class Bridge {
         return themeEngine.getActive();
     }
 
-    ensureAdminAuthAssetsMiddleware() {
-        return adminAuthAssets.serveMiddleware();
-    }
-
     async activateTheme(loadedTheme, checkedTheme) {
         let settings = {
             locale: settingsCache.get('locale')
@@ -69,12 +65,6 @@ class Bridge {
             const cardAssetConfig = this.getCardAssetConfig();
             debug('reload card assets config', cardAssetConfig);
             cardAssets.invalidate(cardAssetConfig);
-
-            // TODO: is this in the right place?
-            // rebuild asset files
-            commentCountsAssets.invalidate();
-            adminAuthAssets.invalidate();
-            memberAttributionAssets.invalidate();
         } catch (err) {
             logging.error(new errors.InternalServerError({
                 message: tpl(messages.activateFailed, {theme: loadedTheme.name}),