Skip to content

Commit 1681d0e

Browse files
IvanGoncharovyaacovCR
IvanGoncharov
authored and
yaacovCR
committed
resources: remove all usages of require.main (graphql#3590)
1 parent c60d426 commit 1681d0e

File tree

4 files changed

+140
-136
lines changed

4 files changed

+140
-136
lines changed

‎resources/benchmark.ts‎

Lines changed: 31 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,14 @@ const maxTime = 5;
1212
// The minimum sample size required to perform statistical analysis.
1313
const minSamples = 5;
1414

15-
// Get the revisions and make things happen!
16-
if (require.main === module) {
15+
async function runBenchmarks() {
16+
// Get the revisions and make things happen!
1717
const { benchmarks, revisions } = getArguments(process.argv.slice(2));
1818
const benchmarkProjects = prepareBenchmarkProjects(revisions);
1919

20-
runBenchmarks(benchmarks, benchmarkProjects).catch((error) => {
21-
console.error(error);
22-
process.exit(1);
23-
});
20+
for (const benchmark of benchmarks) {
21+
await runBenchmark(benchmark, benchmarkProjects);
22+
}
2423
}
2524

2625
function localDir(...paths: ReadonlyArray<string>) {
@@ -266,35 +265,33 @@ function maxBy<T>(array: ReadonlyArray<T>, fn: (obj: T) => number) {
266265
}
267266

268267
// Prepare all revisions and run benchmarks matching a pattern against them.
269-
async function runBenchmarks(
270-
benchmarks: ReadonlyArray<string>,
268+
async function runBenchmark(
269+
benchmark: string,
271270
benchmarkProjects: ReadonlyArray<BenchmarkProject>,
272271
) {
273-
for (const benchmark of benchmarks) {
274-
const results = [];
275-
for (let i = 0; i < benchmarkProjects.length; ++i) {
276-
const { revision, projectPath } = benchmarkProjects[i];
277-
const modulePath = path.join(projectPath, benchmark);
278-
279-
if (i === 0) {
280-
const { name } = await sampleModule(modulePath);
281-
console.log('⏱ ' + name);
282-
}
272+
const results = [];
273+
for (let i = 0; i < benchmarkProjects.length; ++i) {
274+
const { revision, projectPath } = benchmarkProjects[i];
275+
const modulePath = path.join(projectPath, benchmark);
276+
277+
if (i === 0) {
278+
const { name } = await sampleModule(modulePath);
279+
console.log('⏱ ' + name);
280+
}
283281

284-
try {
285-
const samples = await collectSamples(modulePath);
282+
try {
283+
const samples = await collectSamples(modulePath);
286284

287-
results.push(computeStats(revision, samples));
288-
process.stdout.write(' ' + cyan(i + 1) + ' tests completed.\u000D');
289-
} catch (error) {
290-
console.log(' ' + revision + ': ' + red(String(error)));
291-
}
285+
results.push(computeStats(revision, samples));
286+
process.stdout.write(' ' + cyan(i + 1) + ' tests completed.\u000D');
287+
} catch (error) {
288+
console.log(' ' + revision + ': ' + red(String(error)));
292289
}
293-
console.log('\n');
294-
295-
beautifyBenchmark(results);
296-
console.log('');
297290
}
291+
console.log('\n');
292+
293+
beautifyBenchmark(results);
294+
console.log('');
298295
}
299296

300297
function getArguments(argv: ReadonlyArray<string>) {
@@ -422,3 +419,8 @@ function sampleModule(modulePath: string): Promise<BenchmarkSample> {
422419
});
423420
});
424421
}
422+
423+
runBenchmarks().catch((error) => {
424+
console.error(error);
425+
process.exit(1);
426+
});

‎resources/build-deno.ts‎

Lines changed: 32 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -7,40 +7,38 @@ import { addExtensionToImportPaths } from './add-extension-to-import-paths';
77
import { inlineInvariant } from './inline-invariant';
88
import { readdirRecursive, showDirStats, writeGeneratedFile } from './utils';
99

10-
if (require.main === module) {
11-
fs.rmSync('./denoDist', { recursive: true, force: true });
12-
fs.mkdirSync('./denoDist');
13-
14-
const srcFiles = readdirRecursive('./src', { ignoreDir: /^__.*__$/ });
15-
for (const filepath of srcFiles) {
16-
if (filepath.endsWith('.ts')) {
17-
const srcPath = path.join('./src', filepath);
18-
19-
const sourceFile = ts.createSourceFile(
20-
srcPath,
21-
fs.readFileSync(srcPath, 'utf-8'),
22-
ts.ScriptTarget.Latest,
23-
);
24-
25-
const transformed = ts.transform(sourceFile, [
26-
addExtensionToImportPaths({ extension: '.ts' }),
27-
inlineInvariant,
28-
]);
29-
const printer = ts.createPrinter({ newLine: ts.NewLineKind.LineFeed });
30-
const newContent = printer.printBundle(
31-
ts.createBundle(transformed.transformed),
32-
);
33-
34-
transformed.dispose();
35-
36-
const destPath = path.join('./denoDist', filepath);
37-
fs.mkdirSync(path.dirname(destPath), { recursive: true });
38-
writeGeneratedFile(destPath, newContent);
39-
}
10+
fs.rmSync('./denoDist', { recursive: true, force: true });
11+
fs.mkdirSync('./denoDist');
12+
13+
const srcFiles = readdirRecursive('./src', { ignoreDir: /^__.*__$/ });
14+
for (const filepath of srcFiles) {
15+
if (filepath.endsWith('.ts')) {
16+
const srcPath = path.join('./src', filepath);
17+
18+
const sourceFile = ts.createSourceFile(
19+
srcPath,
20+
fs.readFileSync(srcPath, 'utf-8'),
21+
ts.ScriptTarget.Latest,
22+
);
23+
24+
const transformed = ts.transform(sourceFile, [
25+
addExtensionToImportPaths({ extension: '.ts' }),
26+
inlineInvariant,
27+
]);
28+
const printer = ts.createPrinter({ newLine: ts.NewLineKind.LineFeed });
29+
const newContent = printer.printBundle(
30+
ts.createBundle(transformed.transformed),
31+
);
32+
33+
transformed.dispose();
34+
35+
const destPath = path.join('./denoDist', filepath);
36+
fs.mkdirSync(path.dirname(destPath), { recursive: true });
37+
writeGeneratedFile(destPath, newContent);
4038
}
39+
}
4140

42-
fs.copyFileSync('./LICENSE', './denoDist/LICENSE');
43-
fs.copyFileSync('./README.md', './denoDist/README.md');
41+
fs.copyFileSync('./LICENSE', './denoDist/LICENSE');
42+
fs.copyFileSync('./README.md', './denoDist/README.md');
4443

45-
showDirStats('./denoDist');
46-
}
44+
showDirStats('./denoDist');

‎resources/build-npm.ts‎

Lines changed: 76 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -6,61 +6,75 @@ import * as ts from 'typescript';
66

77
import { addExtensionToImportPaths } from './add-extension-to-import-paths';
88
import { inlineInvariant } from './inline-invariant';
9-
import { readPackageJSON, showDirStats, writeGeneratedFile } from './utils';
10-
11-
if (require.main === module) {
12-
fs.rmSync('./npmDist', { recursive: true, force: true });
13-
fs.mkdirSync('./npmDist');
14-
15-
const packageJSON = buildPackageJSON();
16-
17-
// Based on https://github.com/Microsoft/TypeScript/wiki/Using-the-Compiler-API#getting-the-dts-from-a-javascript-file
18-
const tsConfig = JSON.parse(
19-
fs.readFileSync(require.resolve('../tsconfig.json'), 'utf-8'),
20-
);
21-
assert(
22-
tsConfig.compilerOptions,
23-
'"tsconfig.json" should have `compilerOptions`',
9+
import {
10+
readdirRecursive,
11+
readPackageJSON,
12+
showDirStats,
13+
writeGeneratedFile,
14+
} from './utils';
15+
16+
fs.rmSync('./npmDist', { recursive: true, force: true });
17+
fs.mkdirSync('./npmDist');
18+
19+
// Based on https://github.com/Microsoft/TypeScript/wiki/Using-the-Compiler-API#getting-the-dts-from-a-javascript-file
20+
const tsConfig = JSON.parse(
21+
fs.readFileSync(require.resolve('../tsconfig.json'), 'utf-8'),
22+
);
23+
assert(
24+
tsConfig.compilerOptions,
25+
'"tsconfig.json" should have `compilerOptions`',
26+
);
27+
28+
const { options: tsOptions, errors: tsOptionsErrors } =
29+
ts.convertCompilerOptionsFromJson(
30+
{
31+
...tsConfig.compilerOptions,
32+
module: 'es2020',
33+
noEmit: false,
34+
declaration: true,
35+
declarationDir: './npmDist',
36+
outDir: './npmDist',
37+
},
38+
process.cwd(),
2439
);
2540

26-
const { options: tsOptions, errors: tsOptionsErrors } =
27-
ts.convertCompilerOptionsFromJson(
28-
{
29-
...tsConfig.compilerOptions,
30-
module: 'es2020',
31-
noEmit: false,
32-
declaration: true,
33-
declarationDir: './npmDist',
34-
outDir: './npmDist',
35-
},
36-
process.cwd(),
37-
);
38-
39-
assert(
40-
tsOptionsErrors.length === 0,
41-
'Fail to parse options: ' + tsOptionsErrors,
42-
);
41+
assert(
42+
tsOptionsErrors.length === 0,
43+
'Fail to parse options: ' + tsOptionsErrors,
44+
);
45+
46+
const tsHost = ts.createCompilerHost(tsOptions);
47+
tsHost.writeFile = (filepath, body) => {
48+
fs.mkdirSync(path.dirname(filepath), { recursive: true });
49+
writeGeneratedFile(filepath, body);
50+
};
51+
52+
const tsProgram = ts.createProgram(['src/index.ts'], tsOptions, tsHost);
53+
const tsResult = tsProgram.emit(undefined, undefined, undefined, undefined, {
54+
after: [addExtensionToImportPaths({ extension: '.js' }), inlineInvariant],
55+
});
56+
assert(
57+
!tsResult.emitSkipped,
58+
'Fail to generate `*.d.ts` files, please run `npm run check`',
59+
);
60+
61+
fs.copyFileSync('./LICENSE', './npmDist/LICENSE');
62+
fs.copyFileSync('./README.md', './npmDist/README.md');
63+
64+
// Should be done as the last step so only valid packages can be published
65+
writeGeneratedFile(
66+
'./npmDist/package.json',
67+
JSON.stringify(buildPackageJSON()),
68+
);
69+
70+
showDirStats('./npmDist');
4371

44-
const tsHost = ts.createCompilerHost(tsOptions);
45-
tsHost.writeFile = (filepath, body) => {
46-
if (path.basename(filepath) === 'index.js') {
47-
const relative = './' + path.relative('./npmDist', filepath);
48-
const key = relative.replace(/\/?index.js$/, '');
49-
packageJSON.exports[key] = relative;
50-
}
51-
52-
fs.mkdirSync(path.dirname(filepath), { recursive: true });
53-
writeGeneratedFile(filepath, body);
54-
};
72+
function buildPackageJSON() {
73+
const packageJSON = readPackageJSON();
5574

56-
const tsProgram = ts.createProgram(['src/index.ts'], tsOptions, tsHost);
57-
const tsResult = tsProgram.emit(undefined, undefined, undefined, undefined, {
58-
after: [addExtensionToImportPaths({ extension: '.js' }), inlineInvariant],
59-
});
60-
assert(
61-
!tsResult.emitSkipped,
62-
'Fail to generate `*.d.ts` files, please run `npm run check`',
63-
);
75+
delete packageJSON.private;
76+
delete packageJSON.scripts;
77+
delete packageJSON.devDependencies;
6478

6579
assert(packageJSON.types === undefined, 'Unexpected "types" in package.json');
6680
const supportedTSVersions = Object.keys(packageJSON.typesVersions);
@@ -75,33 +89,25 @@ if (require.main === module) {
7589
// Provoke syntax error to show this message
7690
`"Package 'graphql' support only TS versions that are ${supportedTSVersions[0]}".`,
7791
);
92+
7893
packageJSON.typesVersions = {
7994
...packageJSON.typesVersions,
8095
'*': { '*': [notSupportedTSVersionFile] },
8196
};
8297

83-
fs.copyFileSync('./LICENSE', './npmDist/LICENSE');
84-
fs.copyFileSync('./README.md', './npmDist/README.md');
85-
86-
// Should be done as the last step so only valid packages can be published
87-
writeGeneratedFile('./npmDist/package.json', JSON.stringify(packageJSON));
88-
89-
showDirStats('./npmDist');
90-
}
91-
92-
function buildPackageJSON() {
93-
const packageJSON = readPackageJSON();
98+
packageJSON.type = 'module';
99+
packageJSON.exports = {};
94100

95-
delete packageJSON.private;
96-
delete packageJSON.scripts;
97-
delete packageJSON.devDependencies;
101+
for (const filepath of readdirRecursive('./src', { ignoreDir: /^__.*__$/ })) {
102+
if (path.basename(filepath) === 'index.ts') {
103+
const key = path.dirname(filepath);
104+
packageJSON.exports[key] = filepath.replace(/\.ts$/, '.js');
105+
}
106+
}
98107

99-
packageJSON.type = 'module';
100108
// Temporary workaround to allow "internal" imports, no grantees provided
101-
packageJSON.exports = {
102-
'./*.js': './*.js',
103-
'./*': './*.js',
104-
};
109+
packageJSON.exports['./*.js'] = './*.js';
110+
packageJSON.exports['./*'] = './*.js';
105111

106112
// TODO: move to integration tests
107113
const publishTag = packageJSON.publishConfig?.tag;

‎resources/gen-version.ts‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,4 @@ export const versionInfo = Object.freeze({
3030
});
3131
`;
3232

33-
if (require.main === module) {
34-
writeGeneratedFile('./src/version.ts', body);
35-
}
33+
writeGeneratedFile('./src/version.ts', body);

0 commit comments

Comments
 (0)