Skip to content

Commit 486becd

Browse files
crisbetoalan-agius4
crisbeto
authored and
alan-agius4
committed
fix(@ngtools/webpack): remove setClassDebugInfo calls
Angular v17 adds another dev-mode-only function that needs to be removed called `ɵsetClassDebugInfo`. These changes update the Webpack plugin to account for it. (cherry picked from commit 7a41e8f)
1 parent f806e34 commit 486becd

File tree

5 files changed

+66
-17
lines changed

5 files changed

+66
-17
lines changed

‎goldens/public-api/ngtools/webpack/index.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ export interface AngularWebpackPluginOptions {
3535
// (undocumented)
3636
emitNgModuleScope: boolean;
3737
// (undocumented)
38+
emitSetClassDebugInfo?: boolean;
39+
// (undocumented)
3840
fileReplacements: Record<string, string>;
3941
// (undocumented)
4042
inlineStyleFileExtension?: string;

‎packages/ngtools/webpack/src/ivy/plugin.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ export interface AngularWebpackPluginOptions {
4949
directTemplateLoading: boolean;
5050
emitClassMetadata: boolean;
5151
emitNgModuleScope: boolean;
52+
emitSetClassDebugInfo?: boolean;
5253
jitMode: boolean;
5354
inlineStyleFileExtension?: string;
5455
}

‎packages/ngtools/webpack/src/ivy/transformation.ts‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,11 @@ import { replaceResources } from '../transformers/replace_resources';
1414

1515
export function createAotTransformers(
1616
builder: ts.BuilderProgram,
17-
options: { emitClassMetadata?: boolean; emitNgModuleScope?: boolean },
17+
options: {
18+
emitClassMetadata?: boolean;
19+
emitNgModuleScope?: boolean;
20+
emitSetClassDebugInfo?: boolean;
21+
},
1822
imageDomains: Set<string>,
1923
): ts.CustomTransformers {
2024
const getTypeChecker = () => builder.getProgram().getTypeChecker();
@@ -25,10 +29,16 @@ export function createAotTransformers(
2529

2630
const removeClassMetadata = !options.emitClassMetadata;
2731
const removeNgModuleScope = !options.emitNgModuleScope;
28-
if (removeClassMetadata || removeNgModuleScope) {
32+
const removeSetClassDebugInfo = !options.emitSetClassDebugInfo;
33+
if (removeClassMetadata || removeNgModuleScope || removeSetClassDebugInfo) {
2934
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
3035
transformers.before!.push(
31-
removeIvyJitSupportCalls(removeClassMetadata, removeNgModuleScope, getTypeChecker),
36+
removeIvyJitSupportCalls(
37+
removeClassMetadata,
38+
removeNgModuleScope,
39+
removeSetClassDebugInfo,
40+
getTypeChecker,
41+
),
3242
);
3343
}
3444

‎packages/ngtools/webpack/src/transformers/remove-ivy-jit-support-calls.ts‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import { elideImports } from './elide_imports';
1212
export function removeIvyJitSupportCalls(
1313
classMetadata: boolean,
1414
ngModuleScope: boolean,
15+
debugInfo: boolean,
1516
getTypeChecker: () => ts.TypeChecker,
1617
): ts.TransformerFactory<ts.SourceFile> {
1718
return (context: ts.TransformationContext) => {
@@ -43,6 +44,16 @@ export function removeIvyJitSupportCalls(
4344
return undefined;
4445
}
4546
}
47+
48+
if (
49+
debugInfo &&
50+
ts.isBinaryExpression(innerExpression) &&
51+
isIvyPrivateCallExpression(innerExpression.right, 'ɵsetClassDebugInfo')
52+
) {
53+
removedNodes.push(innerExpression);
54+
55+
return undefined;
56+
}
4657
}
4758

4859
return ts.visitEachChild(node, visitNode, context);

‎packages/ngtools/webpack/src/transformers/remove-ivy-jit-support-calls_spec.ts‎

Lines changed: 39 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,16 @@ const inputAsyncArrowFn = tags.stripIndent`
177177
}); })();
178178
`;
179179

180+
const inputDebugInfo = tags.stripIndent`
181+
import { Component } from '@angular/core';
182+
import * as i0 from "@angular/core";
183+
export class TestCmp {
184+
}
185+
TestCmp.ɵfac = function TestCmp_Factory(t) { return new (t || TestCmp)(); };
186+
TestCmp.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: TestCmp, selectors: [["test-cmp"]], decls: 0, vars: 0, template: function TestCmp_Template(rf, ctx) { }, encapsulation: 2 });
187+
(() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassDebugInfo(TestCmp, { className: "TestCmp" }); })();
188+
`;
189+
180190
describe('@ngtools/webpack transformers', () => {
181191
describe('remove-ivy-dev-calls', () => {
182192
it('should allow removing only set class metadata with pure annotation', () => {
@@ -194,7 +204,7 @@ describe('@ngtools/webpack transformers', () => {
194204
`;
195205

196206
const result = transform(input, (getTypeChecker) =>
197-
removeIvyJitSupportCalls(true, false, getTypeChecker),
207+
removeIvyJitSupportCalls(true, false, false, getTypeChecker),
198208
);
199209

200210
expect(tags.oneLine`${result}`).toEqual(tags.oneLine`${output}`);
@@ -215,7 +225,7 @@ describe('@ngtools/webpack transformers', () => {
215225
`;
216226

217227
const result = transform(inputNoPure, (getTypeChecker) =>
218-
removeIvyJitSupportCalls(true, false, getTypeChecker),
228+
removeIvyJitSupportCalls(true, false, false, getTypeChecker),
219229
);
220230

221231
expect(tags.oneLine`${result}`).toEqual(tags.oneLine`${output}`);
@@ -248,7 +258,7 @@ describe('@ngtools/webpack transformers', () => {
248258
`;
249259

250260
const result = transform(input, (getTypeChecker) =>
251-
removeIvyJitSupportCalls(false, true, getTypeChecker),
261+
removeIvyJitSupportCalls(false, true, false, getTypeChecker),
252262
);
253263

254264
expect(tags.oneLine`${result}`).toEqual(tags.oneLine`${output}`);
@@ -281,7 +291,7 @@ describe('@ngtools/webpack transformers', () => {
281291
`;
282292

283293
const result = transform(inputNoPure, (getTypeChecker) =>
284-
removeIvyJitSupportCalls(false, true, getTypeChecker),
294+
removeIvyJitSupportCalls(false, true, false, getTypeChecker),
285295
);
286296

287297
expect(tags.oneLine`${result}`).toEqual(tags.oneLine`${output}`);
@@ -299,7 +309,7 @@ describe('@ngtools/webpack transformers', () => {
299309
`;
300310

301311
const result = transform(input, (getTypeChecker) =>
302-
removeIvyJitSupportCalls(true, true, getTypeChecker),
312+
removeIvyJitSupportCalls(true, true, false, getTypeChecker),
303313
);
304314

305315
expect(tags.oneLine`${result}`).toEqual(tags.oneLine`${output}`);
@@ -317,23 +327,23 @@ describe('@ngtools/webpack transformers', () => {
317327
`;
318328

319329
const result = transform(inputNoPure, (getTypeChecker) =>
320-
removeIvyJitSupportCalls(true, true, getTypeChecker),
330+
removeIvyJitSupportCalls(true, true, false, getTypeChecker),
321331
);
322332

323333
expect(tags.oneLine`${result}`).toEqual(tags.oneLine`${output}`);
324334
});
325335

326336
it('should allow removing neither set class metadata nor ng module scope with pure annotation', () => {
327337
const result = transform(input, (getTypeChecker) =>
328-
removeIvyJitSupportCalls(false, false, getTypeChecker),
338+
removeIvyJitSupportCalls(false, false, false, getTypeChecker),
329339
);
330340

331341
expect(tags.oneLine`${result}`).toEqual(tags.oneLine`${input}`);
332342
});
333343

334344
it('should allow removing neither set class metadata nor ng module scope', () => {
335345
const result = transform(inputNoPure, (getTypeChecker) =>
336-
removeIvyJitSupportCalls(false, false, getTypeChecker),
346+
removeIvyJitSupportCalls(false, false, false, getTypeChecker),
337347
);
338348

339349
expect(tags.oneLine`${result}`).toEqual(tags.oneLine`${inputNoPure}`);
@@ -364,7 +374,7 @@ describe('@ngtools/webpack transformers', () => {
364374
`;
365375

366376
const result = transform(imports + input, (getTypeChecker) =>
367-
removeIvyJitSupportCalls(true, true, getTypeChecker),
377+
removeIvyJitSupportCalls(true, true, false, getTypeChecker),
368378
);
369379

370380
expect(tags.oneLine`${result}`).toEqual(tags.oneLine`${output}`);
@@ -395,7 +405,7 @@ describe('@ngtools/webpack transformers', () => {
395405
`;
396406

397407
const result = transform(imports + inputNoPure, (getTypeChecker) =>
398-
removeIvyJitSupportCalls(true, true, getTypeChecker),
408+
removeIvyJitSupportCalls(true, true, false, getTypeChecker),
399409
);
400410

401411
expect(tags.oneLine`${result}`).toEqual(tags.oneLine`${output}`);
@@ -413,7 +423,7 @@ describe('@ngtools/webpack transformers', () => {
413423
`;
414424

415425
const result = transform(inputArrowFnWithBody, (getTypeChecker) =>
416-
removeIvyJitSupportCalls(true, true, getTypeChecker),
426+
removeIvyJitSupportCalls(true, true, false, getTypeChecker),
417427
);
418428

419429
expect(tags.oneLine`${result}`).toEqual(tags.oneLine`${output}`);
@@ -431,7 +441,7 @@ describe('@ngtools/webpack transformers', () => {
431441
`;
432442

433443
const result = transform(inputArrowFnWithImplicitReturn, (getTypeChecker) =>
434-
removeIvyJitSupportCalls(true, true, getTypeChecker),
444+
removeIvyJitSupportCalls(true, true, false, getTypeChecker),
435445
);
436446

437447
expect(tags.oneLine`${result}`).toEqual(tags.oneLine`${output}`);
@@ -446,7 +456,7 @@ describe('@ngtools/webpack transformers', () => {
446456
`;
447457

448458
const result = transform(inputAsync, (getTypeChecker) =>
449-
removeIvyJitSupportCalls(true, false, getTypeChecker),
459+
removeIvyJitSupportCalls(true, false, false, getTypeChecker),
450460
);
451461

452462
expect(tags.oneLine`${result}`).toEqual(tags.oneLine`${output}`);
@@ -461,7 +471,22 @@ describe('@ngtools/webpack transformers', () => {
461471
`;
462472

463473
const result = transform(inputAsyncArrowFn, (getTypeChecker) =>
464-
removeIvyJitSupportCalls(true, false, getTypeChecker),
474+
removeIvyJitSupportCalls(true, false, false, getTypeChecker),
475+
);
476+
477+
expect(tags.oneLine`${result}`).toEqual(tags.oneLine`${output}`);
478+
});
479+
480+
it('should remove setClassDebugInfo calls', () => {
481+
const output = tags.stripIndent`
482+
import * as i0 from "@angular/core";
483+
export class TestCmp { }
484+
TestCmp.ɵfac = function TestCmp_Factory(t) { return new (t || TestCmp)(); };
485+
TestCmp.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: TestCmp, selectors: [["test-cmp"]], decls: 0, vars: 0, template: function TestCmp_Template(rf, ctx) { }, encapsulation: 2 });
486+
`;
487+
488+
const result = transform(inputDebugInfo, (getTypeChecker) =>
489+
removeIvyJitSupportCalls(true, false, true, getTypeChecker),
465490
);
466491

467492
expect(tags.oneLine`${result}`).toEqual(tags.oneLine`${output}`);

0 commit comments

Comments
 (0)