Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(modal & tabs): remove overflow property that causes unnecessary scrollbars and update to Node 22 #827

Merged
merged 8 commits into from
Nov 22, 2024
Merged
Show file tree
Hide file tree
Changes from 6 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
5 changes: 5 additions & 0 deletions .changeset/fresh-snakes-hope.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@ithaka/pharos': patch
---

Remove unnecessary scrollbars from modal and enable Node 22 support
4 changes: 2 additions & 2 deletions .github/workflows/chromatic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ jobs:
with:
fetch-depth: 0

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

- name: Get yarn cache directory path
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ jobs:
# This makes Actions fetch all Git history so that Changesets can generate changelogs with the correct commits
fetch-depth: 0

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

- name: Get yarn cache directory path
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/size-limit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ jobs:
steps:
- uses: actions/checkout@v4

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

- name: Get yarn cache directory path
id: yarn-cache-dir-path
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/verify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ jobs:
steps:
- uses: actions/checkout@v4

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

- name: Get yarn cache directory path
id: yarn-cache-dir-path
Expand Down Expand Up @@ -44,10 +44,10 @@ jobs:
steps:
- uses: actions/checkout@v4

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

- name: Get yarn cache directory path
id: yarn-cache-dir-path
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20
22
2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
@@ -1 +1 @@
nodejs 20.18.0
nodejs 22.10.0
894 changes: 0 additions & 894 deletions .yarn/releases/yarn-4.2.2.cjs

This file was deleted.

934 changes: 934 additions & 0 deletions .yarn/releases/yarn-4.5.1.cjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
nodeLinker: node-modules

yarnPath: .yarn/releases/yarn-4.2.2.cjs
yarnPath: .yarn/releases/yarn-4.5.1.cjs
2 changes: 1 addition & 1 deletion docs/development/quick-start.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Start by cloning the Pharos repository:
$ git clone git@github.com:ithaka/pharos.git
```

Pharos supports the current long-term support (LTS) version of Node.js—currently version 20. Node can be installed from [its website](https://nodejs.org/en/), with [nvm](https://github.com/nvm-sh/nvm#install--update-script), or with [asdf](https://asdf-vm.com/) and its [Node.js plugin](https://github.com/asdf-vm/asdf-nodejs).
Refer to [.tool-versions](../../.tool-versions) for the latest node version compatible with Pharos. Node can be installed from [its website](https://nodejs.org/en/), with [nvm](https://github.com/nvm-sh/nvm#install--update-script), or with [asdf](https://asdf-vm.com/) and its [Node.js plugin](https://github.com/asdf-vm/asdf-nodejs).
michael-iden marked this conversation as resolved.
Show resolved Hide resolved

If you're using `nvm`, run the following command to switch to a Node version compatible with the project:

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -124,5 +124,5 @@
"path": "packages/pharos/lib/index.js"
}
],
"packageManager": "yarn@4.2.2"
"packageManager": "yarn@4.5.1"
}
2 changes: 1 addition & 1 deletion packages/pharos/scripts/build-react.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as fs from 'fs/promises';
import path from 'path';
import { globbyStream } from 'globby';
import customElementsManifest from '../custom-elements.json' assert { type: 'json' };
import customElementsManifest from '../custom-elements.json' with { type: 'json' };
import prettier from 'prettier';

const REACT_PROP_TYPE = 'DetailedHTMLProps<HTMLAttributes<HTMLElement>, HTMLElement>';
Expand Down
1 change: 0 additions & 1 deletion packages/pharos/src/components/modal/pharos-modal.scss
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@
flex-direction: column;
height: 100%;
pointer-events: auto;
overflow-y: scroll;
background-color: var(--pharos-modal-color-background-content);
background-clip: padding-box;
border-radius: var(--pharos-radius-base-standard);
Expand Down
2 changes: 1 addition & 1 deletion packages/pharos/src/components/tabs/pharos-tabs.scss
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

.tab__list {
display: flex;
overflow-x: scroll;
overflow-x: auto;
brentswisher marked this conversation as resolved.
Show resolved Hide resolved
scroll-behavior: smooth;
margin-bottom: var(--pharos-spacing-one-half-x);
padding: var(--pharos-spacing-one-quarter-x) var(--pharos-spacing-one-quarter-x)
Expand Down
2 changes: 1 addition & 1 deletion packages/pharos/style-dictionary.config.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import icons from './tokens/assets/icons.json' assert { type: 'json' };
import icons from './tokens/assets/icons.json' with { type: 'json' };

export default {
source: ['tokens/**/*.json'],
Expand Down
4 changes: 2 additions & 2 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -24700,11 +24700,11 @@ __metadata:

"typescript@patch:typescript@npm%3A^5.6.3#optional!builtin<compat/typescript>":
version: 5.6.3
resolution: "typescript@patch:typescript@npm%3A5.6.3#optional!builtin<compat/typescript>::version=5.6.3&hash=b45daf"
resolution: "typescript@patch:typescript@npm%3A5.6.3#optional!builtin<compat/typescript>::version=5.6.3&hash=8c6c40"
bin:
tsc: bin/tsc
tsserver: bin/tsserver
checksum: 10c0/ac8307bb06bbfd08ae7137da740769b7d8c3ee5943188743bb622c621f8ad61d244767480f90fbd840277fbf152d8932aa20c33f867dea1bb5e79b187ca1a92f
checksum: 10c0/7c9d2e07c81226d60435939618c91ec2ff0b75fbfa106eec3430f0fcf93a584bc6c73176676f532d78c3594fe28a54b36eb40b3d75593071a7ec91301533ace7
languageName: node
linkType: hard

Expand Down
Loading