Skip to content

Commit c8bbb0a

Browse files
resources/utils: extract 'writeGeneratedFile' to utils (#3420)
1 parent 90bd6ff commit c8bbb0a

File tree

4 files changed

+25
-25
lines changed

4 files changed

+25
-25
lines changed

resources/build-deno.js

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,12 @@ const fs = require('fs');
44
const path = require('path');
55

66
const babel = require('@babel/core');
7-
const prettier = require('prettier');
87

9-
const { readdirRecursive, showDirStats } = require('./utils.js');
10-
11-
const prettierConfig = JSON.parse(
12-
fs.readFileSync(require.resolve('../.prettierrc'), 'utf-8'),
13-
);
8+
const {
9+
writeGeneratedFile,
10+
readdirRecursive,
11+
showDirStats,
12+
} = require('./utils.js');
1413

1514
if (require.main === module) {
1615
fs.rmSync('./denoDist', { recursive: true, force: true });
@@ -34,8 +33,3 @@ if (require.main === module) {
3433

3534
showDirStats('./denoDist');
3635
}
37-
38-
function writeGeneratedFile(filepath, body) {
39-
const formatted = prettier.format(body, { filepath, ...prettierConfig });
40-
fs.writeFileSync(filepath, formatted);
41-
}

resources/build-npm.js

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,12 @@ const assert = require('assert');
66

77
const ts = require('typescript');
88
const babel = require('@babel/core');
9-
const prettier = require('prettier');
109

11-
const { readdirRecursive, showDirStats } = require('./utils.js');
12-
13-
const prettierConfig = JSON.parse(
14-
fs.readFileSync(require.resolve('../.prettierrc'), 'utf-8'),
15-
);
10+
const {
11+
writeGeneratedFile,
12+
readdirRecursive,
13+
showDirStats,
14+
} = require('./utils.js');
1615

1716
if (require.main === module) {
1817
fs.rmSync('./npmDist', { recursive: true, force: true });
@@ -90,11 +89,6 @@ if (require.main === module) {
9089
showDirStats('./npmDist');
9190
}
9291

93-
function writeGeneratedFile(filepath, body) {
94-
const formatted = prettier.format(body, { filepath, ...prettierConfig });
95-
fs.writeFileSync(filepath, formatted);
96-
}
97-
9892
function babelBuild(srcPath, options) {
9993
const { code } = babel.transformFileSync(srcPath, {
10094
babelrc: false,

resources/gen-version.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 fs = require('fs');
4-
53
const { version } = require('../package.json');
64

5+
const { writeGeneratedFile } = require('./utils.js');
6+
77
const versionMatch = /^(\d+)\.(\d+)\.(\d+)-?(.*)?$/.exec(version);
88
if (!versionMatch) {
99
throw new Error('Version does not match semver spec: ' + version);
@@ -34,5 +34,5 @@ export const versionInfo = Object.freeze({
3434
`;
3535

3636
if (require.main === module) {
37-
fs.writeFileSync('./src/version.ts', body.trim() + '\n');
37+
writeGeneratedFile('./src/version.ts', body);
3838
}

resources/utils.js

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ const fs = require('fs');
44
const path = require('path');
55
const childProcess = require('child_process');
66

7+
const prettier = require('prettier');
8+
79
function exec(command, options) {
810
const output = childProcess.execSync(command, {
911
maxBuffer: 10 * 1024 * 1024, // 10MB
@@ -80,8 +82,18 @@ function showDirStats(dirPath) {
8082
);
8183
}
8284

85+
const prettierConfig = JSON.parse(
86+
fs.readFileSync(require.resolve('../.prettierrc'), 'utf-8'),
87+
);
88+
89+
function writeGeneratedFile(filepath, body) {
90+
const formatted = prettier.format(body, { filepath, ...prettierConfig });
91+
fs.writeFileSync(filepath, formatted);
92+
}
93+
8394
module.exports = {
8495
exec,
8596
readdirRecursive,
8697
showDirStats,
98+
writeGeneratedFile,
8799
};

0 commit comments

Comments
 (0)