Skip to content

Commit

Permalink
Update dependencies to latest compatible versions (#716)
Browse files Browse the repository at this point in the history
  • Loading branch information
daneah authored Mar 13, 2024
1 parent e396a02 commit 976ac61
Show file tree
Hide file tree
Showing 29 changed files with 4,225 additions and 3,543 deletions.
12 changes: 2 additions & 10 deletions .storybook/docsPageConfig.jsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,5 @@
import React from 'react';
import {
ArgsTable,
Description,
Primary,
PRIMARY_STORY,
Stories,
Subtitle,
Title,
} from '@storybook/addon-docs';
import { Controls, Description, Primary, Stories, Subtitle, Title } from '@storybook/addon-docs';

import { GuidelineLink } from '@config/GuidelineLink';

Expand All @@ -19,7 +11,7 @@ export const configureDocsPage = (componentName) => {
<Description />
{componentName && <GuidelineLink path={componentName} />}
<Primary />
<ArgsTable story={PRIMARY_STORY} />
<Controls />
<Stories />
</>
);
Expand Down
7 changes: 1 addition & 6 deletions .storybook/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,7 @@ import path from 'path';

const config = {
stories: [],
addons: [
'@storybook/addon-a11y',
'@storybook/addon-styling',
'@storybook/addon-essentials',
'@storybook/addon-links',
],
addons: ['@storybook/addon-a11y', '@storybook/addon-essentials', '@storybook/addon-links'],
features: {
storyStoreV7: true,
},
Expand Down
2 changes: 1 addition & 1 deletion .storybook/main/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const fullConfig: StorybookConfig = {
name: '@storybook/web-components-vite',
options: {},
},
stories: [...config.stories, '../../packages/pharos/**/*.docs.stories.mdx'],
stories: [...config.stories, '../../packages/pharos/**/*.docs.mdx'],
refs: (config, { configType }) => {
const isDevelopment = configType === 'DEVELOPMENT';
return {
Expand Down
6 changes: 5 additions & 1 deletion .storybook/react/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,11 @@ const fullConfig: StorybookConfig = {
...config.stories,
{
directory: '../../packages/pharos',
files: '**/*.@(react|docs|pages).stories.@(js|jsx|mdx|tsx)',
files: '**/*.@(react|pages).stories.@(js|jsx|mdx|tsx)',
},
{
directory: '../../packages/pharos',
files: '**/*.docs.mdx',
},
],
};
Expand Down
6 changes: 5 additions & 1 deletion .storybook/wc/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,11 @@ const fullConfig: StorybookConfig = {
...config.stories,
{
directory: '../../packages/pharos',
files: '**/*.@(wc|docs|pages).stories.@(js|jsx|mdx|ts)',
files: '**/*.@(wc|pages).stories.@(js|jsx|mdx|ts)',
},
{
directory: '../../packages/pharos',
files: '**/*.docs.mdx',
},
],
};
Expand Down
Binary file modified .yarn/install-state.gz
Binary file not shown.
88 changes: 38 additions & 50 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,65 +54,64 @@
},
"homepage": "https://github.com/ithaka/pharos#readme",
"devDependencies": {
"@babel/core": "^7.15.5",
"@babel/eslint-parser": "^7.17.0",
"@babel/plugin-proposal-decorators": "^7.15.4",
"@babel/plugin-proposal-export-default-from": "^7.14.5",
"@babel/plugin-syntax-import-assertions": "^7.16.7",
"@babel/preset-env": "^7.15.6",
"@babel/core": "^7.24.0",
"@babel/eslint-parser": "^7.23.10",
"@babel/plugin-proposal-decorators": "^7.24.0",
"@babel/plugin-proposal-export-default-from": "^7.23.3",
"@babel/plugin-syntax-import-assertions": "^7.23.3",
"@babel/preset-env": "^7.24.0",
"@changesets/changelog-github": "^0.5.0",
"@changesets/cli": "^2.27.1",
"@commitlint/cli": "^15.0.0",
"@commitlint/config-conventional": "^15.0.0",
"@emotion/babel-plugin": "^11.9.2",
"@size-limit/preset-small-lib": "^7.0.4",
"@commitlint/cli": "^19.1.0",
"@commitlint/config-conventional": "^19.1.0",
"@emotion/babel-plugin": "^11.11.0",
"@size-limit/preset-small-lib": "^11.0.3",
"@storybook/addon-a11y": "^7.6.17",
"@storybook/addon-essentials": "^7.6.17",
"@storybook/addon-links": "^7.6.17",
"@storybook/addon-styling": "^1.3.5",
"@storybook/blocks": "^7.6.17",
"@storybook/manager-api": "^7.6.17",
"@storybook/react-vite": "^7.6.17",
"@storybook/theming": "^7.6.17",
"@storybook/web-components": "^7.6.17",
"@storybook/web-components-vite": "^7.6.17",
"@types/uuid": "^9.0.0",
"@typescript-eslint/eslint-plugin": "^6.9.0",
"@typescript-eslint/parser": "^6.9.0",
"all-contributors-cli": "^6.20.0",
"concurrently": "^6.2.0",
"cssnano": "^5.0.1",
"eslint": "^8.26.0",
"@types/uuid": "^9.0.8",
"@typescript-eslint/eslint-plugin": "^7.2.0",
"@typescript-eslint/parser": "^7.2.0",
"all-contributors-cli": "^6.26.1",
"concurrently": "^8.2.2",
"cssnano": "^6.1.0",
"eslint": "^8.57.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-jsx-a11y": "^6.5.1",
"eslint-plugin-lit": "^1.6.1",
"eslint-plugin-jsx-a11y": "^6.8.0",
"eslint-plugin-lit": "^1.11.0",
"eslint-plugin-mdx": "^1.16.0",
"eslint-plugin-no-smart-quotes": "^1.3.0",
"eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-react": "^7.32.2",
"eslint-plugin-react": "^7.34.0",
"eslint-plugin-react-hooks": "^4.6.0",
"eslint-plugin-storybook": "^0.6.15",
"eslint-plugin-wc": "^1.3.2",
"husky": "^7.0.0",
"lint-staged": "^12.0.2",
"lit": "^2.7.5",
"lit-analyzer": "^2.0.1",
"eslint-plugin-storybook": "^0.8.0",
"eslint-plugin-wc": "^2.0.4",
"husky": "^9.0.11",
"lint-staged": "^15.2.2",
"lit": "^2.8.0",
"lit-analyzer": "^2.0.3",
"markdown-toc": "^1.2.0",
"postcss": "^8.4.31",
"postcss-import": "^14.0.0",
"postcss": "^8.4.35",
"postcss-import": "^16.0.1",
"postcss-media-minmax": "^5.0.0",
"postcss-preset-env": "^8.4.2",
"postcss-preset-env": "^9.5.0",
"prettier": "^3.2.5",
"pretty-quick": "^4.0.0",
"react": "^17.0.0",
"react-dom": "^17.0.0",
"sass": "^1.63.6",
"size-limit": "^7.0.4",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"sass": "^1.71.1",
"size-limit": "^11.0.3",
"storybook": "^7.6.17",
"stylelint": "^15.10.1",
"stylelint-config-standard-scss": "^10.0.0",
"stylelint-scss": "^5.0.1",
"svglint": "^2.4.0",
"stylelint": "^16.2.1",
"stylelint-config-standard-scss": "^13.0.0",
"stylelint-scss": "^6.2.1",
"svglint": "^2.6.0",
"vite": "^4.5.2"
},
"workspaces": {
Expand All @@ -121,18 +120,7 @@
]
},
"resolutions": {
"@typescript-eslint/parser": "^6.9.0",
"axe-core": "^4.3.3",
"ansi-regex": "^5.0.1",
"nth-check": "^2.0.1",
"semver-regex": "^3.1.3",
"object-path": "^0.11.8",
"glob-parent": "^6.0.2",
"browserslist": "^4.16.5",
"trim": "^0.0.3",
"loader-utils": "^2.0.3",
"marked": "^4.0.10",
"json5": "^2.2.2"
"@custom-elements-manifest/analyzer": "0.9.0"
},
"size-limit": [
{
Expand Down
12 changes: 6 additions & 6 deletions packages/pharos-cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,20 @@
"preferGlobal": true,
"dependencies": {
"colors": "^1.4.0",
"commander": "^8.0.0",
"fs-extra": "^10.0.0"
"commander": "^12.0.0",
"fs-extra": "^11.2.0"
},
"bin": {
"pharos": "dist/index.js"
},
"devDependencies": {
"@types/jest": "^29.5.12",
"@types/node": "^20.11.25",
"@types/node": "^20.11.26",
"jest": "^29.7.0",
"ts-jest": "^29.1.1",
"ts-morph": "^21.0.1",
"ts-jest": "^29.1.2",
"ts-morph": "^22.0.0",
"ts-node": "^10.9.2",
"typescript": "^5.2.2"
"typescript": "^5.4.2"
},
"scripts": {
"test": "jest",
Expand Down
2 changes: 1 addition & 1 deletion packages/pharos-cli/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"compilerOptions": {
"baseUrl": ".",
"target": "es2019",
"target": "es2021",
"module": "commonjs",
"strict": true,
"allowJs": true,
Expand Down
2 changes: 1 addition & 1 deletion packages/pharos-site/gatsby-config.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ module.exports = {
},
siteUrl: 'https://pharos.jstor.org',
},
trailingSlash: 'never',
plugins: [
`gatsby-plugin-react-helmet`,
{
Expand Down Expand Up @@ -81,6 +82,5 @@ module.exports = {
allExtensions: true,
},
},
`gatsby-plugin-remove-trailing-slashes`,
],
};
41 changes: 20 additions & 21 deletions packages/pharos-site/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,35 +10,34 @@
"@mdx-js/mdx": "^1.6.22",
"@mdx-js/react": "^1.6.22",
"@webcomponents/scoped-custom-element-registry": "^0.0.3",
"gatsby": "^4.25.7",
"gatsby": "^4.25.8",
"gatsby-plugin-alias-imports": "^1.0.5",
"gatsby-plugin-google-tagmanager": "^4.2.0",
"gatsby-plugin-image": "^2.2.0",
"gatsby-plugin-manifest": "^4.2.0",
"gatsby-plugin-mdx": "^3.15.2",
"gatsby-plugin-offline": "^5.2.0",
"gatsby-plugin-react-helmet": "^5.2.0",
"gatsby-plugin-remove-trailing-slashes": "^4.2.0",
"gatsby-plugin-sass": "^5.2.0",
"gatsby-plugin-google-tagmanager": "^4.25.0",
"gatsby-plugin-image": "^2.25.0",
"gatsby-plugin-manifest": "^4.25.0",
"gatsby-plugin-mdx": "^3.20.0",
"gatsby-plugin-offline": "^5.25.0",
"gatsby-plugin-react-helmet": "^5.25.0",
"gatsby-plugin-sass": "^5.25.0",
"gatsby-plugin-sharp": "^4.25.1",
"gatsby-source-filesystem": "^4.2.0",
"gatsby-transformer-sharp": "^4.2.0",
"gatsby-source-filesystem": "^4.25.0",
"gatsby-transformer-sharp": "^4.25.0",
"prettier": "^3.2.5",
"prism-react-renderer": "^1.2.1",
"react": "^17.0.1",
"react-dom": "^17.0.1",
"prism-react-renderer": "^2.3.1",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-helmet": "^6.1.0",
"react-live": "^2.3.0",
"sass": "^1.63.6"
"react-live": "^2.4.1",
"sass": "^1.71.1"
},
"devDependencies": {
"@babel/plugin-transform-private-methods": "^7.23.3",
"@types/mdx-js__react": "^1.5.3",
"@types/mdx-js__react": "^1.5.8",
"@types/react": "^17.0.1",
"@types/react-dom": "^17.0.0",
"@types/react-helmet": "^6.1.0",
"babel-preset-gatsby": "^2.2.0",
"typescript": "^5.2.2"
"@types/react-dom": "^17.0.25",
"@types/react-helmet": "^6.1.11",
"babel-preset-gatsby": "^2.25.0",
"typescript": "^5.4.2"
},
"author": "ITHAKA",
"license": "MIT",
Expand Down
4 changes: 2 additions & 2 deletions packages/pharos-site/src/components/CodeBlock.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { FC, ReactElement } from 'react';
import ReactDOMServer from 'react-dom/server';
import Highlight, { defaultProps } from 'prism-react-renderer';
import { Highlight } from 'prism-react-renderer';
import type { Language } from 'prism-react-renderer';
import { LiveProvider, LiveEditor, LiveError, LivePreview } from 'react-live';
import { mdx } from '@mdx-js/react';
Expand Down Expand Up @@ -50,7 +50,7 @@ const CodeBlock: FC<CodeBlockProps> = ({ children, className, live, render }) =>
}

