mirror of
https://github.com/louislam/uptime-kuma.git
synced 2024-11-27 16:54:04 +00:00
refactor: removed fs-rmsync extra func used for node <14 (#5159)
This commit is contained in:
parent
da168fc220
commit
a5faa4b225
5 changed files with 17 additions and 35 deletions
|
@ -4,7 +4,6 @@ const tar = require("tar");
|
||||||
|
|
||||||
const packageJSON = require("../package.json");
|
const packageJSON = require("../package.json");
|
||||||
const fs = require("fs");
|
const fs = require("fs");
|
||||||
const rmSync = require("./fs-rmSync.js");
|
|
||||||
const version = packageJSON.version;
|
const version = packageJSON.version;
|
||||||
|
|
||||||
const filename = "dist.tar.gz";
|
const filename = "dist.tar.gz";
|
||||||
|
@ -29,8 +28,9 @@ function download(url) {
|
||||||
if (fs.existsSync("./dist")) {
|
if (fs.existsSync("./dist")) {
|
||||||
|
|
||||||
if (fs.existsSync("./dist-backup")) {
|
if (fs.existsSync("./dist-backup")) {
|
||||||
rmSync("./dist-backup", {
|
fs.rmSync("./dist-backup", {
|
||||||
recursive: true
|
recursive: true,
|
||||||
|
force: true,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -43,8 +43,9 @@ function download(url) {
|
||||||
|
|
||||||
tarStream.on("close", () => {
|
tarStream.on("close", () => {
|
||||||
if (fs.existsSync("./dist-backup")) {
|
if (fs.existsSync("./dist-backup")) {
|
||||||
rmSync("./dist-backup", {
|
fs.rmSync("./dist-backup", {
|
||||||
recursive: true
|
recursive: true,
|
||||||
|
force: true,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
console.log("Done");
|
console.log("Done");
|
||||||
|
|
|
@ -1,23 +0,0 @@
|
||||||
const fs = require("fs");
|
|
||||||
/**
|
|
||||||
* Detect if `fs.rmSync` is available
|
|
||||||
* to avoid the runtime deprecation warning triggered for using `fs.rmdirSync` with `{ recursive: true }` in Node.js v16,
|
|
||||||
* or the `recursive` property removing completely in the future Node.js version.
|
|
||||||
* See the link below.
|
|
||||||
* @todo Once we drop the support for Node.js v14 (or at least versions before v14.14.0), we can safely replace this function with `fs.rmSync`, since `fs.rmSync` was add in Node.js v14.14.0 and currently we supports all the Node.js v14 versions that include the versions before the v14.14.0, and this function have almost the same signature with `fs.rmSync`.
|
|
||||||
* @link https://nodejs.org/docs/latest-v16.x/api/deprecations.html#dep0147-fsrmdirpath--recursive-true- the deprecation information of `fs.rmdirSync`
|
|
||||||
* @link https://nodejs.org/docs/latest-v16.x/api/fs.html#fsrmsyncpath-options the document of `fs.rmSync`
|
|
||||||
* @param {fs.PathLike} path Valid types for path values in "fs".
|
|
||||||
* @param {fs.RmDirOptions} options options for `fs.rmdirSync`, if `fs.rmSync` is available and property `recursive` is true, it will automatically have property `force` with value `true`.
|
|
||||||
* @returns {void}
|
|
||||||
*/
|
|
||||||
const rmSync = (path, options) => {
|
|
||||||
if (typeof fs.rmSync === "function") {
|
|
||||||
if (options.recursive) {
|
|
||||||
options.force = true;
|
|
||||||
}
|
|
||||||
return fs.rmSync(path, options);
|
|
||||||
}
|
|
||||||
return fs.rmdirSync(path, options);
|
|
||||||
};
|
|
||||||
module.exports = rmSync;
|
|
|
@ -2,7 +2,6 @@
|
||||||
|
|
||||||
import fs from "fs";
|
import fs from "fs";
|
||||||
import util from "util";
|
import util from "util";
|
||||||
import rmSync from "../fs-rmSync.js";
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Copy across the required language files
|
* Copy across the required language files
|
||||||
|
@ -16,7 +15,10 @@ import rmSync from "../fs-rmSync.js";
|
||||||
*/
|
*/
|
||||||
function copyFiles(langCode, baseLang) {
|
function copyFiles(langCode, baseLang) {
|
||||||
if (fs.existsSync("./languages")) {
|
if (fs.existsSync("./languages")) {
|
||||||
rmSync("./languages", { recursive: true });
|
fs.rmSync("./languages", {
|
||||||
|
recursive: true,
|
||||||
|
force: true,
|
||||||
|
});
|
||||||
}
|
}
|
||||||
fs.mkdirSync("./languages");
|
fs.mkdirSync("./languages");
|
||||||
|
|
||||||
|
@ -93,6 +95,9 @@ console.log("Updating: " + langCode);
|
||||||
|
|
||||||
copyFiles(langCode, baseLangCode);
|
copyFiles(langCode, baseLangCode);
|
||||||
await updateLanguage(langCode, baseLangCode);
|
await updateLanguage(langCode, baseLangCode);
|
||||||
rmSync("./languages", { recursive: true });
|
fs.rmSync("./languages", {
|
||||||
|
recursive: true,
|
||||||
|
force: true,
|
||||||
|
});
|
||||||
|
|
||||||
console.log("Done. Fixing formatting by ESLint...");
|
console.log("Done. Fixing formatting by ESLint...");
|
||||||
|
|
|
@ -68,8 +68,7 @@
|
||||||
"sort-contributors": "node extra/sort-contributors.js",
|
"sort-contributors": "node extra/sort-contributors.js",
|
||||||
"quick-run-nightly": "docker run --rm --env NODE_ENV=development -p 3001:3001 louislam/uptime-kuma:nightly2",
|
"quick-run-nightly": "docker run --rm --env NODE_ENV=development -p 3001:3001 louislam/uptime-kuma:nightly2",
|
||||||
"start-dev-container": "cd docker && docker-compose -f docker-compose-dev.yml up --force-recreate",
|
"start-dev-container": "cd docker && docker-compose -f docker-compose-dev.yml up --force-recreate",
|
||||||
"rebase-pr-to-1.23.X": "node extra/rebase-pr.js 1.23.X",
|
"rebase-pr-to-1.23.X": "node extra/rebase-pr.js 1.23.X"
|
||||||
"start-server-node14-win": "private\\node14\\node.exe server/server.js"
|
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@grpc/grpc-js": "~1.8.22",
|
"@grpc/grpc-js": "~1.8.22",
|
||||||
|
|
|
@ -1,10 +1,10 @@
|
||||||
const fs = require("fs");
|
const fs = require("fs");
|
||||||
const rmSync = require("../extra/fs-rmSync.js");
|
|
||||||
|
|
||||||
const path = "./data/test";
|
const path = "./data/test";
|
||||||
|
|
||||||
if (fs.existsSync(path)) {
|
if (fs.existsSync(path)) {
|
||||||
rmSync(path, {
|
fs.rmSync(path, {
|
||||||
recursive: true,
|
recursive: true,
|
||||||
|
force: true,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue