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

chore(release): merge next into main #1266

Merged
merged 34 commits into from
Oct 24, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
74c2c38
breaking: upgrade gatsby dependencies to v4
vpicone Oct 22, 2021
5ea4364
chore: release 3.0.0-next.0
vpicone Oct 22, 2021
7295bbb
chore(theme): update to 4.4 (#1203)
sstrubberg Jan 10, 2022
0415ebc
chore: release 3.0.0-next.1
sstrubberg Jan 10, 2022
b5e704d
chore(next): update with latest from main (#1226)
tay1orjones Mar 3, 2022
9a4c2c8
feat: V11 migration for gatsby-theme (#1209)
Mar 3, 2022
a6e4171
chore: release 3.0.0-next.2
tay1orjones Mar 3, 2022
b52435f
chore: release 3.0.0-next.2
tay1orjones Mar 3, 2022
dbac708
chore(project): update carbon deps (#1228)
tay1orjones Mar 5, 2022
e0264a5
chore: release 3.0.0-next.3
tay1orjones Mar 7, 2022
ce4f0ca
Remove all usages of carbon components on `next` (#1229)
tay1orjones Mar 8, 2022
9118c88
fix(inlinenotification): re-enable inline links (#1231)
tay1orjones Mar 8, 2022
a04473b
chore: release 3.0.0-next.4
tay1orjones Mar 8, 2022
ec75236
chore(project): update to carbon 10.56.0, correct style import order …
tay1orjones Mar 29, 2022
f301046
chore: release 3.0.0-next.5
tay1orjones Mar 29, 2022
c92c364
fix(overlays): correct z-index for backtotop and launch buttons
tay1orjones Mar 29, 2022
6d38fc4
chore: release 3.0.0-next.6
tay1orjones Mar 29, 2022
dc74868
fix(codeblock): use correct font-family
tay1orjones Mar 29, 2022
6a4b9aa
chore: release 3.0.0-next.7
tay1orjones Mar 29, 2022
9cb74f6
chore(project): update carbon dependencies, related fixes
tay1orjones Mar 30, 2022
c3e7a0d
chore: release 3.0.0-next.8
tay1orjones Mar 30, 2022
8e0da01
chore(project): update carbon to v11, related import/usage fixes
tay1orjones Mar 31, 2022
86b32aa
chore: release 3.0.0-next.9
tay1orjones Mar 31, 2022
9669ada
feat(type): update carbon deps, ensure type-classes are emitted with …
tay1orjones Apr 29, 2022
374476c
chore: release 3.0.0-next.10
tay1orjones Apr 29, 2022
4d3c1ad
fix(grid): add _grid.scss and move over flex grid for precedence (#1242)
dakahn May 18, 2022
585012d
chore: release 3.0.0-next.11
tay1orjones May 18, 2022
a319516
fix(markdown): ensure links within lists do not have padding (#1246)
tay1orjones Jun 16, 2022
e5fdb14
chore: release 3.0.0-next.12
tay1orjones Jun 16, 2022
4705525
chore(project): update changelog
tay1orjones Jul 20, 2022
8bece93
feat(gtc): upgrade to v4 Gatsby, v11 Carbon, and associated docs (#1261)
sstrubberg Sep 13, 2022
cf04b02
chore(deps): update carbon deps
tay1orjones Oct 5, 2022
7f3c78b
chore: release 3.0.0-next.13
tay1orjones Oct 5, 2022
facddae
Merge branch 'main' of github.com:carbon-design-system/gatsby-theme-c…
tay1orjones Oct 24, 2022
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
3 changes: 2 additions & 1 deletion .stylelintrc
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
"composes"
]
}
]
],
"no-descending-specificity": null
}
}
69 changes: 65 additions & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,74 @@
### [2.3.2](https://github.com/carbon-design-system/gatsby-theme-carbon/compare/v2.3.1...v2.3.2) (2022-07-26)
## [3.0.0-next.13](https://github.com/carbon-design-system/gatsby-theme-carbon/compare/v3.0.0-next.12...v3.0.0-next.13) (2022-10-05)

### [2.3.1](https://github.com/carbon-design-system/gatsby-theme-carbon/compare/v2.3.0...v2.3.1) (2022-05-03)

### Features

* **gtc:** upgrade to v4 Gatsby, v11 Carbon, and associated docs ([#1261](https://github.com/carbon-design-system/gatsby-theme-carbon/issues/1261)) ([8bece93](https://github.com/carbon-design-system/gatsby-theme-carbon/commit/8bece9302c6851dc8f3a7d3ddc2fe78af3719efe))

## [3.0.0-next.13](https://github.com/carbon-design-system/gatsby-theme-carbon/compare/v3.0.0-next.12...v3.0.0-next.13) (2022-06-16)

## [3.0.0-next.12](https://github.com/carbon-design-system/gatsby-theme-carbon/compare/v3.0.0-next.11...v3.0.0-next.12) (2022-06-16)


### Bug Fixes

* **expressive-list-container:** remove margin-top from first content element ([#1240](https://github.com/carbon-design-system/gatsby-theme-carbon/issues/1240)) ([86ad4ab](https://github.com/carbon-design-system/gatsby-theme-carbon/commit/86ad4ab99f956c260247f47bc843edef1b404f9b))
* **link:** correct link to Cirrus getting started ([#1237](https://github.com/carbon-design-system/gatsby-theme-carbon/issues/1237)) ([e83a793](https://github.com/carbon-design-system/gatsby-theme-carbon/commit/e83a793861c495ca160d5209957e0078a40688be))
* **markdown:** ensure links within lists do not have padding ([#1246](https://github.com/carbon-design-system/gatsby-theme-carbon/issues/1246)) ([a319516](https://github.com/carbon-design-system/gatsby-theme-carbon/commit/a319516454199c1415e4df3296f4b96d83f9291c))

## [3.0.0-next.11](https://github.com/carbon-design-system/gatsby-theme-carbon/compare/v3.0.0-next.10...v3.0.0-next.11) (2022-05-18)


### Bug Fixes

* **grid:** add _grid.scss and move over flex grid for precedence ([#1242](https://github.com/carbon-design-system/gatsby-theme-carbon/issues/1242)) ([4d3c1ad](https://github.com/carbon-design-system/gatsby-theme-carbon/commit/4d3c1ad6e699c7bbf5013f7cf0daea0153bed469))

## [3.0.0-next.10](https://github.com/carbon-design-system/gatsby-theme-carbon/compare/v3.0.0-next.9...v3.0.0-next.10) (2022-04-29)


### Features

* **type:** update carbon deps, ensure type-classes are emitted with proper prefix ([9669ada](https://github.com/carbon-design-system/gatsby-theme-carbon/commit/9669adaad87e1534411a7f9a61acab0b01f07ff7))

## [3.0.0-next.9](https://github.com/carbon-design-system/gatsby-theme-carbon/compare/v3.0.0-next.8...v3.0.0-next.9) (2022-03-31)

## [3.0.0-next.8](https://github.com/carbon-design-system/gatsby-theme-carbon/compare/v3.0.0-next.7...v3.0.0-next.8) (2022-03-30)

## [3.0.0-next.7](https://github.com/carbon-design-system/gatsby-theme-carbon/compare/v3.0.0-next.6...v3.0.0-next.7) (2022-03-29)


### Bug Fixes

* **codeblock:** use correct font-family ([dc74868](https://github.com/carbon-design-system/gatsby-theme-carbon/commit/dc74868498109a44c4a90b1ae56ab2c243ceb7a1))

## [3.0.0-next.6](https://github.com/carbon-design-system/gatsby-theme-carbon/compare/v3.0.0-next.5...v3.0.0-next.6) (2022-03-29)


### Bug Fixes

* **overlays:** correct z-index for backtotop and launch buttons ([c92c364](https://github.com/carbon-design-system/gatsby-theme-carbon/commit/c92c364e086cc605bde9dd051c9395adb9e754b6))

## [3.0.0-next.5](https://github.com/carbon-design-system/gatsby-theme-carbon/compare/v3.0.0-next.4...v3.0.0-next.5) (2022-03-29)

## [3.0.0-next.4](https://github.com/carbon-design-system/gatsby-theme-carbon/compare/v3.0.0-next.3...v3.0.0-next.4) (2022-03-08)


### Bug Fixes

* **inlinenotification:** re-enable inline links ([#1231](https://github.com/carbon-design-system/gatsby-theme-carbon/issues/1231)) ([9118c88](https://github.com/carbon-design-system/gatsby-theme-carbon/commit/9118c88c46f955497212afe9e5165cd5724bd30c))

## [3.0.0-next.3](https://github.com/carbon-design-system/gatsby-theme-carbon/compare/v3.0.0-next.2...v3.0.0-next.3) (2022-03-07)

## [3.0.0-next.3](https://github.com/carbon-design-system/gatsby-theme-carbon/compare/v3.0.0-next.2...v3.0.0-next.3) (2022-03-03)

## [3.0.0-next.2](https://github.com/carbon-design-system/gatsby-theme-carbon/compare/v3.0.0-next.1...v3.0.0-next.2) (2022-03-03)


### Features

* V11 migration for gatsby-theme ([#1209](https://github.com/carbon-design-system/gatsby-theme-carbon/issues/1209)) ([9a4c2c8](https://github.com/carbon-design-system/gatsby-theme-carbon/commit/9a4c2c8171cbc38d11dc4f8460b4c9ae2874b233)), closes [#1176](https://github.com/carbon-design-system/gatsby-theme-carbon/issues/1176) [#1185](https://github.com/carbon-design-system/gatsby-theme-carbon/issues/1185) [#1176](https://github.com/carbon-design-system/gatsby-theme-carbon/issues/1176) [#1181](https://github.com/carbon-design-system/gatsby-theme-carbon/issues/1181) [#1190](https://github.com/carbon-design-system/gatsby-theme-carbon/issues/1190) [#1193](https://github.com/carbon-design-system/gatsby-theme-carbon/issues/1193) [#1192](https://github.com/carbon-design-system/gatsby-theme-carbon/issues/1192) [#1196](https://github.com/carbon-design-system/gatsby-theme-carbon/issues/1196)

## [3.0.0-next.1](https://github.com/carbon-design-system/gatsby-theme-carbon/compare/v3.0.0-next.0...v3.0.0-next.1) (2022-01-10)

## [3.0.0-next.0](https://github.com/carbon-design-system/gatsby-theme-carbon/compare/v2.1.4...v3.0.0-next.0) (2021-10-22)
## [2.3.0](https://github.com/carbon-design-system/gatsby-theme-carbon/compare/v2.2.0...v2.3.0) (2022-02-17)


Expand Down
7 changes: 3 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
},
"license": "Apache 2.0",
"engines": {
"node": "12.x || 14.x || 16.x"
"node": "14.x || 16.x"
},
"workspaces": [
"packages/*"
Expand All @@ -17,7 +17,6 @@
"dev:clean": "yarn workspace example dev:clean",
"build": "yarn workspace example build",
"build:clean": "yarn workspace example build:clean",
"build:analyze": "ANALYZE=true yarn workspace example build",
"build:prefix": "yarn workspace example build --prefix-paths",
"serve": "yarn build && yarn workspace example serve",
"serve:prefix": "yarn build:prefix && yarn workspace example serve --prefix-paths",
Expand Down Expand Up @@ -93,7 +92,7 @@
"husky": "^4.2.3",
"lerna": "^3.22.1",
"lint-staged": "^10.0.9",
"prettier": "^2.0.2",
"prettier": "^2.5.1",
"prettier-config-carbon": "^0.2.0",
"release-it": "^14.6.1",
"release-it-yarn-workspaces": "^2.0.1",
Expand All @@ -102,5 +101,5 @@
"stylelint-scss": "^3.16.0",
"yarn": "^1.22.4"
},
"version": "2.3.2"
"version": "3.0.0-next.13"
}
6 changes: 3 additions & 3 deletions packages/example/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "example",
"private": true,
"version": "2.3.2",
"version": "3.0.0-next.13",
"license": "Apache 2.0",
"scripts": {
"dev": "gatsby develop -H 0.0.0.0",
Expand All @@ -12,8 +12,8 @@
"clean": "gatsby clean"
},
"dependencies": {
"gatsby": "^3.3.1",
"gatsby-theme-carbon": "^2.3.2",
"gatsby": "^4.21.1",
"gatsby-theme-carbon": "^3.0.0-next.13",
"react": "^17.0.2",
"react-dom": "^17.0.2"
}
Expand Down
2 changes: 1 addition & 1 deletion packages/example/src/components/Homepage.module.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.callout-link {
@include carbon--type-style('body-long-02');
@include type-style('body-long-02');
display: table-cell; // like display block, but the width fits to content rather than 100%
position: relative;
top: $spacing-06; //margin-top doesn't work on table-cell, and padding-top looks weird on focus
Expand Down
2 changes: 2 additions & 0 deletions packages/example/src/data/nav-items.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@
path: /guides/styling
- title: v2.0 Migration
path: /guides/v2-migration
- title: v3.0 Migration
path: /guides/v3-migration
- title: Components
pages:
- title: Accordion
Expand Down
2 changes: 1 addition & 1 deletion packages/example/src/pages/components/Grid.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ repo.

## Row

The `<Row>` component is a wrapper that adds the `bx--row` class to a wrapper
The `<Row>` component is a wrapper that adds the `cds--row` class to a wrapper
div. You will want to use this to define rows that you will place `<Column>`
components inside of.

Expand Down
4 changes: 2 additions & 2 deletions packages/example/src/pages/contributions.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -177,8 +177,8 @@ with the
[global selector](https://github.com/css-modules/css-modules#exceptions).

```scss
:global(.bx--grid) .codeBlock {
@include carbon--type-style('code-01');
:global(.cds--grid) .codeBlock {
@include type-style('code-01');
}
```

Expand Down
15 changes: 3 additions & 12 deletions packages/example/src/pages/demo/index.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,12 @@ description: Demonstration of some of the theme components in action.

<PageDescription>


This page is meant to demonstrate some of the components in action. You can
check out the markdown used for this page
[on github](https://github.com/carbon-design-system/gatsby-theme-carbon/blob/main/packages/example/src/pages/demo/index.mdx).

</PageDescription>


<AnchorLinks>
<AnchorLink>Building bonds</AnchorLink>
<AnchorLink>Global accessibility standards</AnchorLink>
Expand All @@ -28,7 +26,6 @@ check out the markdown used for this page
actionIcon="arrowRight"
>


![Dark article layout mockup](/images/Article_06.png)

</ArticleCard>
Expand All @@ -40,7 +37,6 @@ check out the markdown used for this page
actionIcon="arrowRight"
>


![Dark article layout mockup](/images/Article_06.png)

</ArticleCard>
Expand All @@ -52,25 +48,21 @@ check out the markdown used for this page
actionIcon="arrowRight"
>


![Dark article layout mockup](/images/Article_06.png)

</ArticleCard>
</Column>
</Row>


<PageDescription>


Prow scuttle parrel provost Sail ho shrouds spirits boom mizzenmast yardarm.
Pinnace holystone mizzenmast quarter crow’s nest nipperkin grog yardarm hempen
halter furl. Swab barque interloper chantey doubloon starboard grog black jack
gangway rutters.

</PageDescription>


Prow scuttle parrel provost Sail ho shrouds spirits boom mizzenmast yardarm.
Pinnace holystone mizzenmast quarter crow’s nest nipperkin grog yardarm hempen
halter furl. Swab barque interloper chantey doubloon starboard grog black jack
Expand All @@ -79,7 +71,6 @@ gangway rutters.
<Row>
<Column colMd={5} colLg={8}>


## Section heading

Prow scuttle parrel provost Sail ho shrouds spirits boom mizzenmast yardarm.
Expand All @@ -97,7 +88,6 @@ can improve business, society and the human condition.
<Column colMd={2} colLg={3} offsetMd={1} offsetLg={1}>
<Aside>


<p>
<strong>
Good design is always
Expand All @@ -113,7 +103,6 @@ stylistic terms, but the modernist attitudes and approach used at the time.
</Column>
</Row>


## Small anchor links

Swab barque interloper™ chantey doubloon starboard grog black jack gangway
Expand Down Expand Up @@ -149,7 +138,9 @@ gangway rutters.

- This is a demonstration of an unordered list item. This list item is
particularly long to demonstrate how the text wraps and aligns with the first
line.
line. With `a code snippet` and `yet another code snippet` and also then
[a link as well](http://carbondesignsystem.com/). This is also a
[a second link](http://carbondesignsystem.com/).
- This is a nested list item, it should wrap in the same way. Typically,
nested list items should be of the same type (ordered, unordered) as their
parent.
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions packages/example/src/pages/guides/styling.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@ for you to share your component with other theme consumers down the line.
Every Sass file in your project automatically has access to the the following
carbon resources:

- colors – `background: carbon--gray-10;`
- colors – `background: gray-10;`
- spacing - `margin: $spacing-05;`
- theme-tokens - `color: $text-01;`
- motion -
`transition: all $duration--moderate-01 motion(entrance, productive);`
- typography - `@include carbon--type-style('body-long-01');`
`transition: all $duration-moderate-01 motion(entrance, productive);`
- typography - `@include type-style('body-long-01');`

## Targeting theme components

Expand Down
28 changes: 14 additions & 14 deletions packages/example/src/pages/guides/v2-migration.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,14 @@ description: Guide for migrating to v2.0 of the theme

<PageDescription>

Earlier this year, Gatsby released `v3` of their library. This update introduces
several big improvements to Gatsby sites including incremental builds, fast
refresh, and image processing. The major version change comes with the potential
for breaking changes, this guide aims to cover the most likely issues a site
built with the Carbon Gatsby theme might encounter.
This update introduces several big improvements to Gatsby sites including
incremental builds, fast refresh, and image processing. The major version change
comes with the potential for breaking changes, this guide aims to cover the most
likely issues a site built with the Carbon Gatsby theme might encounter.

</PageDescription>

## Breaking Changes
## Breaking changes

1. Bumped minimum version of Gatsby to `v3`
2. Removed the `emotion` theme provider and its dependenices.
Expand Down Expand Up @@ -61,24 +60,25 @@ equivalent if your project uses `npm` as its package manager.
```js path=Before
import styles from './MySpan.module.scss';
import metadata from './metadata.json';

const MySpan = () => <span className={styles.mySpan} />;
```

```js path=After
import { mySpan } from './MySpan.module.scss';
// Or import * as styles from './MySpan.module.scss'

import * as metadata from './metadata.json';

const MySpan = () => <span className={mySpan} />;
```
4. Make sure to update the path of your shadowed components (Footer and Header).

5. Make sure to update the path of your shadowed components (Footer and Header).
- Create a folder each for `Footer` and `Header`.
- Change the file name to `index.js` inside each corresponding folder. More info can be found in the [shadowing docs](https://gatsby-theme-carbon.vercel.app/guides/shadowing/#shadowing-basics)
5. If you have a custom webpack config, be sure your config is compatible with [Webpack 5](https://webpack.js.org/migrate/5/) (the version Gatsby 3 uses)
6. Run `npx gatsby clean` to delete your projects development bundle
7. Run `yarn dev`
- Change the file name to `index.js` inside each corresponding folder. More
info can be found in the
[shadowing docs](https://gatsby-theme-carbon.vercel.app/guides/shadowing/#shadowing-basics)
6. If you have a custom webpack config, be sure your config is compatible with
[Webpack 5](https://webpack.js.org/migrate/5/) (the version Gatsby 3 uses)
7. Run `npx gatsby clean` to delete your projects development bundle
8. Run `yarn dev`

## Troubleshooting

Expand Down
Loading