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

fix: Fix issue with layer opacity presenting in json #135

Merged
merged 1 commit into from
Dec 18, 2024
Merged

fix: Fix issue with layer opacity presenting in json #135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 .github/workflows/release-web.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
# Only run if:
# - The commit message does not contain `[skip release]`
# - OR the workflow was manually triggered and has a `version` string
if: "(!contains(github.event.head_commit.message, '[skip release]') && (contains(github.event.head_commit.message, '(web)') || contains(github.event.head_commit.message, '(all)'))) || inputs.version"
if: "(!contains(github.event.head_commit.message, '[skip release]') && contains(github.event.head_commit.message, '(web)')) || inputs.version"
runs-on: ubuntu-latest

steps:
Expand Down
2 changes: 1 addition & 1 deletion scripts/utils/pull-request.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export async function createSyncPullRequest(baseBranch = canvasTokensRepoParams.
base: baseBranch,
head: canvasTokensRepoParams.syncBranch,
maintainer_can_modify: true,
title: 'chore: Sync Tokens Studio config 🤖',
title: 'chore(web): Sync Tokens Studio config 🤖',
body: getPullRequestTemplate(),
});
}
2 changes: 1 addition & 1 deletion scripts/utils/sync-base-config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ export async function syncBaseConfig() {
repo: canvasTokensRepoParams.repo,
path: canvasTokensRepoParams.baseConfigPath,
branch: canvasTokensRepoParams.syncBranch,
message: 'chore: Sync base tokens config',
message: 'chore(web): Sync base tokens config',
// If this is a new file, there will be no existing sha to reference.
sha: canvasTokensConfig ? canvasTokensConfig.sha : undefined,
content: encodedConfig,
Expand Down
2 changes: 1 addition & 1 deletion scripts/utils/sync-brand-config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ export async function syncBrandConfig() {
repo: canvasTokensRepoParams.repo,
path: canvasTokensRepoParams.brandConfigPath,
branch: canvasTokensRepoParams.syncBranch,
message: 'chore: Sync brand tokens config',
message: 'chore(web): Sync brand tokens config',
// If this is a new file, there will be no existing sha to reference.
sha: canvasTokensConfig ? canvasTokensConfig.sha : undefined,
content: encodedConfig,
Expand Down
9 changes: 6 additions & 3 deletions scripts/utils/sync-sys-config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,12 @@ function filterNonWebTokens(config: Record<string, object>) {
// If the key is in the non web tokens, iterate over its tokens
if (key in nonWebTokens) {
for (const token in tokenSet) {
const nonWebTokenSet = nonWebTokens[key as keyof typeof nonWebTokens];
const nonWebTokenSet: string[] = nonWebTokens[key as keyof typeof nonWebTokens];
if (!nonWebTokenSet.length) {
delete config[key];
}
// If the token is non web, delete it from the config object
if (!nonWebTokenSet.length || (nonWebTokenSet as string[]).includes(token)) {
if (nonWebTokenSet.includes(token)) {
delete config[key][token as keyof typeof tokenSet];
}
}
Expand Down Expand Up @@ -93,7 +96,7 @@ export async function syncSystemConfig() {
repo: canvasTokensRepoParams.repo,
path: canvasTokensRepoParams.sysConfigPath,
branch: canvasTokensRepoParams.syncBranch,
message: 'chore: Sync system tokens config',
message: 'chore(web): Sync system tokens config',
// If this is a new file, there will be no existing sha to reference.
sha: canvasSystemTokensConfig ? canvasSystemTokensConfig.sha : undefined,
content: encodedConfig,
Expand Down
Loading