Skip to content

Commit c6ff056

Browse files
LinKCodingLinKCoding
authored
Merge branch 'main' into ajr-selectdropdown-fix
2 parents cbe1de8 + f5fb9f0 commit c6ff056

File tree

62 files changed

+514
-246
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+514
-246
lines changed

‎README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,13 @@ We provide a single package to manage the versions of a few core dependencies: `
5858
## Local development
5959

6060
1. Run `yarn` in the root directory
61-
1. Run `yarn build` to build all of the packages (certain packages like `gamut-icons` need to be built to function in storybook).
61+
2. Run `yarn build` to build all of the packages (certain packages like `gamut-icons` need to be built to function in storybook).
6262

6363
### Running the storybook styleguide
6464

65-
1. Run `yarn start` to start the storybook server
66-
1. Add new stories to `packages/styleguide/stories`
67-
1. Stories are written using storybook's [Component Story Format](https://storybook.js.org/docs/formats/component-story-format/)
65+
1. Run `yarn nx storybook styleguide` to start the storybook server
66+
2. Add new stories to `packages/styleguide/src`
67+
3. Stories are written using storybook's [Component Story Format](https://storybook.js.org/docs/formats/component-story-format/) and [MDX](https://storybook.js.org/docs/writing-docs/mdx#basic-example). Check out our comprehensive guide on writing stories [here](https://gamut.codecademy.com/?path=/docs/meta-stories--docs#quick-start).
6868

6969
### Publishing Modules
7070

‎dist/static/CNAME‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
gamut.codecademy.com

‎dist/static/robots.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
User-agent: *
2+
Disallow:

‎dist/static/storybook/index.html‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<!doctype html>
2+
<html class="no-js" lang="">
3+
4+
<head>
5+
<meta charset="utf-8">
6+
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
7+
<meta name="robots" content="noindex" />
8+
<title>Styleguide | Codecademy</title>
9+
<meta name="description" content="">
10+
<meta name="viewport" content="width=device-width, initial-scale=1">
11+
</head>
12+
13+
<body>
14+
<script>
15+
// Preserve existing links to /storybook with a janky redirect
16+
const url = new URL(window.location.href, window.location);
17+
url.pathname = url.pathname.replace(/^\/storybook/, '');
18+
window.location.assign(url.toString());
19+
</script>
20+
21+
</body>
22+
23+
</html>

‎package.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@
8181
"micromatch": "^4.0.5",
8282
"mutationobserver-shim": "^0.3.3",
8383
"nx": "19.3.2",
84+
"nx-cloud": "^19.1.0",
8485
"onchange": "^7.0.2",
8586
"prettier": "^2.6.2",
8687
"react-test-renderer": "18.3.1",
@@ -115,11 +116,11 @@
115116
"scripts": {
116117
"build": "nx run-many --target=build --all",
117118
"build-all": "yarn build",
118-
"build-storybook": "nx run styleguide:build-storybook && lerna run copy-storybook",
119+
"build-storybook": "nx run styleguide:build-storybook",
119120
"build:graph": "nx graph",
120121
"clean-builds": "nx run-many --target=clean --all",
121122
"clear-modules": "yarn clean-builds && lerna clean -y && rm -rf node_modules",
122-
"deploy": "cp -r ./dist/static/* ./dist/docs && gh-pages -b gh-pages -d dist",
123+
"deploy": "rm -rf ./dist/docs && mv ./dist/storybook/styleguide ./dist/docs && cp -r ./dist/static/* ./dist/docs && gh-pages -b gh-pages -d dist",
123124
"format": "yarn lint:fix && yarn prettier --write",
124125
"format:verify": "yarn prettier --check",
125126
"lint": "eslint --ignore-path .eslintignore \"./**/*.{mdx,js,ts,tsx,json}\" --max-warnings 0",

‎packages/eslint-plugin-gamut/CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [2.3.0](https://github.com/Codecademy/gamut/compare/eslint-plugin-gamut@2.2.0...eslint-plugin-gamut@2.3.0) (2024-12-13)
7+
8+
### Features
9+
10+
- Storybook 8 Feature Branch ([300ef37](https://github.com/Codecademy/gamut/commit/300ef37da570c8425f7ac1aed52e87392b44fadf))
11+
612
## [2.2.0](https://github.com/Codecademy/gamut/compare/eslint-plugin-gamut@2.1.0...eslint-plugin-gamut@2.2.0) (2024-05-29)
713

814
### Features

‎packages/eslint-plugin-gamut/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "eslint-plugin-gamut",
33
"description": "Shared eslint plugin for Gamut applications",
4-
"version": "2.2.0",
4+
"version": "2.3.0",
55
"author": "Codecademy Engineering <dev@codecademy.com>",
66
"dependencies": {
77
"@typescript-eslint/utils": "^5.15.0"

‎packages/gamut-icons/CHANGELOG.md‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,18 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [9.36.0](https://github.com/Codecademy/gamut/compare/@codecademy/gamut-icons@9.35.0...@codecademy/gamut-icons@9.36.0) (2024-12-17)
7+
8+
### Features
9+
10+
- **Icons:** Add ClubsSealIcon ([50bb6ce](https://github.com/Codecademy/gamut/commit/50bb6cef37fb4f0a14c2a929c172adc2e37c65a1))
11+
12+
## [9.35.0](https://github.com/Codecademy/gamut/compare/@codecademy/gamut-icons@9.34.1...@codecademy/gamut-icons@9.35.0) (2024-12-13)
13+
14+
### Features
15+
16+
- Storybook 8 Feature Branch ([300ef37](https://github.com/Codecademy/gamut/commit/300ef37da570c8425f7ac1aed52e87392b44fadf))
17+
618
### [9.34.1](https://github.com/Codecademy/gamut/compare/@codecademy/gamut-icons@9.34.0...@codecademy/gamut-icons@9.34.1) (2024-12-03)
719

820
**Note:** Version bump only for package @codecademy/gamut-icons

‎packages/gamut-icons/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
22
"name": "@codecademy/gamut-icons",
33
"description": "Icon library for codecademy.com",
4-
"version": "9.34.1",
4+
"version": "9.36.0",
55
"author": "Codecademy <dev@codecademy.com>",
66
"dependencies": {
7-
"@codecademy/gamut-styles": "17.1.2",
8-
"@codecademy/variance": "0.21.4"
7+
"@codecademy/gamut-styles": "17.2.0",
8+
"@codecademy/variance": "0.22.0"
99
},
1010
"files": [
1111
"dist"

‎packages/gamut-icons/src/svg/regular/clubs-seal-icon.svg‎

Lines changed: 4 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)