@gogitcms/editor 0.23.0 → 0.25.0

package/app/src/App.tsx

@@ -2373,10 +2373,10 @@ function useBranchImport(repositoryId?: string, branchId?: string) {
   const [live, setLive] = useState<BranchImportState | null>(null);
   // Tracks the previous render's `running`, to spot the moment an import lands.
   const wasRunning = useRef(false);
-  // A branch switch invalidates the previous branch's live state; without this
-  // the new branch would inherit it until the new subscription's first emission.
-  // Declared before the landing effect below so it resets first, and the new
-  // branch is never credited with the old one's in-flight import.
+  // A branch switch invalidates the previous branch's live state. The `branchId`
+  // check below is what actually makes that safe — this only frees the memory —
+  // because an effect runs a render too late to keep the switching render from
+  // reading it.
   useEffect(() => { setLive(null); wasRunning.current = false; }, [repositoryId, branchId]);
   useSubscription(BRANCH_IMPORT_PROGRESS, {
     variables,
@@ -2390,16 +2390,40 @@ function useBranchImport(repositoryId?: string, branchId?: string) {
     },
   });
 
-  const state: BranchImportState | null = live ?? data?.branchImport ?? null;
-
-  // An import that just landed replaced the content behind every open query, so
-  // re-read them. When this fires for a FIRST import the editor is not mounted
-  // yet and the only active query is the repository list — which is exactly the
-  // one that has to be re-read, since the branch's projects arrive with the
-  // import.
+  // Every answer names the branch it describes, and anything naming a different
+  // one is discarded. Both sources outlive the render that switches branches —
+  // `live` until its reset effect runs, `data` for as long as Apollo holds the
+  // previous variables' result — so without this the switching render answers
+  // for the branch just left. That is not a cosmetic flash: on the way onto a
+  // newly created branch it reports "already imported", the gate opens, and the
+  // editor mounts and caches an empty `collections` for a branch whose import
+  // has not run yet — an empty editor that never fills in.
+  const answer = live ?? data?.branchImport ?? null;
+  const state: BranchImportState | null =
+    answer && answer.branchId === branchId ? answer : null;
+
+  // An import that just landed replaced this branch's content, so drop what the
+  // cache believes about it and re-read the lists.
+  //
+  // Eviction is not redundant with the refetch: `refetchQueries` only reaches
+  // MOUNTED queries, and the editor is unmounted behind the first-import gate.
+  // Without it, a `collections` answer cached before the import landed would
+  // still be there when the gate opens and the editor mounts.
+  //
+  // Open documents are deliberately left out of both. Replacing the text under
+  // an editor that may hold unsaved edits is worse than showing content one
+  // import behind, and the import's own notification already says something
+  // changed.
   useEffect(() => {
     if (!state) return;
-    if (wasRunning.current && !state.running) void apollo.refetchQueries({ include: "active" });
+    if (wasRunning.current && !state.running) {
+      for (const fieldName of ["collections", "documents", "documentCount", "mediaSets", "media", "mediaCount", "mediaFacets"]) {
+        apollo.cache.evict({ id: "ROOT_QUERY", fieldName });
+      }
+      apollo.cache.gc();
+      // REPOSITORIES carries the branch's projects, which arrive with the import.
+      void apollo.refetchQueries({ include: [REPOSITORIES, COLLECTIONS, DOCUMENTS, DOCUMENT_COUNT] });
+    }
     wasRunning.current = state.running;
   }, [state?.running, apollo]);
 

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@gogitcms/editor",
-  "version": "0.23.0",
+  "version": "0.25.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@gogitcms/editor",
-      "version": "0.23.0",
+      "version": "0.25.0",
       "dependencies": {
         "@apollo/client": "^3.11.8",
         "@handlewithcare/react-prosemirror": "^3.2.7",
@@ -47,11 +47,11 @@
         "node": ">=20"
       },
       "optionalDependencies": {
-        "@gogitcms/gitcms-local-darwin-arm64": "0.23.0",
-        "@gogitcms/gitcms-local-darwin-x64": "0.23.0",
-        "@gogitcms/gitcms-local-linux-arm64": "0.23.0",
-        "@gogitcms/gitcms-local-linux-x64": "0.23.0",
-        "@gogitcms/gitcms-local-win32-x64": "0.23.0"
+        "@gogitcms/gitcms-local-darwin-arm64": "0.25.0",
+        "@gogitcms/gitcms-local-darwin-x64": "0.25.0",
+        "@gogitcms/gitcms-local-linux-arm64": "0.25.0",
+        "@gogitcms/gitcms-local-linux-x64": "0.25.0",
+        "@gogitcms/gitcms-local-win32-x64": "0.25.0"
       }
     },
     "node_modules/@apollo/client": {
@@ -751,9 +751,9 @@
       }
     },
     "node_modules/@gogitcms/gitcms-local-darwin-arm64": {
-      "version": "0.23.0",
-      "resolved": "https://registry.npmjs.org/@gogitcms/gitcms-local-darwin-arm64/-/gitcms-local-darwin-arm64-0.23.0.tgz",
-      "integrity": "sha512-kfPtnEYLi0y9dius3PnQoqbFTqBn3pINjhBfub67VpGDWJ88ZQw57AEgAPXRM21thUAmiFAHLkOwOTnnktIufQ==",
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/@gogitcms/gitcms-local-darwin-arm64/-/gitcms-local-darwin-arm64-0.25.0.tgz",
+      "integrity": "sha512-sJd3OWLscUPtIedhokAEDY1BMk207MZyhQvbUmSKzyjlorRNUduC7P7VkzeUVbdIaA1zmw1fPvq/y3Mhy5p9Cg==",
       "cpu": [
         "arm64"
       ],
@@ -764,9 +764,9 @@
       ]
     },
     "node_modules/@gogitcms/gitcms-local-darwin-x64": {
-      "version": "0.23.0",
-      "resolved": "https://registry.npmjs.org/@gogitcms/gitcms-local-darwin-x64/-/gitcms-local-darwin-x64-0.23.0.tgz",
-      "integrity": "sha512-CJbVB1uUUcapWGj3XdX5qYwKnmuGcMhKrlN65SiX46lGjeKBfs6RJgvV0LspkJDsrqZ+DlLEtt52i1oPoGBfrQ==",
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/@gogitcms/gitcms-local-darwin-x64/-/gitcms-local-darwin-x64-0.25.0.tgz",
+      "integrity": "sha512-vp1I30oLLxBX5KZaxZqTZofU8vCZwipOuhrU8tvfa92cdHFPHWJGGSP7JV2IXjEK/3/oEZrhnk0saQSiKwf80A==",
       "cpu": [
         "x64"
       ],
@@ -777,9 +777,9 @@
       ]
     },
     "node_modules/@gogitcms/gitcms-local-linux-arm64": {
-      "version": "0.23.0",
-      "resolved": "https://registry.npmjs.org/@gogitcms/gitcms-local-linux-arm64/-/gitcms-local-linux-arm64-0.23.0.tgz",
-      "integrity": "sha512-Rd7Y0drASw0mHXVDvnaQHgQAnkwKYh/LGLwSYXjq7v5qVnaZDM+Q7PYBMk0yqKPN2jatPl8BQQIV6fJfHXYMCA==",
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/@gogitcms/gitcms-local-linux-arm64/-/gitcms-local-linux-arm64-0.25.0.tgz",
+      "integrity": "sha512-iPfPLzV2NmvxBqQYwA5NsiPIWO3R3DKOItDMGWTRsV9hlEkPYK8R4c7A2iK/A5QiAkpR4bceeI5QnuwQFJFpdg==",
       "cpu": [
         "arm64"
       ],
@@ -790,9 +790,9 @@
       ]
     },
     "node_modules/@gogitcms/gitcms-local-linux-x64": {
-      "version": "0.23.0",
-      "resolved": "https://registry.npmjs.org/@gogitcms/gitcms-local-linux-x64/-/gitcms-local-linux-x64-0.23.0.tgz",
-      "integrity": "sha512-zaabkKoyZ/KCVoSv/CnuCRdtOZELhRuhE4LJqxG1Qc2JEYF5RrB/3yWDW1+89SO8AxSM5iD0xMZ16+SgBfqQLg==",
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/@gogitcms/gitcms-local-linux-x64/-/gitcms-local-linux-x64-0.25.0.tgz",
+      "integrity": "sha512-stUOczAEnyItQqMnG+RaUkPYNCKqIdK3N6rG3grUDdXkNaS/tPXDc/ehEjKY2+c0o3NRIFpHrDVVh/lHazoRTw==",
       "cpu": [
         "x64"
       ],
@@ -803,9 +803,9 @@
       ]
     },
     "node_modules/@gogitcms/gitcms-local-win32-x64": {
-      "version": "0.23.0",
-      "resolved": "https://registry.npmjs.org/@gogitcms/gitcms-local-win32-x64/-/gitcms-local-win32-x64-0.23.0.tgz",
-      "integrity": "sha512-6WRhc0BBs07W2GFMeLeCJVvNy3vPE4hLfPtL5w8mbrcIGr/rkOtfY4NVG5I3REZhAaX2v0oNYOWtewcu7wVePQ==",
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/@gogitcms/gitcms-local-win32-x64/-/gitcms-local-win32-x64-0.25.0.tgz",
+      "integrity": "sha512-rUhJZgXT2r4Z6Vfl3zzJUe6jXOrt0UC6X7yC/qCk5gfJlR9yJHDa9etO6pURn07fV6RcaKB9VeuN7ijz5vYYuA==",
       "cpu": [
         "x64"
       ],
@@ -982,12 +982,12 @@
       }
     },
     "node_modules/@posthog/core": {
-      "version": "1.48.11",
-      "resolved": "https://registry.npmjs.org/@posthog/core/-/core-1.48.11.tgz",
-      "integrity": "sha512-fvKbxGaUM8RuCDB1jdhSqAHYjk42INfJDWT1KVezn74sCrfnr1YaUafxzmcS+87D5FzbA2tu7IT0GQRV2WkkRg==",
+      "version": "1.49.0",
+      "resolved": "https://registry.npmjs.org/@posthog/core/-/core-1.49.0.tgz",
+      "integrity": "sha512-+Ejf6sZ2wI9F37rOrPxoI90mydOw5O/YKjAgWMkkuuQRHGwyfXugxsD/+CVI4Yymg8LujHr0C/KXJvWDJYgwWQ==",
       "license": "MIT",
       "dependencies": {
-        "@posthog/types": "^1.405.3"
+        "@posthog/types": "^1.407.0"
       }
     },
     "node_modules/@posthog/types": {
@@ -3898,9 +3898,9 @@
       "peer": true
     },
     "node_modules/node-releases": {
-      "version": "2.0.53",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.53.tgz",
-      "integrity": "sha512-D9UOmYG3UH1V+ENW56t5QXBwJw1YEY18ruVeus89Rw+SyIgjPkCO84bRzO3uNIYosJbNwiabWVn48o3uJLjxFQ==",
+      "version": "2.0.54",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.54.tgz",
+      "integrity": "sha512-YHs7BmmcsdAI5Ozuf8JZo6PT0mv2GIWC9vMfvUC3dp65M8hn7Ux8CPL+2oBI7juNuj9d0ndhTcznq2ODBps9cQ==",
       "license": "MIT",
       "engines": {
         "node": ">=18"
@@ -4071,13 +4071,13 @@
       "license": "MIT"
     },
     "node_modules/posthog-js": {
-      "version": "1.421.0",
-      "resolved": "https://registry.npmjs.org/posthog-js/-/posthog-js-1.421.0.tgz",
-      "integrity": "sha512-MXXVvAphK7rXg8bPGTBHWG/I5784wMyRev6sjjQPRXLoMy3JJcvaZuBHrlLqNLCw8r6YtD12ubNBo/2ZdaElIQ==",
+      "version": "1.422.0",
+      "resolved": "https://registry.npmjs.org/posthog-js/-/posthog-js-1.422.0.tgz",
+      "integrity": "sha512-m2mg6SLFZs9L2/L+a8+aeraR0LyijMrXLuwSbgfSeBLjHe99C4IR11Q2DV7R5qktVTwSx0Dg2kdMosx35/FfwQ==",
       "license": "(Apache-2.0 AND MIT)",
       "dependencies": {
         "@posthog/browser-common": "^0.6.0",
-        "@posthog/core": "^1.48.11",
+        "@posthog/core": "^1.49.0",
         "@posthog/types": "^1.407.0",
         "core-js": "^3.49.0",
         "dompurify": "^3.4.13",
@@ -5056,9 +5056,9 @@
       }
     },
     "node_modules/terser": {
-      "version": "5.51.0",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.51.0.tgz",
-      "integrity": "sha512-myiQ6aFnxDOjdiXdTlC8ngVccQD88uHXTx5RUQOSEnarDYgJMjDagwAQszcOusjvmf4YqWsxoD1+MY+oAJRmpw==",
+      "version": "5.51.2",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.51.2.tgz",
+      "integrity": "sha512-bWnjSNscmuI+GJze6ZupnHP8G/cTcsJF+bXCeQknk2SHQsgbNJnLrqiH9jZ2W4STPVXH2mDKKRX3iwPhc9Cn/Q==",
       "license": "BSD-2-Clause",
       "peer": true,
       "dependencies": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gogitcms/editor",
-  "version": "0.23.0",
+  "version": "0.25.0",
   "description": "Terminal UI for setting up and running the Go·Git CMS content editor",
   "type": "module",
   "bin": {
@@ -65,10 +65,10 @@
     "@gogitcms/frontend": "workspace:*"
   },
   "optionalDependencies": {
-    "@gogitcms/gitcms-local-darwin-arm64": "0.23.0",
-    "@gogitcms/gitcms-local-darwin-x64": "0.23.0",
-    "@gogitcms/gitcms-local-linux-arm64": "0.23.0",
-    "@gogitcms/gitcms-local-linux-x64": "0.23.0",
-    "@gogitcms/gitcms-local-win32-x64": "0.23.0"
+    "@gogitcms/gitcms-local-darwin-arm64": "0.25.0",
+    "@gogitcms/gitcms-local-darwin-x64": "0.25.0",
+    "@gogitcms/gitcms-local-linux-arm64": "0.25.0",
+    "@gogitcms/gitcms-local-linux-x64": "0.25.0",
+    "@gogitcms/gitcms-local-win32-x64": "0.25.0"
   }
 }