Skip to content

fix(compiler): add more specific matcher for hydrate never block #58360

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

Closed
brandonroberts wants to merge 3 commits into from
Closed

fix(compiler): add more specific matcher for hydrate never block #58360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
52fa675
fix(compiler): add more specific matcher for hydrate never block
brandonroberts Oct 25, 2024
e304b2e
fixup! fix(compiler): add more specific matcher for hydrate never block
brandonroberts Oct 25, 2024
8cff6f0
fixup! fix(compiler): add more specific matcher for hydrate never block
brandonroberts Oct 25, 2024
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
2 changes: 1 addition & 1 deletion packages/compiler/src/render3/r3_deferred_blocks.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ const HYDRATE_WHEN_PATTERN = /^hydrate\s+when\s/;
const HYDRATE_ON_PATTERN = /^hydrate\s+on\s/;

/** Pattern to identify a `hydrate never` trigger. */
const HYDRATE_NEVER_PATTERN = /^hydrate\s+never\s*/;
const HYDRATE_NEVER_PATTERN = /^hydrate\s+never(\s*)$/;

/** Pattern to identify a `minimum` parameter in a block. */
const MINIMUM_PARAMETER_PATTERN = /^minimum\s/;
Expand Down
26 changes: 26 additions & 0 deletions packages/compiler/test/render3/r3_template_transform_spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1419,6 +1419,32 @@ describe('R3 template transform', () => {
);
});

it('should report `hydrate never` used with additonal characters', () => {
expect(() => parse('@defer (hydrate never, and thank you) {hello}')).toThrowError(
/Unrecognized trigger/,
);
});

it('should not report an error when `hydrate never` is used with additonal blocks', () => {
expect(() => parse('@defer (hydrate never; on idle;) {hello}')).not.toThrowError(
/Unrecognized trigger/,
);
});

it('should not report an error when `hydrate never` is used with spaces', () => {
expect(() => parse('@defer(hydrate never ; on idle ;) {hello}')).not.toThrowError(
/Unrecognized trigger/,
);
});

it('should not report an error when `hydrate never` is used after another block', () => {
expect(() =>
parse(`@defer(
on idle;
hydrate never) {hello}`),
).not.toThrowError(/Unrecognized trigger/);
});

it('should report when `hydrate never` is used together with another `hydrate` trigger', () => {
// Extra trigger after `hydrate never`.
expect(() =>
Expand Down