Skip to content

Commit 93a0898

Browse files
committed
rolling back nested exclude path
1 parent 1d31526 commit 93a0898

File tree

3 files changed

+6
-15
lines changed

3 files changed

+6
-15
lines changed

dist/index.js

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3316,7 +3316,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
33163316
return (mod && mod.__esModule) ? mod : { "default": mod };
33173317
};
33183318
Object.defineProperty(exports, "__esModule", ({ value: true }));
3319-
exports.applyExcludeFilter = exports.applyFolderFiltersToSubItems = exports.getDefaultSettings = exports.Timer = exports.Timings = exports.retryRequest = exports.formatNumber = exports.pluralize = exports.Logger = void 0;
3319+
exports.applyExcludeFilter = exports.getDefaultSettings = exports.Timer = exports.Timings = exports.retryRequest = exports.formatNumber = exports.pluralize = exports.Logger = void 0;
33203320
const pretty_ms_1 = __importDefault(__nccwpck_require__(1127));
33213321
const module_1 = __nccwpck_require__(8347);
33223322
const types_1 = __nccwpck_require__(6703);
@@ -3463,21 +3463,12 @@ function getDefaultSettings(withoutDefaults) {
34633463
"state-name": (_e = withoutDefaults["state-name"]) !== null && _e !== void 0 ? _e : ".ftp-deploy-sync-state.json",
34643464
"dry-run": (_f = withoutDefaults["dry-run"]) !== null && _f !== void 0 ? _f : false,
34653465
"dangerous-clean-slate": (_g = withoutDefaults["dangerous-clean-slate"]) !== null && _g !== void 0 ? _g : false,
3466-
"exclude": applyFolderFiltersToSubItems((_h = withoutDefaults.exclude) !== null && _h !== void 0 ? _h : module_1.excludeDefaults),
3466+
"exclude": (_h = withoutDefaults.exclude) !== null && _h !== void 0 ? _h : module_1.excludeDefaults,
34673467
"log-level": (_j = withoutDefaults["log-level"]) !== null && _j !== void 0 ? _j : "standard",
34683468
"security": (_k = withoutDefaults.security) !== null && _k !== void 0 ? _k : "loose",
34693469
};
34703470
}
34713471
exports.getDefaultSettings = getDefaultSettings;
3472-
/**
3473-
* automatically exclude all sub-files/sub-folders if we exclude a folder.
3474-
* For example "test/" should also exclude "test/file.txt"
3475-
* to do this we add "**" to all folder paths
3476-
*/
3477-
function applyFolderFiltersToSubItems(excludeFilters) {
3478-
return excludeFilters.map(filter => filter.endsWith("/") ? `${filter}**` : filter);
3479-
}
3480-
exports.applyFolderFiltersToSubItems = applyFolderFiltersToSubItems;
34813472
function applyExcludeFilter(stat, excludeFilters) {
34823473
// match exclude, return immediatley
34833474
if (excludeFilters.length > 0) {

package-lock.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"license": "MIT",
2424
"dependencies": {
2525
"@actions/core": "^1.6.0",
26-
"@samkirkland/ftp-deploy": "^1.2.0",
26+
"@samkirkland/ftp-deploy": "^1.2.1",
2727
"@types/jest": "^27.0.2",
2828
"jest": "^27.2.5",
2929
"ts-jest": "^27.0.5",

0 commit comments

Comments
 (0)