Skip to content

Commit

Permalink
chore: merged main
Browse files Browse the repository at this point in the history
  • Loading branch information
GarthDB committed Jul 10, 2023
2 parents 02459bf + 4ec09da commit aac91f5
Show file tree
Hide file tree
Showing 64 changed files with 6,265 additions and 2,423 deletions.
2 changes: 1 addition & 1 deletion .changeset/sharp-actors-serve.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
"@adobe/spectrum-tokens": minor
"@adobe/spectrum-tokens": patch
---

Migrate dependencies to devDependencies as they are not needed downstream to leverage the package.
2 changes: 1 addition & 1 deletion .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,4 @@ feel free to reach out to existing committers to have a conversation about that.

## Security Issues

Security issues shouldn't be reported on this issue tracker. Instead, [file an issue to our security experts](https://helpx.adobe.com/security/alertus.html).
Security issues shouldn't be reported on this issue tracker. Instead, [file an issue to our security experts](https://helpx.adobe.com/security/alertus.html).
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,4 @@
- [ ] I have updated the documentation accordingly.
- [ ] I have read the **CONTRIBUTING** document.
- [ ] I have added tests to cover my changes.
- [ ] All new and existing tests passed.
- [ ] All new and existing tests passed.
6 changes: 3 additions & 3 deletions .github/workflows/deploy-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
fetch-depth: 0
- uses: pnpm/action-setup@v2
with:
version: 8.6.5
version: 8.6.6
- uses: moonrepo/setup-moon-action@v1
- run: moon setup
- run: moon run site:export
Expand All @@ -43,7 +43,7 @@ jobs:
- name: Upload artifact
uses: actions/upload-pages-artifact@v1
with:
path: './site'
path: "./site"
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v2
uses: actions/deploy-pages@v2
10 changes: 5 additions & 5 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ jobs:
fetch-depth: 0
- uses: pnpm/action-setup@v2
with:
version: 8.6.5
version: 8.6.6
- uses: moonrepo/setup-moon-action@v1
- run: moon setup
- run: moon run :build
- run: moon run :build --query "projectSource~packages/*"
- name: Publish
id: changesets
uses: changesets/action@v1
Expand All @@ -34,6 +34,6 @@ jobs:
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}

# - name: Send a Slack notification if a publish happens
# if: steps.changesets.outputs.published == 'true'
# You can do something when a publish happens.
# run: my-slack-bot send-notification --message "A new version of ${GITHUB_REPOSITORY} was published!"
# if: steps.changesets.outputs.published == 'true'
# You can do something when a publish happens.
# run: my-slack-bot send-notification --message "A new version of ${GITHUB_REPOSITORY} was published!"
2 changes: 1 addition & 1 deletion .lintstagedrc.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"**/*.{js,jsx,ts,tsx,json}": ["rome format --write"]
"**/*.{js,jsx,ts,tsx,json,yml,yaml,md}": ["prettier --write"]
}
2 changes: 1 addition & 1 deletion .moon/toolchain.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ node:

# The version of the package manager (above) to use.
pnpm:
version: "8.6.5"
version: "8.6.6"

# Add `node.version` as a constraint in the root `package.json` `engines`.
addEnginesConstraint: true
Expand Down
22 changes: 11 additions & 11 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,19 @@ We pledge to act and interact in ways that contribute to an open, welcoming, div

Examples of behavior that contribute to a positive environment for our project and community include:

* Demonstrating empathy and kindness toward other people
* Being respectful of differing opinions, viewpoints, and experiences
* Giving and gracefully accepting constructive feedback
* Accepting responsibility and apologizing to those affected by our mistakes, and learning from the experience
* Focusing on what is best, not just for us as individuals but for the overall community
- Demonstrating empathy and kindness toward other people
- Being respectful of differing opinions, viewpoints, and experiences
- Giving and gracefully accepting constructive feedback
- Accepting responsibility and apologizing to those affected by our mistakes, and learning from the experience
- Focusing on what is best, not just for us as individuals but for the overall community

Examples of unacceptable behavior include:

* The use of sexualized language or imagery, and sexual attention or advances of any kind
* Trolling, insulting or derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others’ private information, such as a physical or email address, without their explicit permission
* Other conduct which could reasonably be considered inappropriate in a professional setting
- The use of sexualized language or imagery, and sexual attention or advances of any kind
- Trolling, insulting or derogatory comments, and personal or political attacks
- Public or private harassment
- Publishing others’ private information, such as a physical or email address, without their explicit permission
- Other conduct which could reasonably be considered inappropriate in a professional setting

