Skip to content

Commit ed3c5cb

Browse files
43081jFrozenPandaz
authored andcommitted
cleanup(core): move esbuild to use tinyglobby (#29453)
(cherry picked from commit c6e9565)
1 parent 099ee41 commit ed3c5cb

File tree

4 files changed

+12
-9
lines changed

4 files changed

+12
-9
lines changed

packages/esbuild/.eslintrc.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@
1414
{
1515
"name": "fs-extra",
1616
"message": "Please use equivalent utilities from `node:fs` instead."
17+
},
18+
{
19+
"name": "fast-glob",
20+
"message": "Please use `tinyglobby` in place of `fast-glob` for executing glob traversals"
1721
}
1822
]
1923
}

packages/esbuild/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"dependencies": {
3434
"@nx/devkit": "file:../devkit",
3535
"@nx/js": "file:../js",
36-
"fast-glob": "3.2.7",
36+
"tinyglobby": "^0.2.10",
3737
"picocolors": "^1.1.0",
3838
"tsconfig-paths": "^4.1.2",
3939
"tslib": "^2.3.0"

packages/esbuild/src/utils/get-entry-points.ts

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { ExecutorContext, readJsonFile } from '@nx/devkit';
22
import * as fs from 'fs';
33
import * as path from 'path';
4-
import * as glob from 'fast-glob';
4+
import { globSync } from 'tinyglobby';
55

66
export interface GetEntryPointsOptions {
77
recursive?: boolean;
@@ -50,12 +50,11 @@ export function getEntryPoints(
5050
const tsconfig = readJsonFile(
5151
path.join(project.data.root, foundTsConfig)
5252
);
53-
const projectFiles = glob
54-
.sync(tsconfig.include ?? [], {
55-
cwd: project.data.root,
56-
ignore: tsconfig.exclude ?? [],
57-
})
58-
.map((f) => path.join(project.data.root, f));
53+
const projectFiles = globSync(tsconfig.include ?? [], {
54+
cwd: project.data.root,
55+
ignore: tsconfig.exclude ?? [],
56+
expandDirectories: false,
57+
}).map((f) => path.join(project.data.root, f));
5958

6059
projectFiles.forEach((f) => entryPoints.add(f));
6160
options?.onProjectFilesMatched?.(projectName, projectFiles);

packages/esbuild/tsconfig.lib.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"compilerOptions": {
44
"outDir": "../../dist/out-tsc",
55
"declaration": true,
6-
"types": []
6+
"types": ["node"]
77
},
88
"include": ["**/*.ts"],
99
"exclude": ["jest.config.ts", "**/*.spec.ts", "**/*.test.ts"]

0 commit comments

Comments
 (0)