Compare commits

...

21 Commits

Author SHA1 Message Date
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
Bret Comnes
3c952f902a 1.0.9 2020-04-30 10:19:30 -06:00
Bret Comnes
ac44455352 Fix semver ranges for runtime deps 2020-04-30 10:19:07 -06:00
Bret Comnes
966272451f Merge pull request #6 from bcomnes/greenkeeper/auto-changelog-2.0.0
Update auto-changelog to the latest version 🚀
2020-04-30 10:12:15 -06:00
Bret Comnes
b130f6d837 Merge branch 'master' into greenkeeper/auto-changelog-2.0.0 2020-04-30 10:11:50 -06:00
Bret Comnes
afcf9d5f32 Merge pull request #7 from bcomnes/greenkeeper/@actions/core-1.2.4
Update @actions/core to the latest version 🚀
2020-04-30 10:10:44 -06:00
Bret Comnes
2fac7bb55b Merge pull request #5 from bcomnes/greenkeeper/@zeit/ncc-0.22.0
Update @zeit/ncc to the latest version 🚀
2020-04-30 10:10:19 -06:00
greenkeeper[bot]
bc980f6378 fix(package): update @actions/core to version 1.2.4 2020-04-30 15:11:26 +00:00
greenkeeper[bot]
7059bcae53 chore(package): update auto-changelog to version 2.0.0 2020-04-10 20:42:42 +00:00
greenkeeper[bot]
d0a89f6e19 chore(package): update @zeit/ncc to version 0.22.0 2020-03-23 22:31:00 +00:00
Bret Comnes
21143840e5 Merge pull request #4 from bcomnes/greenkeeper/@actions/core-1.2.3
Update @actions/core to the latest version 🚀
2020-03-02 08:15:21 -07:00
greenkeeper[bot]
6dc1f9fb26 fix(package): update @actions/core to version 1.2.3 2020-03-02 13:06:27 +00:00
8 changed files with 169 additions and 72 deletions

View File

