From b6fd8861088ecae85adcbc45962f7b6f948b45d3 Mon Sep 17 00:00:00 2001 From: Aman pandey <116947899+byteakp@users.noreply.github.com> Date: Sat, 24 May 2025 10:37:03 +0000 Subject: [PATCH 1/8] Update the value of --spectrum-cjk-font to reference --spectrum-cjk-font-family-stack. --- .gitignore | 3 +++ .vscode/mcp.json | 8 ++++++++ .vscode/settings.json | 11 ++++++----- tokens/custom/global-vars.css | 2 +- 4 files changed, 18 insertions(+), 6 deletions(-) create mode 100644 .vscode/mcp.json diff --git a/.gitignore b/.gitignore index 28c3ba85761..33b93ae84ea 100644 --- a/.gitignore +++ b/.gitignore @@ -47,3 +47,6 @@ chromatic.config.json !.yarn/releases !.yarn/sdks !.yarn/versions + +.cursor/rules/nx-rules.mdc +.github/instructions/nx.instructions.md diff --git a/.vscode/mcp.json b/.vscode/mcp.json new file mode 100644 index 00000000000..7563c1cbb56 --- /dev/null +++ b/.vscode/mcp.json @@ -0,0 +1,8 @@ +{ + "servers": { + "nx-mcp": { + "type": "http", + "url": "http://localhost:9835/mcp" + } + } +} \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json index c940cee9d9d..2833cf35fb9 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -150,19 +150,19 @@ "githubPullRequests.queries": [ { "label": "Waiting for my review", - "query": "is:open review-requested:${user}" + "query": "repo:${owner}/${repository} is:open review-requested:${user}" }, { "label": "Assigned to me", - "query": "is:open assignee:${user}" + "query": "repo:${owner}/${repository} is:open assignee:${user}" }, { "label": "Created by me", - "query": "is:open author:${user}" + "query": "repo:${owner}/${repository} is:open author:${user}" }, { "label": "Mentioned me", - "query": "is:open mentions:${user}" + "query": "repo:${owner}/${repository} is:open mentions:${user}" } ], "js/ts.implicitProjectConfig.experimentalDecorators": true, @@ -184,5 +184,6 @@ ".storybook/deprecated/*/*.mdx", "components/*/stories/*.stories.js", "components/*/stories/*.mdx" - ] + ], + "nxConsole.generateAiAgentRules": true } diff --git a/tokens/custom/global-vars.css b/tokens/custom/global-vars.css index 55cad6984bd..eb72e4e1b58 100644 --- a/tokens/custom/global-vars.css +++ b/tokens/custom/global-vars.css @@ -55,7 +55,7 @@ --spectrum-font-size: var(--spectrum-font-size-100); --spectrum-cjk-font-family-stack: adobe-clean-han-japanese, var(--spectrum-cjk-font-family), sans-serif; - --spectrum-cjk-font: var(--spectrum-code-font-family-stack); + --spectrum-cjk-font: var(--spectrum-cjk-font-family-stack); /* static white / black background color for docs containers */ --spectrum-docs-static-white-background-color: rgb(15 121 125); From 8e7e39b3b151d35897a91c500704f2370f150787 Mon Sep 17 00:00:00 2001 From: Aman pandey <116947899+byteakp@users.noreply.github.com> Date: Sun, 1 Jun 2025 07:23:40 +0000 Subject: [PATCH 2/8] fix(tokens): add changeset for CJK font variable fix --- .changeset/cute-bags-live.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/cute-bags-live.md diff --git a/.changeset/cute-bags-live.md b/.changeset/cute-bags-live.md new file mode 100644 index 00000000000..808b640b549 --- /dev/null +++ b/.changeset/cute-bags-live.md @@ -0,0 +1,5 @@ +--- +"@spectrum-css/tokens": major +--- + +Fixed --spectrum-cjk-font variable to correctly reference --spectrum-cjk-font-family-stack instead of --spectrum-code-font-family-stack From d5a87516105c34fd5910843909b877e6cbb774f7 Mon Sep 17 00:00:00 2001 From: Aman pandey <116947899+byteakp@users.noreply.github.com> Date: Sun, 1 Jun 2025 07:25:57 +0000 Subject: [PATCH 3/8] fix(tokens): add patch changeset for CJK font variable fix --- .changeset/{cute-bags-live.md => late-teams-share.md} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename .changeset/{cute-bags-live.md => late-teams-share.md} (82%) diff --git a/.changeset/cute-bags-live.md b/.changeset/late-teams-share.md similarity index 82% rename from .changeset/cute-bags-live.md rename to .changeset/late-teams-share.md index 808b640b549..c1506df47dc 100644 --- a/.changeset/cute-bags-live.md +++ b/.changeset/late-teams-share.md @@ -1,5 +1,5 @@ --- -"@spectrum-css/tokens": major +"@spectrum-css/tokens": patch --- Fixed --spectrum-cjk-font variable to correctly reference --spectrum-cjk-font-family-stack instead of --spectrum-code-font-family-stack From 6317077f89753516bda6ca5bcec5c802873ac5e4 Mon Sep 17 00:00:00 2001 From: Aman pandey <116947899+byteakp@users.noreply.github.com> Date: Fri, 6 Jun 2025 10:41:55 +0000 Subject: [PATCH 4/8] Remove out-of-scope changes to .gitignore and .vscode files --- .vscode/mcp.json | 8 -- .vscode/settings.json | 189 ------------------------------------------ 2 files changed, 197 deletions(-) delete mode 100644 .vscode/mcp.json delete mode 100644 .vscode/settings.json diff --git a/.vscode/mcp.json b/.vscode/mcp.json deleted file mode 100644 index 7563c1cbb56..00000000000 --- a/.vscode/mcp.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "servers": { - "nx-mcp": { - "type": "http", - "url": "http://localhost:9835/mcp" - } - } -} \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index 2833cf35fb9..00000000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,189 +0,0 @@ -{ - "[css]": { - "editor.codeActionsOnSave": { - "source.fixAll.stylelint": "explicit" - }, - "editor.defaultFormatter": "stylelint.vscode-stylelint" - }, - "[javascript]": { - "editor.codeActionsOnSave": { - "source.organizeImports": "explicit" - }, - "editor.colorDecorators": true, - "editor.defaultFormatter": "dbaeumer.vscode-eslint" - }, - "[markdown]": { - "editor.defaultFormatter": "DavidAnson.vscode-markdownlint" - }, - "atlascode.bitbucket.enabled": false, - "atlascode.jira.enabled": true, - "atlascode.jira.jqlList": [ - { - "enabled": true, - "id": "6ec799fe-ae6a-46cd-86d8-ec19839a70e3", - "monitor": true, - "name": "Current sprint", - "query": "\"Project\" = \"CSS\" AND sprint in openSprints ()", - "siteId": "jira.corp.adobe.com" - }, - { - "enabled": true, - "id": "6916b063-1a7b-411a-87eb-2e58c5a82ffa", - "monitor": true, - "name": "Assigned to me", - "query": "assignee= currentUser() and status != Closed and status != Done", - "siteId": "jira.corp.adobe.com" - }, - { - "enabled": true, - "id": "fb78270c-9799-4b6a-aaa7-16badf452395", - "monitor": true, - "name": "Open CSS issues", - "query": "status != Closed and status != Done AND \"Project\" = \"CSS\" ", - "siteId": "jira.corp.adobe.com" - } - ], - "atlascode.jira.lastCreateSiteAndProject": { - "projectKey": "CSS", - "siteId": "jira.corp.adobe.com" - }, - "atlascode.jira.workingSite": { - "baseUrlSuffix": "jira.corp.adobe.com" - }, - "colorInfo.languages": [ - { - "colors": "css", - "selector": "css" - }, - { - "colors": "css", - "selector": "postcss" - }, - { - "colors": "css", - "selector": "javascript" - }, - { - "colors": "css", - "selector": "js" - }, - { - "colors": "css", - "selector": "jsx" - }, - { - "colors": "css", - "selector": "json" - }, - { - "colors": "css", - "selector": "svg" - }, - { - "colors": "css", - "selector": "markdown" - }, - { - "colors": "css", - "selector": "md" - }, - { - "colors": "css", - "selector": "mdx" - }, - { - "colors": "css", - "selector": "html" - }, - { - "colors": "css", - "selector": "yaml" - } - ], - "cssVariables.lookupFiles": [ - "${workspaceFolder}/tokens/dist/css/index.css", - "${workspaceFolder}/tokens/dist/css/*.css", - "${workspaceFolder}/components/*/index.css", - "${workspaceFolder}/components/*/themes/*.css" - ], - "docthis.includeDescriptionTag": true, - "docthis.inferTypesFromNames": true, - "docthis.returnsTag": true, - "editor.defaultFormatter": "esbenp.prettier-vscode", - "editor.largeFileOptimizations": true, - "editor.renderControlCharacters": true, - "emmet.includeLanguages": { - "postcss": "css" - }, - "emmet.syntaxProfiles": { - "postcss": "css" - }, - "eslint.format.enable": true, - "eslint.useESLintClass": true, - "files.associations": { - "*.css": "postcss" - }, - "files.insertFinalNewline": true, - "files.trimFinalNewlines": true, - "files.trimTrailingWhitespace": true, - "github.copilot.enable": { - "*": true, - "plaintext": false, - "scminput": false - }, - "githubIssues.createIssueTriggers": ["TODO", "todo", "FIXME", "ISSUE", "BUG"], - "githubIssues.issueBranchTitle": "${author}/${sanitizedIssueTitle}-gh-${issueNumber}", - "githubIssues.queries": [ - { - "label": "My issues", - "query": "default" - }, - { - "label": "Created issues", - "query": "author:${user} state:open repo:${owner}/${repository} sort:created-desc" - }, - { - "label": "Recent issues", - "query": "state:open repo:${owner}/${repository} sort:updated-desc" - } - ], - "githubPullRequests.queries": [ - { - "label": "Waiting for my review", - "query": "repo:${owner}/${repository} is:open review-requested:${user}" - }, - { - "label": "Assigned to me", - "query": "repo:${owner}/${repository} is:open assignee:${user}" - }, - { - "label": "Created by me", - "query": "repo:${owner}/${repository} is:open author:${user}" - }, - { - "label": "Mentioned me", - "query": "repo:${owner}/${repository} is:open mentions:${user}" - } - ], - "js/ts.implicitProjectConfig.experimentalDecorators": true, - "postcss.validate": false, - "prettier.configPath": ".prettierrc", - "prettier.ignorePath": ".prettierignore", - "prettier.prettierPath": "node_modules/prettier", - "stylelint.enable": true, - "stylelint.packageManager": "yarn", - "stylelint.reportDescriptionlessDisables": true, - "stylelint.reportInvalidScopeDisables": true, - "stylelint.reportNeedlessDisables": true, - "stylelint.validate": ["css", "postcss"], - "yaml.schemas": { - "~/.vscode/extensions/atlassian.atlascode-3.0.4/resources/schemas/pipelines-schema.json": "bitbucket-pipelines.yml" - }, - "storyExplorer.storiesGlobs": [ - ".storybook/deprecated/*/*.stories.js", - ".storybook/deprecated/*/*.mdx", - "components/*/stories/*.stories.js", - "components/*/stories/*.mdx" - ], - "nxConsole.generateAiAgentRules": true -} From aebae7578a82aaf6bab852f6657d5c30b48da59e Mon Sep 17 00:00:00 2001 From: Aman pandey <116947899+byteakp@users.noreply.github.com> Date: Fri, 6 Jun 2025 10:43:24 +0000 Subject: [PATCH 5/8] Revert out-of-scope changes to .gitignore --- .gitignore | 52 ---------------------------------------------------- 1 file changed, 52 deletions(-) delete mode 100644 .gitignore diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 33b93ae84ea..00000000000 --- a/.gitignore +++ /dev/null @@ -1,52 +0,0 @@ -# Ignore dist directories except metadata.json -**/dist/* -!components/*/dist/metadata.json -!tokens/dist/json/* - -# Not committing the map assets, these are dev-only -*.map - -# Recommended update re:https://docs.netlify.com/integrations/frameworks/eleventy/ -**/node_modules/** - -temp -.npmrc* -.nx -.env -.tmp -npm-debug.log* -.DS_Store -.idea -lerna-debug.log -yarn-error.log -package-lock.json -.nx - -# Storybook build output -.storybook/storybook-static -storybook-static -build-storybook.log - -# Chromatic -chromatic.log -chromatic-build-*.xml -chromatic-diagnostics*.json -chromatic.config.json - -# Custom diff tool -.diff-output - -.eslintcache -.stylelintcache - -# yarn 3 -.pnp.* -.yarn/* -!.yarn/patches -!.yarn/plugins -!.yarn/releases -!.yarn/sdks -!.yarn/versions - -.cursor/rules/nx-rules.mdc -.github/instructions/nx.instructions.md From 059620a85083d1a2a62a958d4b7b2dfbce5749ed Mon Sep 17 00:00:00 2001 From: Aman pandey <116947899+byteakp@users.noreply.github.com> Date: Sat, 7 Jun 2025 10:29:18 +0000 Subject: [PATCH 6/8] Revert unintended deletion of .gitignore and settings --- .gitignore | 52 ++++++++++++ .vscode/settings.json | 189 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 241 insertions(+) create mode 100644 .gitignore create mode 100644 .vscode/settings.json diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000000..33b93ae84ea --- /dev/null +++ b/.gitignore @@ -0,0 +1,52 @@ +# Ignore dist directories except metadata.json +**/dist/* +!components/*/dist/metadata.json +!tokens/dist/json/* + +# Not committing the map assets, these are dev-only +*.map + +# Recommended update re:https://docs.netlify.com/integrations/frameworks/eleventy/ +**/node_modules/** + +temp +.npmrc* +.nx +.env +.tmp +npm-debug.log* +.DS_Store +.idea +lerna-debug.log +yarn-error.log +package-lock.json +.nx + +# Storybook build output +.storybook/storybook-static +storybook-static +build-storybook.log + +# Chromatic +chromatic.log +chromatic-build-*.xml +chromatic-diagnostics*.json +chromatic.config.json + +# Custom diff tool +.diff-output + +.eslintcache +.stylelintcache + +# yarn 3 +.pnp.* +.yarn/* +!.yarn/patches +!.yarn/plugins +!.yarn/releases +!.yarn/sdks +!.yarn/versions + +.cursor/rules/nx-rules.mdc +.github/instructions/nx.instructions.md diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 00000000000..2833cf35fb9 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,189 @@ +{ + "[css]": { + "editor.codeActionsOnSave": { + "source.fixAll.stylelint": "explicit" + }, + "editor.defaultFormatter": "stylelint.vscode-stylelint" + }, + "[javascript]": { + "editor.codeActionsOnSave": { + "source.organizeImports": "explicit" + }, + "editor.colorDecorators": true, + "editor.defaultFormatter": "dbaeumer.vscode-eslint" + }, + "[markdown]": { + "editor.defaultFormatter": "DavidAnson.vscode-markdownlint" + }, + "atlascode.bitbucket.enabled": false, + "atlascode.jira.enabled": true, + "atlascode.jira.jqlList": [ + { + "enabled": true, + "id": "6ec799fe-ae6a-46cd-86d8-ec19839a70e3", + "monitor": true, + "name": "Current sprint", + "query": "\"Project\" = \"CSS\" AND sprint in openSprints ()", + "siteId": "jira.corp.adobe.com" + }, + { + "enabled": true, + "id": "6916b063-1a7b-411a-87eb-2e58c5a82ffa", + "monitor": true, + "name": "Assigned to me", + "query": "assignee= currentUser() and status != Closed and status != Done", + "siteId": "jira.corp.adobe.com" + }, + { + "enabled": true, + "id": "fb78270c-9799-4b6a-aaa7-16badf452395", + "monitor": true, + "name": "Open CSS issues", + "query": "status != Closed and status != Done AND \"Project\" = \"CSS\" ", + "siteId": "jira.corp.adobe.com" + } + ], + "atlascode.jira.lastCreateSiteAndProject": { + "projectKey": "CSS", + "siteId": "jira.corp.adobe.com" + }, + "atlascode.jira.workingSite": { + "baseUrlSuffix": "jira.corp.adobe.com" + }, + "colorInfo.languages": [ + { + "colors": "css", + "selector": "css" + }, + { + "colors": "css", + "selector": "postcss" + }, + { + "colors": "css", + "selector": "javascript" + }, + { + "colors": "css", + "selector": "js" + }, + { + "colors": "css", + "selector": "jsx" + }, + { + "colors": "css", + "selector": "json" + }, + { + "colors": "css", + "selector": "svg" + }, + { + "colors": "css", + "selector": "markdown" + }, + { + "colors": "css", + "selector": "md" + }, + { + "colors": "css", + "selector": "mdx" + }, + { + "colors": "css", + "selector": "html" + }, + { + "colors": "css", + "selector": "yaml" + } + ], + "cssVariables.lookupFiles": [ + "${workspaceFolder}/tokens/dist/css/index.css", + "${workspaceFolder}/tokens/dist/css/*.css", + "${workspaceFolder}/components/*/index.css", + "${workspaceFolder}/components/*/themes/*.css" + ], + "docthis.includeDescriptionTag": true, + "docthis.inferTypesFromNames": true, + "docthis.returnsTag": true, + "editor.defaultFormatter": "esbenp.prettier-vscode", + "editor.largeFileOptimizations": true, + "editor.renderControlCharacters": true, + "emmet.includeLanguages": { + "postcss": "css" + }, + "emmet.syntaxProfiles": { + "postcss": "css" + }, + "eslint.format.enable": true, + "eslint.useESLintClass": true, + "files.associations": { + "*.css": "postcss" + }, + "files.insertFinalNewline": true, + "files.trimFinalNewlines": true, + "files.trimTrailingWhitespace": true, + "github.copilot.enable": { + "*": true, + "plaintext": false, + "scminput": false + }, + "githubIssues.createIssueTriggers": ["TODO", "todo", "FIXME", "ISSUE", "BUG"], + "githubIssues.issueBranchTitle": "${author}/${sanitizedIssueTitle}-gh-${issueNumber}", + "githubIssues.queries": [ + { + "label": "My issues", + "query": "default" + }, + { + "label": "Created issues", + "query": "author:${user} state:open repo:${owner}/${repository} sort:created-desc" + }, + { + "label": "Recent issues", + "query": "state:open repo:${owner}/${repository} sort:updated-desc" + } + ], + "githubPullRequests.queries": [ + { + "label": "Waiting for my review", + "query": "repo:${owner}/${repository} is:open review-requested:${user}" + }, + { + "label": "Assigned to me", + "query": "repo:${owner}/${repository} is:open assignee:${user}" + }, + { + "label": "Created by me", + "query": "repo:${owner}/${repository} is:open author:${user}" + }, + { + "label": "Mentioned me", + "query": "repo:${owner}/${repository} is:open mentions:${user}" + } + ], + "js/ts.implicitProjectConfig.experimentalDecorators": true, + "postcss.validate": false, + "prettier.configPath": ".prettierrc", + "prettier.ignorePath": ".prettierignore", + "prettier.prettierPath": "node_modules/prettier", + "stylelint.enable": true, + "stylelint.packageManager": "yarn", + "stylelint.reportDescriptionlessDisables": true, + "stylelint.reportInvalidScopeDisables": true, + "stylelint.reportNeedlessDisables": true, + "stylelint.validate": ["css", "postcss"], + "yaml.schemas": { + "~/.vscode/extensions/atlassian.atlascode-3.0.4/resources/schemas/pipelines-schema.json": "bitbucket-pipelines.yml" + }, + "storyExplorer.storiesGlobs": [ + ".storybook/deprecated/*/*.stories.js", + ".storybook/deprecated/*/*.mdx", + "components/*/stories/*.stories.js", + "components/*/stories/*.mdx" + ], + "nxConsole.generateAiAgentRules": true +} From d44c9bd077c3336264e747f8e9fcc5d9619b12a2 Mon Sep 17 00:00:00 2001 From: "[ Cassondra ]" Date: Tue, 10 Jun 2025 17:42:45 -0400 Subject: [PATCH 7/8] chore: remove unrelated updates from PR --- .gitignore | 3 --- .vscode/settings.json | 10 ++++------ 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 33b93ae84ea..28c3ba85761 100644 --- a/.gitignore +++ b/.gitignore @@ -47,6 +47,3 @@ chromatic.config.json !.yarn/releases !.yarn/sdks !.yarn/versions - -.cursor/rules/nx-rules.mdc -.github/instructions/nx.instructions.md diff --git a/.vscode/settings.json b/.vscode/settings.json index 2833cf35fb9..f123a20a283 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -150,19 +150,19 @@ "githubPullRequests.queries": [ { "label": "Waiting for my review", - "query": "repo:${owner}/${repository} is:open review-requested:${user}" + "query": "is:open review-requested:${user}" }, { "label": "Assigned to me", - "query": "repo:${owner}/${repository} is:open assignee:${user}" + "query": "is:open assignee:${user}" }, { "label": "Created by me", - "query": "repo:${owner}/${repository} is:open author:${user}" + "query": "is:open author:${user}" }, { "label": "Mentioned me", - "query": "repo:${owner}/${repository} is:open mentions:${user}" + "query": "is:open mentions:${user}" } ], "js/ts.implicitProjectConfig.experimentalDecorators": true, @@ -184,6 +184,4 @@ ".storybook/deprecated/*/*.mdx", "components/*/stories/*.stories.js", "components/*/stories/*.mdx" - ], - "nxConsole.generateAiAgentRules": true } From c75ef922fc2a5f43783147f9c8cefefa65b88825 Mon Sep 17 00:00:00 2001 From: "[ Cassondra ]" Date: Tue, 10 Jun 2025 17:43:29 -0400 Subject: [PATCH 8/8] chore: revert regression in vscode settings --- .vscode/settings.json | 1 + 1 file changed, 1 insertion(+) diff --git a/.vscode/settings.json b/.vscode/settings.json index f123a20a283..3fbd617ce55 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -184,4 +184,5 @@ ".storybook/deprecated/*/*.mdx", "components/*/stories/*.stories.js", "components/*/stories/*.mdx" + ] }