Fix(CSS): override doesn't work
#304
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@lesha1201 is attempting to deploy a commit to the Aoyue Team on Vercel. A member of the Team first needs to authorize it. |
lesha1201
commented
Nov 6, 2023
packages/css/src/core.ts
Outdated
Comment on lines
373
to
464
| eachRuleOptions.layer === Layer.NativeShorthand || | ||
| eachRuleOptions.layer === CoreLayer.Native || | ||
| eachRuleOptions.layer === CoreLayer.NativeShorthand | ||
| ) { | ||
| eachRuleOptions.resolvedPropName = id | ||
| .replace(/(?!^)[A-Z]/g, (m) => '-' + m) | ||
| .toLowerCase() | ||
| } | ||
| } | ||
| // 2. custom `config.variables` | ||
| addResolvedVariables(id) | ||
|
|
||
| if (match) { | ||
| if (Array.isArray(match)) { | ||
| const [key, values = []] = match | ||
| const valueMatches = [] | ||
| if (values.length) { | ||
| valueMatches.push(`(?:${values.join('|')})(?![a-zA-Z0-9-])`) | ||
| } | ||
| if (Object.keys(eachRuleOptions.resolvedVariables).length) { | ||
| valueMatches.push(`(?:${Object.keys(eachRuleOptions.resolvedVariables).join('|')})(?![a-zA-Z0-9-])`) | ||
| eachRuleOptions.resolvedVariables = {} | ||
| const addResolvedVariables = (prefix: string) => { | ||
| Object.assign( | ||
| eachRuleOptions.resolvedVariables, | ||
| Object.keys(this.variables) | ||
| .filter( | ||
| (eachVariableName) => | ||
| eachVariableName.startsWith(prefix + '-') || | ||
| eachVariableName.startsWith('-' + prefix + '-'), | ||
| ) | ||
| .reduce((newResolvedVariables, eachVariableName) => { | ||
| newResolvedVariables[ | ||
| eachVariableName.slice( | ||
| prefix.length + (prefix.startsWith('-') ? 0 : 1), | ||
| ) | ||
| ] = { | ||
| ...this.variables[eachVariableName], | ||
| name: eachVariableName, | ||
| } | ||
| return newResolvedVariables | ||
| }, {}), | ||
| ) | ||
| } | ||
| // 1. custom `config.rules[id].variableGroups` | ||
| if (eachRuleOptions.variableGroups) { | ||
| for (const eachVariableGroup of eachRuleOptions.variableGroups) { | ||
| addResolvedVariables(eachVariableGroup) | ||
| } | ||
| if (eachRuleOptions.colored) { | ||
| valueMatches.push( | ||
| '#', | ||
| '(?:color|color-contrast|color-mix|hwb|lab|lch|oklab|oklch|rgb|rgba|hsl|hsla)\\(.*\\)', | ||
| `(?:${colorNames.join('|')})(?![a-zA-Z0-9-])` | ||
| } | ||
| // 2. custom `config.variables` | ||
| addResolvedVariables(id) | ||
|
|
||
| if (match) { | ||
| if (Array.isArray(match)) { | ||
| const [key, values = []] = match | ||
| const valueMatches = [] | ||
| if (values.length) { | ||
| valueMatches.push(`(?:${values.join('|')})(?![a-zA-Z0-9-])`) | ||
| } | ||
| if (Object.keys(eachRuleOptions.resolvedVariables).length) { | ||
| valueMatches.push( | ||
| `(?:${Object.keys(eachRuleOptions.resolvedVariables).join( | ||
| '|', | ||
| )})(?![a-zA-Z0-9-])`, | ||
| ) | ||
| } | ||
| if (eachRuleOptions.colored) { | ||
| valueMatches.push( | ||
| '#', | ||
| '(?:color|color-contrast|color-mix|hwb|lab|lch|oklab|oklch|rgb|rgba|hsl|hsla)\\(.*\\)', | ||
| `(?:${colorNames.join('|')})(?![a-zA-Z0-9-])`, | ||
| ) | ||
| } | ||
| if (eachRuleOptions.numeric) { | ||
| valueMatches.push('[\\d\\.]', '(?:max|min|calc|clamp)\\(.*\\)') | ||
| } | ||
| eachRuleOptions.resolvedMatch = new RegExp( | ||
| `^${key}:(?:${valueMatches.join('|')})[^|]*?(?:@|$)`, | ||
| ) | ||
| } else { | ||
| eachRuleOptions.resolvedMatch = match as RegExp | ||
| } | ||
| if (eachRuleOptions.numeric) { | ||
| valueMatches.push('[\\d\\.]', '(?:max|min|calc|clamp)\\(.*\\)') | ||
| } | ||
| eachRuleOptions.resolvedMatch = new RegExp(`^${key}:(?:${valueMatches.join('|')})[^|]*?(?:@|$)`) | ||
| } else { | ||
| eachRuleOptions.resolvedMatch = match as RegExp | ||
| } | ||
| } | ||
| }) | ||
| }, | ||
| ) | ||
| } |
There was a problem hiding this comment.
Here, I just added if statement and indented the code. I'm not sure how it actually should look like, I just did the same way as the code above.
lesha1201
commented
Nov 6, 2023
There was a problem hiding this comment.
Not sure if it's the right place for the tests.
|
@1aron How do you format the code? What do you think about adding Prettier? |
We now use https://editorconfig.org. The reasons for not using Prettier: https://antfu.me/posts/why-not-prettier |
|
@1aron Formatted the code. |
|
@lesha1201 Released. Great job 👍🏻 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Noticed in the code that config doesn't work with
override: truebecause it passesundefinedinstead ofcustomConfig. This PR makes it possible to useoverride: true.