diff --git a/.gitignore b/.gitignore index fb65db3..ac19000 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ examples/assets examples/js/vendor examples/showcase/assets +docs/CNAME node_modules/ site/ site-repo/ diff --git a/scripts/copy-site-files.js b/scripts/copy-site-files.js index 37ad4c9..b3f30d3 100644 --- a/scripts/copy-site-files.js +++ b/scripts/copy-site-files.js @@ -1,5 +1,5 @@ import fs from "node:fs"; -import { copyFile, mkdir, rename } from "node:fs/promises"; +import { copyFile, mkdir, rename, writeFile } from "node:fs/promises"; import path from "node:path"; function copyDir(src, dest) { @@ -21,6 +21,9 @@ function copyDir(src, dest) { // Copy static files to docs directory. copyDir("examples", "docs/examples"); + +// Create CNAME file +await writeFile("docs/CNAME", "sparkjs.dev\n"); await copyFile("examples.html", "docs/examples/index.html"); await rename("docs/examples/viewer", "docs/viewer"); await mkdir("docs/examples/vendor", { recursive: true }); diff --git a/scripts/deploy-site.js b/scripts/deploy-site.js index 59bcbe6..41d1945 100644 --- a/scripts/deploy-site.js +++ b/scripts/deploy-site.js @@ -1,15 +1,12 @@ import { execSync } from "node:child_process"; import fs from "node:fs/promises"; import { rm } from "node:fs/promises"; -import { writeFile } from "node:fs/promises"; import path from "node:path"; const siteRemoteURL = "git@github.com:sparkjsdev/sparkjsdev.github.io.git"; const siteRepoDir = "site-repo"; const siteBuild = "site"; -await writeFile(`${siteBuild}/CNAME`, "sparkjs.dev\n"); - function run(cmd, options = {}) { console.log(`> ${cmd}`); execSync(cmd, { stdio: "inherit", ...options }); @@ -55,17 +52,17 @@ async function emptyDirectory(directoryPath) { } } -// try { -// await fs.access(siteRepoDir); -// } catch { -// run(`git clone ${siteRemoteURL} ${siteRepoDir}`); -// } +try { + await fs.access(siteRepoDir); +} catch { + run(`git clone ${siteRemoteURL} ${siteRepoDir}`); +} -// run("git reset --hard", { cwd: siteRepoDir }); -// run("git fetch origin", { cwd: siteRepoDir }); -// run("git merge --ff-only origin/main", { cwd: siteRepoDir }); -// await emptyDirectory(siteRepoDir); -// await copyDir(siteBuild, siteRepoDir); -// run("git add .", { cwd: siteRepoDir }); -// run('git commit -m "Update Spark site"', { cwd: siteRepoDir }); -// run("git push origin main", { cwd: siteRepoDir }); +run("git reset --hard", { cwd: siteRepoDir }); +run("git fetch origin", { cwd: siteRepoDir }); +run("git merge --ff-only origin/main", { cwd: siteRepoDir }); +await emptyDirectory(siteRepoDir); +await copyDir(siteBuild, siteRepoDir); +run("git add .", { cwd: siteRepoDir }); +run('git commit -m "Update Spark site"', { cwd: siteRepoDir }); +run("git push origin main", { cwd: siteRepoDir });