1.1.3

chore(deps): bump fastify/github-action-merge-dependabot from 2.7.1 to 3.0.2

.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@v2
     # 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@v2
       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,17 +8,22 @@ 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@v2
       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@v2
       with:
         node-version: ${{ env.node_version }}
         # setting a registry enables the NODE_AUTH_TOKEN env variable where we can set an npm token.  REQUIRED

.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@v2
     - name: Use Node.js ${{ matrix.node }}
-      uses: actions/setup-node@v2.4.0
+      uses: actions/setup-node@v2
       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.0.2
         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,42 @@ 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.3](https://github.com/bcomnes/deploy-to-neocities/compare/v1.1.2...v1.1.3)
+
+### 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 starnge things
+  group: deploy-to-neocities
+  cancel-in-progress: true
+
 jobs:
   deploy:
     runs-on: ubuntu-latest
@@ -130,6 +134,8 @@ 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))
 - ...PR your site when you set it up!
 
 ## See also

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,27 +1,27 @@
 {
   "name": "deploy-to-neocities",
   "description": "Github Action to deplpoy a folder to Neocities.org",
-  "version": "1.1.1",
+  "version": "1.1.3",
   "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",
+    "@actions/core": "1.6.0",
     "async-neocities": "2.1.1",
     "minimatch": "^3.0.4",
     "ms": "2.1.3",
     "webassert": "3.0.2"
   },
   "devDependencies": {
+    "@siteup/cli": "^1.3.3",
+    "@vercel/ncc": "^0.33.1",
     "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",
+    "mkdirp": "^1.0.4",
+    "npm-run-all2": "^5.0.2",
     "standard": "^16.0.0"
   },
   "homepage": "https://github.com/bcomnes/deploy-to-neocities#readme",
@@ -36,8 +36,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 +47,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": [