@@ -7,6 +7,44 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog). Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
## [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
- Update auto-changelog to the latest version 🚀 [`#6`](https://github.com/bcomnes/deploy-to-neocities/pull/6)
- Update @actions/core to the latest version 🚀 [`#7`](https://github.com/bcomnes/deploy-to-neocities/pull/7)
- Update @zeit/ncc to the latest version 🚀 [`#5`](https://github.com/bcomnes/deploy-to-neocities/pull/5)
- Update @actions/core to the latest version 🚀 [`#4`](https://github.com/bcomnes/deploy-to-neocities/pull/4)
### Commits
- Fix semver ranges for runtime deps [`ac44455`](https://github.com/bcomnes/deploy-to-neocities/commit/ac444553521612a3cab840b54287356c2e585971)
- 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-03-01
### Merged ### Merged

View File

@@ -7,7 +7,7 @@
<center><img src="static/logo.png"></center> <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 ## Usage
@@ -104,6 +104,13 @@ None.
- No deploy previews. - No deploy previews.
- No Github Deploys API support (yet). - 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))
- ...PR your site when you set it up!
## See also ## See also

View File

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

134
dist/index.js vendored

File diff suppressed because one or more lines are too long

2
dist/index.js.map vendored

File diff suppressed because one or more lines are too long

View File

@@ -578,7 +578,7 @@ function retrieveSourceMapURL(source) {
// Get the URL of the source map // Get the URL of the source map
fileData = retrieveFile(source); fileData = retrieveFile(source);
var re = /(?:\/\/[@#][\s]*sourceMappingURL=([^\s'"]+)[\s]*$)|(?:\/\*[@#][\s]*sourceMappingURL=([^\s*'"]+)[\s]*(?:\*\/)[\s]*$)/mg; var re = /(?:\/\/[@#][ \t]+sourceMappingURL=([^\s'"]+?)[ \t]*$)|(?:\/\*[@#][ \t]+sourceMappingURL=([^\*]+?)[ \t]*(?:\*\/)[ \t]*$)/mg;
// Keep executing the search to find the *last* sourceMappingURL to avoid // Keep executing the search to find the *last* sourceMappingURL to avoid
// picking up sourceMappingURLs from comments, strings, etc. // picking up sourceMappingURLs from comments, strings, etc.
var lastMatch, match; var lastMatch, match;
@@ -651,7 +651,7 @@ function mapSourcePosition(position) {
} }
// Resolve the source URL relative to the URL of the source map // Resolve the source URL relative to the URL of the source map
if (sourceMap && sourceMap.map && typeof sourceMap.map.originalPositionFor === 'function') { if (sourceMap && sourceMap.map) {
var originalPosition = sourceMap.map.originalPositionFor(position); var originalPosition = sourceMap.map.originalPositionFor(position);
// Only return the original position if a matching line was found. If no // Only return the original position if a matching line was found. If no
@@ -776,13 +776,8 @@ function cloneCallSite(frame) {
return object; return object;
} }
function wrapCallSite(frame, state) { function wrapCallSite(frame) {
// provides interface backward compatibility
if (state === undefined) {
state = { nextPosition: null, curPosition: null }
}
if(frame.isNative()) { if(frame.isNative()) {
state.curPosition = null;
return frame; return frame;
} }
@@ -796,11 +791,7 @@ function wrapCallSite(frame, state) {
// Fix position in Node where some (internal) code is prepended. // Fix position in Node where some (internal) code is prepended.
// See https://github.com/evanw/node-source-map-support/issues/36 // See https://github.com/evanw/node-source-map-support/issues/36
// Header removed in node at ^10.16 || >=11.11.0 var headerLength = 62;
// v11 is not an LTS candidate, we can just test the one version with it.
// Test node versions for: 10.16-19, 10.20+, 12-19, 20-99, 100+, or 11.11
var noHeader = /^v(10\.1[6-9]|10\.[2-9][0-9]|10\.[0-9]{3,}|1[2-9]\d*|[2-9]\d|\d{3,}|11\.11)/;
var headerLength = noHeader.test(process.version) ? 0 : 62;
if (line === 1 && column > headerLength && !isInBrowser() && !frame.isEval()) { if (line === 1 && column > headerLength && !isInBrowser() && !frame.isEval()) {
column -= headerLength; column -= headerLength;
} }
@@ -810,15 +801,9 @@ function wrapCallSite(frame, state) {
line: line, line: line,
column: column column: column
}); });
state.curPosition = position;
frame = cloneCallSite(frame); frame = cloneCallSite(frame);
var originalFunctionName = frame.getFunctionName; var originalFunctionName = frame.getFunctionName;
frame.getFunctionName = function() { frame.getFunctionName = function() { return position.name || originalFunctionName(); };
if (state.nextPosition == null) {
return originalFunctionName();
}
return state.nextPosition.name || originalFunctionName();
};
frame.getFileName = function() { return position.source; }; frame.getFileName = function() { return position.source; };
frame.getLineNumber = function() { return position.line; }; frame.getLineNumber = function() { return position.line; };
frame.getColumnNumber = function() { return position.column + 1; }; frame.getColumnNumber = function() { return position.column + 1; };
@@ -840,25 +825,16 @@ function wrapCallSite(frame, state) {
} }
// This function is part of the V8 stack trace API, for more info see: // This function is part of the V8 stack trace API, for more info see:
// https://v8.dev/docs/stack-trace-api // http://code.google.com/p/v8/wiki/JavaScriptStackTraceApi
function prepareStackTrace(error, stack) { function prepareStackTrace(error, stack) {
if (emptyCacheBetweenOperations) { if (emptyCacheBetweenOperations) {
fileContentsCache = {}; fileContentsCache = {};
sourceMapCache = {}; sourceMapCache = {};
} }
var name = error.name || 'Error'; return error + stack.map(function(frame) {
var message = error.message || ''; return '\n at ' + wrapCallSite(frame);
var errorString = name + ": " + message; }).join('');
var state = { nextPosition: null, curPosition: null };
var processedStack = [];
for (var i = stack.length - 1; i >= 0; i--) {
processedStack.push('\n at ' + wrapCallSite(stack[i], state));
state.nextPosition = state.curPosition;
}
state.curPosition = state.nextPosition = null;
return errorString + processedStack.reverse().join('');
} }
// Generate position and snippet of original source with pointer // Generate position and snippet of original source with pointer
@@ -1022,9 +998,6 @@ exports.resetRetrieveHandlers = function() {
retrieveFileHandlers = originalRetrieveFileHandlers.slice(0); retrieveFileHandlers = originalRetrieveFileHandlers.slice(0);
retrieveMapHandlers = originalRetrieveMapHandlers.slice(0); retrieveMapHandlers = originalRetrieveMapHandlers.slice(0);
retrieveSourceMap = handlerExec(retrieveMapHandlers);
retrieveFile = handlerExec(retrieveFileHandlers);
} }

View File

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

View File

@@ -1,20 +1,20 @@
{ {
"name": "deploy-to-neocities", "name": "deploy-to-neocities",
"description": "Github Action to deplpoy a folder to Neocities.org", "description": "Github Action to deplpoy a folder to Neocities.org",
"version": "1.0.8", "version": "1.0.11",
"author": "Bret Comnes <bcomnes@gmail.com> (https://bret.io/)", "author": "Bret Comnes <bcomnes@gmail.com> (https://bret.io/)",
"bugs": { "bugs": {
"url": "https://github.com/bcomnes/deploy-to-neocities/issues" "url": "https://github.com/bcomnes/deploy-to-neocities/issues"
}, },
"dependencies": { "dependencies": {
"@actions/core": "1.2.2", "@actions/core": "1.2.4",
"async-neocities": "1.1.6", "async-neocities": "1.1.6",
"ms": "^2.1.2", "ms": "^2.1.2",
"nanoassert": "^2.0.0" "webassert": "^3.0.2"
}, },
"devDependencies": { "devDependencies": {
"@zeit/ncc": "^0.21.1", "auto-changelog": "^2.0.0",
"auto-changelog": "^1.16.2", "@zeit/ncc": "^0.22.0",
"budo": "^11.6.3", "budo": "^11.6.3",
"cpx2": "^2.0.0", "cpx2": "^2.0.0",
"dependency-check": "^4.1.0", "dependency-check": "^4.1.0",