Skip to content

Commit 62b6382

Browse files
committed
ftp-deploy update
solved caching issue updated ftp-deploy library
1 parent c6e7e7c commit 62b6382

File tree

3 files changed

+458
-311
lines changed

3 files changed

+458
-311
lines changed

dist/index.js

Lines changed: 24 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5779,7 +5779,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
57795779
var __importStar = (this && this.__importStar) || function (mod) {
57805780
if (mod && mod.__esModule) return mod;
57815781
var result = {};
5782-
if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
5782+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
57835783
__setModuleDefault(result, mod);
57845784
return result;
57855785
};
@@ -5884,7 +5884,8 @@ function includeExcludeFilter(stat, args) {
58845884
}
58855885
function getLocalFiles(args) {
58865886
return __awaiter(this, void 0, void 0, function () {
5887-
var files, records, _i, files_1, stat, _a, _b, _c;
5887+
var files, records, _i, files_1, stat, _a, _b;
5888+
var _c;
58885889
return __generator(this, function (_d) {
58895890
switch (_d.label) {
58905891
case 0: return [4 /*yield*/, readdir_enhanced_1.default.async(args["local-dir"], { deep: true, stats: true, sep: "/", filter: function (stat) { return includeExcludeFilter(stat, args); } })];
@@ -6240,7 +6241,7 @@ function getServerFiles(client, logger, args) {
62406241
_a.sent();
62416242
logger.all("Clear complete");
62426243
throw new Error("nope");
6243-
case 3: return [4 /*yield*/, downloadFileList(client, args["state-name"])];
6244+
case 3: return [4 /*yield*/, downloadFileList(client, args["server-dir"] + args["state-name"])];
62446245
case 4:
62456246
serverFiles = _a.sent();
62466247
logger.all("----------------------------------------------------------------");
@@ -6249,7 +6250,7 @@ function getServerFiles(client, logger, args) {
62496250
case 5:
62506251
e_3 = _a.sent();
62516252
logger.all("----------------------------------------------------------------");
6252-
logger.all("No file exists on the server \"" + args["state-name"] + "\" - this much be your first publish! \uD83C\uDF89");
6253+
logger.all("No file exists on the server \"" + (args["server-dir"] + args["state-name"]) + "\" - this much be your first publish! \uD83C\uDF89");
62536254
logger.all("The first publish will take a while... but once the initial sync is done only differences are published!");
62546255
logger.all("If you get this message and its NOT your first publish, something is wrong.");
62556256
// set the server state to nothing, because we don't know what the server state is
@@ -6266,6 +6267,16 @@ function getServerFiles(client, logger, args) {
62666267
}
62676268
function getDefaultSettings(withoutDefaults) {
62686269
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
6270+
if (withoutDefaults["local-dir"] !== undefined) {
6271+
if (!withoutDefaults["local-dir"].endsWith("/")) {
6272+
throw new Error("local-dir should be a folder (must end with /)");
6273+
}
6274+
}
6275+
if (withoutDefaults["server-dir"] !== undefined) {
6276+
if (!withoutDefaults["server-dir"].endsWith("/")) {
6277+
throw new Error("server-dir should be a folder (must end with /)");
6278+
}
6279+
}
62696280
return {
62706281
"server": withoutDefaults.server,
62716282
"username": withoutDefaults.username,
@@ -6362,8 +6373,8 @@ function syncLocalToServer(client, diffs, logger, args) {
63626373
return [3 /*break*/, 17];
63636374
case 20:
63646375
logger.all("----------------------------------------------------------------");
6365-
logger.all("\uD83C\uDF89 Sync complete. Saving current server state to \"" + args["state-name"] + "\"");
6366-
return [4 /*yield*/, client.uploadFrom(args["state-name"], args["state-name"])];
6376+
logger.all("\uD83C\uDF89 Sync complete. Saving current server state to \"" + (args["server-dir"] + args["state-name"]) + "\"");
6377+
return [4 /*yield*/, client.uploadFrom(args["state-name"], args["server-dir"] + args["state-name"])];
63676378
case 21:
63686379
_k.sent();
63696380
return [2 /*return*/];
@@ -6552,7 +6563,7 @@ var ErrorCode;
65526563
/***/ }),
65536564

65546565
/***/ 5739:
6555-
/***/ (function(__unused_webpack_module, exports, __nested_webpack_require_223229__) {
6566+
/***/ (function(__unused_webpack_module, exports, __nested_webpack_require_223769__) {
65566567

65576568
"use strict";
65586569

@@ -6561,7 +6572,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
65616572
};
65626573
Object.defineProperty(exports, "__esModule", ({ value: true }));
65636574
exports.Timer = exports.Timings = exports.pluralize = exports.Logger = void 0;
6564-
var pretty_ms_1 = __importDefault(__nested_webpack_require_223229__(1127));
6575+
var pretty_ms_1 = __importDefault(__nested_webpack_require_223769__(1127));
65656576
var Logger = /** @class */ (function () {
65666577
function Logger(level) {
65676578
this.level = level !== null && level !== void 0 ? level : "info";
@@ -6731,7 +6742,7 @@ module.exports = __webpack_require__(669);
67316742
/******/ var __webpack_module_cache__ = {};
67326743
/******/
67336744
/******/ // The require function
6734-
/******/ function __nested_webpack_require_227574__(moduleId) {
6745+
/******/ function __nested_webpack_require_228114__(moduleId) {
67356746
/******/ // Check if module is in cache
67366747
/******/ if(__webpack_module_cache__[moduleId]) {
67376748
/******/ return __webpack_module_cache__[moduleId].exports;
@@ -6746,7 +6757,7 @@ module.exports = __webpack_require__(669);
67466757
/******/ // Execute the module function
67476758
/******/ var threw = true;
67486759
/******/ try {
6749-
/******/ __webpack_modules__[moduleId].call(module.exports, module, module.exports, __nested_webpack_require_227574__);
6760+
/******/ __webpack_modules__[moduleId].call(module.exports, module, module.exports, __nested_webpack_require_228114__);
67506761
/******/ threw = false;
67516762
/******/ } finally {
67526763
/******/ if(threw) delete __webpack_module_cache__[moduleId];
@@ -6759,11 +6770,11 @@ module.exports = __webpack_require__(669);
67596770
/************************************************************************/
67606771
/******/ /* webpack/runtime/compat */
67616772
/******/
6762-
/******/ __nested_webpack_require_227574__.ab = __dirname + "/";/************************************************************************/
6773+
/******/ __nested_webpack_require_228114__.ab = __dirname + "/";/************************************************************************/
67636774
/******/ // module exports must be returned from runtime so entry inlining is disabled
67646775
/******/ // startup
67656776
/******/ // Load entry module and return exports
6766-
/******/ return __nested_webpack_require_227574__(6611);
6777+
/******/ return __nested_webpack_require_228114__(6611);
67676778
/******/ })()
67686779
;
67696780

@@ -6789,7 +6800,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
67896800
var __importStar = (this && this.__importStar) || function (mod) {
67906801
if (mod && mod.__esModule) return mod;
67916802
var result = {};
6792-
if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
6803+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
67936804
__setModuleDefault(result, mod);
67946805
return result;
67956806
};

0 commit comments

Comments
 (0)