Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ orbs:
references:
default_env: &default_env
docker:
- image: cimg/node:22.13.1
- image: cimg/node:22.14.0
working_directory: ~/repo
environment:
IGNORE_COMMIT_MESSAGE: 'chore(release): publish'
Expand Down Expand Up @@ -114,7 +114,7 @@ jobs:
- checkout
- *set_npm_token
- *restore_yarn_cache
- run: yarn --production=false --frozen-lockfile
- run: yarn install --immutable
- *save_yarn_cache
- *save_node_modules

Expand Down
14 changes: 14 additions & 0 deletions .github/actions/yarn/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
name: 'Restore Yarn Cache'
description: 'Setup a NodeJS environment and restore cache if any, given a node version'

runs:
using: 'composite'
steps:
- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version-file: .nvmrc
cache: 'yarn'
- name: Install Dependencies
run: yarn install --immutable
shell: bash
2 changes: 1 addition & 1 deletion .github/workflows/auto-request-reviews.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-latest
if: github.event.pull_request.draft == false
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Request review based on files changed
uses: ohnogumi/[email protected]
with:
Expand Down
68 changes: 0 additions & 68 deletions .github/workflows/codeql-analysis.yml

This file was deleted.

15 changes: 7 additions & 8 deletions .github/workflows/push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,9 @@ jobs:
format:
runs-on: ubuntu-latest
steps:
- uses: Codecademy/[email protected]
with:
node-version: 22
command: format:verify
- uses: actions/checkout@v4
- uses: ./.github/actions/yarn
- run: yarn format:verify

lint:
strategy:
Expand All @@ -16,10 +15,10 @@ jobs:
command: ['lint', 'verify']
runs-on: ubuntu-latest
steps:
- uses: Codecademy/[email protected]
with:
node-version: 22
command: build
- uses: actions/checkout@v4
- uses: ./.github/actions/yarn
- run: npx nx build eslint-plugin-gamut
if: ${{ matrix.command == 'lint' }}
- run: yarn ${{ matrix.command }}

on:
Expand Down
13 changes: 12 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,15 @@ tmp
.npmrc
.awcache

# Yarn specific ignores
.pnp.*
.yarn/*
!.yarn/patches
!.yarn/plugins
!.yarn/releases
!.yarn/sdks
!.yarn/versions

# Users Environment Variables
.lock-wscript

Expand Down Expand Up @@ -65,4 +74,6 @@ report*.json

# IDE - Cursor
.cursor/*
!.cursor/rules
!.cursor/rules
.cursor/rules/nx-rules.mdc
.github/instructions/nx.instructions.md
2 changes: 1 addition & 1 deletion .lintstagedrc.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export default {
}

if (micromatch.some(allChanges, 'yarn.lock')) {
commands.push(`npx yarn-deduplicate`);
commands.push(`yarn dedupe`);
}

const eslintExtensions = `{mdx,ts,tsx,js,jsx,json}`;
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v22.13.1
v22.14.0
3 changes: 2 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,5 +40,6 @@
"source.fixAll.eslint": "explicit"
},
"storyExplorer.storiesGlobs": "packages/styleguide/stories/**/*.stories.mdx",
"jest.jestCommandLine": "node_modules/.bin/jest"
"jest.jestCommandLine": "node_modules/.bin/jest",
"nxConsole.generateAiAgentRules": true
}
948 changes: 948 additions & 0 deletions .yarn/releases/yarn-4.9.1.cjs

Large diffs are not rendered by default.

4 changes: 0 additions & 4 deletions .yarnrc

This file was deleted.

3 changes: 3 additions & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
nodeLinker: node-modules

yarnPath: .yarn/releases/yarn-4.9.1.cjs
3 changes: 2 additions & 1 deletion nx.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@
"inputs": ["production", "^production", "babelConfig", "ci"]
},
"verify": {
"cache": true
"cache": true,
"dependsOn": ["^build"]
},
"@nx/jest:jest": {
"dependsOn": ["^build"],
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
"conventional-changelog-conventionalcommits": "^4.3.0",
"cpy-cli": "^4.1.0",
"eslint": "^8.11.0",
"eslint-plugin-gamut": "^2.0.0",
"eslint-plugin-gamut": "2.3.1",
"eslint-plugin-local-rules": "^1.1.0",
"eslint-plugin-lodash": "^7.4.0",
"gh-pages": "^2.2.0",
Expand Down Expand Up @@ -96,7 +96,7 @@
"typescript": "5.1.3"
},
"engines": {
"node": "^22.13.1",
"node": "^22.14.0",
"yarn": "^1.21.1"
},
"license": "MIT",
Expand All @@ -109,7 +109,7 @@
"prettier --ignore-path .prettierignore --write"
]
},
"packageManager": "yarn@1.22.10",
"packageManager": "yarn@4.9.1",
"private": true,
"repository": "[email protected]:Codecademy/gamut.git",
"resolutions": {
Expand Down
4 changes: 0 additions & 4 deletions packages/eslint-plugin-gamut/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,5 @@
"access": "public"
},
"repository": "Codecademy/gamut.git",
"scripts": {
"build": "nx build eslint-plugin-gamut",
"verify": "tsc --noEmit"
},
"types": "./dist/index.d.ts"
}
7 changes: 7 additions & 0 deletions packages/eslint-plugin-gamut/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,13 @@
"parallel": false
}
},
"verify": {
"executor": "nx:run-commands",
"options": {
"cwd": "packages/eslint-plugin-gamut",
"command": "tsc --noEmit"
}
},
"test": {
"executor": "@nx/jest:jest",
"outputs": ["{workspaceRoot}/coverage/packages/eslint-plugin-gamut"],
Expand Down
4 changes: 0 additions & 4 deletions packages/gamut-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,5 @@
"access": "public"
},
"repository": "Codecademy/gamut.git",
"scripts": {
"build": "nx build @codecademy/gamut-tests",
"verify": "tsc --noEmit"
},
"types": "./dist/index.d.ts"
}
7 changes: 7 additions & 0 deletions packages/gamut-tests/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,13 @@
"parallel": false
}
},
"verify": {
"executor": "nx:run-commands",
"options": {
"cwd": "packages/gamut-tests",
"command": "tsc --noEmit"
}
},
"test": {
"executor": "@nx/jest:jest",
"outputs": ["{workspaceRoot}/coverage/packages/gamut-tests"],
Expand Down
3 changes: 1 addition & 2 deletions packages/gamut/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,7 @@
"scripts": {
"build": "nx build @codecademy/gamut",
"build:watch": "yarn build && onchange ./src -- yarn build",
"compile": "babel ./src --out-dir ./dist --extensions \".ts,.tsx\"",
"verify": "tsc --noEmit"
"compile": "babel ./src --out-dir ./dist --extensions \".ts,.tsx\""
},
"sideEffects": [
"**/*.css",
Expand Down
7 changes: 7 additions & 0 deletions packages/gamut/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,13 @@
"parallel": false
}
},
"verify": {
"executor": "nx:run-commands",
"options": {
"cwd": "packages/gamut",
"command": "tsc --noEmit"
}
},
"test": {
"dependsOn": ["^build"],
"executor": "@nx/jest:jest",
Expand Down
Loading
Loading