Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commitae7f613

Browse files
committed
Build: migrate more uses of fs.promises; use node: protocol
Refgh-5440
1 parent822362e commitae7f613

File tree

12 files changed

+65
-56
lines changed

12 files changed

+65
-56
lines changed

‎build/release.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"use strict";
22

3-
varfs=require("fs");
3+
constfs=require("node:fs");
44

55
module.exports=function(Release){
66

‎build/release/authors.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"use strict";
22

3-
constfs=require("node:fs");
3+
constfs=require("node:fs/promises");
44
constutil=require("node:util");
55
constexec=util.promisify(require("node:child_process").exec);
66
constrnewline=/\r?\n/;
@@ -40,7 +40,7 @@ function cloneSizzle() {
4040
}
4141

4242
asyncfunctiongetLastAuthor(){
43-
constauthorsTxt=awaitfs.promises.readFile("AUTHORS.txt","utf8");
43+
constauthorsTxt=awaitfs.readFile("AUTHORS.txt","utf8");
4444
returnauthorsTxt.trim().split(rnewline).pop();
4545
}
4646

@@ -93,7 +93,7 @@ async function updateAuthors() {
9393
constauthors=awaitgetAuthors();
9494

9595
constauthorsTxt="Authors ordered by first contribution.\n\n"+authors.join("\n")+"\n";
96-
awaitfs.promises.writeFile("AUTHORS.txt",authorsTxt);
96+
awaitfs.writeFile("AUTHORS.txt",authorsTxt);
9797

9898
console.log("AUTHORS.txt updated");
9999
}

‎build/release/cdn.js

Lines changed: 33 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
"use strict";
22

3-
constfs=require("fs");
3+
constfs=require("node:fs");
44
constshell=require("shelljs");
5-
constpath=require("path");
6-
constos=require("os");
5+
constpath=require("node:path");
6+
constos=require("node:os");
77

88
constcdnFolderContainer="dist/cdn";
99
constcdnFolderVersioned=`${cdnFolderContainer}/versioned`;
@@ -49,7 +49,7 @@ function makeReleaseCopies( Release ) {
4949
].forEach(({ filesMap, cdnFolder})=>{
5050
shell.mkdir("-p",cdnFolder);
5151

52-
Object.keys(filesMap).forEach(key=>{
52+
Object.keys(filesMap).forEach((key)=>{
5353
lettext;
5454
constbuiltFile=filesMap[key];
5555
constunpathedFile=key.replace(/@VER/g,Release.newVersion);
@@ -60,28 +60,33 @@ function makeReleaseCopies( Release ) {
6060
// Map files need to reference the new uncompressed name;
6161
// assume that all files reside in the same directory.
6262
// "file":"jquery.min.js" ... "sources":["jquery.js"]
63-
text=fs.readFileSync(builtFile,"utf8")
64-
.replace(/"file":"([^"]+)"/,
65-
"\"file\":\""+unpathedFile.replace(/\.min\.map/,".min.js\""))
66-
.replace(/"sources":\["([^"]+)"\]/,
67-
"\"sources\":[\""+unpathedFile.replace(/\.min\.map/,".js")+"\"]");
63+
text=fs
64+
.readFileSync(builtFile,"utf8")
65+
.replace(
66+
/"file":"([^"]+)"/,
67+
`"file":"${unpathedFile.replace(/\.min\.map/,".min.js")}"`
68+
)
69+
.replace(
70+
/"sources":\["([^"]+)"\]/,
71+
`"sources":["${unpathedFile.replace(/\.min\.map/,".js")}"]`
72+
);
6873
fs.writeFileSync(releaseFile,text);
6974
}elseif(builtFile!==releaseFile){
7075
shell.cp("-f",builtFile,releaseFile);
7176
}
7277
});
73-
7478
});
7579
}
7680

