diff --git a/.github/workflows/build-and-deploy.yml b/.github/workflows/build-and-deploy.yml index 31b1fe8..7654be6 100644 --- a/.github/workflows/build-and-deploy.yml +++ b/.github/workflows/build-and-deploy.yml @@ -16,9 +16,7 @@ jobs: run: | npm ci --prefix processing node processing - npm ci --prefix site - npm run build --prefix site npm run deploy --prefix site - name: Generate App List # Have to run it again because the deploy wipes the file and folders out diff --git a/.gitignore b/.gitignore index 8f48256..cc89f58 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ # build output dist +public .next target packages/next/wasm/@next diff --git a/processing/processjson.js b/processing/processjson.js index a6465ce..d17b02c 100644 --- a/processing/processjson.js +++ b/processing/processjson.js @@ -3,7 +3,7 @@ const glob = require("glob"); const { hashElement } = require("folder-hash"); const nextConfig = require("../site/next.config.js") -var dir = "./site/out"; +var dir = "./public"; if (!fs.existsSync(dir)) { fs.mkdirSync(dir); diff --git a/site/package.json b/site/package.json index 089ecda..9b9ab43 100644 --- a/site/package.json +++ b/site/package.json @@ -3,8 +3,8 @@ "private": true, "scripts": { "dev": "next dev", - "build": "next build && next export", - "deploy": "next build && touch out/.nojekyll", + "build": "next build && next export -o ../public/", + "deploy": "next build && next export -o ../public/ && touch ../public/.nojekyll", "start": "next start", "lint": "next lint" },