ultimate-jekyll-manager 1.9.25 → 1.9.27

package/dist/assets/js/pages/token/index.js

@@ -8,6 +8,14 @@ export default function () {
   const $status = document.getElementById('token-status');
   const $error = document.getElementById('token-error');
   const $errorMessage = document.getElementById('token-error-message');
+  const $spinner = document.getElementById('token-spinner');
+  const $actions = document.getElementById('token-actions');
+  const $retry = document.getElementById('token-retry');
+
+  // Retry re-runs the whole flow — reloading re-attempts auth + token generation
+  if ($retry) {
+    $retry.addEventListener('click', () => window.location.reload());
+  }
 
   // Get URL params
   const url = new URL(window.location.href);
@@ -83,7 +91,7 @@ export default function () {
           const returnUrl = new URL(authReturnUrl);
           returnUrl.searchParams.set('authToken', token);
 
-          // LEGACY: Reformat token for desktop app deep links
+          // LEGACY: Add the legacy payload shape for old desktop app deep links
           // TODO: Remove this block when legacy desktop app support is no longer needed
           _legacyTranslateTokenRedirect(returnUrl, token);
 
@@ -101,6 +109,7 @@ export default function () {
           // Extension background will detect this and close the tab
           url.searchParams.set('authToken', token);
           window.history.replaceState({}, '', url.toString());
+          stopSpinner();
           updateStatus('You can close this tab now.');
         }
       } catch (error) {
@@ -150,8 +159,10 @@ export default function () {
     $status.appendChild($p);
   }
 
-  // Show error message
+  // Show error message + swap the spinner for the retry / go-home actions
   function showError(message) {
+    stopSpinner();
+
     if ($error && $errorMessage) {
       $errorMessage.textContent = message;
       $error.classList.remove('d-none');
@@ -159,14 +170,25 @@ export default function () {
     if ($status) {
       $status.classList.add('d-none');
     }
+    if ($actions) {
+      $actions.classList.remove('d-none');
+    }
+  }
+
+  // Stop the loading spinner once the flow reaches a terminal state
+  function stopSpinner() {
+    if ($spinner) {
+      $spinner.classList.add('d-none');
+    }
   }
 
-  // LEGACY: Reformat token for desktop app deep links
-  // Legacy desktop apps expect ?payload={"token":"X"} instead of ?authToken=X for custom protocol URLs
+  // LEGACY: Add the legacy token shape for desktop app deep links
+  // Legacy desktop apps read ?payload={"token":"X"} on custom protocol URLs — ADDED
+  // alongside ?authToken=X (never replacing it): old apps read payload and ignore
+  // authToken, modern apps (Electron Manager) read authToken and ignore payload.
   // TODO: Remove this function AND its call above when legacy desktop app support is no longer needed
   function _legacyTranslateTokenRedirect(returnUrl, token) {
     if (returnUrl.protocol !== 'http:' && returnUrl.protocol !== 'https:') {
-      returnUrl.searchParams.delete('authToken');
       returnUrl.searchParams.set('payload', JSON.stringify({ token: token }));
     }
   }

package/dist/defaults/dist/_layouts/themes/classy/frontend/pages/auth/token.html

@@ -20,7 +20,7 @@ layout: themes/[ site.theme.id ]/frontend/core/cover
       </div>
 
       <!-- Spinner -->
-      <div class="text-center mb-4">
+      <div id="token-spinner" class="text-center mb-4">
         <div class="spinner-border text-primary" role="status">
           <span class="visually-hidden">Loading...</span>
         </div>
@@ -35,6 +35,12 @@ layout: themes/[ site.theme.id ]/frontend/core/cover
       <div id="token-error" class="alert alert-danger d-none" role="alert">
         <strong>Error:</strong> <span id="token-error-message"></span>
       </div>
+
+      <!-- Actions (hidden until the flow resolves with an error) -->
+      <div id="token-actions" class="text-center d-none">
+        <button type="button" id="token-retry" class="btn btn-primary w-100">Try again</button>
+        <a href="/" class="btn btn-link btn-sm text-muted d-block mt-2">Go home</a>
+      </div>
     </div>
   </div>
 </section>

package/dist/gulp/tasks/defaults.js

@@ -55,6 +55,11 @@ const FILE_MAP = {
   'src/**/*': {
     overwrite: false,
   },
+  // Consumer-owned after seeding (e.g. test/_init.js fixture hooks) — copy when
+  // missing, never clobber the consumer's version on setup reruns
+  'test/**/*': {
+    overwrite: false,
+  },
   'src/**/*.{html,md,json}': {
     skip: (file) => {
       // Get the name
@@ -604,6 +609,9 @@ function defaultsWatcher(complete) {
 // Default Task
 module.exports = series(defaults, defaultsWatcher);
 
+// Exposed for the build-layer FILE_MAP test (defaults-file-options.test.js)
+module.exports.getFileOptions = getFileOptions;
+
 function getFileOptions(filePath) {
   const defaults = {
     overwrite: true,

package/dist/test/suites/build/defaults-file-options.test.js

@@ -0,0 +1,59 @@
+// getFileOptions from src/gulp/tasks/defaults.js — the FILE_MAP rules that decide
+// which shipped defaults may overwrite consumer files on `npx mgr setup` reruns.
+// Regression here silently clobbers consumer-owned files (test/_init.js was reset
+// to the stub on every setup because no rule matched it and the fall-through
+// default is overwrite: true).
+
+module.exports = {
+  layer: 'build',
+  description: 'defaults FILE_MAP (gulp/tasks/defaults.js getFileOptions)',
+  type: 'group',
+  tests: [
+    {
+      name: 'consumer-owned seeds are copy-once (test/, hooks/, src/)',
+      run: async (ctx) => {
+        const { getFileOptions } = require('../../../gulp/tasks/defaults.js');
+
+        // The regression case: consumer fixture hook must survive setup reruns
+        ctx.expect(getFileOptions('test/_init.js').overwrite).toBe(false);
+        ctx.expect(getFileOptions('test/README.md').overwrite).toBe(false);
+
+        ctx.expect(getFileOptions('hooks/build/pre.js').overwrite).toBe(false);
+        ctx.expect(getFileOptions('src/assets/js/main.js').overwrite).toBe(false);
+        ctx.expect(getFileOptions('src/service-worker.js').overwrite).toBe(false);
+      },
+    },
+    {
+      name: 'framework-owned files always overwrite',
+      run: async (ctx) => {
+        const { getFileOptions } = require('../../../gulp/tasks/defaults.js');
+
+        const workflow = getFileOptions('.github/workflows/build.yml');
+        ctx.expect(workflow.overwrite).toBe(true);
+        ctx.expect(!!workflow.template).toBe(true);
+
+        // Last-match-wins: team images override the earlier src/**/* (false) rule
+        ctx.expect(getFileOptions('src/assets/images/team/rare-ivy/profile.jpg').overwrite).toBe(true);
+      },
+    },
+    {
+      name: 'merge and skip rules resolve as declared',
+      run: async (ctx) => {
+        const { getFileOptions } = require('../../../gulp/tasks/defaults.js');
+
+        ctx.expect(getFileOptions('CLAUDE.md').mergeLines).toBe(true);
+
+        const config = getFileOptions('config/ultimate-jekyll-manager.json');
+        ctx.expect(config.overwrite).toBe(true);
+        ctx.expect(config.merge).toBe(true);
+
+        ctx.expect(getFileOptions('test/.DS_Store').skip).toBe(true);
+
+        // Unmatched files fall through to overwrite: true — any new consumer-owned
+        // default MUST get an explicit rule or setup will clobber it
+        ctx.expect(getFileOptions('dist/robots.txt').overwrite).toBe(true);
+        ctx.expect(getFileOptions('dist/robots.txt').rule).toBeNull();
+      },
+    },
+  ],
+};

package/dist/test/suites/page/token-error-state.test.js

@@ -0,0 +1,124 @@
+// /token page: when the flow resolves with an error (e.g. token fetch fails) the
+// loading spinner must STOP and be replaced by a "Try again" (reload) button plus
+// a smaller "Go home" link — previously the spinner spun forever behind the error.
+//
+// Each run() is serialized to the browser (Puppeteer), so every test builds the
+// token card DOM (mirrors classy's auth/token.html) and replicates the module's
+// stopSpinner/showError logic inline — the page module can't be imported (ESM +
+// web-manager deps) and module-scope helpers aren't in the browser's scope.
+
+module.exports = {
+  layer: 'page',
+  description: '/token error state swaps the spinner for retry/home actions',
+  type: 'group',
+  tests: [
+    {
+      name: 'showError stops the spinner and reveals the retry/home actions',
+      run: async (ctx) => {
+        const $root = document.createElement('div');
+        $root.innerHTML = ''
+          + '<div id="token-spinner" class="text-center mb-4"><div class="spinner-border" role="status"></div></div>'
+          + '<div id="token-status" class="text-center"><p class="text-muted small">Generating secure token...</p></div>'
+          + '<div id="token-error" class="alert alert-danger d-none" role="alert"><strong>Error:</strong> <span id="token-error-message"></span></div>'
+          + '<div id="token-actions" class="text-center d-none">'
+          +   '<button type="button" id="token-retry" class="btn btn-primary w-100">Try again</button>'
+          +   '<a href="/" class="btn btn-link btn-sm text-muted d-block mt-2">Go home</a>'
+          + '</div>';
+        document.body.appendChild($root);
+
+        const $status = $root.querySelector('#token-status');
+        const $error = $root.querySelector('#token-error');
+        const $errorMessage = $root.querySelector('#token-error-message');
+        const $spinner = $root.querySelector('#token-spinner');
+        const $actions = $root.querySelector('#token-actions');
+
+        function stopSpinner() {
+          if ($spinner) { $spinner.classList.add('d-none'); }
+        }
+        function showError(message) {
+          stopSpinner();
+          if ($error && $errorMessage) {
+            $errorMessage.textContent = message;
+            $error.classList.remove('d-none');
+          }
+          if ($status) { $status.classList.add('d-none'); }
+          if ($actions) { $actions.classList.remove('d-none'); }
+        }
+
+        // Baseline: spinner visible, actions + error hidden
+        ctx.expect($spinner.classList.contains('d-none')).toBe(false);
+        ctx.expect($actions.classList.contains('d-none')).toBe(true);
+        ctx.expect($error.classList.contains('d-none')).toBe(true);
+
+        showError('Failed to generate token. Please try again.');
+
+        // Spinner + status gone, error + actions shown, message set
+        ctx.expect($spinner.classList.contains('d-none')).toBe(true);
+        ctx.expect($status.classList.contains('d-none')).toBe(true);
+        ctx.expect($error.classList.contains('d-none')).toBe(false);
+        ctx.expect($actions.classList.contains('d-none')).toBe(false);
+        ctx.expect($errorMessage.textContent).toBe('Failed to generate token. Please try again.');
+
+        $root.remove();
+      },
+    },
+    {
+      name: 'retry button click re-runs the flow (reload)',
+      run: async (ctx) => {
+        const $root = document.createElement('div');
+        $root.innerHTML = '<button type="button" id="token-retry" class="btn btn-primary w-100">Try again</button>';
+        document.body.appendChild($root);
+
+        const $retry = $root.querySelector('#token-retry');
+
+        // Mirror the module's wiring with reload stubbed (can't reload the harness)
+        let reloadCount = 0;
+        $retry.addEventListener('click', () => { reloadCount++; });
+
+        $retry.click();
+        $retry.click();
+
+        ctx.expect(reloadCount).toBe(2);
+
+        $root.remove();
+      },
+    },
+    {
+      name: 'go-home link points at the site root',
+      run: async (ctx) => {
+        const $root = document.createElement('div');
+        $root.innerHTML = '<div id="token-actions"><a href="/" class="btn btn-link btn-sm text-muted d-block mt-2">Go home</a></div>';
+        document.body.appendChild($root);
+
+        const $home = $root.querySelector('#token-actions a');
+
+        ctx.expect($home).toBeTruthy();
+        ctx.expect($home.getAttribute('href')).toBe('/');
+
+        $root.remove();
+      },
+    },
+    {
+      name: 'terminal success (close-tab flow) also stops the spinner',
+      run: async (ctx) => {
+        const $root = document.createElement('div');
+        $root.innerHTML = ''
+          + '<div id="token-spinner" class="text-center mb-4"><div class="spinner-border" role="status"></div></div>'
+          + '<div id="token-actions" class="text-center d-none"></div>';
+        document.body.appendChild($root);
+
+        const $spinner = $root.querySelector('#token-spinner');
+        const $actions = $root.querySelector('#token-actions');
+
+        // The extension "You can close this tab now." branch calls stopSpinner()
+        if ($spinner) { $spinner.classList.add('d-none'); }
+
+        ctx.expect($spinner.classList.contains('d-none')).toBe(true);
+        // No error, so the retry/home actions stay hidden
+        ctx.expect($actions.classList.contains('d-none')).toBe(true);
+
+        $root.remove();
+      },
+    },
+  ],
+};

package/docs/build-system.md

@@ -22,6 +22,19 @@ serve → build → developmentRebuild
 
 Pure helpers are exposed under [src/gulp/tasks/utils/](../src/gulp/tasks/utils/) (`merge-jekyll-configs`, `_validate-yaml`, `template-transform`, `collectTextNodes`, `dictionary`, `github-cache`, `formatDocument`) — these are the highest-value test targets (zero I/O, callable directly in `build`-layer tests).
 
+## Defaults distribution (`defaults` task)
+
+The `defaults` task copies `dist/defaults/**` from the framework into the consumer project on every build/setup. Per-file behavior is decided by `FILE_MAP` in [defaults.js](../src/gulp/tasks/defaults.js) (`getFileOptions` — **last matching glob wins**), in four classes:
+
+| Class | Behavior | Rules |
+|---|---|---|
+| Copy-once (consumer-owned) | Seeded when missing, NEVER overwritten | `**/*.md`, `hooks/**/*`, `src/**/*`, `test/**/*` (e.g. `test/_init.js`) |
+| Always-overwrite (framework-owned) | Replaced every run | `.github/workflows/build.yml`, `src/assets/images/team/**/*`, and **any file with no matching rule** (fall-through default) |
+| Merge | Combined with the consumer's version | `config/ultimate-jekyll-manager.json` (deep config merge), `CLAUDE.md` / `_.env` / `_.gitignore` (marker-based line merge) |
+| Skip | Never copied | `**/.DS_Store`, `**/__temp/**/*` |
+
+⚠️ The fall-through default is `overwrite: true` — when adding a new consumer-owned file to `src/defaults/`, it MUST get an explicit copy-once rule or setup reruns will clobber the consumer's edits. The rule classes are locked by the build-layer test `defaults-file-options.test.js`.
+
 ## Config flow
 
 Three config files in the consumer project feed the build:

package/docs/test-framework.md

@@ -241,6 +241,8 @@ Same protocol as EM (`__EM_TEST__`) and BXM (`__BXM_TEST__`). One marker per fra
 
 The runner loads an optional `test/_init.js` from **both** test roots — the framework (`<UJM>/test/_init.js`) and the consumer project (`<cwd>/test/_init.js`) — and runs it **once, before any suite** (it is NOT itself run as a test; the `_`-prefix keeps it out of discovery). Mirrors the same hook in BEM/EM/BXM so all four frameworks share one shape.
 
+The stub shipped in `src/defaults/test/_init.js` is **seeded once and never overwritten** — the file is consumer-owned, so setup reruns preserve whatever fixture logic the project puts in it (`test/**/*` is copy-once in the defaults task's `FILE_MAP`; see [build-system.md](build-system.md#defaults-distribution-defaults-task)).
+
 The module **must export a function** — `module.exports = (ctx) => ({ ... })` — called with `{ projectRoot }` and returning the hook object. It may declare:
 
 - `async setup({ projectRoot })` — runs once before the suites, e.g. to scaffold a fixture file the boot layer needs.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ultimate-jekyll-manager",
-  "version": "1.9.25",
+  "version": "1.9.27",
   "description": "Ultimate Jekyll dependency manager",
   "main": "dist/index.js",
   "files": [