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

fix(angular): target correct versions of ng-packagr to create stylesheet worker synchronously (#22485)

Browse Source
This commit is contained in:
Leosvel Pérez Espinosa 2024-03-25 12:54:17 +01:00 committed by GitHub
parent 54d47805de
commit 9bfdf897be
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/angular/src/executors/utilities/ng-packagr/stylesheet-processor.di.ts
View File

@ -1,6 +1,5 @@
import type { FactoryProvider } from 'injection-js'; import type { FactoryProvider } from 'injection-js';
import { STYLESHEET_PROCESSOR_TOKEN } from 'ng-packagr/lib/styles/stylesheet-processor.di'; import { STYLESHEET_PROCESSOR_TOKEN } from 'ng-packagr/lib/styles/stylesheet-processor.di';
import { gte, lt } from 'semver';
import { getInstalledPackageVersionInfo } from '../angular-version-utils'; import { getInstalledPackageVersionInfo } from '../angular-version-utils';
import { import {
AsyncStylesheetProcessor, AsyncStylesheetProcessor,
@ -13,7 +12,7 @@ export const STYLESHEET_PROCESSOR: FactoryProvider = {
const { version: ngPackagrVersion } = const { version: ngPackagrVersion } =
getInstalledPackageVersionInfo('ng-packagr'); getInstalledPackageVersionInfo('ng-packagr');
return lt(ngPackagrVersion, '17.2.0') || gte(ngPackagrVersion, '17.3.0') return ngPackagrVersion !== '17.2.0'
? StylesheetProcessor ? StylesheetProcessor
: AsyncStylesheetProcessor; : AsyncStylesheetProcessor;
}, },

10
packages/angular/src/executors/utilities/ng-packagr/stylesheet-processor.ts
View File

@ -129,10 +129,10 @@ export class StylesheetProcessor {
} }
/** /**
* This class is used when ng-packagr version is greater than or equal to 17.2.0 and less than 17.3.0. * This class is used when ng-packagr version is 17.2.0. The async `loadPostcssConfiguration` function
* The async `loadPostcssConfiguration` function introduced in ng-packagr 17.2.x causes a memory leak * introduced in ng-packagr 17.2.0 causes a memory leak due to multiple workers being created. We must
* due to multiple workers being created. We must keep this class to support any workspace that might * keep this class to support any workspace that might be using ng-packagr 17.2.0 where that function
* be using ng-packagr 17.2.x where that function need to be awaited. * need to be awaited.
*/ */
export class AsyncStylesheetProcessor { export class AsyncStylesheetProcessor {
private renderWorker: typeof Piscina | undefined; private renderWorker: typeof Piscina | undefined;
@ -199,7 +199,7 @@ export class AsyncStylesheetProcessor {
const { version: ngPackagrVersion } = const { version: ngPackagrVersion } =
getInstalledPackageVersionInfo('ng-packagr'); getInstalledPackageVersionInfo('ng-packagr');
let postcssConfiguration: PostcssConfiguration | undefined; let postcssConfiguration: PostcssConfiguration | undefined;
if (gte(ngPackagrVersion, '17.2.0')) { if (ngPackagrVersion === '17.2.0') {
const { loadPostcssConfiguration } = await import( const { loadPostcssConfiguration } = await import(
'ng-packagr/lib/styles/postcss-configuration' 'ng-packagr/lib/styles/postcss-configuration'
); );