Skip to content

Commit

Permalink
Merge branch 'develop' into feature/thumbs-up-down-icons
Browse files Browse the repository at this point in the history
* develop: (77 commits)
  chore(deps): update GitHub Actions and Node versions (#704)
  fix(site): use Pharos v14 properties (#703)
  fix(storybook): update Babel configuration (#702)
  fix(infra): use Node 18 in .nvmrc (#701)
  fix(infra): update dependencies
  fix(infra): allow mutable Yarn lockfile during release for workspaces versions
  Version Packages (#700)
  Release/14.0.0 (#697)
  chore(deps): upgrade to Yarn 4 (#694)
  chore(deps): bump es5-ext from 0.10.62 to 0.10.64 (#692)
  fix(icon): add media query style for WHCM (#689)
  chore(deps): bump ip from 1.1.8 to 1.1.9 (#687)
  chore: version packages (#685)
  Icon: Add "add to folder" icon (#678)
  Fix the all-contributors badge (#680)
  Update link, dropdown-menu-nav, and popover to use a11y-label (#675)
  DropdownMenuNav: Add pharos-elevation-level-3 token (#670)
  chore(deps-dev): bump vite from 4.3.9 to 4.5.2 (#672)
  chore: version packages (#667)
  Update deprecated a11y attributes in button component (#666)
  ...
  • Loading branch information
daneah committed Mar 8, 2024
2 parents a7f80ed + bad31d2 commit 510f4e1
Show file tree
Hide file tree
Showing 248 changed files with 36,099 additions and 204,444 deletions.
38 changes: 38 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -298,6 +298,44 @@
"contributions": [
"code"
]
},
{
"login": "brentswisher",
"name": "Brent Swisher",
"avatar_url": "https://avatars.githubusercontent.com/u/6653970?v=4",
"profile": "http://brentswisher.com/",
"contributions": [
"bug",
"code"
]
},
{
"login": "henryclong",
"name": "Henry Long",
"avatar_url": "https://avatars.githubusercontent.com/u/52258386?v=4",
"profile": "https://github.com/henryclong",
"contributions": [
"code"
]
},
{
"login": "sirrah-tam",
"name": "Mat Harris",
"avatar_url": "https://avatars.githubusercontent.com/u/6874453?v=4",
"profile": "https://matharris.dev/",
"contributions": [
"a11y"
]
},
{
"login": "david-corneail",
"name": "david-corneail",
"avatar_url": "https://avatars.githubusercontent.com/u/104939119?v=4",
"profile": "https://github.com/david-corneail",
"contributions": [
"design",
"doc"
]
}
],
"contributorsPerLine": 7
Expand Down
5 changes: 5 additions & 0 deletions .changeset/beige-planes-hide.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@ithaka/pharos-site': patch
---

Fix component properties for Pharos v14
2 changes: 2 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,12 @@ module.exports = {
parserOptions: {
ecmaVersion: 2020,
sourceType: 'module',
requireConfigFile: false,
ecmaFeatures: {
jsx: true,
},
babelOptions: {
plugins: ['@babel/plugin-syntax-import-assertions'],
presets: ['@babel/preset-react'],
},
},
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/chromatic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,21 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Repo
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Setup Node.js 18.x
uses: actions/setup-node@v3
- name: Setup Node.js 20.x
uses: actions/setup-node@v4
with:
node-version: 18.x
node-version: 20.x
registry-url: 'https://registry.npmjs.org'

- name: Get yarn cache directory path
id: yarn-cache-dir-path
run: echo "YARN_CACHE_DIR=$(yarn cache dir)" >> $GITHUB_OUTPUT
run: echo "YARN_CACHE_DIR=.yarn/cache" >> $GITHUB_OUTPUT

- uses: actions/cache@v3
- uses: actions/cache@v4
id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
with:
path: |
Expand All @@ -42,13 +42,13 @@ jobs:
${{ runner.os }}-yarn-
- name: Install Dependencies
run: yarn --prefer-offline --frozen-lockfile
run: yarn --check-cache --immutable

- name: Setup Storybook
run: yarn storybook:setup

- name: Build Storybook
run: yarn build-storybook:wc
run: yarn storybook:wc:build

- name: Publish to Chromatic
uses: chromaui/action@v1
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,22 +13,22 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Repo
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
# This makes Actions fetch all Git history so that Changesets can generate changelogs with the correct commits
fetch-depth: 0

- name: Setup Node.js 18.x
uses: actions/setup-node@v3
- name: Setup Node.js 20.x
uses: actions/setup-node@v4
with:
node-version: 18.x
node-version: 20.x
registry-url: 'https://registry.npmjs.org'

- name: Get yarn cache directory path
id: yarn-cache-dir-path
run: echo "YARN_CACHE_DIR=$(yarn cache dir)" >> $GITHUB_OUTPUT
run: echo "YARN_CACHE_DIR=.yarn/cache" >> $GITHUB_OUTPUT

- uses: actions/cache@v3
- uses: actions/cache@v4
id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
with:
path: |
Expand All @@ -39,7 +39,7 @@ jobs:
${{ runner.os }}-yarn-
- name: Install Dependencies
run: yarn --prefer-offline --frozen-lockfile
run: yarn --check-cache --immutable

- name: Create Release Pull Request or Publish to npm # Pushes to main will create/update the release PR. Merging the PR will publish the packages.
id: changesets
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/size-limit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,18 @@ jobs:
env:
CI_JOB_NUMBER: 1
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Setup Node 18.x
uses: actions/setup-node@v3
- name: Setup Node 20.x
uses: actions/setup-node@v4
with:
node-version: 18.x
node-version: 20.x

- name: Get yarn cache directory path
id: yarn-cache-dir-path
run: echo "YARN_CACHE_DIR=$(yarn cache dir)" >> $GITHUB_OUTPUT
run: echo "YARN_CACHE_DIR=.yarn/cache" >> $GITHUB_OUTPUT

- uses: actions/cache@v3
- uses: actions/cache@v4
id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
with:
path: |
Expand Down
28 changes: 14 additions & 14 deletions .github/workflows/verify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,18 @@ jobs:
name: Lint
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Setup Node 18.x
uses: actions/setup-node@v3
- name: Setup Node 20.x
uses: actions/setup-node@v4
with:
node-version: 18.x
node-version: 20.x

- name: Get yarn cache directory path
id: yarn-cache-dir-path
run: echo "YARN_CACHE_DIR=$(yarn cache dir)" >> $GITHUB_OUTPUT
run: echo "YARN_CACHE_DIR=.yarn/cache" >> $GITHUB_OUTPUT

- uses: actions/cache@v3
- uses: actions/cache@v4
id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
with:
path: |
Expand All @@ -33,7 +33,7 @@ jobs:
${{ runner.os }}-yarn-
- name: Install Dependencies
run: yarn --prefer-offline --frozen-lockfile
run: yarn --check-cache --immutable

- name: Lint
run: yarn lint
Expand All @@ -42,18 +42,18 @@ jobs:
name: Test
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Setup Node 18.x
uses: actions/setup-node@v3
- name: Setup Node 20.x
uses: actions/setup-node@v4
with:
node-version: 18.x
node-version: 20.x

- name: Get yarn cache directory path
id: yarn-cache-dir-path
run: echo "YARN_CACHE_DIR=$(yarn cache dir)" >> $GITHUB_OUTPUT
run: echo "YARN_CACHE_DIR=.yarn/cache" >> $GITHUB_OUTPUT

- uses: actions/cache@v3
- uses: actions/cache@v4
id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
with:
path: |
Expand All @@ -70,7 +70,7 @@ jobs:
run: npx playwright install-deps

- name: Install Dependencies
run: yarn --prefer-offline --frozen-lockfile
run: yarn --check-cache --immutable

- name: Test
run: yarn test
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
16
20
28 changes: 0 additions & 28 deletions .storybook/babel.config.js

This file was deleted.

10 changes: 8 additions & 2 deletions .storybook/initComponents.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,13 @@ import {
PharosButton,
PharosCheckbox,
PharosCheckboxGroup,
PharosCoachMark,
PharosCombobox,
PharosDropdownMenu,
PharosDropdownMenuItem,
PharosDropdownMenuNav,
PharosDropdownMenuNavLink,
PharosDropdownMenuNavCategory,
PharosFooter,
PharosHeader,
PharosHeading,
Expand All @@ -22,12 +24,13 @@ import {
PharosLoadingSpinner,
PharosModal,
PharosPagination,
PharosPopover,
PharosProgressBar,
PharosRadioButton,
PharosRadioGroup,
PharosSelect,
PharosSheet,
PharosSidenav,
PharosSidenavButton,
PharosSidenavLink,
PharosSidenavMenu,
PharosSidenavSection,
Expand All @@ -52,11 +55,13 @@ registerComponents('storybook', [
PharosButton,
PharosCheckbox,
PharosCheckboxGroup,
PharosCoachMark,
PharosCombobox,
PharosDropdownMenu,
PharosDropdownMenuItem,
PharosDropdownMenuNav,
PharosDropdownMenuNavLink,
PharosDropdownMenuNavCategory,
PharosFooter,
PharosHeader,
PharosHeading,
Expand All @@ -69,12 +74,13 @@ registerComponents('storybook', [
PharosLoadingSpinner,
PharosModal,
PharosPagination,
PharosPopover,
PharosProgressBar,
PharosRadioButton,
PharosRadioGroup,
PharosSelect,
PharosSheet,
PharosSidenav,
PharosSidenavButton,
PharosSidenavLink,
PharosSidenavMenu,
PharosSidenavSection,
Expand Down
36 changes: 36 additions & 0 deletions .storybook/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,45 @@ const config = {
'@storybook/addon-essentials',
'@storybook/addon-links',
],
features: {
storyStoreV7: true,
},
docs: {
autodocs: true,
},
async babel(config, { configType }) {
config = {
...config,
configFile: false,
plugins: [
'@babel/plugin-transform-shorthand-properties',
'@babel/plugin-transform-block-scoping',
['@babel/plugin-proposal-decorators', { decoratorsBeforeExport: true }],
['@babel/plugin-proposal-class-properties', { loose: true }],
['@babel/plugin-proposal-private-methods', { loose: true }],
['@babel/plugin-proposal-private-property-in-object', { loose: true }],
'@babel/plugin-proposal-export-default-from',
'@babel/plugin-syntax-dynamic-import',
['@babel/plugin-proposal-object-rest-spread', { loose: true, useBuiltIns: true }],
'@babel/plugin-transform-classes',
'@babel/plugin-transform-arrow-functions',
'@babel/plugin-transform-parameters',
'@babel/plugin-transform-destructuring',
'@babel/plugin-transform-spread',
'@babel/plugin-transform-for-of',
'babel-plugin-macros',
'@babel/plugin-proposal-optional-chaining',
'@babel/plugin-proposal-nullish-coalescing-operator',
['@emotion', { sourceMap: true, autoLabel: 'always' }],
],
presets: [
['@babel/preset-env', { shippedProposals: true, useBuiltIns: 'usage', corejs: '3' }],
'@babel/preset-typescript',
['@babel/preset-react', { runtime: 'automatic' }],
],
};
return config;
},
async viteFinal(config) {
return mergeConfig(config, {
esbuild: {
Expand Down
1 change: 0 additions & 1 deletion .storybook/main/babel.config.js

This file was deleted.

1 change: 0 additions & 1 deletion .storybook/react/babel.config.js

This file was deleted.

1 change: 0 additions & 1 deletion .storybook/wc/babel.config.js

This file was deleted.

2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
@@ -1 +1 @@
nodejs 18.16.0
nodejs 20.11.1
Binary file added .yarn/install-state.gz
Binary file not shown.
Loading

0 comments on commit 510f4e1

Please sign in to comment.