update all the npm after 2 years
This commit is contained in:
+2
-2
@@ -5,7 +5,7 @@ import { LANGS } from "./langs";
|
||||
|
||||
export type LangType = keyof typeof LANGS;
|
||||
export type LangTypeAndAuto = LangType | "auto";
|
||||
export type TransItemType = keyof typeof LANGS["en"];
|
||||
export type TransItemType = keyof (typeof LANGS)["en"];
|
||||
|
||||
export class I18n {
|
||||
lang: LangTypeAndAuto;
|
||||
@@ -31,7 +31,7 @@ export class I18n {
|
||||
}
|
||||
|
||||
const res: string =
|
||||
(LANGS[realLang] as typeof LANGS["en"])[key] || LANGS["en"][key] || key;
|
||||
(LANGS[realLang] as (typeof LANGS)["en"])[key] || LANGS["en"][key] || key;
|
||||
return res;
|
||||
}
|
||||
|
||||
|
||||
+2
-3
@@ -312,9 +312,8 @@ export const clearDeleteRenameHistoryOfKeyAndVault = async (
|
||||
vaultRandomID: string
|
||||
) => {
|
||||
const fullKey = `${vaultRandomID}\t${key}`;
|
||||
const item: FileFolderHistoryRecord | null = await db.fileHistoryTbl.getItem(
|
||||
fullKey
|
||||
);
|
||||
const item: FileFolderHistoryRecord | null =
|
||||
await db.fileHistoryTbl.getItem(fullKey);
|
||||
if (
|
||||
item !== null &&
|
||||
(item.actionType === "delete" || item.actionType === "rename")
|
||||
|
||||
+2
-3
@@ -976,9 +976,8 @@ export default class RemotelySavePlugin extends Plugin {
|
||||
const pluginConfigDir =
|
||||
this.manifest.dir ||
|
||||
`${this.app.vault.configDir}/plugins/${this.manifest.dir}`;
|
||||
const pluginConfigDirExists = await this.app.vault.adapter.exists(
|
||||
pluginConfigDir
|
||||
);
|
||||
const pluginConfigDirExists =
|
||||
await this.app.vault.adapter.exists(pluginConfigDir);
|
||||
if (!pluginConfigDirExists) {
|
||||
// what happened?
|
||||
return;
|
||||
|
||||
+8
-2
@@ -4,14 +4,20 @@
|
||||
import { TAbstractFile, TFolder, TFile, Vault } from "obsidian";
|
||||
|
||||
import * as origLog from "loglevel";
|
||||
import type { LogLevelNumbers, Logger, LogLevel, LogLevelDesc } from "loglevel";
|
||||
import type {
|
||||
LogLevelNumbers,
|
||||
Logger,
|
||||
LogLevel,
|
||||
LogLevelDesc,
|
||||
LogLevelNames,
|
||||
} from "loglevel";
|
||||
const log2 = origLog.getLogger("rs-default");
|
||||
|
||||
const originalFactory = log2.methodFactory;
|
||||
|
||||
export const applyLogWriterInplace = function (writer: (...msg: any[]) => any) {
|
||||
log2.methodFactory = function (
|
||||
methodName: string,
|
||||
methodName: LogLevelNames,
|
||||
logLevel: LogLevelNumbers,
|
||||
loggerName: string | symbol
|
||||
) {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import delay from "delay";
|
||||
import { rangeDelay } from "delay";
|
||||
import { Dropbox, DropboxAuth } from "dropbox";
|
||||
import type { files, DropboxResponseError, DropboxResponse } from "dropbox";
|
||||
import { Vault } from "obsidian";
|
||||
@@ -340,7 +340,7 @@ async function retryReq<T>(
|
||||
2
|
||||
)}`
|
||||
);
|
||||
await delay.range(secMin * 1000, secMax * 1000);
|
||||
await rangeDelay(secMin * 1000, secMax * 1000);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+4
-4
@@ -11,14 +11,14 @@ import {
|
||||
S3Client,
|
||||
} from "@aws-sdk/client-s3";
|
||||
import { Upload } from "@aws-sdk/lib-storage";
|
||||
import { HttpHandler, HttpRequest, HttpResponse } from "@aws-sdk/protocol-http";
|
||||
import { HttpHandler, HttpRequest, HttpResponse } from "@smithy/protocol-http";
|
||||
import {
|
||||
FetchHttpHandler,
|
||||
FetchHttpHandlerOptions,
|
||||
} from "@aws-sdk/fetch-http-handler";
|
||||
} from "@smithy/fetch-http-handler";
|
||||
// @ts-ignore
|
||||
import { requestTimeout } from "@aws-sdk/fetch-http-handler/dist-es/request-timeout";
|
||||
import { buildQueryString } from "@aws-sdk/querystring-builder";
|
||||
import { requestTimeout } from "@smithy/fetch-http-handler/dist-es/request-timeout";
|
||||
import { buildQueryString } from "@smithy/querystring-builder";
|
||||
import { HeaderBag, HttpHandlerOptions, Provider } from "@aws-sdk/types";
|
||||
import { Buffer } from "buffer";
|
||||
import * as mime from "mime-types";
|
||||
|
||||
+13
-11
@@ -17,8 +17,8 @@ import type {
|
||||
RequestOptionsWithState,
|
||||
Response,
|
||||
ResponseDataDetailed,
|
||||
} from "webdav/web";
|
||||
import { getPatcher } from "webdav/web";
|
||||
} from "webdav";
|
||||
import { getPatcher } from "webdav";
|
||||
if (VALID_REQURL) {
|
||||
getPatcher().patch(
|
||||
"request",
|
||||
@@ -38,28 +38,28 @@ if (VALID_REQURL) {
|
||||
});
|
||||
|
||||
let r2: Response | ResponseDataDetailed<any> = undefined;
|
||||
if (options.responseType === undefined) {
|
||||
if ((options as any).responseType === undefined) {
|
||||
r2 = {
|
||||
data: undefined,
|
||||
status: r.status,
|
||||
statusText: getReasonPhrase(r.status),
|
||||
headers: r.headers,
|
||||
};
|
||||
} else if (options.responseType === "json") {
|
||||
} else if ((options as any).responseType === "json") {
|
||||
r2 = {
|
||||
data: r.json,
|
||||
status: r.status,
|
||||
statusText: getReasonPhrase(r.status),
|
||||
headers: r.headers,
|
||||
};
|
||||
} else if (options.responseType === "text") {
|
||||
} else if ((options as any).responseType === "text") {
|
||||
r2 = {
|
||||
data: r.text,
|
||||
status: r.status,
|
||||
statusText: getReasonPhrase(r.status),
|
||||
headers: r.headers,
|
||||
};
|
||||
} else if (options.responseType === "arraybuffer") {
|
||||
} else if ((options as any).responseType === "arraybuffer") {
|
||||
r2 = {
|
||||
data: r.arrayBuffer,
|
||||
status: r.status,
|
||||
@@ -68,7 +68,9 @@ if (VALID_REQURL) {
|
||||
};
|
||||
} else {
|
||||
throw Error(
|
||||
`do not know how to deal with responseType = ${options.responseType}`
|
||||
`do not know how to deal with responseType = ${
|
||||
(options as any).responseType
|
||||
}`
|
||||
);
|
||||
}
|
||||
return r2;
|
||||
@@ -108,8 +110,8 @@ if (VALID_REQURL) {
|
||||
// // console.log("using fetch");
|
||||
// return r;
|
||||
// });
|
||||
import { AuthType, BufferLike, createClient } from "webdav/web";
|
||||
export type { WebDAVClient } from "webdav/web";
|
||||
import { AuthType, BufferLike, createClient } from "webdav";
|
||||
export type { WebDAVClient } from "webdav";
|
||||
|
||||
export const DEFAULT_WEBDAV_CONFIG = {
|
||||
address: "",
|
||||
@@ -234,7 +236,7 @@ export class WrappedWebdavClient {
|
||||
Depth: "infinity",
|
||||
},
|
||||
responseType: "text",
|
||||
});
|
||||
} as any);
|
||||
if (res.status === 403) {
|
||||
throw Error("not support Infinity, get 403");
|
||||
} else {
|
||||
@@ -255,7 +257,7 @@ export class WrappedWebdavClient {
|
||||
Depth: "1",
|
||||
},
|
||||
responseType: "text",
|
||||
}
|
||||
} as any
|
||||
);
|
||||
testPassed = true;
|
||||
this.webdavConfig.depth = "auto_1";
|
||||
|
||||
Reference in New Issue
Block a user