Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 79a19b4

Browse files
timmywiltimmywil
committed
Build: migrate more uses of fs.promises; use node: protocol
Ref gh-5441
1 parent 2d8208e commit 79a19b4

File tree

12 files changed

+76
-58
lines changed

12 files changed

+76
-58
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-
var fs = require( "fs" );
3+
const fs = 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-
const fs = require( "node:fs" );
3+
const fs = require( "node:fs/promises" );
44
const util = require( "node:util" );
55
const exec = util.promisify( require( "node:child_process" ).exec );
66
const rnewline = /\r?\n/;
@@ -40,7 +40,7 @@ function cloneSizzle() {
4040
}
4141

4242
async function getLastAuthor() {
43-
const authorsTxt = await fs.promises.readFile( "AUTHORS.txt", "utf8" );
43+
const authorsTxt = await fs.readFile( "AUTHORS.txt", "utf8" );
4444
return authorsTxt.trim().split( rnewline ).pop();
4545
}
4646

@@ -93,7 +93,7 @@ async function updateAuthors() {
9393
const authors = await getAuthors();
9494

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

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

‎build/release/cdn.js‎

Lines changed: 44 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
"use strict";
22

3-
var
4-
fs = require( "fs" ),
3+
var fs = require( "node:fs" ),
54
shell = require( "shelljs" ),
6-
path = require( "path" ),
7-
os = require( "os" ),
8-
5+
path = require( "node:path" ),
6+
os = require( "node:os" ),
97
cdnFolder = "dist/cdn",
10-
118
releaseFiles = {
129
"jquery-VER.js": "dist/jquery.js",
1310
"jquery-VER.min.js": "dist/jquery.min.js",
@@ -16,15 +13,21 @@ var
1613
"jquery-VER.slim.min.js": "dist/jquery.slim.min.js",
1714
"jquery-VER.slim.min.map": "dist/jquery.slim.min.map"
1815
},
19-
2016
googleFilesCDN = [
21-
"jquery.js", "jquery.min.js", "jquery.min.map",
22-
"jquery.slim.js", "jquery.slim.min.js", "jquery.slim.min.map"
17+
"jquery.js",
18+
"jquery.min.js",
19+
"jquery.min.map",
20+
"jquery.slim.js",
21+
"jquery.slim.min.js",
22+
"jquery.slim.min.map"
2323
],
24-
2524
msFilesCDN = [
26-
"jquery-VER.js", "jquery-VER.min.js", "jquery-VER.min.map",
27-
"jquery-VER.slim.js", "jquery-VER.slim.min.js", "jquery-VER.slim.min.map"
25+
"jquery-VER.js",
26+
"jquery-VER.min.js",
27+
"jquery-VER.min.map",
28+
"jquery-VER.slim.js",
29+
"jquery-VER.slim.min.js",
30+
"jquery-VER.slim.min.map"
2831
];
2932

3033
/**
@@ -44,11 +47,16 @@ function makeReleaseCopies( Release ) {
4447
// Map files need to reference the new uncompressed name;
4548
// assume that all files reside in the same directory.
4649
// "file":"jquery.min.js" ... "sources":["jquery.js"]
47-
text = fs.readFileSync( builtFile, "utf8" )
48-
.replace( /"file":"([^"]+)"/,
49-
"\"file\":\"" + unpathedFile.replace( /\.min\.map/, ".min.js\"" ) )
50-
.replace( /"sources":\["([^"]+)"\]/,
51-
"\"sources\":[\"" + unpathedFile.replace( /\.min\.map/, ".js" ) + "\"]" );
50+
text = fs
51+
.readFileSync( builtFile, "utf8" )
52+
.replace(
53+
/"file":"([^"]+)"/,
54+
`"file":"${ unpathedFile.replace( /\.min\.map/, ".min.js" ) }"`
55+
)
56+
.replace(
57+
/"sources":\["([^"]+)"\]/,
58+
`"sources":["${ unpathedFile.replace( /\.min\.map/, ".js" ) }"]`
59+
);
5260
fs.writeFileSync( releaseFile, text );
5361
} else if ( builtFile !== releaseFile ) {
5462
shell.cp( "-f", builtFile, releaseFile );
@@ -57,19 +65,22 @@ function makeReleaseCopies( Release ) {
5765
}
5866

5967
function makeArchives( Release, callback ) {
60-
6168
Release.chdir( Release.dir.repo );
6269

6370
function makeArchive( cdn, files, callback ) {
6471
if ( Release.preRelease ) {
65-
console.log( "Skipping archive creation for " + cdn + "; this is a beta release." );
72+
console.log(
73+
`Skipping archive creation for ${ cdn }; this is a beta release.`
74+
);
6675
callback();
6776
return;
6877
}
6978

7079
console.log( "Creating production archive for " + cdn );
7180

72-
var i, sum, result,
81+
var i,
82+
sum,
83+
result,
7384
archiver = require( "archiver" )( "zip" ),
7485
md5file = cdnFolder + "/" + cdn + "-md5.txt",
7586
output = fs.createWriteStream(
@@ -87,28 +98,35 @@ function makeArchives( Release, callback ) {
8798
archiver.pipe( output );
8899

89100
files = files.map( function( item ) {
90-
return "dist" + ( rver.test( item ) ? "/cdn" : "" ) + "/" +
91-
item.replace( rver, Release.newVersion );
101+
return (
102+
"dist" +
103+
( rver.test( item ) ? "/cdn" : "" ) +
104+
"/" +
105+
item.replace( rver, Release.newVersion )
106+
);
92107
} );
93108

94109
if ( os.platform() === "win32" ) {
95110
sum = [];
96111
for ( i = 0; i < files.length; i++ ) {
97112
result = Release.exec(
98-
"certutil -hashfile " + files[ i ] + " MD5", "Error retrieving md5sum"
113+
"certutil -hashfile " + files[ i ] + " MD5",
114+
"Error retrieving md5sum"
99115
);
100116
sum.push( rmd5.exec( result )[ 0 ] + " " + files[ i ] );
101117
}
102118
sum = sum.join( "\n" );
103119
} else {
104-
sum = Release.exec( "md5 -r " + files.join( " " ), "Error retrieving md5sum" );
120+
sum = Release.exec(
121+
"md5 -r " + files.join( " " ),
122+
"Error retrieving md5sum"
123+
);
105124
}
106125
fs.writeFileSync( md5file, sum );
107126
files.push( md5file );
108127

109128
files.forEach( function( file ) {
110-
archiver.append( fs.createReadStream( file ),
111-
{ name: path.basename( file ) } );
129+
archiver.append( fs.createReadStream( file ), { name: path.basename( file ) } );
112130
} );
113131

114132
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-
const fs = require( "fs" ).promises;
5+
const fs = require( "node:fs/promises" );
66
const shell = require( "shelljs" );
77
const inquirer = require( "inquirer" );
88
const pkg = 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
import chalk from "chalk";
2-
import fs from "node:fs";
2+
import fs from "node:fs/promises";
33
import { promisify } from "node:util";
44
import zlib from "node:zlib";
55
import { exec as nodeExec } from "node:child_process";
@@ -34,7 +34,7 @@ function getBranchHeader( branch, commit ) {
3434
async function getCache( loc ) {
3535
let cache;
3636
try {
37-
const contents = await fs.promises.readFile( loc, "utf8" );
37+
const contents = await fs.readFile( loc, "utf8" );
3838
cache = JSON.parse( contents );
3939
} catch ( err ) {
4040
return {};
@@ -60,7 +60,7 @@ function cacheResults( results ) {
6060
}
6161

6262
function saveCache( loc, cache ) {
63-
return fs.promises.writeFile( loc, JSON.stringify( cache ) );
63+
return fs.writeFile( loc, JSON.stringify( cache ) );
6464
}
6565

6666
function compareSizes( existing, current, padLength ) {
@@ -104,7 +104,7 @@ export async function compareSize( { cache = ".sizecache.json", files } = {} ) {
104104
const results = await Promise.all(
105105
files.map( async function( filename ) {
106106

107-
let contents = await fs.promises.readFile( filename, "utf8" );
107+
let contents = await fs.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-
const util = require( "util" );
4-
const exec = util.promisify( require( "child_process" ).exec );
3+
const util = require( "node:util" );
4+
const exec = util.promisify( require( "node:child_process" ).exec );
55

66
module.exports = async function isCleanWorkingDir() {
77
const { stdout } = await exec( "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,16 +1,16 @@
11
"use strict";
22

33
const UglifyJS = require( "uglify-js" );
4-
const fs = require( "fs" );
5-
const path = require( "path" );
4+
const fs = require( "node:fs/promises" );
5+
const path = require( "node:path" );
66
const processForDist = require( "./dist" );
77
const getTimestamp = require( "./lib/getTimestamp" );
88

99
const rjs = /\.js$/;
1010

1111
module.exports = async function minify( { dir, filename } ) {
1212
const filepath = path.join( dir, filename );
13-
const contents = await fs.promises.readFile( filepath, "utf8" );
13+
const contents = await fs.readFile( filepath, "utf8" );
1414
const version = /jQuery JavaScript Library ([^\n]+)/.exec( contents )[ 1 ];
1515
const banner = `/*! jQuery ${ version }` +
1616
" | (c) OpenJS Foundation and other contributors" +
@@ -63,11 +63,11 @@ module.exports = async function minify( { dir, filename } ) {
6363
} );
6464

6565
await Promise.all( [
66-
fs.promises.writeFile(
66+
fs.writeFile(
6767
path.join( dir, minFilename ),
6868
code
6969
),
70-
fs.promises.writeFile(
70+
fs.writeFile(
7171
path.join( dir, mapFilename ),
7272
map
7373
)

‎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-
const fs = require( "fs" );
4-
const util = require( "util" );
5-
const exec = util.promisify( require( "child_process" ).exec );
3+
const fs = require( "node:fs/promises" );
4+
const util = require( "node:util" );
5+
const exec = util.promisify( require( "node:child_process" ).exec );
66
const verifyNodeVersion = require( "./lib/verifyNodeVersion" );
77

88
if ( !verifyNodeVersion() ) {
@@ -17,7 +17,7 @@ if ( !verifyNodeVersion() ) {
1717

1818
async function runTests( { module } ) {
1919
const dir = "./test/node_smoke_tests";
20-
const files = await fs.promises.readdir( dir, { withFileTypes: true } );
20+
const files = await fs.readdir( dir, { withFileTypes: true } );
2121
const testFiles = files.filter( ( testFilePath ) => testFilePath.isFile() );
2222

2323
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-
const fs = require( "fs" );
4-
const path = require( "path" );
3+
const fs = require( "node:fs/promises" );
4+
const path = require( "node:path" );
55

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

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

2828
async function npmcopy() {
29-
await fs.promises.mkdir( path.resolve( projectDir, "external" ), {
29+
await fs.mkdir( path.resolve( projectDir, "external" ), {
3030
recursive: true
3131
} );
3232
for ( const [ dest, source ] of Object.entries( files ) ) {
3333
const from = path.resolve( projectDir, "node_modules", source );
3434
const to = path.resolve( projectDir, "external", dest );
3535
const toDir = path.dirname( to );
36-
await fs.promises.mkdir( toDir, { recursive: true } );
37-
await fs.promises.copyFile( from, to );
36+
await fs.mkdir( toDir, { recursive: true } );
37+
await fs.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
const verifyNodeVersion = require( "./lib/verifyNodeVersion" );
5-
const path = require( "path" );
6-
const os = require( "os" );
5+
const path = require( "node:path" );
6+
const os = require( "node:os" );
77

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

0 commit comments

Comments
 (0)