Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- name: pnpm
uses: pnpm/action-setup@v4
with:
version: 9.15.0
version: 10.18.3

- uses: actions/cache/restore@v4
name: Check for build cache
Expand Down Expand Up @@ -95,7 +95,7 @@ jobs:
- name: pnpm
uses: pnpm/action-setup@v4
with:
version: 9.15.0
version: 10.18.3

- name: Use Node 18
uses: actions/setup-node@v4
Expand Down Expand Up @@ -134,7 +134,7 @@ jobs:
- name: pnpm
uses: pnpm/action-setup@v4
with:
version: 9.15.0
version: 10.18.3

- name: Use Node 18
uses: actions/setup-node@v4
Expand Down Expand Up @@ -182,7 +182,7 @@ jobs:
- name: pnpm
uses: pnpm/action-setup@v4
with:
version: 9.15.0
version: 10.18.3

- name: Use Node 18
uses: actions/setup-node@v4
Expand Down Expand Up @@ -227,7 +227,7 @@ jobs:
- name: pnpm
uses: pnpm/action-setup@v4
with:
version: 9.15.0
version: 10.18.3

- name: Use Node 18
uses: actions/setup-node@v4
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/react17.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- name: pnpm
uses: pnpm/action-setup@v4
with:
version: 9.15.0
version: 10.18.3
cache: false

- uses: actions/cache/restore@v4
Expand Down Expand Up @@ -75,7 +75,7 @@ jobs:
- name: Install pnpm
uses: pnpm/action-setup@v4
with:
version: 9.15.0
version: 10.18.3
cache: false

- uses: actions/cache/restore@v4
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- name: pnpm
uses: pnpm/action-setup@v4
with:
version: 9.15.0
version: 10.18.3

# Needed following Github's transition from Node 16 to 20
- name: Install node-gyp
Expand Down Expand Up @@ -95,7 +95,7 @@ jobs:
- name: pnpm
uses: pnpm/action-setup@v4
with:
version: 9.15.0
version: 10.18.3

- name: Use Node 18
uses: actions/setup-node@v4
Expand Down Expand Up @@ -148,7 +148,7 @@ jobs:
- name: pnpm
uses: pnpm/action-setup@v4
with:
version: 9.15.0
version: 10.18.3

- name: Use Node 18
uses: actions/setup-node@v4
Expand Down Expand Up @@ -209,7 +209,7 @@ jobs:
- name: pnpm
uses: pnpm/action-setup@v4
with:
version: 9.15.0
version: 10.18.3

- name: Use Node 18
uses: actions/setup-node@v4
Expand Down Expand Up @@ -264,7 +264,7 @@ jobs:
- name: pnpm
uses: pnpm/action-setup@v4
with:
version: 9.15.0
version: 10.18.3

# Needed following Github's transition from Node 16 to 20
- name: Install node-gyp
Expand Down Expand Up @@ -309,7 +309,7 @@ jobs:
- name: pnpm
uses: pnpm/action-setup@v4
with:
version: 9.15.0
version: 10.18.3

- name: Dispatch to Website repo
uses: peter-evans/repository-dispatch@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sizeDiff.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- name: pnpm
uses: pnpm/action-setup@v4
with:
version: 9.15.0
version: 10.18.3

- name: Use Node.js 18
uses: actions/setup-node@v4
Expand Down
2 changes: 2 additions & 0 deletions .tool-versions
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
nodejs 18.20.8
pnpm 10.18.3
28 changes: 9 additions & 19 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -183,15 +183,18 @@ import Button from '@leafygreen-ui/button';

### Setup

1. Node >= 18.0.0 required.
1. Install [`asdf`](https://asdf-vm.com/guide/getting-started.html)

via [homebrew](https://brew.sh/) with `brew install node`

via [nodejs installer](https://nodejs.org/en/)
```zsh
brew install asdf;
echo 'export PATH="${ASDF_DATA_DIR:-$HOME/.asdf}/shims:$PATH"' >> ~/.zshrc
```

2. Install PNPM >= 9.15.0.
2. Install Node & pnpm

[PNPM Installation documentation](https://pnpm.io/installation)
```zsh
asdf install
```

3. Clone the repository.

Expand Down Expand Up @@ -360,19 +363,6 @@ To publish a new pre-release version, pull the changes from `new-feature` into b

When `new-feature` is merged into `main`, you can safely delete the `pre-release` branch

## Deploy gh-pages

You can deploy a static build of our Storybook site to gh-pages from the `main` branch.

1. First be sure you've built a static version of Storybook with the script: `build-storybook`
2. Then deploy to gh-pages: `pnpm release:site`

### To deploy to your own mirror of leafygreen-ui

1. Run `pnpm demo:site [your_github_username]`.
2. If you haven't built a static version of Storybook yet, you will be prompted to do so.
3. You will be asked for confirmation before Storybook is published.

## License

The source files in this repository are made available under the terms of the Apache License, version 2.0.
13 changes: 8 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@
"private": true,
"engines": {
"node": ">= 18.20.8",
"pnpm": ">= 9.15.0"
"pnpm": ">= 10.18.3"
},
"packageManager": "[email protected]",
"scripts": {
"init": "pnpm install && pnpm build",
"init:react17": "pnpm clean; npx node ./scripts/react17/init.mjs; pnpm run init",
Expand Down Expand Up @@ -83,7 +84,11 @@
"caniuse-lite": "^1.0.30001585",
"jackspeak": "2.1.1",
"typescript": "$typescript"
}
},
"onlyBuiltDependencies": [
"core-js",
"esbuild"
]
},
"lg": {
"scopes": {
Expand All @@ -108,7 +113,5 @@
},
"bugs": {
"url": "https://github.com/mongodb/leafygreen-ui/issues"
},
"packageManager": "[email protected]",
"typesVersions": {}
}
}
4 changes: 2 additions & 2 deletions packages/icon/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,13 @@
"@lg-tools/storybook-utils": "workspace:^",
"@rollup/plugin-node-resolve": "15.1.0",
"@svgr/core": "^5.3.1",
"@types/xml2json": "^0.11.0",
"commander": "^11.0.0",
"fast-xml-parser": "^5.3.0",
"fs-extra": "11.1.1",
"p-queue": "^8.1.0",
"rollup": "4.16.1",
"rollup-plugin-node-externals": "7.1.1",
"ts-node": "^10.9.2",
"rollup-plugin-node-externals": "7.1.1",
"xml2json": "^0.12.0"
},
"gitHead": "dd71a2d404218ccec2e657df9c0263dc1c15b9e0",
Expand Down
6 changes: 3 additions & 3 deletions packages/icon/src/Icon.spec.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import React from 'react';
import { render, screen } from '@testing-library/react';
import { XMLParser } from 'fast-xml-parser';
import fs from 'fs';
import { axe } from 'jest-axe';
import path from 'path';
import { toJson } from 'xml2json';

import { typeIs } from '@leafygreen-ui/lib';

Expand Down Expand Up @@ -106,8 +106,8 @@ describe('packages/Icon/glyphs/', () => {
readonly [K in string]: string | SVGNodeObject;
};

//@ts-expect-error
const rootGlyphObject: SVGNodeObject = toJson(svg, { object: true });
const parser = new XMLParser({ ignoreAttributes: false });
const rootGlyphObject: SVGNodeObject = parser.parse(svg);

function validateGlyphObject(obj: SVGNodeObject) {
Object.keys(obj).forEach(key => {
Expand Down
32 changes: 19 additions & 13 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading