Skip to content
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

Jump to bottom

fix(compiler-cli): resolve resource URLs before loading them under en… #22688

Closed
wants to merge 2 commits into from
Closed

fix(compiler-cli): resolve resource URLs before loading them under en… #22688

wants to merge 2 commits into from

Conversation

alexeagle
Copy link
Contributor

…ableResourceInlining

Also turn on the feature for Bazel ng_module rules

@alexeagle alexeagle requested a review from alxhub March 9, 2018 20:00
@mary-poppins
Copy link

You can preview 9187a76 at https://pr22688-9187a76.ngbuilds.io/.

@mary-poppins
Copy link

You can preview a425ab6 at https://pr22688-a425ab6.ngbuilds.io/.

@mary-poppins
Copy link

You can preview 4232892 at https://pr22688-4232892.ngbuilds.io/.

@kara kara added area: core Issues related to the framework runtime type: bug/fix action: review The PR is still awaiting reviews from at least one requested reviewer labels Mar 9, 2018
@alexeagle
fix(compiler-cli): resolve resource URLs before loading them under en…
8594afe 
…ableResourceInlining

Also turn on the feature for Bazel ng_module rules
@alexeagle alexeagle added target: major This PR is targeted for the next major release action: merge The PR is ready for merge by the caretaker and removed action: review The PR is still awaiting reviews from at least one requested reviewer labels Mar 9, 2018
@mary-poppins
Copy link

You can preview 8594afe at https://pr22688-8594afe.ngbuilds.io/.

@alexeagle alexeagle removed the action: merge The PR is ready for merge by the caretaker label Mar 9, 2018
alxhub
alxhub reviewed Mar 9, 2018
View reviewed changes
packages/compiler-cli/src/transformers/inline_resources.ts Outdated
delete arg.styleUrls;
}

const styles = arg['styles'];
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can simplify with || []

@mary-poppins
Copy link

You can preview 4d4e280 at https://pr22688-4d4e280.ngbuilds.io/.

@mary-poppins
Copy link

You can preview a58ec98 at https://pr22688-a58ec98.ngbuilds.io/.

@mary-poppins
Copy link

You can preview 833c8a9 at https://pr22688-833c8a9.ngbuilds.io/.

@mary-poppins
Copy link

You can preview 128771e at https://pr22688-128771e.ngbuilds.io/.

@mary-poppins
Copy link

You can preview dabeb84 at https://pr22688-dabeb84.ngbuilds.io/.

alfaproject
alfaproject reviewed Mar 10, 2018
View reviewed changes
packages/compiler-cli/src/transformers/inline_resources.ts Outdated
return node;
case 'styleUrls':
if (!ts.isArrayLiteralExpression(prop.initializer)) {
throw new Error('styles takes an array argument');
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

styleUrls

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

alfaproject
alfaproject reviewed Mar 10, 2018
View reviewed changes
packages/compiler-cli/src/transformers/inline_resources.ts Outdated
if (!ts.isStringLiteral(prop.initializer) &&
!ts.isNoSubstitutionTemplateLiteral(prop.initializer)) {
throw new Error(
'Can only accept string literal arguments to templateUrl. ' + PRECONDITIONS_TEXT);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

templateUrl is not an array, so maybe reword this?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

@alexeagle
fix(compiler-cli): enableResourceInlining handles both styles and sty…
629cd37 
…leUrls

When both are present, the inlined styles are appended to the end of the styles
@mary-poppins
Copy link

You can preview 629cd37 at https://pr22688-629cd37.ngbuilds.io/.

@alexeagle alexeagle added the action: merge The PR is ready for merge by the caretaker label Mar 10, 2018
@kara kara closed this in 123efba Mar 12, 2018
kara pushed a commit that referenced this pull request Mar 12, 2018
@alexeagle @kara
fix(compiler-cli): enableResourceInlining handles both styles and sty…
40315be 
…leUrls (#22688)

When both are present, the inlined styles are appended to the end of the styles

PR Close #22688
leo6104 pushed a commit to leo6104/angular that referenced this pull request Mar 25, 2018
@alexeagle @leo6104
fix(compiler-cli): resolve resource URLs before loading them under en…
7427112 
…ableResourceInlining (angular#22688)

Also turn on the feature for Bazel ng_module rules

PR Close angular#22688
leo6104 pushed a commit to leo6104/angular that referenced this pull request Mar 25, 2018
@alexeagle @leo6104
fix(compiler-cli): enableResourceInlining handles both styles and sty…
9f43eac 
…leUrls (angular#22688)

When both are present, the inlined styles are appended to the end of the styles

PR Close angular#22688
@angular-automatic-lock-bot
Copy link

This issue has been automatically locked due to inactivity.
Please file a new issue if you are encountering a similar or related problem.

Read more about our automatic conversation locking policy.

This action has been performed automatically by a bot.

@angular-automatic-lock-bot angular-automatic-lock-bot bot locked and limited conversation to collaborators Sep 13, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@alfaproject alfaproject alfaproject left review comments

@alxhub alxhub alxhub approved these changes

Assignees
No one assigned
Labels
action: merge The PR is ready for merge by the caretaker area: core Issues related to the framework runtime cla: yes target: major This PR is targeted for the next major release type: bug/fix
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@alexeagle @mary-poppins @alfaproject @alxhub @kara @googlebot