## Our Responsibilities

Expand Down Expand Up @@ -76,4 +76,4 @@ This Code of Conduct is adapted from the [Contributor Covenant][homepage], versi
available at [https://contributor-covenant.org/version/2/1][version]

[homepage]: https://contributor-covenant.org
[version]: https://contributor-covenant.org/version/2/1
[version]: https://contributor-covenant.org/version/2/1
24 changes: 12 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,26 @@

This repo uses:

* [pnpm](https://pnpm.io/) for package management
* [moon](https://moonrepo.dev/moon) to manage task running
* [Changesets](https://github.com/changesets/changesets) for automated versioning and releasing
* [Rome](https://rome.tools) for code formatting/linting
* [commitlint](https://commitlint.js.org/) and [Convetional Commits](https://www.conventionalcommits.org/en/v1.0.0/) to standardize commit messages
* [husky](https://typicode.github.io/husky/) to automate formatting of committed files and linting of commit messages
- [pnpm](https://pnpm.io/) for package management
- [moon](https://moonrepo.dev/moon) to manage task running
- [Changesets](https://github.com/changesets/changesets) for automated versioning and releasing
- [Prettier](https://prettier.io/) for code formatting/linting
- [commitlint](https://commitlint.js.org/) and [Convetional Commits](https://www.conventionalcommits.org/en/v1.0.0/) to standardize commit messages
- [husky](https://typicode.github.io/husky/) to automate formatting of committed files and linting of commit messages

Packages in this monorepo:

* [Spectrum Tokens](packages/tokens/) design tokens for Spectrum, Adobe's design system.
* [Spectrum Token Visualizer Tool](docs/visualizer/) a visualizer for inspecting tokens. Published as a [static site](https://opensource.adobe.com/spectrum-tokens/visualizer/), not an NPM package.
* [Spectrum Tokens Docs](docs/site/) a static site to show the component options API and other token data.
- [Spectrum Tokens](packages/tokens/) design tokens for Spectrum, Adobe's design system.
- [Spectrum Token Visualizer Tool](docs/visualizer/) a visualizer for inspecting tokens. Published as a [static site](https://opensource.adobe.com/spectrum-tokens/visualizer/), not an NPM package.
- [Spectrum Tokens Docs](docs/site/) a static site to show the component options API and other token data.

## Setup monorepo locally

1. Install pnpm using [this guide](https://pnpm.io/installation).
1. Install dependencies
```bash
pnpm i
```
```bash
pnpm i
```

### Build all packages locally

Expand Down
9 changes: 6 additions & 3 deletions docs/site/moon.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
# the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
# OF ANY KIND, either express or implied. See the License for the specific language
# governing permissions and limitations under the License.
tags:
- docs
- site
fileGroups:
target:
- "/site/[!visualizer]"
Expand All @@ -23,7 +26,7 @@ tasks:
outputs:
- public/schemas
build:
command:
command:
- next
- build
platform: node
Expand All @@ -33,7 +36,7 @@ tasks:
command:
- rimraf
- -g
- '../../site/!(visualizer)'
- "../../site/!(visualizer)"
platform: node
inputs:
- "@globs(target)"
Expand All @@ -56,4 +59,4 @@ tasks:
- ~:clean
- ~:build
outputs:
- "/site/"
- "/site/"
7 changes: 3 additions & 4 deletions docs/site/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,9 @@
},
"dependencies": {
"@spectrum-css/page": "^5.0.31",
"@spectrum-css/sidenav": "^3.0.50",
"@spectrum-css/table": "^4.0.58",
"@spectrum-css/tokens": "^10.2.0",
"@spectrum-css/typography": "^5.0.24",
"@spectrum-css/vars": "^9.0.8",
"@spectrum-css/typography": "^5.0.25",
"ajv": "^8.12.0",
"ajv-formats": "^2.1.1",
"glob-promise": "^6.0.2",
Expand All @@ -25,7 +24,7 @@
"bugs": {
"url": "https://github.com/adobe/spectrum-tokens/issues"
},
"homepage": "https://github.com/adobe/spectrum-tokens/tree/main/docs/visualizer#readme",
"homepage": "https://github.com/adobe/spectrum-tokens/tree/main/docs/site#readme",
"keywords": [],
"author": "Garth Braithwaite <[email protected]> (http://garthdb.com/)"
}
8 changes: 3 additions & 5 deletions docs/site/pages/_app.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
import "@spectrum-css/tokens/dist/css/global-vars.css";
import "@spectrum-css/tokens/dist/css/spectrum/custom-vars.css";
import "@spectrum-css/tokens/dist/css/medium-vars.css";
import "@spectrum-css/tokens/dist/css/light-vars.css";
import "@spectrum-css/page/dist/index-vars.css";

import "@spectrum-css/vars/dist/spectrum-global.css";
import "@spectrum-css/vars/dist/spectrum-medium.css";
import "@spectrum-css/vars/dist/spectrum-light.css";
import "@spectrum-css/table/dist/index-vars.css";
import "@spectrum-css/typography/dist/index-vars.css";
import "@spectrum-css/sidenav/dist/index-vars.css";
import "../styles/sidenav.css";

export default function App({ Component, pageProps }) {
return <Component {...pageProps} />;
Expand Down
7 changes: 4 additions & 3 deletions docs/site/pages/_document.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
import { Html, Head, Main, NextScript } from "next/document";
import Script from "next/script";

export default function Document() {
return (
<Html
lang="en-US"
dir="ltr"
className='spectrum spectrum--medium spectrum--light'
className="spectrum spectrum--medium spectrum--light"
>
<Head>
<Script src='/typekit.js' />
<link rel="preconnect" href="https://use.typekit.net" />
<link rel="dns-prefetch" href="https://use.typekit.net" />
<link rel="stylesheet" href="https://use.typekit.net/evk7lzt.css" />
</Head>
<body>
<Main />
Expand Down
10 changes: 8 additions & 2 deletions docs/site/public/schemas/component.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,14 @@
"category": {
"type": "string",
"enum": [
"actions", "containers", "data visualization", "feedback", "inputs",
"navigation", "status", "typography"
"actions",
"containers",
"data visualization",
"feedback",
"inputs",
"navigation",
"status",
"typography"
]
},
"documentationUrl": { "type": "string", "format": "uri" }
Expand Down
6 changes: 5 additions & 1 deletion docs/site/public/schemas/components/alert-dialog.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,11 @@
"variant": {
"type": "string",
"enum": [
"confirmation", "information", "warning", "destructive", "error"
"confirmation",
"information",
"warning",
"destructive",
"error"
],
"default": "confirmation"
},
Expand Down
12 changes: 10 additions & 2 deletions docs/site/public/schemas/components/badge.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,16 @@
"variant": {
"type": "string",
"enum": [
"neutral", "info", "positive", "negative", "indigo", "yellow",
"magenta", "fuchsia", "purple", "seafoam"
"neutral",
"info",
"positive",
"negative",
"indigo",
"yellow",
"magenta",
"fuchsia",
"purple",
"seafoam"
]
},
"fixed": {
Expand Down
8 changes: 6 additions & 2 deletions docs/site/public/schemas/components/combo-box.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,12 @@
"state": {
"type": "string",
"enum": [
"default", "hover (text area)", "hover (button area)", "focus + hover",
"focus + not hover", "keyboard focus"
"default",
"hover (text area)",
"hover (button area)",
"focus + hover",
"focus + not hover",
"keyboard focus"
],
"default": "default"
}
Expand Down
26 changes: 22 additions & 4 deletions docs/site/public/schemas/components/contextual-help.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,28 @@
"popoverPlacement": {
"type": "string",
"enum": [
"top", "top left", "top right", "top start", "top end", "bottom",
"bottom left", "bottom right", "bottom start", "bottom end", "left",
"left top", "left bottom", "start", "start top", "start bottom",
"right", "right top", "right bottom", "end", "end top", "end bottom"
"top",
"top left",
"top right",
"top start",
"top end",
"bottom",
"bottom left",
"bottom right",
"bottom start",
"bottom end",
"left",
"left top",
"left bottom",
"start",
"start top",
"start bottom",
"right",
"right top",
"right bottom",
"end",
"end top",
"end bottom"
],
"default": "bottom start"
},
Expand Down
7 changes: 6 additions & 1 deletion docs/site/public/schemas/components/in-line-alert.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,12 @@
"variant": {
"type": "string",
"enum": [
"neutral", "informative", "positive", "notice", "negative", "neutral"
"neutral",
"informative",
"positive",
"notice",
"negative",
"neutral"
],
"default": "neutral"
}
Expand Down
5 changes: 4 additions & 1 deletion docs/site/public/schemas/components/picker.json
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,10 @@
"state": {
"type": "string",
"enum": [
"default", "hover", "focus + hover", "focus + not hover",
"default",
"hover",
"focus + hover",
"focus + not hover",
"keyboard focus"
],
"default": "default"
Expand Down
Loading

0 comments on commit aac91f5

Please sign in to comment.