ultimate-jekyll-manager 1.6.1 → 1.6.3

package/CHANGELOG.md

@@ -14,6 +14,30 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - `Fixed` for any bug fixes.
 - `Security` in case of vulnerabilities.
 
+---
+## [1.6.3] - 2026-06-03
+
+### Changed
+
+- **Workflow template dynamically generates secrets from `.env`.** `defaults.js` reads the default `_.env`, extracts all key names, and produces a `{ github.secrets }` template variable — no more hardcoding individual secrets in `build.yml`.
+- **`publishSecrets()` replaces `publishGitHubToken()` in setup.** Now reads the consumer's `.env` and publishes ALL non-empty keys as GitHub Actions repo secrets (not just `GH_TOKEN`).
+
+### Added
+
+- **Country flag SVGs:** id, in, ph, pk, ru, vn (modern-square style).
+- **Auto-create `pages/` dir for custom themes** in webpack.js — prevents `Module not found: __theme__/pages` error when a consumer theme lacks a `pages/` directory.
+
+### Removed
+
+- **`BACKEND_MANAGER_KEY`** removed from workflow template (replaced by dynamic `.env` secrets).
+
+---
+## [1.6.2] - 2026-06-02
+
+### Fixed
+
+- **`npx mgr setup` now merges new `.env` keys into existing consumer projects.** Previously, `ensureCoreFiles()` returned early when `src/_config.yml` existed, skipping the `gulp defaults` task that handles `.env` merging. New framework keys (like `BACKEND_MANAGER_OPENAI_API_KEY`) were never added to consumers that had already run setup once.
+
 ---
 ## [1.6.1] - 2026-06-02
 

package/CLAUDE.md

@@ -200,7 +200,7 @@ Deep references live in `docs/`. Treat docs as a first-class deliverable. **When
 - [docs/themes.md](docs/themes.md) — theme system: selection + resolution (SCSS loadPaths, `__theme__`, classy layout fallback), shared vs per-theme layers, authoring a theme inside UJM OR in a consumer project, live validation
 - [docs/layouts-and-pages.md](docs/layouts-and-pages.md) — page types, layout chain, `asset_path` frontmatter
 - [docs/images.md](docs/images.md) — `@post/` shortcut for blog post images, BEM admin/post image handling, imagemin pipeline + source-size constraints + `UJ_IMAGEMIN_REWRITE_SOURCES` cleanup flag
-- [docs/icons.md](docs/icons.md) — Font Awesome conventions, `{% uj_icon %}` vs prerendered icons in JS, size reference
+- [docs/icons.md](docs/icons.md) — Font Awesome conventions, `{% uj_icon %}` vs prerendered icons in JS, size reference, country flag SVGs (`assets/icons/flags/modern-square/`)
 - [docs/seo.md](docs/seo.md) — Alternatives collection (competitor comparison pages) + Schema/JSON-LD (`SoftwareApplication`, `FAQPage`)
 
 ### Frontend behavior

package/assets/icons/flags/modern-square/id.svg

@@ -0,0 +1 @@
+<svg height="512" viewBox="0 0 152 152" width="512" xmlns="http://www.w3.org/2000/svg"><defs><clipPath id="clip"><path d="m124.81 149.4a459 459 0 0 1 -97.62 0 27.69 27.69 0 0 1 -24.59-24.59 459 459 0 0 1 0-97.62 27.69 27.69 0 0 1 24.59-24.59 459 459 0 0 1 97.62 0 27.69 27.69 0 0 1 24.59 24.59 459 459 0 0 1 0 97.62 27.69 27.69 0 0 1 -24.59 24.59z"/></clipPath></defs><g clip-path="url(#clip)"><rect width="152" height="76" fill="#f40055"/><rect y="76" width="152" height="76" fill="#f0f9ff"/></g></svg>

package/assets/icons/flags/modern-square/in.svg

