Skip to content

build: update to latest sass version #20984

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.

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 1 commit into from
Nov 12, 2020

Conversation

crisbeto
Copy link
Member

@crisbeto crisbeto commented Nov 6, 2020

Bumps to the latest version of Sass and fixes up our custom patch so that it accounts for some changes in the published files.

@crisbeto crisbeto added P3 An issue that is relevant to core functions, but does not impede progress. Important, but not urgent merge safe target: patch This PR is targeted for the next patch release labels Nov 6, 2020
@crisbeto crisbeto requested a review from a team as a code owner November 6, 2020 20:26
@google-cla google-cla bot added the cla: yes PR author has agreed to Google's Contributor License Agreement label Nov 6, 2020
+ const result = sass.cli_pkg_main_0_(args);
+ const originalThen = result.then$1$2$onError;
+ let dynamicType;
+ result.then$1$2$onError = (receiver, done, error, type) => dynamicType = type;
Copy link
Member Author

Choose a reason for hiding this comment

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

This is a very janky implementation, but the problem it's trying to solve is that then$1$2$onError requires an internal Dart type object to be passed in which we don't have access to. I hacked around it by monkey-patching the function, saving a reference and then passing it back in.

Copy link
Member

@jelbourn jelbourn left a comment

Choose a reason for hiding this comment

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

LGTM

@jelbourn jelbourn added the action: merge The PR is ready for merge by the caretaker label Nov 6, 2020
Copy link
Member

@josephperrott josephperrott left a comment

Choose a reason for hiding this comment

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

LGTM

@mmalerba mmalerba added target: minor This PR is targeted for the next minor release and removed target: patch This PR is targeted for the next patch release labels Nov 12, 2020
@mmalerba
Copy link
Contributor

@crisbeto needs rebase

@mmalerba mmalerba removed the action: merge The PR is ready for merge by the caretaker label Nov 12, 2020
Bumps to the latest version of Sass and fixes up our custom patch so that it accounts
for some changes in the published files.
@crisbeto
Copy link
Member Author

Rebased.

@mmalerba mmalerba added the action: merge The PR is ready for merge by the caretaker label Nov 12, 2020
@mmalerba mmalerba merged commit 7f63750 into angular:master Nov 12, 2020
@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 Dec 13, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
action: merge The PR is ready for merge by the caretaker cla: yes PR author has agreed to Google's Contributor License Agreement P3 An issue that is relevant to core functions, but does not impede progress. Important, but not urgent target: minor This PR is targeted for the next minor release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants