GithubFollow/Surge_by_SukkaW
1
0
Fork 0
mirror of https://github.com/SukkaW/Surge.git synced 2026-01-29 01:51:52 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Chore: remove fs-extra

Browse Source
This commit is contained in:
SukkaW
2023-10-22 23:05:29 +08:00
parent afb954e2d8
commit 57a306c592
5 changed files with 21 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Build/build-public.js
View File

@@ -2,7 +2,6 @@ const listDir = require('@sukka/listdir');
const path = require('path');
const fs = require('fs');
const fsp = require('fs/promises');
const { copy } = require('fs-extra');
const { task } = require('./lib/trace-runner');
const rootPath = path.resolve(__dirname, '../');
@@ -19,7 +18,11 @@ const folderAndFilesToBeDeployed = [
const buildPublicHtml = task(__filename, async () => {
await fsp.mkdir(publicPath, { recursive: true });
await Promise.all(folderAndFilesToBeDeployed.map(dir => copy(path.resolve(rootPath, dir), path.resolve(publicPath, dir))));
await Promise.all(folderAndFilesToBeDeployed.map(dir => fsp.cp(
path.resolve(rootPath, dir),
path.resolve(publicPath, dir),
{ force: true, recursive: true }
)));
const list = await listDir(publicPath, {
ignoreHidden: true,

22
Build/build-reject-domainset.js
View File

@@ -1,6 +1,6 @@
// @ts-check
const { copy } = require('fs-extra');
const { resolve: pathResolve } = require('path');
const fsp = require('fs/promises');
const path = require('path');
const { processHosts, processFilterRules } = require('./lib/parse-filter');
const createTrie = require('./lib/trie');
@@ -97,7 +97,7 @@ const buildRejectDomainSet = task(__filename, async () => {
let previousSize = domainSets.size;
console.log(`Import ${previousSize} rules from Hosts / AdBlock Filter Rules!`);
for await (const line of readFileByLine(pathResolve(__dirname, '../Source/domainset/reject_sukka.conf'))) {
for await (const line of readFileByLine(path.resolve(__dirname, '../Source/domainset/reject_sukka.conf'))) {
const l = processLine(line);
if (l) {
domainSets.add(l);
@@ -107,7 +107,7 @@ const buildRejectDomainSet = task(__filename, async () => {
previousSize = domainSets.size - previousSize;
console.log(`Import ${previousSize} rules from reject_sukka.conf!`);
for await (const line of readFileByLine(pathResolve(__dirname, '../Source/non_ip/reject.conf'))) {
for await (const line of readFileByLine(path.resolve(__dirname, '../Source/non_ip/reject.conf'))) {
if (line.startsWith('DOMAIN-KEYWORD')) {
const [, ...keywords] = line.split(',');
domainKeywordsSet.add(keywords.join(',').trim());
@@ -117,7 +117,7 @@ const buildRejectDomainSet = task(__filename, async () => {
}
}
for await (const line of readFileByLine(pathResolve(__dirname, '../List/domainset/reject_phishing.conf'))) {
for await (const line of readFileByLine(path.resolve(__dirname, '../List/domainset/reject_phishing.conf'))) {
const l = processLine(line);
if (l && l[0] === '.') {
domainSuffixSet.add(l.slice(1));
@@ -217,15 +217,19 @@ const buildRejectDomainSet = task(__filename, async () => {
new Date(),
domainset,
'domainset',
pathResolve(__dirname, '../List/domainset/reject.conf'),
pathResolve(__dirname, '../Clash/domainset/reject.txt')
path.resolve(__dirname, '../List/domainset/reject.conf'),
path.resolve(__dirname, '../Clash/domainset/reject.txt')
),
compareAndWriteFile(
rejectDomainsStats.map(([domain, count]) => `${domain}${' '.repeat(100 - domain.length)}${count}`),
pathResolve(__dirname, '../List/internal/reject-stats.txt')
path.resolve(__dirname, '../List/internal/reject-stats.txt')
),
// Copy reject_sukka.conf for backward compatibility
copy(pathResolve(__dirname, '../Source/domainset/reject_sukka.conf'), pathResolve(__dirname, '../List/domainset/reject_sukka.conf'))
fsp.cp(
path.resolve(__dirname, '../Source/domainset/reject_sukka.conf'),
path.resolve(__dirname, '../List/domainset/reject_sukka.conf'),
{ force: true, recursive: true }
)
]);
});

7
Build/download-previous-build.js
View File

@@ -1,8 +1,7 @@
const { fetch } = require('undici');
const tar = require('tar');
const fs = require('fs');
const fsp = fs.promises;
const { copy } = require('fs-extra');
const fsp = require('fs/promises');
const path = require('path');
const { tmpdir } = require('os');
const { Readable } = require('stream');
@@ -72,10 +71,10 @@ const downloadPreviousBuild = task(__filename, async () => {
await Promise.all(filesList.map(async p => {
const src = path.join(extractedPath, 'ruleset.skk.moe-master', p);
if (await fileExists(src)) {
return copy(
return fsp.cp(
src,
path.join(__dirname, '..', p),
{ overwrite: true }
{ force: true, recursive: true }
);
}
}));