@@ -0,0 +1 @@
+<svg height="512" viewBox="0 0 152 152" width="512" xmlns="http://www.w3.org/2000/svg"><g id="Layer_2" data-name="Layer 2"><g id="india" data-name="india"><path id="path" d="m124.81 149.4a459 459 0 0 1 -97.62 0 27.69 27.69 0 0 1 -24.59-24.59 459 459 0 0 1 0-97.62 27.69 27.69 0 0 1 24.59-24.59 459 459 0 0 1 97.62 0 27.69 27.69 0 0 1 24.59 24.59 459 459 0 0 1 0 97.62 27.69 27.69 0 0 1 -24.59 24.59z" fill="#f0f9ff"/><path d="m151.38 52.26h-150.76q.63-12.54 2-25.08a27.68 27.68 0 0 1 24.57-24.58 459 459 0 0 1 97.62 0 27.68 27.68 0 0 1 24.59 24.58q1.33 12.53 1.98 25.08z" fill="#ff9933"/><path d="m151.38 99.73q-.63 12.54-2 25.08a27.68 27.68 0 0 1 -24.59 24.58 459 459 0 0 1 -97.62 0 27.68 27.68 0 0 1 -24.57-24.58q-1.34-12.54-2-25.08z" fill="#138808"/><circle cx="76" cy="76" r="13" fill="#000080"/><circle cx="76" cy="76" r="10.5" fill="#f0f9ff"/><circle cx="76" cy="76" r="3" fill="#000080"/></g></g></svg>

package/assets/icons/flags/modern-square/ph.svg

@@ -0,0 +1 @@
+<svg height="512" viewBox="0 0 152 152" width="512" xmlns="http://www.w3.org/2000/svg"><defs><clipPath id="clip"><path d="m124.81 149.4a459 459 0 0 1 -97.62 0 27.69 27.69 0 0 1 -24.59-24.59 459 459 0 0 1 0-97.62 27.69 27.69 0 0 1 24.59-24.59 459 459 0 0 1 97.62 0 27.69 27.69 0 0 1 24.59 24.59 459 459 0 0 1 0 97.62 27.69 27.69 0 0 1 -24.59 24.59z"/></clipPath></defs><g clip-path="url(#clip)"><rect width="152" height="76" fill="#406bd4"/><rect y="76" width="152" height="76" fill="#f40055"/><path d="m0 0v152l76-76z" fill="#f0f9ff"/><g fill="#ffcb24"><circle cx="25" cy="76" r="7"/><circle cx="10" cy="24" r="3.5"/><circle cx="10" cy="128" r="3.5"/><circle cx="52" cy="76" r="3.5"/></g></g></svg>

package/assets/icons/flags/modern-square/pk.svg

@@ -0,0 +1 @@
+<svg height="512" viewBox="0 0 152 152" width="512" xmlns="http://www.w3.org/2000/svg"><defs><clipPath id="clip"><path d="m124.81 149.4a459 459 0 0 1 -97.62 0 27.69 27.69 0 0 1 -24.59-24.59 459 459 0 0 1 0-97.62 27.69 27.69 0 0 1 24.59-24.59 459 459 0 0 1 97.62 0 27.69 27.69 0 0 1 24.59 24.59 459 459 0 0 1 0 97.62 27.69 27.69 0 0 1 -24.59 24.59z"/></clipPath></defs><g clip-path="url(#clip)"><rect width="152" height="152" fill="#01411c"/><rect width="38" height="152" fill="#f0f9ff"/><g transform="rotate(-270, 90, 76)"><circle cx="90" cy="76" r="24" fill="#f0f9ff"/><circle cx="82" cy="68" r="20" fill="#01411c"/></g><path d="m117.72 58.47a5 5 0 0 0 -4.5-5 5 5 0 0 0 -10 0 5 5 0 0 0 0 10 5 5 0 0 0 10 0 5 5 0 0 0 4.5-5z" fill="#f0f9ff"/></g></svg>

package/assets/icons/flags/modern-square/ru.svg

