notion-static-exporter 1.0.2 → 1.0.3

package/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 1.0.2
+
+- Fix CI: when syncing with `--out .` (GitHub Actions), preserve `.git` / `.github`
+  instead of renaming the checkout into `*.nsp-backup` (which broke Commit & push)
+
 ## 1.0.0
 
 - Initial release: Puppeteer BFS scrape of public `notion.site` pages

package/dist/cache.d.ts

@@ -43,6 +43,10 @@ export declare function ensureCachedPageInStaging(outRoot: string, staging: stri
 /**
  * Atomically publish staging → outRoot, keeping one previous copy at backup.
  * Live outRoot is never wiped until staging is complete.
+ *
+ * When outRoot is a git checkout (`--out .` in Actions), we must NOT rename the
+ * directory (that would move `.git` aside and leave the next step outside a repo).
+ * Instead merge staging into place while preserving `.git` / `.github`.
  */
 export declare function publishStaging(outRoot: string): {
     backup: string | null;

package/dist/cache.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cache.d.ts","sourceRoot":"","sources":["../src/cache.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAG9C,eAAO,MAAM,aAAa,EAAG,CAAU,CAAC;AACxC,eAAO,MAAM,UAAU,oBAAoB,CAAC;AAE5C,MAAM,MAAM,cAAc,GAAG;IAC3B,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,MAAM,EAAE,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG;IACtB,OAAO,EAAE,OAAO,aAAa,CAAC;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;IACtC,iFAAiF;IACjF,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAChC,CAAC;AAEF,wBAAgB,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAElD;AAED,wBAAgB,SAAS,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAEjD;AAED,wBAAgB,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,CAErD;AAED,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAWvD;AAED,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,GAAG,IAAI,CAG7D;AAED,oFAAoF;AACpF,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,SAAS,GAAG,MAAM,CAa7E;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,UAAU,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAQxE;AAED;;;GAGG;AACH,wBAAsB,eAAe,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAuBjE;AAED,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAUnD;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAC5B,OAAO,EAAE,MAAM,EACf,SAAS,CAAC,EAAE,OAAO,GAClB;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,OAAO,CAAA;CAAE,CAsCtC;AAED,gFAAgF;AAChF,wBAAgB,yBAAyB,CACvC,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,GACX,OAAO,CAQT;AAED;;;GAGG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG;IAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CA+BzE;AAED,2DAA2D;AAC3D,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CA4BtD;AAED,qEAAqE;AACrE,wBAAgB,eAAe,CAC7B,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,GAAG,CAAC,MAAM,CAAC,GACrB,MAAM,CASR"}
+{"version":3,"file":"cache.d.ts","sourceRoot":"","sources":["../src/cache.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAG9C,eAAO,MAAM,aAAa,EAAG,CAAU,CAAC;AACxC,eAAO,MAAM,UAAU,oBAAoB,CAAC;AAE5C,MAAM,MAAM,cAAc,GAAG;IAC3B,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,MAAM,EAAE,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG;IACtB,OAAO,EAAE,OAAO,aAAa,CAAC;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;IACtC,iFAAiF;IACjF,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAChC,CAAC;AAEF,wBAAgB,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAElD;AAED,wBAAgB,SAAS,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAEjD;AAED,wBAAgB,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,CAErD;AAED,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAWvD;AAED,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,GAAG,IAAI,CAG7D;AAED,oFAAoF;AACpF,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,SAAS,GAAG,MAAM,CAa7E;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,UAAU,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAQxE;AAED;;;GAGG;AACH,wBAAsB,eAAe,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAuBjE;AAED,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAUnD;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAC5B,OAAO,EAAE,MAAM,EACf,SAAS,CAAC,EAAE,OAAO,GAClB;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,OAAO,CAAA;CAAE,CAsCtC;AAED,gFAAgF;AAChF,wBAAgB,yBAAyB,CACvC,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,GACX,OAAO,CAQT;AAID;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG;IAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAwDzE;AAED,2DAA2D;AAC3D,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CA2CtD;AAED,qEAAqE;AACrE,wBAAgB,eAAe,CAC7B,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,GAAG,CAAC,MAAM,CAAC,GACrB,MAAM,CASR"}

package/dist/cli.js

@@ -4666,6 +4666,30 @@ function publishStaging(outRoot) {
   if (existsSync3(backup)) {
     rmSync(backup, { recursive: true, force: true });
   }
+  const preserveRepo = existsSync3(join6(outRoot, ".git"));
+  if (preserveRepo) {
+    mkdirSync4(backup, { recursive: true });
+    for (const name of readdirSync2(outRoot)) {
+      if (PRESERVE_IN_OUT.has(name))
+        continue;
+      const src = join6(outRoot, name);
+      try {
+        cpSync(src, join6(backup, name), { recursive: true });
+      } catch {}
+    }
+    for (const name of readdirSync2(outRoot)) {
+      if (PRESERVE_IN_OUT.has(name))
+        continue;
+      rmSync(join6(outRoot, name), { recursive: true, force: true });
+    }
+    for (const name of readdirSync2(staging)) {
+      if (PRESERVE_IN_OUT.has(name))
+        continue;
+      cpSync(join6(staging, name), join6(outRoot, name), { recursive: true });
+    }
+    rmSync(staging, { recursive: true, force: true });
+    return { backup: siteHasContent(backup) ? backup : null };
+  }
   if (siteHasContent(outRoot)) {
     try {
       renameSync(outRoot, backup);
@@ -4691,6 +4715,21 @@ function restoreBackup(outRoot) {
   if (existsSync3(staging)) {
     rmSync(staging, { recursive: true, force: true });
   }
+  const preserveRepo = existsSync3(join6(outRoot, ".git"));
+  if (preserveRepo) {
+    for (const name of readdirSync2(outRoot)) {
+      if (PRESERVE_IN_OUT.has(name))
+        continue;
+      rmSync(join6(outRoot, name), { recursive: true, force: true });
+    }
+    for (const name of readdirSync2(backup)) {
+      if (PRESERVE_IN_OUT.has(name))
+        continue;
+      cpSync(join6(backup, name), join6(outRoot, name), { recursive: true });
+    }
+    rmSync(backup, { recursive: true, force: true });
+    return true;
+  }
   const doomed = `${outRoot}.nsp-restore-old`;
   if (existsSync3(outRoot)) {
     if (existsSync3(doomed))
@@ -4725,9 +4764,10 @@ function pruneOrphanHtml(staging, keepFiles) {
   }
   return removed;
 }
-var CACHE_VERSION = 1, CACHE_FILE = ".nsp-cache.json";
+var CACHE_VERSION = 1, CACHE_FILE = ".nsp-cache.json", PRESERVE_IN_OUT;
 var init_cache = __esm(() => {
   init_assets();
+  PRESERVE_IN_OUT = new Set([".git", ".github", ".gitignore"]);
 });
 
 // src/scrape.ts

package/examples/sync-notion.yml

@@ -64,12 +64,20 @@ jobs:
 
       - name: Commit & push
         run: |
+          if ! git rev-parse --is-inside-work-tree >/dev/null 2>&1; then
+            echo "ERROR: working tree is not a git repo after sync."
+            echo "Upgrade notion-static-exporter (>=1.0.2) — publish used to move .git aside when --out ."
+            ls -la
+            exit 1
+          fi
           git config user.name "github-actions[bot]"
           git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
           git add -A
           # Keep local tooling / staging leftovers out of the Pages commit
           git reset -- .notion-static-exporter 2>/dev/null || true
           git reset -- '*.nsp-staging' '*.nsp-backup' 2>/dev/null || true
+          # Never commit the sibling backup/staging folders next to the repo
+          git reset -- ../"$(basename "$PWD")".nsp-backup ../"$(basename "$PWD")".nsp-staging 2>/dev/null || true
           if git diff --staged --quiet; then
             echo "No changes"
             exit 0

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "notion-static-exporter",
-	"version": "1.0.2",
+	"version": "1.0.3",
 	"description": "Scrape public Notion sites into static HTML for GitHub Pages",
 	"type": "module",
 	"bin": {