7781
asyncfunctionmakeArchives(Release){
78-
7982
Release.chdir(Release.dir.repo);
8083

8184
asyncfunctionmakeArchive({ cdn, filesMap, cdnFolder}){
8285
returnnewPromise((resolve,reject)=>{
8386
if(Release.preRelease){
84-
console.log("Skipping archive creation for "+cdn+"; this is a beta release.");
87+
console.log(
88+
`Skipping archive creation for${cdn}; this is a beta release.`
89+
);
8590
resolve();
8691
return;
8792
}
@@ -99,41 +104,45 @@ async function makeArchives( Release ) {
99104

100105
output.on("close",resolve);
101106

102-
output.on("error",err=>{
107+
output.on("error",(err)=>{
103108
reject(err);
104109
});
105110

106111
archiver.pipe(output);
107112

108113
letfinalFilesMap=Object.create(null);
109114
for(const[releaseFile,builtFile]ofObject.entries(filesMap)){
110-
finalFilesMap[releaseFile.replace(rver,Release.newVersion)]=builtFile;
115+
finalFilesMap[releaseFile.replace(rver,Release.newVersion)]=
116+
builtFile;
111117
}
112118

113-
constfiles=Object
114-
.keys(filesMap)
115-
.map(item=>`${cdnFolder}/${
116-
item.replace(rver,Release.newVersion)
117-
}`);
119+
constfiles=Object.keys(filesMap).map(
120+
(item)=>`${cdnFolder}/${item.replace(rver,Release.newVersion)}`
121+
);
118122

119123
if(os.platform()==="win32"){
120124
sum=[];
121125
for(i=0;i<files.length;i++){
122126
result=Release.exec(
123-
"certutil -hashfile "+files[i]+" MD5","Error retrieving md5sum"
127+
"certutil -hashfile "+files[i]+" MD5",
128+
"Error retrieving md5sum"
124129
);
125130
sum.push(rmd5.exec(result)[0]+" "+files[i]);
126131
}
127132
sum=sum.join("\n");
128133
}else{
129-
sum=Release.exec("md5 -r "+files.join(" "),"Error retrieving md5sum");
134+
sum=Release.exec(
135+
"md5 -r "+files.join(" "),
136+
"Error retrieving md5sum"
137+
);
130138
}
131139
fs.writeFileSync(md5file,sum);
132140
files.push(md5file);
133141

134-
files.forEach(file=>{
135-
archiver.append(fs.createReadStream(file),
136-
{name:path.basename(file)});
142+
files.forEach((file)=>{
143+
archiver.append(fs.createReadStream(file),{
144+
name:path.basename(file)
145+
});
137146
});
138147

139148
archiver.finalize();

‎build/release/dist.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
module.exports=function(Release,files,complete){
44

5-
constfs=require("fs").promises;
5+
constfs=require("node:fs/promises");
66
constshell=require("shelljs");
77
constinquirer=require("inquirer");
88
constpkg=require(`${Release.dir.repo}/package.json`);

‎build/tasks/compare_size.mjs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
importchalkfrom"chalk";
2-
importfsfrom"node:fs";
2+
importfsfrom"node:fs/promises";
33
import{promisify}from"node:util";
44
importzlibfrom"node:zlib";
55
import{execasnodeExec}from"node:child_process";
@@ -34,7 +34,7 @@ function getBranchHeader( branch, commit ) {
3434
asyncfunctiongetCache(loc){
3535
letcache;
3636
try{
37-
constcontents=awaitfs.promises.readFile(loc,"utf8");
37+
constcontents=awaitfs.readFile(loc,"utf8");
3838
cache=JSON.parse(contents);
3939
}catch(err){
4040
return{};
@@ -60,7 +60,7 @@ function cacheResults( results ) {
6060
}
6161

6262
functionsaveCache(loc,cache){
63-
returnfs.promises.writeFile(loc,JSON.stringify(cache));
63+
returnfs.writeFile(loc,JSON.stringify(cache));
6464
}
6565

6666
functioncompareSizes(existing,current,padLength){
@@ -104,7 +104,7 @@ export async function compareSize( { cache = ".sizecache.json", files } = {} ) {
104104
constresults=awaitPromise.all(
105105
files.map(asyncfunction(filename){
106106

107-
letcontents=awaitfs.promises.readFile(filename,"utf8");
107+
letcontents=awaitfs.readFile(filename,"utf8");
108108

109109
// Remove the short SHA and .dirty from comparisons.
110110
// The short SHA so commits can be compared against each other

‎build/tasks/lib/isCleanWorkingDir.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
"use strict";
22

3-
constutil=require("util");
4-
constexec=util.promisify(require("child_process").exec);
3+
constutil=require("node:util");
4+
constexec=util.promisify(require("node:child_process").exec);
55

66
module.exports=asyncfunctionisCleanWorkingDir(){
77
const{ stdout}=awaitexec("git status --untracked-files=no --porcelain");

‎build/tasks/minify.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
"use strict";
22

33
constswc=require("@swc/core");
4-
constfs=require("fs");
5-
constpath=require("path");
4+
constfs=require("node:fs/promises");
5+
constpath=require("node:path");
66
constprocessForDist=require("./dist");
77
constgetTimestamp=require("./lib/getTimestamp");
88

99
constrjs=/\.js$/;
1010

1111
module.exports=asyncfunctionminify({ filename, dir, esm}){
12-
constcontents=awaitfs.promises.readFile(path.join(dir,filename),"utf8");
12+
constcontents=awaitfs.readFile(path.join(dir,filename),"utf8");
1313
constversion=/jQueryJavaScriptLibrary([^\n]+)/.exec(contents)[1];
1414

1515
const{ code,map:incompleteMap}=awaitswc.minify(
@@ -48,11 +48,11 @@ module.exports = async function minify( { filename, dir, esm } ) {
4848
});
4949

5050
awaitPromise.all([
51-
fs.promises.writeFile(
51+
fs.writeFile(
5252
path.join(dir,minFilename),
5353
code
5454
),
55-
fs.promises.writeFile(
55+
fs.writeFile(
5656
path.join(dir,mapFilename),
5757
map
5858
)

‎build/tasks/node_smoke_tests.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
"use strict";
22

3-
constfs=require("fs");
4-
constutil=require("util");
5-
constexec=util.promisify(require("child_process").exec);
3+
constfs=require("node:fs/promises");
4+
constutil=require("node:util");
5+
constexec=util.promisify(require("node:child_process").exec);
66
constverifyNodeVersion=require("./lib/verifyNodeVersion");
77

88
constallowedLibraryTypes=["regular","factory"];
@@ -26,7 +26,7 @@ async function runTests( { libraryType, sourceType, module } ) {
2626
}${sourceType} "${module}"`);
2727
}
2828
constdir=`./test/node_smoke_tests/${sourceType}/${libraryType}`;
29-
constfiles=awaitfs.promises.readdir(dir,{withFileTypes:true});
29+
constfiles=awaitfs.readdir(dir,{withFileTypes:true});
3030
consttestFiles=files.filter((testFilePath)=>testFilePath.isFile());
3131

3232
if(!testFiles.length){

‎build/tasks/npmcopy.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
"use strict";
22

3-
constfs=require("fs");
4-
constpath=require("path");
3+
constfs=require("node:fs/promises");
4+
constpath=require("node:path");
55

66
constprojectDir=path.resolve(__dirname,"..","..");
77

@@ -26,15 +26,15 @@ const files = {
2626
};
2727

2828
asyncfunctionnpmcopy(){
29-
awaitfs.promises.mkdir(path.resolve(projectDir,"external"),{
29+
awaitfs.mkdir(path.resolve(projectDir,"external"),{
3030
recursive:true
3131
});
3232
for(const[dest,source]ofObject.entries(files)){
3333
constfrom=path.resolve(projectDir,"node_modules",source);
3434
constto=path.resolve(projectDir,"external",dest);
3535
consttoDir=path.dirname(to);
36-
awaitfs.promises.mkdir(toDir,{recursive:true});
37-
awaitfs.promises.copyFile(from,to);
36+
awaitfs.mkdir(toDir,{recursive:true});
37+
awaitfs.copyFile(from,to);
3838
console.log(`${source}${dest}`);
3939
}
4040
}

‎build/tasks/promises_aplus_tests.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
"use strict";
22

3-
const{ spawn}=require("child_process");
3+
const{ spawn}=require("node:child_process");
44
constverifyNodeVersion=require("./lib/verifyNodeVersion");
5-
constpath=require("path");
6-
constos=require("os");
5+
constpath=require("node:path");
6+
constos=require("node:os");
77

88
if(!verifyNodeVersion()){
99
return;

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp