Skip to content

Commit 1ba2dec

Browse files
smithgajjar09smithgajjar09
authored
Merge branch 'main' into cass-pink-theme
2 parents 5c010c9 + cd81923 commit 1ba2dec

File tree

194 files changed

+3508
-1502
lines changed

Some content is hidden

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

194 files changed

+3508
-1502
lines changed

‎.github/workflows/push.yml

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ jobs:
66
steps:
77
- uses: Codecademy/[email protected]
88
with:
9-
node-version: 20
9+
node-version: 18
1010
command: format:verify
1111

1212
lint:
@@ -18,16 +18,7 @@ jobs:
1818
steps:
1919
- uses: Codecademy/[email protected]
2020
with:
21-
node-version: 20
22-
command: build
23-
- run: yarn ${{ matrix.command }}
24-
25-
26-
runs-on: ubuntu-latest
27-
steps:
28-
- uses: Codecademy/[email protected]
29-
with:
30-
node-version: 16
21+
node-version: 18
3122
command: build
3223
- run: yarn ${{ matrix.command }}
3324

‎nx.json

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,7 @@
33
"default": {
44
"runner": "nx-cloud",
55
"options": {
6-
"cacheableOperations": [
7-
"lint",
8-
"build",
9-
"test",
10-
"verify",
11-
"build-storybook"
12-
],
6+
"cacheableOperations": ["lint", "build", "test", "verify"],
137
"parallel": 3,
148
"accessToken": "ZmVjZWYxNzctYTdmZC00ODYzLTg4MzEtZTE1YTVmZDdkZmY1fHJlYWQ="
159
}

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
"nx": "19.3.2",
8484
"nx-cloud": "^19.1.0",
8585
"onchange": "^7.0.2",
86-
"prettier": "^2.6.2",
86+
"prettier": "^2.8.7",
8787
"react-test-renderer": "18.3.1",
8888
"storybook": "^8.3.6",
8989
"svgo": "^1.3.2",

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
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.1](https://github.com/Codecademy/gamut/compare/[email protected]@2.3.1) (2025-02-05)
7+
8+
**Note:** Version bump only for package eslint-plugin-gamut
9+
610
## [2.3.0](https://github.com/Codecademy/gamut/compare/[email protected]@2.3.0) (2024-12-13)
711

812
### 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.3.0",
4+
"version": "2.3.1",
55
"author": "Codecademy Engineering <[email protected]>",
66
"dependencies": {
77
"@typescript-eslint/utils": "^5.15.0"

‎packages/eslint-plugin-gamut/src/gamut-import-paths.ts

Lines changed: 45 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -5,49 +5,54 @@ import { createRule } from './createRule';
55
export default createRule({
66
create(context) {
77
return {
8-
'ImportDeclaration[source.value=/(^@)codecademy(\\u002F)gamut/]': function (
9-
node: TSESTree.ImportDeclaration
10-
) {
11-
const filename = context.getFilename();
12-
const importPath = node.source.value;
8+
'ImportDeclaration[source.value=/(^@)codecademy(\\u002F)gamut/]':
9+
function (node: TSESTree.ImportDeclaration) {
10+
const filename = context.getFilename();
11+
const importPath = node.source.value;
1312

14-
const fileDirectory = filename.split('/packages/')[1].split('/')[0];
15-
const importPackage = importPath.split('@codecademy/')[1].split('/')[0];
13+
const fileDirectory = filename.split('/packages/')[1].split('/')[0];
14+
const importPackage = importPath
15+
.split('@codecademy/')[1]
16+
.split('/')[0];
1617

17-
if (fileDirectory === importPackage) {
18-
context.report({
19-
messageId: 'useRelativeImport',
20-
node,
21-
});
22-
return;
23-
}
18+
if (fileDirectory === importPackage) {
19+
context.report({
20+
messageId: 'useRelativeImport',
21+
node,
22+
});
23+
return;
24+
}
2425

25-
if (importPath.includes('/src')) {
26-
const indexOfSrc = node.source.range[0] + importPath.search('/src');
27-
context.report({
28-
...(importPath.endsWith('/src') && {
29-
fix: (fixer) => {
30-
return fixer.removeRange([indexOfSrc + 1, node.range[1] - 2]);
31-
},
32-
}),
33-
messageId: 'removeSrc',
34-
node,
35-
});
36-
return;
37-
}
38-
if (importPath.includes('/dist')) {
39-
const indexOfDist = node.source.range[0] + importPath.search('/dist');
40-
context.report({
41-
...(importPath.endsWith('/dist') && {
42-
fix: (fixer) => {
43-
return fixer.removeRange([indexOfDist + 1, node.range[1] - 2]);
44-
},
45-
}),
46-
messageId: 'removeDist',
47-
node,
48-
});
49-
}
50-
},
26+
if (importPath.includes('/src')) {
27+
const indexOfSrc = node.source.range[0] + importPath.search('/src');
28+
context.report({
29+
...(importPath.endsWith('/src') && {
30+
fix: (fixer) => {
31+
return fixer.removeRange([indexOfSrc + 1, node.range[1] - 2]);
32+
},
33+
}),
34+
messageId: 'removeSrc',
35+
node,
36+
});
37+
return;
38+
}
39+
if (importPath.includes('/dist')) {
40+
const indexOfDist =
41+
node.source.range[0] + importPath.search('/dist');
42+
context.report({
43+
...(importPath.endsWith('/dist') && {
44+
fix: (fixer) => {
45+
return fixer.removeRange([
46+
indexOfDist + 1,
47+
node.range[1] - 2,
48+
]);
49+
},
50+
}),
51+
messageId: 'removeDist',
52+
node,
53+
});
54+
}
55+
},
5156
};
5257
},
5358
defaultOptions: [],

‎packages/gamut-icons/CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,16 @@
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.38.0](https://github.com/Codecademy/gamut/compare/@codecademy/[email protected]...@codecademy/[email protected]) (2025-02-05)
7+
8+
### Features
9+
10+
- **Icons:** add InteractiveCursor and Report icons ([#3028](https://github.com/Codecademy/gamut/issues/3028)) ([d894070](https://github.com/Codecademy/gamut/commit/d8940706d40878e79424aa77fa58031406961570))
11+
12+
### [9.37.3](https://github.com/Codecademy/gamut/compare/@codecademy/[email protected]...@codecademy/[email protected]) (2025-02-05)
13+
14+
**Note:** Version bump only for package @codecademy/gamut-icons
15+
616
### [9.37.2](https://github.com/Codecademy/gamut/compare/@codecademy/[email protected]...@codecademy/[email protected]) (2025-01-14)
717

818
**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.37.2",
4+
"version": "9.38.0",
55
"author": "Codecademy <[email protected]>",
66
"dependencies": {
7-
"@codecademy/gamut-styles": "17.4.0",
8-
"@codecademy/variance": "0.22.0"
7+
"@codecademy/gamut-styles": "17.4.1",
8+
"@codecademy/variance": "0.22.1"
99
},
1010
"files": [
1111
"dist"

‎packages/gamut-icons/src/svg/regular/interactive-cursor-icon.svg

Lines changed: 1 addition & 0 deletions
Loading

‎packages/gamut-icons/src/svg/regular/report-icon.svg

Lines changed: 1 addition & 0 deletions
Loading

‎packages/gamut-illustrations/CHANGELOG.md

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,28 @@
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+
### [0.53.1](https://github.com/Codecademy/gamut/compare/@codecademy/[email protected]...@codecademy/[email protected]) (2025-02-05)
7+
8+
**Note:** Version bump only for package @codecademy/gamut-illustrations
9+
10+
## [0.53.0](https://github.com/Codecademy/gamut/compare/@codecademy/[email protected]...@codecademy/[email protected]) (2025-02-03)
11+
12+
### Features
13+
14+
- **Illustration:** added new stackedPagesVariantIllustration ([39c8dbd](https://github.com/Codecademy/gamut/commit/39c8dbd5bcd8060293f1d1e9f6e6c838da228fa5))
15+
16+
## [0.52.0](https://github.com/Codecademy/gamut/compare/@codecademy/[email protected]...@codecademy/[email protected]) (2025-02-03)
17+
18+
### Features
19+
20+
- **Illustration:** Discount tag illustrations ([1065431](https://github.com/Codecademy/gamut/commit/106543146262bdb16383ba840658f2c5208b440a))
21+
22+
## [0.51.0](https://github.com/Codecademy/gamut/compare/@codecademy/[email protected]...@codecademy/[email protected]) (2025-01-22)
23+
24+
### Features
25+
26+
- **TagCelebration:** :sparkles: A new illustration for the upcoming trial cancellation incentive ([89f18d4](https://github.com/Codecademy/gamut/commit/89f18d429521ddd6e339e7fbd13fe9f1e0292b9c))
27+
628
### [0.50.2](https://github.com/Codecademy/gamut/compare/@codecademy/[email protected]...@codecademy/[email protected]) (2025-01-14)
729

830
**Note:** Version bump only for package @codecademy/gamut-illustrations

‎packages/gamut-illustrations/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
22
"name": "@codecademy/gamut-illustrations",
33
"description": "Illustrations library for Codecademy",
4-
"version": "0.50.2",
4+
"version": "0.53.1",
55
"author": "Codecademy Engineering <[email protected]>",
66
"bugs": "https://github.com/Codecademy/gamut/issues",
77
"dependencies": {
8-
"@codecademy/gamut-styles": "17.4.0",
8+
"@codecademy/gamut-styles": "17.4.1",
99
"classnames": "^2.2.5"
1010
},
1111
"files": [

0 commit comments

Comments
 (0)