Skip to content

fix(@angular-devkit/build-angular): remove CJS usage warnings for inactionable packages #26217

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 3, 2023
Merged

fix(@angular-devkit/build-angular): remove CJS usage warnings for inactionable packages #26217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
37f329c
fix(@angular-devkit/build-angular): remove CJS usage warnings for ina…
alan-agius4 Nov 3, 2023
a7700ef
refactor(@angular-devkit/build-angular): remove redundant `async` fro…
alan-agius4 Nov 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions packages/angular_devkit/build_angular/src/tools/esbuild/commonjs-checker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,11 @@ export function checkCommonJSModules(
// using `provideHttpClient(withFetch())`.
allowedRequests.add('xhr2');

// Packages used by @angular/ssr.
// While critters is ESM it has a number of direct and transtive CJS deps.
allowedRequests.add('express');
allowedRequests.add('critters');

// Find all entry points that contain code (JS/TS)
const files: string[] = [];
for (const { entryPoint } of Object.values(metafile.outputs)) {
Expand Down Expand Up @@ -76,8 +81,14 @@ export function checkCommonJSModules(
if (!imported.original || seenFiles.has(imported.path)) {
continue;
}

seenFiles.add(imported.path);

// If the dependency is allowed ignore all other checks
if (allowedRequests.has(imported.original)) {
continue;
}

// Only check actual code files
if (!isPathCode(imported.path)) {
continue;
Expand Down Expand Up @@ -141,11 +152,7 @@ function isPathCode(name: string): boolean {
* @returns True, if specifier is potentially relative; false, otherwise.
*/
function isPotentialRelative(specifier: string): boolean {
if (specifier[0] === '.') {
return true;
}

return false;
return specifier[0] === '.';
}

/**
Expand Down
2 changes: 1 addition & 1 deletion packages/angular_devkit/build_angular/src/utils/server-rendering/render-worker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export interface RenderOptions {
const { outputFiles, document, inlineCriticalCss } = workerData as RenderWorkerData;

/** Renders an application based on a provided options. */
async function render(options: RenderOptions): Promise<RenderResult> {
function render(options: RenderOptions): Promise<RenderResult> {
return renderPage({
...options,
outputFiles,
Expand Down