diff --git a/.github/workflows/pwa-microservices-template.page.yml b/.github/workflows/pwa-microservices-template.page.yml index e1e2cdf..9d099a0 100644 --- a/.github/workflows/pwa-microservices-template.page.yml +++ b/.github/workflows/pwa-microservices-template.page.yml @@ -40,7 +40,7 @@ jobs: run: | npm install node bin/deploy update-default-conf - npm run build + npm run build '' underpostnet.github.io /pwa-microservices-template-ghpkg - name: Setup Pages uses: actions/configure-pages@v5 @@ -48,7 +48,7 @@ jobs: uses: actions/upload-pages-artifact@v3 with: # Upload entire repository - path: './public/default.net/' + path: './public/underpostnet.github.io/pwa-microservices-template-ghpkg/' - name: Deploy to GitHub Pages id: deployment uses: actions/deploy-pages@v4 diff --git a/bin/deploy.js b/bin/deploy.js index 79765c4..a0ed02d 100644 --- a/bin/deploy.js +++ b/bin/deploy.js @@ -232,9 +232,9 @@ try { const serverConf = deployId ? JSON.parse(fs.readFileSync(`./conf/conf.server.json`, 'utf8')) : Config.default.server; - if (!deployId) { - argHost = 'default.net'; - argPath = '/'; + if (!deployId && !argHost[0] && !argPath[0]) { + argHost = ['default.net']; + argPath = ['/']; } for (const host of Object.keys(serverConf)) { for (const path of Object.keys(serverConf[host])) { diff --git a/package.json b/package.json index 3b63d15..7de0205 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "pm2": "env-cmd -f .env.production pm2 start src/server.js --node-args=\"--max-old-space-size=8192\" --name engine && pm2 logs", "ssl": "env-cmd -f .env.production node bin/ssl", "pm2-delete": "pm2 delete engine", - "build": "node bin/deploy build-full-client --no-warnings", + "build": "node bin/deploy build-full-client", "dev": "env-cmd -f .env.development node src/client.dev --no-warnings", "dev-api": "env-cmd -f .env.development nodemon --watch src --ignore src/client src/api", "docs": "jsdoc -c jsdoc.json",