miel.truyen/nx
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

cleanup(bundling): replace fs-extra with node:fs (#28113)

Browse Source
This commit is contained in:
pralkarz 2024-09-27 04:30:17 +02:00 committed by GitHub
parent 151c8380fa
commit 28c12b50bd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/esbuild/.eslintrc.json
View File

@ -10,6 +10,10 @@
{ {
"name": "chalk", "name": "chalk",
"message": "Please use `picocolors` in place of `chalk` for rendering terminal colors" "message": "Please use `picocolors` in place of `chalk` for rendering terminal colors"
},
{
"name": "fs-extra",
"message": "Please use equivalent utilities from `node:fs` instead."
} }
] ]
} }

1
packages/esbuild/package.json
View File

@ -34,7 +34,6 @@
"@nx/devkit": "file:../devkit", "@nx/devkit": "file:../devkit",
"@nx/js": "file:../js", "@nx/js": "file:../js",
"fast-glob": "3.2.7", "fast-glob": "3.2.7",
"fs-extra": "^11.1.0",
"picocolors": "^1.1.0", "picocolors": "^1.1.0",
"tsconfig-paths": "^4.1.2", "tsconfig-paths": "^4.1.2",
"tslib": "^2.3.0" "tslib": "^2.3.0"

15
packages/esbuild/src/executors/esbuild/esbuild.impl.ts
View File

@ -1,6 +1,12 @@
import * as pc from 'picocolors'; import * as pc from 'picocolors';
import type { ExecutorContext } from '@nx/devkit'; import type { ExecutorContext } from '@nx/devkit';
import { cacheDir, joinPathFragments, logger, stripIndents } from '@nx/devkit'; import {
cacheDir,
joinPathFragments,
logger,
stripIndents,
writeJsonFile,
} from '@nx/devkit';
import { import {
copyAssets, copyAssets,
copyPackageJson, copyPackageJson,
@ -13,7 +19,6 @@ import * as esbuild from 'esbuild';
import { normalizeOptions } from './lib/normalize'; import { normalizeOptions } from './lib/normalize';
import { EsBuildExecutorOptions } from './schema'; import { EsBuildExecutorOptions } from './schema';
import { removeSync, writeJsonSync } from 'fs-extra';
import { createAsyncIterable } from '@nx/devkit/src/utils/async-iterable'; import { createAsyncIterable } from '@nx/devkit/src/utils/async-iterable';
import { import {
buildEsbuildOptions, buildEsbuildOptions,
@ -22,6 +27,7 @@ import {
} from './lib/build-esbuild-options'; } from './lib/build-esbuild-options';
import { getExtraDependencies } from './lib/get-extra-dependencies'; import { getExtraDependencies } from './lib/get-extra-dependencies';
import { DependentBuildableProjectNode } from '@nx/js/src/utils/buildable-libs-utils'; import { DependentBuildableProjectNode } from '@nx/js/src/utils/buildable-libs-utils';
import { rmSync } from 'node:fs';
import { join, relative } from 'path'; import { join, relative } from 'path';
const BUILD_WATCH_FAILED = `[ ${pc.red( const BUILD_WATCH_FAILED = `[ ${pc.red(
@ -43,7 +49,8 @@ export async function* esbuildExecutor(
process.env.NODE_ENV ??= context.configurationName ?? 'production'; process.env.NODE_ENV ??= context.configurationName ?? 'production';
const options = normalizeOptions(_options, context); const options = normalizeOptions(_options, context);
if (options.deleteOutputPath) removeSync(options.outputPath); if (options.deleteOutputPath)
rmSync(options.outputPath, { recursive: true, force: true });
const assetsResult = await copyAssets(options, context); const assetsResult = await copyAssets(options, context);
@ -190,7 +197,7 @@ export async function* esbuildExecutor(
options.format.length === 1 options.format.length === 1
? 'meta.json' ? 'meta.json'
: `meta.${options.format[i]}.json`; : `meta.${options.format[i]}.json`;
writeJsonSync( writeJsonFile(
joinPathFragments(options.outputPath, filename), joinPathFragments(options.outputPath, filename),
buildResult.metafile buildResult.metafile
); );

4
packages/esbuild/src/utils/fs.ts
View File

@ -1,5 +1,5 @@
import * as path from 'path'; import * as path from 'path';
import { removeSync } from 'fs-extra'; import { rmSync } from 'node:fs';
/** /**
* Delete an output directory, but error out if it's the root of the project. * Delete an output directory, but error out if it's the root of the project.
@ -10,5 +10,5 @@ export function deleteOutputDir(root: string, outputPath: string) {
throw new Error('Output path MUST not be project root directory!'); throw new Error('Output path MUST not be project root directory!');
} }
removeSync(resolvedOutputPath); rmSync(resolvedOutputPath, { recursive: true, force: true });
} }