diff --git a/.changeset/sharp-actors-serve.md b/.changeset/sharp-actors-serve.md index a6bcf2c8..fd26fc4e 100644 --- a/.changeset/sharp-actors-serve.md +++ b/.changeset/sharp-actors-serve.md @@ -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. diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 3ac4131d..dd00b8fc 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -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). \ No newline at end of file +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). diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 77ac3297..9e21b1a8 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -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. \ No newline at end of file +- [ ] All new and existing tests passed. diff --git a/.github/workflows/deploy-docs.yml b/.github/workflows/deploy-docs.yml index 00cd61fe..5c838842 100644 --- a/.github/workflows/deploy-docs.yml +++ b/.github/workflows/deploy-docs.yml @@ -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 @@ -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 \ No newline at end of file + uses: actions/deploy-pages@v2 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 74feadf8..1c4b0827 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -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 @@ -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!" diff --git a/.lintstagedrc.json b/.lintstagedrc.json index d9bbe81e..be745b8b 100644 --- a/.lintstagedrc.json +++ b/.lintstagedrc.json @@ -1,3 +1,3 @@ { - "**/*.{js,jsx,ts,tsx,json}": ["rome format --write"] + "**/*.{js,jsx,ts,tsx,json,yml,yaml,md}": ["prettier --write"] } diff --git a/.moon/toolchain.yml b/.moon/toolchain.yml index 5b9e25b1..3f64b31d 100644 --- a/.moon/toolchain.yml +++ b/.moon/toolchain.yml @@ -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 diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 1ae2aa26..6d111a0a 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -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 @@ -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 \ No newline at end of file +[version]: https://contributor-covenant.org/version/2/1 diff --git a/README.md b/README.md index 06ccaf2a..c42e9e91 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/docs/site/moon.yml b/docs/site/moon.yml index 8d69dd92..dca21f57 100644 --- a/docs/site/moon.yml +++ b/docs/site/moon.yml @@ -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]" @@ -23,7 +26,7 @@ tasks: outputs: - public/schemas build: - command: + command: - next - build platform: node @@ -33,7 +36,7 @@ tasks: command: - rimraf - -g - - '../../site/!(visualizer)' + - "../../site/!(visualizer)" platform: node inputs: - "@globs(target)" @@ -56,4 +59,4 @@ tasks: - ~:clean - ~:build outputs: - - "/site/" \ No newline at end of file + - "/site/" diff --git a/docs/site/package.json b/docs/site/package.json index 0e011152..c27998e0 100644 --- a/docs/site/package.json +++ b/docs/site/package.json @@ -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", @@ -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 (http://garthdb.com/)" } diff --git a/docs/site/pages/_app.js b/docs/site/pages/_app.js index 16e1805e..dec146b4 100644 --- a/docs/site/pages/_app.js +++ b/docs/site/pages/_app.js @@ -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 ; diff --git a/docs/site/pages/_document.js b/docs/site/pages/_document.js index 0c6b900b..3c681f3e 100644 --- a/docs/site/pages/_document.js +++ b/docs/site/pages/_document.js @@ -1,15 +1,16 @@ import { Html, Head, Main, NextScript } from "next/document"; -import Script from "next/script"; export default function Document() { return ( - - +