1.1.11

Ensure that we print the error cause when we catch an error

.github/workflows/neocities.yml

@@ -5,19 +5,27 @@ on:
   push:
     branches:
       - master
+      
+env:
+  FORCE_COLOR: 2
+  node_version: lts/*
+
+concurrency: # prevent concurrent deploys doing starnge things
+  group: deploy-to-neocities
+  cancel-in-progress: true
 
 jobs:
   deploy:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2.3.4
+    - uses: actions/checkout@v3
     # Set up any tools and build steps here
     # This example uses a Node.js toolchain to build a site
     - name: Use Node.js
-      uses: actions/setup-node@v2.4.0
+      uses: actions/setup-node@v3
       with:
-        node-version: 15
+        node-version: ${{ env.node_version }}
     - run: npm i
     - run: npm run build
     # When the dist_dir is ready, deploy it to neocities

.github/workflows/release.yml

@@ -8,24 +8,29 @@ on:
         required: true
 
 env:
-  node_version: 14
+  node_version: lts/*
+  FORCE_COLOR: 2
+
+concurrency: # prevent concurrent releases
+  group: npm-bump
+  cancel-in-progress: true
 
 jobs:
   version_and_release:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2.3.4
+    - uses: actions/checkout@v3
       with:
         # fetch full history so things like auto-changelog work properly
         fetch-depth: 0
-    - uses: actions/setup-node@v2.4.0
+    - uses: actions/setup-node@v3
       with:
         node-version: ${{ env.node_version }}
         # setting a registry enables the NODE_AUTH_TOKEN env variable where we can set an npm token.  REQUIRED
         registry-url: 'https://registry.npmjs.org'
     - run: npm i
     - run: npm test
-    - uses: bcomnes/npm-bump@v2.0.2
+    - uses: bcomnes/npm-bump@v2.1.0
       with:
         git_email: bcomnes@gmail.com
         git_username: ${{ github.actor }}

.github/workflows/test.yml

@@ -2,6 +2,9 @@ name: tests
 
 on: [push, pull_request]
 
+env:
+  FORCE_COLOR: 2
+
 jobs:
   test:
     runs-on: ${{ matrix.os }}
@@ -9,12 +12,12 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        node: [15]
+        node: [lts/*]
 
     steps:
-    - uses: actions/checkout@v2.3.4
+    - uses: actions/checkout@v3
     - name: Use Node.js ${{ matrix.node }}
-      uses: actions/setup-node@v2.4.0
+      uses: actions/setup-node@v3
       with:
         node-version: ${{ matrix.node }}
     - run: npm i
@@ -23,8 +26,11 @@ jobs:
   automerge:
     needs: test
     runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
+      contents: write
     steps:
-      - uses: fastify/github-action-merge-dependabot@v2.4.0
+      - uses: fastify/github-action-merge-dependabot@v3
         if: ${{ github.actor == 'dependabot[bot]' && github.event_name == 'pull_request' && contains(github.head_ref, 'dependabot/github_actions') }}
         with:
           github-token: ${{secrets.github_token}}

CHANGELOG.md

@@ -7,7 +7,142 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
-## [v1.1.1](https://github.com/bcomnes/deploy-to-neocities/compare/v1.1.0...v1.1.1)
+## [v1.1.11](https://github.com/bcomnes/deploy-to-neocities/compare/v1.1.10...v1.1.11)
+
+### Merged
+
+- the site is open-source again [`#107`](https://github.com/bcomnes/deploy-to-neocities/pull/107)
+- info [`#104`](https://github.com/bcomnes/deploy-to-neocities/pull/104)
+- chore(deps): bump bcomnes/npm-bump from 2.0.2 to 2.1.0 [`#105`](https://github.com/bcomnes/deploy-to-neocities/pull/105)
+
+### Commits
+
+- Print error cause no matter what [`8fae4b2`](https://github.com/bcomnes/deploy-to-neocities/commit/8fae4b2c6c1923355b43f7dcfd2efdad7279ffc1)
+- Update README.md [`c7b4dca`](https://github.com/bcomnes/deploy-to-neocities/commit/c7b4dca027b41fa09bc9d92efa5489238bc98a5a)
+
+## [v1.1.10](https://github.com/bcomnes/deploy-to-neocities/compare/v1.1.9...v1.1.10) - 2022-10-03
+
+### Merged
+
+- chore(deps): bump @actions/core from 1.9.1 to 1.10.0 [`#102`](https://github.com/bcomnes/deploy-to-neocities/pull/102)
+- the site is open-source again [`#103`](https://github.com/bcomnes/deploy-to-neocities/pull/103)
+- added notice about my site source code [`#100`](https://github.com/bcomnes/deploy-to-neocities/pull/100)
+- Update README.md [`#97`](https://github.com/bcomnes/deploy-to-neocities/pull/97)
+- add conorsheehan1.neocities.org [`#95`](https://github.com/bcomnes/deploy-to-neocities/pull/95)
+
+### Commits
+
+- Bump async-neocities to 2.1.3 [`8f9be80`](https://github.com/bcomnes/deploy-to-neocities/commit/8f9be808b5b4f9e1d9a316b391c7c21acfcba3ad)
+- Merge pull request #96 from bechnokid/patch-1 [`635243f`](https://github.com/bcomnes/deploy-to-neocities/commit/635243fdea7e5d224675222008031a553bc142c3)
+- Add bechnokid.neocities.org to README.md [`9808b83`](https://github.com/bcomnes/deploy-to-neocities/commit/9808b8398bf70ac8e2a41172c74eb9f66e7d0d89)
+
+## [v1.1.9](https://github.com/bcomnes/deploy-to-neocities/compare/v1.1.8...v1.1.9) - 2022-08-10
+
+### Commits
+
+- Update deps to fix hung actions [`46319ec`](https://github.com/bcomnes/deploy-to-neocities/commit/46319ec8034824d8a562f3f449080400f2fc0218)
+- Merge pull request #94 from bcomnes/dependabot/npm_and_yarn/actions/core-1.9.1 [`3cfd2ec`](https://github.com/bcomnes/deploy-to-neocities/commit/3cfd2ec3ee0474635567bbfc56763329693b16cf)
+- chore(deps): bump @actions/core from 1.9.0 to 1.9.1 [`65cb789`](https://github.com/bcomnes/deploy-to-neocities/commit/65cb7897571e6b168e5ba8b0823307c4fe64bc7d)
+
+## [v1.1.8](https://github.com/bcomnes/deploy-to-neocities/compare/v1.1.7...v1.1.8) - 2022-07-22
+
+### Fixed
+
+- s/zeit/vercel [`#92`](https://github.com/bcomnes/deploy-to-neocities/issues/92)
+
+### Commits
+
+- Merge pull request #93 from bcomnes/docs [`5e51c4d`](https://github.com/bcomnes/deploy-to-neocities/commit/5e51c4db747382faa9f56d0f8de8f37d2a5842e5)
+- Merge pull request #91 from fu-sen/patch-1 [`bda6c1e`](https://github.com/bcomnes/deploy-to-neocities/commit/bda6c1eb47143325a36eea712ac9c954f1c70f12)
+- Use lts/* [`9b65715`](https://github.com/bcomnes/deploy-to-neocities/commit/9b6571537b238f3446151711b1ea115e4d4e4023)
+
+## [v1.1.7](https://github.com/bcomnes/deploy-to-neocities/compare/v1.1.6...v1.1.7) - 2022-06-17
+
+### Merged
+
+- chore(deps): bump @actions/core from 1.8.2 to 1.9.0 [`#89`](https://github.com/bcomnes/deploy-to-neocities/pull/89)
+- Update README.md [`#88`](https://github.com/bcomnes/deploy-to-neocities/pull/88)
+- chore(deps-dev): bump npm-run-all2 from 5.0.2 to 6.0.0 [`#87`](https://github.com/bcomnes/deploy-to-neocities/pull/87)
+- please add me [`#85`](https://github.com/bcomnes/deploy-to-neocities/pull/85)
+
+## [v1.1.6](https://github.com/bcomnes/deploy-to-neocities/compare/v1.1.5...v1.1.6) - 2022-05-26
+
+### Merged
+
+- chore(deps-dev): bump @vercel/ncc from 0.33.4 to 0.34.0 [`#84`](https://github.com/bcomnes/deploy-to-neocities/pull/84)
+- chore(deps): bump @actions/core from 1.8.1 to 1.8.2 [`#83`](https://github.com/bcomnes/deploy-to-neocities/pull/83)
+
+### Commits
+
+- Merge pull request #82 from bcomnes/dependabot/npm_and_yarn/actions/core-1.8.1 [`2abb3f9`](https://github.com/bcomnes/deploy-to-neocities/commit/2abb3f996d5b9af84eb44488cfb74e307ad8574d)
+- chore(deps): bump @actions/core from 1.8.0 to 1.8.1 [`f16012d`](https://github.com/bcomnes/deploy-to-neocities/commit/f16012dd28b1a06080fa8fefeb28da6cb44b3c2e)
+- Update test.yml [`bfa04d5`](https://github.com/bcomnes/deploy-to-neocities/commit/bfa04d557bd13931d6b441e2455b525dc076ed26)
+
+## [v1.1.5](https://github.com/bcomnes/deploy-to-neocities/compare/v1.1.4...v1.1.5) - 2022-05-06
+
+### Merged
+
+- chore(deps-dev): bump standard from 16.0.4 to 17.0.0 [`#77`](https://github.com/bcomnes/deploy-to-neocities/pull/77)
+- chore(deps): bump @actions/core from 1.6.0 to 1.7.0 [`#78`](https://github.com/bcomnes/deploy-to-neocities/pull/78)
+- chore(deps): bump actions/setup-node from 3.1.0 to 3.1.1 [`#76`](https://github.com/bcomnes/deploy-to-neocities/pull/76)
+- chore(deps): bump fastify/github-action-merge-dependabot from 3.0.2 to 3.1 [`#75`](https://github.com/bcomnes/deploy-to-neocities/pull/75)
+- chore(deps): bump actions/setup-node from 3.0.0 to 3.1.0 [`#74`](https://github.com/bcomnes/deploy-to-neocities/pull/74)
+- chore(deps): bump actions/checkout from 2 to 3 [`#73`](https://github.com/bcomnes/deploy-to-neocities/pull/73)
+- chore(deps): bump actions/setup-node from 2 to 3.0.0 [`#72`](https://github.com/bcomnes/deploy-to-neocities/pull/72)
+
+### Commits
+
+- Merge pull request #81 from bcomnes/dependabot/npm_and_yarn/actions/core-1.8.0 [`f37bb2b`](https://github.com/bcomnes/deploy-to-neocities/commit/f37bb2b7224fae864b2080db62db15e886dbd6c5)
+- chore(deps): bump @actions/core from 1.7.0 to 1.8.0 [`cabfb54`](https://github.com/bcomnes/deploy-to-neocities/commit/cabfb5468a6b1e78144a68c32e2a14c4fdcb839a)
+- Merge pull request #80 from bcomnes/dependabot/npm_and_yarn/siteup/cli-2.0.0 [`b36d448`](https://github.com/bcomnes/deploy-to-neocities/commit/b36d44888aa3dce0da455cd8610b988d50925e89)
+
+## [v1.1.4](https://github.com/bcomnes/deploy-to-neocities/compare/v1.1.3...v1.1.4) - 2022-02-17
+
+### Merged
+
+- chore(deps): bump minimatch from 4.2.1 to 5.0.0 [`#71`](https://github.com/bcomnes/deploy-to-neocities/pull/71)
+- chore(deps): bump minimatch from 3.1.1 to 4.1.1 [`#70`](https://github.com/bcomnes/deploy-to-neocities/pull/70)
+
+### Commits
+
+- Update README.md [`beaded6`](https://github.com/bcomnes/deploy-to-neocities/commit/beaded6a96f0378b2111dc87c379edf035411108)
+
+## [v1.1.3](https://github.com/bcomnes/deploy-to-neocities/compare/v1.1.2...v1.1.3) - 2022-02-08
+
+### Merged
+
+- chore(deps): bump fastify/github-action-merge-dependabot from 2.7.1 to 3.0.2 [`#66`](https://github.com/bcomnes/deploy-to-neocities/pull/66)
+
+### Commits
+
+- Document the use of concurrency [`f160bcd`](https://github.com/bcomnes/deploy-to-neocities/commit/f160bcde052d8794acf67ffb8e7c042e3c721b37)
+- Update neocities.yml [`223504c`](https://github.com/bcomnes/deploy-to-neocities/commit/223504cb704aeba9aed8b354f4e53aa15593f8dd)
+- Update release.yml [`898a858`](https://github.com/bcomnes/deploy-to-neocities/commit/898a85881d00f10f1ddc66d430f80b89d6ed467d)
+
+## [v1.1.2](https://github.com/bcomnes/deploy-to-neocities/compare/v1.1.1...v1.1.2) - 2022-02-08
+
+### Merged
+
+- add additional website [`#69`](https://github.com/bcomnes/deploy-to-neocities/pull/69)
+- Add "Frontier Corps" [`#68`](https://github.com/bcomnes/deploy-to-neocities/pull/68)
+- chore(deps): bump actions/setup-node from 2.5.0 to 2.5.1 [`#67`](https://github.com/bcomnes/deploy-to-neocities/pull/67)
+- chore(deps): bump fastify/github-action-merge-dependabot [`#65`](https://github.com/bcomnes/deploy-to-neocities/pull/65)
+- chore(deps): bump fastify/github-action-merge-dependabot [`#64`](https://github.com/bcomnes/deploy-to-neocities/pull/64)
+- chore(deps): bump actions/setup-node from 2.4.1 to 2.5.0 [`#63`](https://github.com/bcomnes/deploy-to-neocities/pull/63)
+- chore(deps): bump fastify/github-action-merge-dependabot [`#57`](https://github.com/bcomnes/deploy-to-neocities/pull/57)
+- chore(deps): bump actions/checkout from 2.3.5 to 2.4.0 [`#56`](https://github.com/bcomnes/deploy-to-neocities/pull/56)
+- chore(deps): bump actions/checkout from 2.3.4 to 2.3.5 [`#55`](https://github.com/bcomnes/deploy-to-neocities/pull/55)
+- chore(deps): bump @actions/core from 1.5.0 to 1.6.0 [`#54`](https://github.com/bcomnes/deploy-to-neocities/pull/54)
+- chore(deps): bump actions/setup-node from 2.4.0 to 2.4.1 [`#53`](https://github.com/bcomnes/deploy-to-neocities/pull/53)
+- chore(deps): bump fastify/github-action-merge-dependabot [`#52`](https://github.com/bcomnes/deploy-to-neocities/pull/52)
+- chore(deps-dev): bump cpx2 from 3.0.2 to 4.0.0 [`#51`](https://github.com/bcomnes/deploy-to-neocities/pull/51)
+
+### Commits
+
+- Update site build and ncc [`def67b4`](https://github.com/bcomnes/deploy-to-neocities/commit/def67b48c6e28d4544d8dd2bd92ab53f56856e40)
+- Fix static deploy stuff with bandaid [`fea2d47`](https://github.com/bcomnes/deploy-to-neocities/commit/fea2d4780c7a98bcdf5738c1c259d66ff115326a)
+
+## [v1.1.1](https://github.com/bcomnes/deploy-to-neocities/compare/v1.1.0...v1.1.1) - 2021-08-20
 
 ### Merged
 

README.md

@@ -20,6 +20,10 @@ on:
     branches:
       - master
 
+concurrency: # prevent concurrent deploys doing strange things
+  group: deploy-to-neocities
+  cancel-in-progress: true
+
 jobs:
   deploy:
     runs-on: ubuntu-latest
@@ -31,7 +35,7 @@ jobs:
     - name: Use Node.js
       uses: actions/setup-node@v1
       with:
-        node-version: 12
+        node-version: lts/*
     - name: Install deps and build
       run: |
         npm i
@@ -98,7 +102,7 @@ None.
 - [Support the distributed web](https://neocities.org/distributed-web). Built in IPFS support.
 - [Beginner friendly docs](https://neocities.org/tutorials) for learning how to make your own websites.
 
-### What are some of the drawbacks compared to Netlify/Zeit?
+### What are some of the drawbacks compared to Netlify/Vercel?
 
 - Not appropriate for hyper traffic commercial sites most likely.
 - No concept of a Deploy or atomicity when changing files.
@@ -130,6 +134,12 @@ None.
 - https://cavacado.neocities.org
 - https://wanderinginn.neocities.org
 - https://andri.dk/blog/2021/deploy-static-websites-anywhere
+- https://github.com/PersonMeetup/frontiercorps ([frontiercorps.neocities.org](https://frontiercorps.neocities.org/))
+- https://github.com/riastrad/cyberbspace ([cyberb.space](https://cyberb.space))
+- https://github.com/rogerahuntley/neocities-site ([stealdog.neocities.org](https://stealdog.neocities.org))
+- https://github.com/ConorSheehan1/conorsheehan1.neocities.org ([conorsheehan1.neocities.org](https://conorsheehan1.neocities.org))
+- https://github.com/bechnokid/neocities ([bechnokid.neocities.org](https://bechnokid.neocities.org))
+- https://github.com/lime360/website ([lime360.neocities.org](https://lime360.neocities.org))
 - ...PR your site when you set it up!
 
 ## See also
@@ -138,6 +148,7 @@ None.
 - [Neocities API Docs](https://neocities.org/api)
 - [neocities/neocities-node](https://github.com/neocities/neocities-node): Official Node API
 - [jonchang/deploy-neocities](https://github.com/jonchang/deploy-neocities): An alternative docker + official ruby client based action similar to this one.
+- [M1ssM0ss/deploy-to-neocities-template](https://github.com/M1ssM0ss/deploy-to-neocities-template): a template repo ready for cloning using deploy-to-neocities.
 
 ## CHANGELOG
 

index.js

@@ -6,6 +6,7 @@ const ms = require('ms')
 const assert = require('webassert').default
 const fsp = require('fs').promises
 const minimatch = require('minimatch')
+const { stackWithCauses } = require('pony-cause')
 
 let cleanup
 
@@ -41,7 +42,7 @@ async function doDeploy () {
 }
 
 doDeploy().catch(err => {
-  console.error(err)
+  console.error(stackWithCauses(err))
   if (err.stats) {
     console.log('Files to upload: ')
     console.dir(err.stats.filesToUpload, { colors: true, depth: 999 })

layout.html

@@ -1,15 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8">
-    <title>Deploy to Neocities</title>
-    <meta name='viewport' content='initial-scale=1, viewport-fit=cover'>
-    <link rel="shortcut icon" href="/favicon.ico">
-    <link rel="stylesheet" href="https://unpkg.com/highlight.js@^9/styles/github.css">
-    <link rel="stylesheet" href="https://unpkg.com/mine.css@^2/dist/style.css">
-    <link rel="stylesheet" href="https://unpkg.com/mine.css@^2/dist/layout.css">
-  </head>
-  <body>
-    <main class="markdown-body"></main>
-  </body>
-</html>

package.json

@@ -1,28 +1,29 @@
 {
   "name": "deploy-to-neocities",
   "description": "Github Action to deplpoy a folder to Neocities.org",
-  "version": "1.1.1",
+  "version": "1.1.11",
   "author": "Bret Comnes <bcomnes@gmail.com> (https://bret.io/)",
   "bugs": {
     "url": "https://github.com/bcomnes/deploy-to-neocities/issues"
   },
   "dependencies": {
-    "@actions/core": "1.5.0",
-    "async-neocities": "2.1.1",
-    "minimatch": "^3.0.4",
+    "@actions/core": "1.10.0",
+    "async-neocities": "2.1.4",
+    "minimatch": "5.1.0",
     "ms": "2.1.3",
+    "pony-cause": "^2.1.4",
     "webassert": "3.0.2"
   },
   "devDependencies": {
+    "@siteup/cli": "^2.0.0",
+    "@vercel/ncc": "^0.34.0",
     "auto-changelog": "^2.0.0",
-    "@zeit/ncc": "^0.22.0",
-    "budo": "^11.6.3",
-    "cpx2": "^3.0.0",
+    "browser-sync": "^2.27.7",
     "dependency-check": "^4.1.0",
     "gh-release": "^6.0.0",
-    "npm-run-all": "^4.1.5",
-    "sitedown": "^5.0.0",
-    "standard": "^16.0.0"
+    "mkdirp": "^1.0.4",
+    "npm-run-all2": "^6.0.0",
+    "standard": "^17.0.0"
   },
   "homepage": "https://github.com/bcomnes/deploy-to-neocities#readme",
   "keywords": [],
@@ -36,8 +37,7 @@
   "scripts": {
     "build": "npm run clean && run-p build:*",
     "build:action": "rm -rf dist && ncc build index.js -o dist -s",
-    "build:md": "sitedown . -b public -l layout.html",
-    "build:static": "cpx './!(node_modules)**/*.{png,ico}' public",
+    "build:site": "siteup --src . --dest public",
     "clean": "rimraf public && mkdirp public",
     "release": "git push --follow-tags && gh-release -y",
     "start": "npm run watch",
@@ -48,9 +48,8 @@
     "version:build": "npm run build:action && git add dist",
     "version:changelog": "auto-changelog -p --template keepachangelog auto-changelog --breaking-pattern 'BREAKING CHANGE:' && git add CHANGELOG.md",
     "watch": "npm run clean && run-p watch:*",
-    "watch:js": "budo --dir public --live --open",
-    "watch:md": "npm run build:md -- -w",
-    "watch:static": "npm run build:static -- --watch"
+    "watch:serve": "browser-sync start --server 'public' --files 'public'",
+    "watch:site": "npm run build:site -- -w"
   },
   "standard": {
     "ignore": [