@@ -0,0 +1 @@
+<svg height="512" viewBox="0 0 152 152" width="512" xmlns="http://www.w3.org/2000/svg"><g id="Layer_2" data-name="Layer 2"><g id="russia" data-name="russia"><path id="path" d="m124.81 149.4a459 459 0 0 1 -97.62 0 27.69 27.69 0 0 1 -24.59-24.59 459 459 0 0 1 0-97.62 27.69 27.69 0 0 1 24.59-24.59 459 459 0 0 1 97.62 0 27.69 27.69 0 0 1 24.59 24.59 459 459 0 0 1 0 97.62 27.69 27.69 0 0 1 -24.59 24.59z" fill="#406bd4"/><path d="m151.38 52.26h-150.76q.63-12.54 2-25.08a27.68 27.68 0 0 1 24.57-24.58 459 459 0 0 1 97.62 0 27.68 27.68 0 0 1 24.59 24.58q1.33 12.53 1.98 25.08z" fill="#f0f9ff"/><path d="m151.38 99.73q-.63 12.54-2 25.08a27.68 27.68 0 0 1 -24.59 24.58 459 459 0 0 1 -97.62 0 27.68 27.68 0 0 1 -24.57-24.58q-1.34-12.54-2-25.08z" fill="#f40055"/></g></g></svg>

package/assets/icons/flags/modern-square/vn.svg

@@ -0,0 +1 @@
+<svg height="512" viewBox="0 0 152 152" width="512" xmlns="http://www.w3.org/2000/svg"><g id="Layer_2" data-name="Layer 2"><g id="vietnam" data-name="vietnam"><path id="path" d="m124.81 149.4a459 459 0 0 1 -97.62 0 27.69 27.69 0 0 1 -24.59-24.59 459 459 0 0 1 0-97.62 27.69 27.69 0 0 1 24.59-24.59 459 459 0 0 1 97.62 0 27.69 27.69 0 0 1 24.59 24.59 459 459 0 0 1 0 97.62 27.69 27.69 0 0 1 -24.59 24.59z" fill="#f40055"/><g transform="translate(20,0)"><path d="m84.77 66.21a5 5 0 0 0 -4.77-3.46h-12a3.67 3.67 0 0 1 -3.5-2.54l-3.78-11.47a5 5 0 0 0 -9.53 0l-3.72 11.47a3.67 3.67 0 0 1 -3.47 2.54h-12.09a5 5 0 0 0 -2.91 9.07l9.76 7.08a3.69 3.69 0 0 1 1.3 4.1l-3.73 11.49a5 5 0 0 0 7.71 5.6l9.76-7.09a3.66 3.66 0 0 1 4.32 0l9.76 7.09a5 5 0 0 0 7.71-5.6l-3.73-11.49a3.68 3.68 0 0 1 1.34-4.1l9.8-7.08a5 5 0 0 0 1.82-5.61z" fill="#ffcb24"/></g></g></g></svg>

package/dist/commands/setup.js

@@ -129,9 +129,9 @@ module.exports = async function (options) {
     checkLocality();
   }
 
-  // Publish GH_TOKEN as repository secret
+  // Publish .env secrets as repository secrets
   if (options.publishGitHubToken) {
-    await publishGitHubToken();
+    await publishSecrets();
   }
 
   // Deduplicate posts (remove duplicate posts with same slug but different dates)
@@ -268,31 +268,28 @@ function setupScripts() {
 }
 
 async function ensureCoreFiles() {
-  if (jetpack.exists('src/_config.yml')) {
-    return;
-  }
-
-  logger.log('No src/_config.yml found. Creating default config file...');
-
-  // Files that must exist BEFORE the gulpfile loads. Several task modules
-  // (sass/distribute/imagemin) read these at module top-level, so a fresh
-  // consumer can't even invoke `gulp defaults` without them.
-  const coreFiles = [
-    'src/_config.yml',
-    'config/ultimate-jekyll-manager.json',
-  ];
-
-  coreFiles.forEach((relPath) => {
-    const sourcePath = path.join(rootPathPackage, 'dist/defaults', relPath);
-    const targetPath = path.join(rootPathProject, relPath);
-    jetpack.copy(sourcePath, targetPath, { overwrite: false });
-    logger.log(`Copied default ${relPath}`);
-  });
+  // First-time setup: scaffold core files that must exist before gulp can load
+  if (!jetpack.exists('src/_config.yml')) {
+    logger.log('No src/_config.yml found. Creating default config file...');
+
+    const coreFiles = [
+      'src/_config.yml',
+      'config/ultimate-jekyll-manager.json',
+    ];
+
+    coreFiles.forEach((relPath) => {
+      const sourcePath = path.join(rootPathPackage, 'dist/defaults', relPath);
+      const targetPath = path.join(rootPathProject, relPath);
+      jetpack.copy(sourcePath, targetPath, { overwrite: false });
+      logger.log(`Copied default ${relPath}`);
+    });
 
-  // Inject new config into config variable
-  config = Manager.getConfig('project');
+    // Inject new config into config variable
+    config = Manager.getConfig('project');
+  }
 
-  // Run gulp defaults task since this is likely the first run
+  // Always run gulp defaults — merges new framework keys into .env, .gitignore,
+  // CLAUDE.md, and config files without overwriting user values
   await execute('UJ_BUILD_MODE=true npm run gulp -- defaults', { log: true });
 }
 
