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

feat: update to gatsby-theme-carbon v4 and gatsby v5 #3979

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
66 commits
Select commit Hold shift + click to select a range
6ca4542
feat: start migration
alisonjoseph Mar 18, 2024
ae34868
Update documentation.mdx
alisonjoseph Mar 18, 2024
9f5cb42
Update data-visualization.scss
alisonjoseph Mar 18, 2024
737e416
Update Grid.module.scss
alisonjoseph Mar 18, 2024
60e862f
chore: test
alisonjoseph Mar 19, 2024
e7460b3
chore: cleanup
alisonjoseph Mar 19, 2024
b0e435c
fix: all the things
alisonjoseph Mar 19, 2024
6edf9db
chore: extra file
alisonjoseph Mar 19, 2024
547ec93
chore: update package json
alisonjoseph Mar 19, 2024
79c8456
chore: stuff
alisonjoseph Mar 19, 2024
1195ebb
chore: more stuff
alisonjoseph Mar 19, 2024
fae8b30
chore: stuff
alisonjoseph Mar 19, 2024
d219002
Merge pull request #2 from alisonjoseph/gatsby-upgrade-testing
alisonjoseph Mar 19, 2024
22129f6
chore: prettier
alisonjoseph Mar 19, 2024
309d1cd
chore: remove random image
alisonjoseph Mar 19, 2024
7f42308
chore: missing stuff
alisonjoseph Mar 19, 2024
06758a4
chore: prettier version
alisonjoseph Mar 19, 2024
55ce21a
chore: prettier
alisonjoseph Mar 19, 2024
4048c66
chore: quotes
alisonjoseph Mar 19, 2024
ef2ced3
chore: quotes
alisonjoseph Mar 19, 2024
c8adfd6
chore: nvm
alisonjoseph Mar 19, 2024
b6e3aa0
chore: stuff
alisonjoseph Mar 19, 2024
5908cda
chore: resource links
alisonjoseph Mar 19, 2024
37cfd1f
chore: uncomment css
alisonjoseph Mar 19, 2024
7c09518
chore: missing file
alisonjoseph Mar 19, 2024
e605087
chore: add eslint
alisonjoseph Mar 19, 2024
d7187cf
chore: packages
alisonjoseph Mar 19, 2024
ca7896e
chore: missing packages
alisonjoseph Mar 20, 2024
bccc0ea
chore: cleanup
alisonjoseph Mar 20, 2024
78e9c8b
chore: add remark images
alisonjoseph Mar 20, 2024
09c02a1
chore: fix build
alisonjoseph Mar 20, 2024
b84e3f0
chore: cleanup
alisonjoseph Mar 20, 2024
9e174ea
fix: get carbon react version from gatsby theme
alisonjoseph Mar 20, 2024
cec1129
chore: update to latest theme
alisonjoseph Mar 21, 2024
cd1638b
chore: update gatsby-theme-carbon 4.0.0-next.9
alisonjoseph Apr 17, 2024
8a10346
chore: update theme version
alisonjoseph Apr 22, 2024
80b716e
chore: update carbon and theme to latest
alisonjoseph May 24, 2024
a35dee5
chore: yarn install state
alisonjoseph May 24, 2024
5b8346e
chore: fix merge conflicts
alisonjoseph May 24, 2024
a6cba36
chore: eslint carbon version
alisonjoseph May 24, 2024
ed55935
chore: fix lint errors
alisonjoseph May 24, 2024
ef52b0f
chore: update to latest
alisonjoseph May 28, 2024
04c4335
chore: merge conflicts
alisonjoseph Jun 12, 2024
974cc45
chore; remove install state
alisonjoseph Jun 12, 2024
4bf23f4
chore: fix
alisonjoseph Jun 12, 2024
6c4a36d
chore: install state
alisonjoseph Jun 12, 2024
59fd9a0
chore: remove install state
alisonjoseph Jun 12, 2024
59e0170
chore: gitignore
alisonjoseph Jun 12, 2024
62f397c
chore: merge conflicts
alisonjoseph Jun 12, 2024
4b45ae2
fix: breaking build encode brackets
alisonjoseph Jun 13, 2024
c7f3475
chore: merge conflict
alisonjoseph Jun 19, 2024
7f49417
chore: update icon and pictogram versions
alisonjoseph Jun 19, 2024
df30fb9
chore: prettier
alisonjoseph Jun 19, 2024
35127e2
chore: revert to older icons package
alisonjoseph Jun 25, 2024
1b6ef20
fix: meetups styles and content switcher size
alisonjoseph Jun 25, 2024
6ba5e9a
chore: merge changes in from main branch
alisonjoseph Jul 25, 2024
e0a90e9
fix: image path and style bugs
alisonjoseph Jul 25, 2024
61cea37
chore: fix lockfile
alisonjoseph Jul 25, 2024
263b4b9
chore: fix
alisonjoseph Jul 25, 2024
197ba90
chore: fix lockfile
alisonjoseph Jul 25, 2024
411395e
chore: update icons and theme to latest version
alisonjoseph Jul 25, 2024
e8ee66a
chore: merge
alisonjoseph Aug 12, 2024
2326b08
chore: merge
alisonjoseph Aug 12, 2024
c97fffc
chore: yarn version fix ci
alisonjoseph Aug 12, 2024
10d7a0d
chore: fix merge conflicts
alisonjoseph Sep 10, 2024
405a505
chore: format
alisonjoseph Sep 10, 2024
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
11 changes: 7 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@
![Deployment status](https://github.com/carbon-design-system/carbon-website/workflows/Deployment%20status/badge.svg)

This is the [Carbon Design System website](http://www.carbondesignsystem.com).
It's built using the [gatsby-theme-carbon](https://gatsby.carbondesignsystem.com/)
with [GatsbyJS](https://www.gatsbyjs.org/).
It's built using the
[gatsby-theme-carbon](https://gatsby.carbondesignsystem.com/) with
[GatsbyJS](https://www.gatsbyjs.org/).

## 📂 Structure

Expand All @@ -22,8 +23,10 @@ src
## 👩‍💻 Develop

- 🤝 [Contribution guidelines](.github/CONTRIBUTING.md)
- 📚 [Content and Markdown guidelines](https://gatsby-theme-carbon.now.sh/components/markdown)
- 🗺 [Navigation guidelines](https://gatsby-theme-carbon.now.sh/guides/navigation/sidebar)
- 📚
[Content and Markdown guidelines](https://gatsby-theme-carbon.now.sh/components/markdown)
- 🗺
[Navigation guidelines](https://gatsby-theme-carbon.now.sh/guides/navigation/sidebar)

- `yarn install` – install dependencies
- `yarn dev` – start the development server
Expand Down
27 changes: 11 additions & 16 deletions gatsby-config.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
const path = require('path');

module.exports = {
trailingSlash: `always`,
siteMetadata: {
title: 'Carbon Design System',
siteUrl: 'https://www.carbondesignsystem.com',
Expand Down Expand Up @@ -38,6 +39,16 @@ module.exports = {
'gatsby-plugin-sharp',
'gatsby-transformer-sharp',
'gatsby-plugin-lodash',
{
resolve: 'gatsby-plugin-manifest',
options: {
name: 'Carbon Design System',
short_name: 'Carbon',
icon: 'src/images/favicon.svg',
start_url: '/',
display: 'browser',
},
},
{
resolve: 'gatsby-theme-carbon',
options: {
Expand All @@ -55,28 +66,12 @@ module.exports = {
},
},
},
{
resolve: 'gatsby-plugin-manifest',
options: {
name: 'Carbon Design System',
short_name: 'Carbon',
icon: 'src/images/favicon.svg',
},
},
'gatsby-plugin-sitemap',
{
resolve: 'gatsby-plugin-component-index',
options: {
directory: path.resolve(__dirname, './src/data/index'),
},
},
{
resolve: 'gatsby-plugin-chart-index',
options: {
directory: path.resolve(__dirname, './src/data/chart-index'),
},
},
'gatsby-plugin-remove-serviceworker',
'gatsby-plugin-meta-redirect',
],
};
6 changes: 3 additions & 3 deletions gatsby-ssr.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export const onRenderBody = ({ setHeadComponents, setPostBodyComponents }) => {
}`;

setHeadComponents([
<meta key="image" name="image" content={'/ogimage.png'} />,
<meta key="image" name="image" content={"/ogimage.png"} />,
<meta
key="og:url"
property="og:url"
Expand All @@ -33,13 +33,13 @@ export const onRenderBody = ({ setHeadComponents, setPostBodyComponents }) => {
property="og:description"
content="Carbon is IBM’s open source design system for products and digital experiences. With the IBM Design Language as its foundation, the system consists of working code, design tools and resources, human interface guidelines, and a vibrant community of contributors."
/>,
<meta key="og:image" property="og:image" content={'/ogimage.png'} />,
<meta key="og:image" property="og:image" content={"/ogimage.png"} />,
<meta
key="og:image:alt"
property="og:image:alt"
content="Carbon Design System logo"
/>,
<meta key="twitter:image" name="twitter:image" content={'/ogimage.png'} />,
<meta key="twitter:image" name="twitter:image" content={"/ogimage.png"} />,
<meta
key="twitter:image:alt"
property="twitter:image:alt"
Expand Down
88 changes: 28 additions & 60 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
{
"name": "carbondesignsystem",
"private": true,
"version": "1.0.0",
"main": "index.js",
"version": "2.0,0",
"license": "MIT",
"workspaces": {
"packages": [
Expand All @@ -18,8 +17,8 @@
"build:analyze": "yarn install --force && yarn clean && ANALYZE=true yarn build",
"serve": "gatsby serve",
"lint:js": "NODE_ENV=test eslint . --fix",
"format": "prettier --write 'src/**/*.{css,scss,json,html,yaml,md,mdx}'",
"format:check": "prettier --check 'src/**/*.{css,scss,json,html,yaml,md,mdx}'",
"format": "prettier --write 'src/**/*.{css,scss,json,html,yaml,md,mdx,js}'",
"format:check": "prettier --check 'src/**/*.{css,scss,json,html,yaml,md,mdx,js}'",
"update-browserslist": "npx browserslist-ga"
},
"engines": {
Expand All @@ -37,69 +36,38 @@
"/node_modules/*"
],
"dependencies": {
"@babel/core": "^7.15.8",
"@carbon/charts-react": "0.55.0",
"@carbon/elements": "^11.51.0",
"@carbon/icons": "^11.47.0",
"@carbon/icons-react": "^11.47.0",
"@carbon/pictograms": "^12.38.0",
"@carbon/pictograms-react": "^11.64.0",
"@carbon/react": "^1.64.0",
"@loadable/component": "^5.15.2",
"@slack/web-api": "^5.11.0",
"babel-preset-env": "^1.7.0",
"babel-preset-gatsby": "^2.9.0",
"change-case": "^4.1.1",
"classnames": "^2.2.6",
"codesandbox": "^2.1.10",
"copy-to-clipboard": "^3.2.1",
"fuse.js": "^6.4.1",
"gatsby": "^4.25.7",
"gatsby-image": "^3.7.1",
"gatsby-plugin-image": "^2.9.0",
"gatsby-theme-carbon": "^3.4.19",
"lodash-es": "^4.17.15",
"markdown-it": "^12.3.2",
"nanoid": "^2.1.11",
"prettier-config-carbon": "^0.4.0",
"prop-types": "^15.7.2",
"react": "^17.0.2",
"react-copy-to-clipboard": "^5.0.1",
"react-dom": "^17.0.2",
"react-live": "^3.1.0",
"use-media": "^1.4.0",
"webpack": "^5.94.0"
"@carbon/icons-react": "^11.48.0",
"@carbon/pictograms": "^12.39.0",
"@carbon/pictograms-react": "^11.65.0",
"@loadable/babel-plugin": "^5.16.1",
"@loadable/component": "^5.16.4",
"codesandbox": "^2.2.3",
"d3": "^7.9.0",
"gatsby": "^5.13.5",
"gatsby-plugin-sharp": "^5.13.1",
"gatsby-theme-carbon": "^4.0.8",
"markdown-it": "^14.1.0",
"prettier-config-carbon": "^0.11.0",
"react": "^18.2.0",
"react-copy-to-clipboard": "^5.1.0",
"react-dom": "^18.2.0"
},
"devDependencies": {
"@loadable/babel-plugin": "^5.12.0",
"@loadable/webpack-plugin": "^5.15.2",
"@now/node": "^1.6.1",
"@philpl/buble": "^0.19.7",
"babel-eslint": "^10.1.0",
"babel-preset-carbon": "^0.0.14",
"core-js": "^3.18.3",
"d3": "7.0.0",
"dotenv": "^8.2.0",
"eslint": "^8.36.0",
"eslint-config-carbon": "^3.1.0",
"fs-extra": "^9.0.1",
"gatsby-plugin-lodash": "^5.9.0",
"gatsby-plugin-manifest": "^4.9.0",
"gatsby-plugin-meta-redirect": "^1.1.1",
"gatsby-plugin-remove-serviceworker": "^1.0.0",
"gatsby-plugin-sharp": "^4.25.1",
"gatsby-plugin-sitemap": "^5.9.0",
"gatsby-remark-images": "^6.9.0",
"gatsby-source-filesystem": "^4.9.0",
"gatsby-transformer-sharp": "^4.9.0",
"html-loader": "^3.1.0",
"husky": "^4.2.3",
"eslint": "^8.57.0",
"eslint-config-carbon": "3.15.0",
"gatsby-plugin-lodash": "^6.13.1",
"gatsby-plugin-sitemap": "^6.13.1",
"gatsby-source-filesystem": "^5.13.1",
"gatsby-transformer-sharp": "^5.13.1",
"html-loader": "^5.1.0",
"husky": "^9.0.11",
"lint-staged": ">=10.0.9",
"markdown-loader": "^6.0.0",
"node-fetch": "^2.6.1",
"markdown-loader": "^8.0.0",
"prettier": "^2.0.2",
"prismjs": "^1.17.1",
"use-resize-observer": "^4.0.0"
"typescript": "^4.8.4"
},
"husky": {
"hooks": {
Expand Down
3 changes: 2 additions & 1 deletion src/components/ColorPalette/ColorPalette.js
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,8 @@ const ColorPalette = ({
onChange={handleKeyboard}
className={paletteSwitcher}
selectionMode="automatic"
selectedIndex={0}>
selectedIndex={0}
size="lg">
<Switch text={switcherOne} onClick={activateFirstSwitcher} />
<Switch text={switcherTwo} onClick={activateSecondSwitcher} />
</ContentSwitcher>
Expand Down
8 changes: 2 additions & 6 deletions src/components/ColorPalette/ColorPalette.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@
}

.palette-switcher :global(.cds--content-switcher-btn) {
border-radius: 0;
color: $text-01;
border-radius: 0 !important;
}

.palette-switcher :global(.cds--content-switcher--selected) {
Expand All @@ -67,11 +67,7 @@
.palette-switcher :global(.cds--content-switcher-btn:focus) {
outline: 1px solid $inverse-focus-ui;
box-shadow: none;
outline-offset: -4px;
}

.palette-switcher :global(.cds--content-switcher-btn) {
border-radius: 0;
outline-offset: -5px;
}

.palette-switcher
Expand Down
Loading
Loading