Compare commits

...

22 Commits

Author SHA1 Message Date
bcomnes
0f7cdf6e15 1.0.12 2020-09-11 17:16:53 +00:00
Bret Comnes
0460e9fd78 Update release.yml 2020-09-11 11:15:52 -06:00
Bret Comnes
9a792306ca Create release.yml 2020-09-11 11:10:39 -06:00
Bret Comnes
86a931c560 Update release script to be automatic 2020-09-11 11:10:13 -06:00
Bret Comnes
7e75396715 Update README.md
Add link to @jonchang's deploy-neocities action to See Also section.
2020-09-08 10:34:56 -06:00
Bret Comnes
2876a7c9b2 Merge pull request #12 from bcomnes/dependabot/github_actions/actions/setup-node-v2.1.1
chore(deps): bump actions/setup-node from v1 to v2.1.1
2020-09-07 14:04:41 -06:00
Bret Comnes
2039560edd Merge pull request #13 from bcomnes/dependabot/npm_and_yarn/actions/core-1.2.5
chore(deps): bump @actions/core from 1.2.4 to 1.2.5
2020-09-07 14:03:07 -06:00
dependabot[bot]
1c4ddaed91 chore(deps): bump @actions/core from 1.2.4 to 1.2.5
Bumps [@actions/core](https://github.com/actions/toolkit/tree/HEAD/packages/core) from 1.2.4 to 1.2.5.
- [Release notes](https://github.com/actions/toolkit/releases)
- [Changelog](https://github.com/actions/toolkit/blob/main/packages/core/RELEASES.md)
- [Commits](https://github.com/actions/toolkit/commits/HEAD/packages/core)

Signed-off-by: dependabot[bot] <support@github.com>
2020-09-07 19:17:28 +00:00
dependabot[bot]
27ba5580e2 chore(deps): bump actions/setup-node from v1 to v2.1.1
Bumps [actions/setup-node](https://github.com/actions/setup-node) from v1 to v2.1.1.
- [Release notes](https://github.com/actions/setup-node/releases)
- [Commits](https://github.com/actions/setup-node/compare/v1...321b6ccb03083caa2ad22b27dc4b45335212e824)

Signed-off-by: dependabot[bot] <support@github.com>
2020-09-07 19:10:00 +00:00
Bret Comnes
6975b43119 Create dependabot.yml 2020-09-07 13:09:38 -06:00
Bret Comnes
8b3d238de6 rebuild 2020-08-11 20:40:28 -06:00
Bret Comnes
b00151fe41 Update README.md 2020-08-08 10:54:51 -06:00
Bret Comnes
14eaced049 1.0.11 2020-08-05 13:33:45 -06:00
Bret Comnes
f638cbacda Merge pull request #11 from jonchang/patch-1
action.yml: remove invalid syntax
2020-08-05 13:31:13 -06:00
Jonathan Chang
3fb6c25a99 action.yml: remove invalid syntax
Fixes https://github.com/bcomnes/deploy-to-neocities/issues/10
2020-08-05 16:19:14 +10:00
Bret Comnes
7dce130590 Update README.md 2020-07-09 12:42:05 -06:00
Bret Comnes
bfabadd110 Update README.md 2020-06-19 12:40:04 -06:00
Bret Comnes
63006b6b6b Update README.md 2020-06-19 12:38:33 -06:00
Bret Comnes
d9da06a597 Merge branch 'fix-bug' 2020-04-30 11:26:41 -06:00
Bret Comnes
eae8102e0d 1.0.10 2020-04-30 11:26:00 -06:00
Bret Comnes
2f0de08e9d Merge pull request #9 from bcomnes/fix-bug
bug: fix import
2020-04-30 11:25:49 -06:00
Bret Comnes
5cf59d6e7f bug: fix import
Closes https://github.com/bcomnes/deploy-to-neocities/issues/8
2020-04-30 11:24:46 -06:00
13 changed files with 8280 additions and 88 deletions

18
.github/dependabot.yml vendored Normal file
View File

@@ -0,0 +1,18 @@
# Basic dependabot.yml file with
# minimum configuration for two package managers
version: 2
updates:
# Enable version updates for npm
- package-ecosystem: "npm"
# Look for `package.json` and `lock` files in the `root` directory
directory: "/"
# Check the npm registry for updates every day (weekdays)
schedule:
interval: "daily"
# Enable updates to github actions
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "daily"

View File

@@ -15,7 +15,7 @@ jobs:
# 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@v1
uses: actions/setup-node@v2.1.1
with:
node-version: 12
- name: Install deps and build

32
.github/workflows/release.yml vendored Normal file
View File

@@ -0,0 +1,32 @@
name: npm bump
on:
workflow_dispatch:
inputs:
newversion:
description: 'npm version (major minor patch)'
required: true
env:
node_version: 14
jobs:
version_and_release:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2.3.2
with:
# fetch full history so things like auto-changelog work properly
fetch-depth: 0
- uses: actions/setup-node@v2.1.1
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'
- uses: bcomnes/npm-bump@v1.0.4
with:
git_email: bcomnes@gmail.com
git_username: ${{ github.actor }}
newversion: ${{ github.event.inputs.newversion }}
github_token: ${{ secrets.GITHUB_TOKEN }} # built in actions token. Passed tp gh-release if in use.
publish_cmd: npm run release

View File

@@ -14,7 +14,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Use Node.js ${{ matrix.node }}
uses: actions/setup-node@v1
uses: actions/setup-node@v2.1.1
with:
node-version: ${{ matrix.node }}
- name: npm install && npm test

View File

@@ -7,6 +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.0.12](https://github.com/bcomnes/deploy-to-neocities/compare/v1.0.11...v1.0.12) - 2020-09-11
### Merged
- chore(deps): bump actions/setup-node from v1 to v2.1.1 [`#12`](https://github.com/bcomnes/deploy-to-neocities/pull/12)
- chore(deps): bump @actions/core from 1.2.4 to 1.2.5 [`#13`](https://github.com/bcomnes/deploy-to-neocities/pull/13)
### Commits
- Create release.yml [`9a79230`](https://github.com/bcomnes/deploy-to-neocities/commit/9a792306ca7b0d9800de1c6e1cb995070caf67df)
- Create dependabot.yml [`6975b43`](https://github.com/bcomnes/deploy-to-neocities/commit/6975b431197241de88beb858e612dfc5c37f414f)
- Update release.yml [`0460e9f`](https://github.com/bcomnes/deploy-to-neocities/commit/0460e9fd782d26030ab102877961cfe0f0aa7b2e)
## [v1.0.11](https://github.com/bcomnes/deploy-to-neocities/compare/v1.0.10...v1.0.11) - 2020-08-05
### Merged
- action.yml: remove invalid syntax [`#11`](https://github.com/bcomnes/deploy-to-neocities/pull/11)
- bug: fix import [`#9`](https://github.com/bcomnes/deploy-to-neocities/pull/9)
### Fixed
- action.yml: remove invalid syntax [`#10`](https://github.com/bcomnes/deploy-to-neocities/issues/10)
### Commits
- Update README.md [`bfabadd`](https://github.com/bcomnes/deploy-to-neocities/commit/bfabadd110556a72b29314df1349f4efb3e1566c)
- Update README.md [`63006b6`](https://github.com/bcomnes/deploy-to-neocities/commit/63006b6b6bbb3276fd1130b23398c468196dc34b)
- Update README.md [`7dce130`](https://github.com/bcomnes/deploy-to-neocities/commit/7dce130590457fee0823c708884cb309fedc140c)
## [v1.0.10](https://github.com/bcomnes/deploy-to-neocities/compare/v1.0.9...v1.0.10) - 2020-04-30
### Fixed
- bug: fix import [`#8`](https://github.com/bcomnes/deploy-to-neocities/issues/8)
## [v1.0.9](https://github.com/bcomnes/deploy-to-neocities/compare/v1.0.8...v1.0.9) - 2020-04-30
### Merged
@@ -22,7 +58,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
- fix(package): update @actions/core to version 1.2.4 [`bc980f6`](https://github.com/bcomnes/deploy-to-neocities/commit/bc980f6378b06e225a7854b65ef9de27838eba18)
- chore(package): update auto-changelog to version 2.0.0 [`7059bca`](https://github.com/bcomnes/deploy-to-neocities/commit/7059bcae5305d0068f02b2268f76e626ff0a940a)
## [v1.0.8](https://github.com/bcomnes/deploy-to-neocities/compare/v1.0.7...v1.0.8) - 2020-03-01
## [v1.0.8](https://github.com/bcomnes/deploy-to-neocities/compare/v1.0.7...v1.0.8) - 2020-02-29
### Merged
@@ -72,19 +108,19 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
- refactor: clean up pacakge.json a bit [`7bb0bde`](https://github.com/bcomnes/deploy-to-neocities/commit/7bb0bdec75f6ec26707d036479c84b40f20f6ba8)
- docs: improve docs [`cc11705`](https://github.com/bcomnes/deploy-to-neocities/commit/cc11705059c58406f070b67a4f3456a040599ae5)
## [v1.0.2](https://github.com/bcomnes/deploy-to-neocities/compare/v1.0.1...v1.0.2) - 2020-02-18
## [v1.0.2](https://github.com/bcomnes/deploy-to-neocities/compare/v1.0.1...v1.0.2) - 2020-02-17
### Commits
- bug: fix input name [`14f0fea`](https://github.com/bcomnes/deploy-to-neocities/commit/14f0feaed2b52c65b7a9fac2a8c5437f75a3b033)
## [v1.0.1](https://github.com/bcomnes/deploy-to-neocities/compare/v1.0.0...v1.0.1) - 2020-02-18
## [v1.0.1](https://github.com/bcomnes/deploy-to-neocities/compare/v1.0.0...v1.0.1) - 2020-02-17
### Commits
- docs: typos [`91c25ab`](https://github.com/bcomnes/deploy-to-neocities/commit/91c25ab7221a139f318ed7ef4a6518d5a64debe8)
## [v1.0.0](https://github.com/bcomnes/deploy-to-neocities/compare/v0.0.11...v1.0.0) - 2020-02-18
## [v1.0.0](https://github.com/bcomnes/deploy-to-neocities/compare/v0.0.11...v1.0.0) - 2020-02-17
### Merged
@@ -144,14 +180,14 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
- refactor: Dramatically simplify logging [`bc86874`](https://github.com/bcomnes/deploy-to-neocities/commit/bc86874ede188f9c33f0b6dfd2e54b25328b1285)
## [v0.0.3](https://github.com/bcomnes/deploy-to-neocities/compare/v0.0.2...v0.0.3) - 2020-02-13
## [v0.0.3](https://github.com/bcomnes/deploy-to-neocities/compare/v0.0.2...v0.0.3) - 2020-02-12
### Commits
- Fix boolean parsing [`19246fa`](https://github.com/bcomnes/deploy-to-neocities/commit/19246fac798151a3ab80666412f72394c0615c32)
- bug: Fix reference bug in logging [`2c52eea`](https://github.com/bcomnes/deploy-to-neocities/commit/2c52eeaa2badbb1bcb3c2520e358fcc088bc3879)
## [v0.0.2](https://github.com/bcomnes/deploy-to-neocities/compare/v0.0.1...v0.0.2) - 2020-02-13
## [v0.0.2](https://github.com/bcomnes/deploy-to-neocities/compare/v0.0.1...v0.0.2) - 2020-02-12
### Commits

View File

@@ -7,7 +7,7 @@
<center><img src="static/logo.png"></center>
Efficiently deploy a website to [Neocities][nc] using [Github actions](https://github.com/features/actions).
Efficiently deploy a website to [Neocities][nc] using [Github actions](https://github.com/features/actions). Uses content aware diffing to only update files that changed.
## Usage
@@ -104,12 +104,21 @@ None.
- No deploy previews.
- No Github Deploys API support (yet).
## Sites using deploy-to-neocities
- https://github.com/bcomnes/bret.io ([bret.io](https://bret.io))
- https://github.com/ecomnes/elenacomnes.com ([elenacomnes.comnes](https://elenacomnes.com))
- https://github.com/gumcast/gumcast-client ([gumcast.com](https://gumcast.com))
- https://github.com/bcomnes/deploy-to-neocities/blob/master/.github/workflows/neocities.yml ([deploy-to-neocities.neocities.org](https://deploy-to-neocities.neocities.org))
- [Zambonifofex/stories](https://github.com/Zambonifofex/stories) ([zamstories.neocities.org](https://zamstories.neocities.org))
- ...PR your site when you set it up!
## See also
- [async-neocities](https://ghub.io/async-neocities): diffing engine used for action.
- [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.
[qs]: https://ghub.io/qs
[nf]: https://ghub.io/node-fetch

View File

@@ -15,7 +15,6 @@ inputs:
description: Delete orphaned files on neocities that don't exist in distDir
default: false
required: true
outputs: # none
runs:
using: 'node12'
main: 'dist/index.js'

212
dist/index.js vendored
View File

@@ -19,7 +19,13 @@ require('./sourcemap-register.js');module.exports =
/******/ };
/******/
/******/ // Execute the module function
/******/ modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
/******/ var threw = true;
/******/ try {
/******/ modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
/******/ threw = false;
/******/ } finally {
/******/ if(threw) delete installedModules[moduleId];
/******/ }
/******/
/******/ // Flag the module as loaded
/******/ module.l = true;
@@ -731,7 +737,7 @@ const core = __webpack_require__(470)
const Neocities = __webpack_require__(248)
const path = __webpack_require__(622)
const ms = __webpack_require__(317)
const assert = __webpack_require__(920)
const assert = __webpack_require__(920).default
const fsp = __webpack_require__(747).promises
async function doDeploy () {
@@ -895,6 +901,7 @@ function state(list, sortMethod)
/***/ 149:
/***/ (function(module, exports, __webpack_require__) {
/*! safe-buffer. MIT License. Feross Aboukhadijeh <https://feross.org/opensource> */
/* eslint-disable node/no-deprecated-api */
var buffer = __webpack_require__(293)
var Buffer = buffer.Buffer
@@ -4471,7 +4478,7 @@ function escapeProperty(s) {
/***/ 442:
/***/ (function(module) {
module.exports = {"_from":"async-neocities@1.1.6","_id":"async-neocities@1.1.6","_inBundle":false,"_integrity":"sha512-q5fTVttBaN9znGxqxxDAh/ks+bZngIJPu6zPS7nlbJLC9NnOhrcP5Mu0VntxgEBtAuaExyI6uH/C+CxKSW0LeQ==","_location":"/async-neocities","_phantomChildren":{},"_requested":{"type":"version","registry":true,"raw":"async-neocities@1.1.6","name":"async-neocities","escapedName":"async-neocities","rawSpec":"1.1.6","saveSpec":null,"fetchSpec":"1.1.6"},"_requiredBy":["/"],"_resolved":"https://registry.npmjs.org/async-neocities/-/async-neocities-1.1.6.tgz","_shasum":"405b45565ccbe9c4ea56e65552ae9c48c20a0309","_spec":"async-neocities@1.1.6","_where":"/Users/bret/repos/deploy-to-neocities","author":{"name":"Bret Comnes","email":"bcomnes@gmail.com","url":"https://bret.io"},"bugs":{"url":"https://github.com/bcomnes/async-neocities/issues"},"bundleDependencies":false,"dependencies":{"async-folder-walker":"^2.0.1","fetch-errors":"^2.0.1","form-data":"^3.0.0","nanoassert":"^2.0.0","node-fetch":"^2.6.0","pretty-bytes":"^5.3.0","pump":"^3.0.0","pumpify":"^2.0.1","qs":"^6.9.1","streamx":"^2.6.0"},"deprecated":false,"description":"WIP - nothing to see here","devDependencies":{"auto-changelog":"^1.16.2","dependency-check":"^4.1.0","gh-release":"^3.5.0","npm-run-all":"^4.1.5","standard":"^13.1.0","tap":"^14.10.2"},"homepage":"https://github.com/bcomnes/async-neocities","keywords":["neocities","async","api client","static hosting"],"license":"MIT","main":"index.js","name":"async-neocities","repository":{"type":"git","url":"git+https://github.com/bcomnes/async-neocities.git"},"scripts":{"prepublishOnly":"git push --follow-tags && gh-release","test":"run-s test:*","test:deps":"dependency-check . --no-dev --no-peer","test:standard":"standard","test:tape":"tap","version":"auto-changelog -p --template keepachangelog auto-changelog --breaking-pattern 'BREAKING:' && git add CHANGELOG.md"},"standard":{"ignore":["dist"]},"version":"1.1.6"};
module.exports = {"_from":"async-neocities@1.1.6","_id":"async-neocities@1.1.6","_inBundle":false,"_integrity":"sha512-q5fTVttBaN9znGxqxxDAh/ks+bZngIJPu6zPS7nlbJLC9NnOhrcP5Mu0VntxgEBtAuaExyI6uH/C+CxKSW0LeQ==","_location":"/async-neocities","_phantomChildren":{},"_requested":{"type":"version","registry":true,"raw":"async-neocities@1.1.6","name":"async-neocities","escapedName":"async-neocities","rawSpec":"1.1.6","saveSpec":null,"fetchSpec":"1.1.6"},"_requiredBy":["/"],"_resolved":"https://registry.npmjs.org/async-neocities/-/async-neocities-1.1.6.tgz","_shasum":"405b45565ccbe9c4ea56e65552ae9c48c20a0309","_spec":"async-neocities@1.1.6","_where":"/home/runner/work/deploy-to-neocities/deploy-to-neocities","author":{"name":"Bret Comnes","email":"bcomnes@gmail.com","url":"https://bret.io"},"bugs":{"url":"https://github.com/bcomnes/async-neocities/issues"},"bundleDependencies":false,"dependencies":{"async-folder-walker":"^2.0.1","fetch-errors":"^2.0.1","form-data":"^3.0.0","nanoassert":"^2.0.0","node-fetch":"^2.6.0","pretty-bytes":"^5.3.0","pump":"^3.0.0","pumpify":"^2.0.1","qs":"^6.9.1","streamx":"^2.6.0"},"deprecated":false,"description":"WIP - nothing to see here","devDependencies":{"auto-changelog":"^1.16.2","dependency-check":"^4.1.0","gh-release":"^3.5.0","npm-run-all":"^4.1.5","standard":"^13.1.0","tap":"^14.10.2"},"homepage":"https://github.com/bcomnes/async-neocities","keywords":["neocities","async","api client","static hosting"],"license":"MIT","main":"index.js","name":"async-neocities","repository":{"type":"git","url":"git+https://github.com/bcomnes/async-neocities.git"},"scripts":{"prepublishOnly":"git push --follow-tags && gh-release","test":"run-s test:*","test:deps":"dependency-check . --no-dev --no-peer","test:standard":"standard","test:tape":"tap","version":"auto-changelog -p --template keepachangelog auto-changelog --breaking-pattern 'BREAKING:' && git add CHANGELOG.md"},"standard":{"ignore":["dist"]},"version":"1.1.6"};
/***/ }),
@@ -5035,6 +5042,12 @@ function convertBody(buffer, headers) {
// html4
if (!res && str) {
res = /<meta[\s]+?http-equiv=(['"])content-type\1[\s]+?content=(['"])(.+?)\2/i.exec(str);
if (!res) {
res = /<meta[\s]+?content=(['"])(.+?)\1[\s]+?http-equiv=(['"])content-type\3/i.exec(str);
if (res) {
res.pop(); // drop last quote
}
}
if (res) {
res = /charset=(.*)/i.exec(res.pop());
@@ -6042,7 +6055,7 @@ function fetch(url, opts) {
// HTTP fetch step 5.5
switch (request.redirect) {
case 'error':
reject(new FetchError(`redirect mode is set to error: ${request.url}`, 'no-redirect'));
reject(new FetchError(`uri requested responds with a redirect, redirect mode is set to error: ${request.url}`, 'no-redirect'));
finalize();
return;
case 'manual':
@@ -6081,7 +6094,8 @@ function fetch(url, opts) {
method: request.method,
body: request.body,
signal: request.signal,
timeout: request.timeout
timeout: request.timeout,
size: request.size
};
// HTTP-redirect fetch step 9
@@ -7162,6 +7176,17 @@ var combine = function combine(a, b) {
return [].concat(a, b);
};
var maybeMap = function maybeMap(val, fn) {
if (isArray(val)) {
var mapped = [];
for (var i = 0; i < val.length; i += 1) {
mapped.push(fn(val[i]));
}
return mapped;
}
return fn(val);
};
module.exports = {
arrayToObject: arrayToObject,
assign: assign,
@@ -7171,6 +7196,7 @@ module.exports = {
encode: encode,
isBuffer: isBuffer,
isRegExp: isRegExp,
maybeMap: maybeMap,
merge: merge
};
@@ -7195,6 +7221,18 @@ const BYTE_UNITS = [
'YB'
];
const BIBYTE_UNITS = [
'B',
'kiB',
'MiB',
'GiB',
'TiB',
'PiB',
'EiB',
'ZiB',
'YiB'
];
const BIT_UNITS = [
'b',
'kbit',
@@ -7207,6 +7245,18 @@ const BIT_UNITS = [
'Ybit'
];
const BIBIT_UNITS = [
'b',
'kibit',
'Mibit',
'Gibit',
'Tibit',
'Pibit',
'Eibit',
'Zibit',
'Yibit'
];
/*
Formats the given number using `Number#toLocaleString`.
- If locale is a string, the value is expected to be a locale-key (for example: `de`).
@@ -7229,8 +7279,10 @@ module.exports = (number, options) => {
throw new TypeError(`Expected a finite number, got ${typeof number}: ${number}`);
}
options = Object.assign({bits: false}, options);
const UNITS = options.bits ? BIT_UNITS : BYTE_UNITS;
options = Object.assign({bits: false, binary: false}, options);
const UNITS = options.bits ?
(options.binary ? BIBIT_UNITS : BIT_UNITS) :
(options.binary ? BIBYTE_UNITS : BYTE_UNITS);
if (options.signed && number === 0) {
return ' 0 ' + UNITS[0];
@@ -7248,9 +7300,9 @@ module.exports = (number, options) => {
return prefix + numberString + ' ' + UNITS[0];
}
const exponent = Math.min(Math.floor(Math.log10(number) / 3), UNITS.length - 1);
const exponent = Math.min(Math.floor(options.binary ? Math.log(number) / Math.log(1024) : Math.log10(number) / 3), UNITS.length - 1);
// eslint-disable-next-line unicorn/prefer-exponentiation-operator
number = Number((number / Math.pow(1000, exponent)).toPrecision(3));
number = Number((number / Math.pow(options.binary ? 1024 : 1000, exponent)).toPrecision(3));
const numberString = toLocaleString(number, options.locale);
const unit = UNITS[exponent];
@@ -7942,6 +7994,10 @@ class WritableState {
this.afterWrite = afterWrite.bind(this)
}
get ended () {
return (this.stream._duplexState & WRITE_DONE) !== 0
}
push (data) {
if (this.map !== null) data = this.map(data)
@@ -7968,7 +8024,8 @@ class WritableState {
}
end (data) {
if (data !== undefined && data !== null) this.push(data)
if (typeof data === 'function') this.stream.once('finish', data)
else if (data !== undefined && data !== null) this.push(data)
this.stream._duplexState = (this.stream._duplexState | WRITE_FINISHING) & WRITE_NON_PRIMARY
}
@@ -8042,6 +8099,10 @@ class ReadableState {
this.afterRead = afterRead.bind(this)
}
get ended () {
return (this.stream._duplexState & READ_DONE) !== 0
}
pipe (pipeTo, cb) {
if (this.pipeTo !== null) throw new Error('Can only pipe to one destination')
@@ -8064,7 +8125,8 @@ class ReadableState {
}
pipeTo.on('drain', afterDrain.bind(this))
this.stream.emit('pipe', pipeTo)
this.stream.emit('piping', pipeTo)
pipeTo.emit('pipe', this.stream)
}
push (data) {
@@ -8355,11 +8417,11 @@ class Stream extends EventEmitter {
}
get readable () {
return this._readableState !== null
return this._readableState !== null ? true : undefined
}
get writable () {
return this._writableState !== null
return this._writableState !== null ? true : undefined
}
get destroyed () {
@@ -8499,14 +8561,12 @@ class Readable extends Stream {
const stream = this
let error = null
let ended = false
let promiseResolve
let promiseReject
let promiseResolve = null
let promiseReject = null
this.on('error', (err) => { error = err })
this.on('end', () => { ended = true })
this.on('close', () => call(error, null))
this.on('readable', () => call(null, stream.read()))
this.on('readable', onreadable)
this.on('close', onclose)
return {
[asyncIterator] () {
@@ -8517,21 +8577,44 @@ class Readable extends Stream {
promiseResolve = resolve
promiseReject = reject
const data = stream.read()
if (data !== null) call(null, data)
if (data !== null) ondata(data)
else if ((stream._duplexState & DESTROYED) !== 0) ondata(null)
})
},
return () {
stream.destroy()
return destroy(null)
},
throw (err) {
return destroy(err)
}
}
function call (err, data) {
function onreadable () {
if (promiseResolve !== null) ondata(stream.read())
}
function onclose () {
if (promiseResolve !== null) ondata(null)
}
function ondata (data) {
if (promiseReject === null) return
if (err) promiseReject(err)
else if (data === null && !ended) promiseReject(STREAM_DESTROYED)
if (error) promiseReject(error)
else if (data === null && (stream._duplexState & READ_DONE) === 0) promiseReject(STREAM_DESTROYED)
else promiseResolve({ value: data, done: data === null })
promiseReject = promiseResolve = null
}
function destroy (err) {
stream.destroy(err)
return new Promise((resolve, reject) => {
if (stream._duplexState & DESTROYED) return resolve()
stream.once('close', function () {
if (err) reject(err)
else resolve({ value: undefined, done: true })
})
})
}
}
}
@@ -8657,6 +8740,8 @@ class Transform extends Duplex {
}
}
class PassThrough extends Transform {}
function transformAfterFlush (err, data) {
const cb = this._transformState.afterFinal
if (err) return cb(err)
@@ -8686,7 +8771,9 @@ module.exports = {
Writable,
Readable,
Duplex,
Transform
Transform,
// Export PassThrough for compatibility with Node.js core's stream module
PassThrough
}
@@ -8850,17 +8937,6 @@ var parseArrayValue = function (val, options) {
return val;
};
var maybeMap = function maybeMap(val, fn) {
if (isArray(val)) {
var mapped = [];
for (var i = 0; i < val.length; i += 1) {
mapped.push(fn(val[i]));
}
return mapped;
}
return fn(val);
};
// This is what browsers will submit when the ✓ character occurs in an
// application/x-www-form-urlencoded body and the encoding of the page containing
// the form is iso-8859-1, or when the submitted form has an accept-charset
@@ -8909,7 +8985,7 @@ var parseValues = function parseQueryStringValues(str, options) {
val = options.strictNullHandling ? null : '';
} else {
key = options.decoder(part.slice(0, pos), defaults.decoder, charset, 'key');
val = maybeMap(
val = utils.maybeMap(
parseArrayValue(part.slice(pos + 1), options),
function (encodedVal) {
return options.decoder(encodedVal, defaults.decoder, charset, 'value');
@@ -9935,7 +10011,12 @@ var stringify = function stringify(
} else if (obj instanceof Date) {
obj = serializeDate(obj);
} else if (generateArrayPrefix === 'comma' && isArray(obj)) {
obj = obj.join(',');
obj = utils.maybeMap(obj, function (value) {
if (value instanceof Date) {
return serializeDate(value);
}
return value;
}).join(',');
}
if (obj === null) {
@@ -9970,44 +10051,31 @@ var stringify = function stringify(
for (var i = 0; i < objKeys.length; ++i) {
var key = objKeys[i];
var value = obj[key];
if (skipNulls && obj[key] === null) {
if (skipNulls && value === null) {
continue;
}
if (isArray(obj)) {
pushToArray(values, stringify(
obj[key],
typeof generateArrayPrefix === 'function' ? generateArrayPrefix(prefix, key) : prefix,
generateArrayPrefix,
strictNullHandling,
skipNulls,
encoder,
filter,
sort,
allowDots,
serializeDate,
formatter,
encodeValuesOnly,
charset
));
} else {
pushToArray(values, stringify(
obj[key],
prefix + (allowDots ? '.' + key : '[' + key + ']'),
generateArrayPrefix,
strictNullHandling,
skipNulls,
encoder,
filter,
sort,
allowDots,
serializeDate,
formatter,
encodeValuesOnly,
charset
));
}
var keyPrefix = isArray(obj)
? typeof generateArrayPrefix === 'function' ? generateArrayPrefix(prefix, key) : prefix
: prefix + (allowDots ? '.' + key : '[' + key + ']');
pushToArray(values, stringify(
value,
keyPrefix,
generateArrayPrefix,
strictNullHandling,
skipNulls,
encoder,
filter,
sort,
allowDots,
serializeDate,
formatter,
encodeValuesOnly,
charset
));
}
return values;

2
dist/index.js.map vendored

File diff suppressed because one or more lines are too long

View File

@@ -19,7 +19,13 @@ module.exports =
/******/ };
/******/
/******/ // Execute the module function
/******/ modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
/******/ var threw = true;
/******/ try {
/******/ modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
/******/ threw = false;
/******/ } finally {
/******/ if(threw) delete installedModules[moduleId];
/******/ }
/******/
/******/ // Flag the module as loaded
/******/ module.l = true;

View File

@@ -3,7 +3,7 @@ const core = require('@actions/core')
const Neocities = require('async-neocities')
const path = require('path')
const ms = require('ms')
const assert = require('webassert')
const assert = require('webassert').default
const fsp = require('fs').promises
async function doDeploy () {

8024
package-lock.json generated Normal file

File diff suppressed because it is too large Load Diff

View File

@@ -1,13 +1,13 @@
{
"name": "deploy-to-neocities",
"description": "Github Action to deplpoy a folder to Neocities.org",
"version": "1.0.9",
"version": "1.0.12",
"author": "Bret Comnes <bcomnes@gmail.com> (https://bret.io/)",
"bugs": {
"url": "https://github.com/bcomnes/deploy-to-neocities/issues"
},
"dependencies": {
"@actions/core": "1.2.4",
"@actions/core": "1.2.5",
"async-neocities": "1.1.6",
"ms": "^2.1.2",
"webassert": "^3.0.2"
@@ -38,7 +38,7 @@
"build:md": "sitedown . -b public -l layout.html",
"build:static": "cpx './**/*.{png,ico}' public",
"clean": "rimraf public && mkdirp public",
"release": "git push --follow-tags && gh-release",
"release": "git push --follow-tags && gh-release -y",
"start": "npm run watch",
"test": "run-s test:*",
"test:deps": "dependency-check . --no-dev --no-peer",