@@ -392,7 +389,7 @@ function checkLocality() {
   }
 }
 
-async function publishGitHubToken() {
+async function publishSecrets() {
   if (!process.env.GH_TOKEN) {
     logger.warn('GH_TOKEN not found in environment variables. Skipping secret publication.');
     return;
@@ -404,37 +401,67 @@ async function publishGitHubToken() {
   }
 
   if (Manager.isBuildMode()) {
-    logger.log('Skipping GH_TOKEN publication in build mode.');
+    logger.log('Skipping secret publication in build mode.');
+    return;
+  }
+
+  // Read .env and collect all keys with non-empty values
+  const envPath = path.join(process.cwd(), '.env');
+  if (!jetpack.exists(envPath)) {
+    logger.warn('.env file not found. Skipping secret publication.');
+    return;
+  }
+
+  const envContent = jetpack.read(envPath);
+  const secrets = {};
+
+  envContent.split('\n').forEach(line => {
+    const trimmed = line.trim();
+    if (!trimmed || trimmed.startsWith('#')) {
+      return;
+    }
+    const match = trimmed.match(/^([A-Z_][A-Z0-9_]*)=["']?(.+?)["']?$/);
+    if (match && match[2]) {
+      secrets[match[1]] = match[2];
+    }
+  });
+
+  const secretNames = Object.keys(secrets);
+  if (!secretNames.length) {
+    logger.warn('No secrets with values found in .env. Skipping secret publication.');
     return;
   }
 
   try {
     const [owner, repo] = process.env.GITHUB_REPOSITORY.split('/');
-
     const octokit = new Octokit({ auth: process.env.GH_TOKEN });
 
-    logger.log(`Publishing GH_TOKEN as repository secret for ${owner}/${repo}...`);
+    logger.log(`Publishing ${secretNames.length} secret(s) for ${owner}/${repo}: ${secretNames.join(', ')}`);
 
     await sodium.ready;
 
     const { data: publicKeyData } = await octokit.actions.getRepoPublicKey({ owner, repo });
-
-    const secretBytes = Buffer.from(process.env.GH_TOKEN);
     const keyBytes = Buffer.from(publicKeyData.key, 'base64');
-    const encryptedBytes = sodium.crypto_box_seal(secretBytes, keyBytes);
-    const encryptedValue = Buffer.from(encryptedBytes).toString('base64');
-
-    await octokit.actions.createOrUpdateRepoSecret({
-      owner,
-      repo,
-      secret_name: 'GH_TOKEN',
-      encrypted_value: encryptedValue,
-      key_id: publicKeyData.key_id,
-    });
 
-    logger.log(`Successfully published GH_TOKEN as repository secret`);
+    for (const [name, value] of Object.entries(secrets)) {
+      const secretBytes = Buffer.from(value);
+      const encryptedBytes = sodium.crypto_box_seal(secretBytes, keyBytes);
+      const encryptedValue = Buffer.from(encryptedBytes).toString('base64');
+
+      await octokit.actions.createOrUpdateRepoSecret({
+        owner,
+        repo,
+        secret_name: name,
+        encrypted_value: encryptedValue,
+        key_id: publicKeyData.key_id,
+      });
+
+      logger.log(`  ✅ ${name}`);
+    }
+
+    logger.log(`Successfully published ${secretNames.length} secret(s)`);
   } catch (error) {
-    logger.error(`Failed to publish GH_TOKEN as repository secret: ${error.message}`);
+    logger.error(`Failed to publish secrets: ${error.message}`);
   }
 }
 

package/dist/defaults/.github/workflows/build.yml

@@ -18,8 +18,7 @@ concurrency:
 #   contents: write
 
 env:
-  GH_TOKEN: ${{ secrets.GH_TOKEN }}
-  BACKEND_MANAGER_KEY: ${{ secrets.BACKEND_MANAGER_KEY }}
+  { github.secrets }
   RUBY_VERSION: '{ versions.ruby }'
   BUNDLER_VERSION: '{ versions.bundler }'
   NODE_VERSION: '{ versions.node }'

package/dist/defaults/_.env

@@ -1,6 +1,5 @@
 # ========== Default Values ==========
 # Github Token
-# Get token at: https://github.com/settings/tokens
 GH_TOKEN=""
 
 # Backend Manager

package/dist/gulp/tasks/defaults.js

@@ -30,6 +30,19 @@ const ujConfig = jetpack.exists(ujConfigPath) ? JSON5.parse(jetpack.read(ujConfi
 // const cleanVersions = { versions: Manager.getCleanVersions()};
 const cleanVersions = { versions: package.engines };
 
+// Build GitHub Actions secrets env block from default .env
+const defaultEnvPath = path.join(rootPathPackage, 'dist/defaults/_.env');
+const githubSecrets = (() => {
+  const content = jetpack.exists(defaultEnvPath) ? jetpack.read(defaultEnvPath) : '';
+  const lines = content.split('\n')
+    .map(l => l.trim())
+    .filter(l => l && !l.startsWith('#') && l.includes('='))
+    .map(l => l.split('=')[0].trim())
+    .map(key => `${key}: \${{ secrets.${key} }}`);
+
+  return { github: { secrets: lines.join('\n  ') } };
+})();
+
 // File MAP
 const FILE_MAP = {
   // Files to skip overwrite
@@ -116,7 +129,7 @@ const FILE_MAP = {
 
   // Files to run templating on
   '.github/workflows/build.yml': {
-    template: { ...cleanVersions, ...ujConfig },
+    template: { ...cleanVersions, ...ujConfig, ...githubSecrets },
   },
   '.nvmrc': {
     template: cleanVersions,

package/dist/gulp/tasks/webpack.js

@@ -158,7 +158,10 @@ function getSettings() {
           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;
+          const resolved = jetpack.exists(projectThemePath) ? projectThemePath : ujmThemePath;
+          // Ensure pages/ directory exists so dynamic imports don't fail
+          jetpack.dir(path.join(resolved, 'pages'));
+          return resolved;
         })(),
       },
       // Add module resolution paths for local web-manager

package/docs/icons.md

@@ -117,6 +117,21 @@ $el.innerHTML = '<i class="fa-solid fa-check"></i> Text';
 $el.innerHTML = `${getPrerenderedIcon('circle-check', 'fa-sm me-1')} Text`;
 ```
 
+## Country Flag Icons
+
+UJM ships rounded-square country flag SVGs at `assets/icons/flags/modern-square/`. The `{% uj_icon %}` tag resolves language codes to country flags via a `LANGUAGE_TO_COUNTRY` mapping in [jekyll-uj-powertools](https://github.com/itw-creative-works/jekyll-uj-powertools) (`lib/tags/icon.rb`). For example, `{% uj_icon "es" %}` resolves to `es.svg` (Spain), and `{% uj_icon "ja" %}` maps `ja` → `jp` → `jp.svg` (Japan).
+
+Most flags are from a Flaticon rounded-square icon pack. The following 6 were hand-created to match the pack's style:
+
+- `in.svg` (India) — saffron/white/green tricolor + Ashoka Chakra
+- `ru.svg` (Russia) — white/blue/red tricolor
+- `id.svg` (Indonesia) — red/white bicolor
+- `vn.svg` (Vietnam) — red background + yellow star
+- `pk.svg` (Pakistan) — green + white stripe, crescent & star
+- `ph.svg` (Philippines) — blue/red + white triangle, sun & stars
+
+When adding new flags, match the existing style: 152×152 viewBox, `clipPath` using the shared rounded-square path, flat/simplified design.
+
 ## Benefits
 
 - Icons are rendered server-side with proper Font Awesome classes

package/package.json

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