return (
<Highlight {...defaultProps} code={code.trim()} language={language}>
<Highlight code={code.trim()} language={language}>
{({ className, style, tokens, getLineProps, getTokenProps }) => (
<pre className={className} style={{ ...style, padding: '20px', whiteSpace: 'normal' }}>
{tokens.map((line, i) => (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@

.colorsContainer {
display: grid;
column-gap: var(--pharos-spacing-2-x);
row-gap: var(--pharos-spacing-2-x);
gap: var(--pharos-spacing-2-x);
}

.colorName {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@
}

.container_text {
align-self: center;
justify-self: center;
place-self: center;
text-align: center;
font-family: var(--pharos-font-family-body);
font-size: var(--pharos-spacing-one-and-a-half-x);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
display: grid;
grid-auto-flow: column;
grid-template-columns: repeat(3, 1fr);
row-gap: var(--pharos-spacing-2-x);
column-gap: var(--pharos-spacing-2-x);
gap: var(--pharos-spacing-2-x);
margin-bottom: var(--pharos-spacing-5-x);
}

Expand Down
6 changes: 3 additions & 3 deletions packages/pharos-site/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"compilerOptions": {
"target": "es2019",
"module": "es2015",
"lib": ["es2019", "dom", "dom.iterable", "esnext.array"],
"target": "es2021",
"module": "es2022",
"lib": ["es2021", "dom", "dom.iterable", "esnext.array"],
"jsx": "react-jsx",
"declaration": true,
"declarationMap": true,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { Markdown, Meta } from '@storybook/blocks';
import Intro from '../README.md?raw';
import PHAROS_TITLE from '@config/pharosTitle';

<Meta title="Pharos/Intro" />
<Meta title="Intro" />

export const Title = () => PHAROS_TITLE;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ import { Markdown, Meta } from '@storybook/blocks';

import Changelog from '../CHANGELOG.md?raw';

<Meta title="Pharos/Changelog" />
<Meta title="Changelog" />

<Markdown>{Changelog}</Markdown>
Loading

0 comments on commit 976ac61

Please sign in to comment.