Skip to content

Commit 1542171

Browse files
jakemhillerdreamwasp
jakemhiller
and
dreamwasp
authored
feat: update eslint-config packages
Update eslint-config packages, remove airbnb & replace with standard recommended rules & overrides where necessary. Co-authored-by: cassie spain <[email protected]>
1 parent 8df687f commit 1542171

File tree

15 files changed

+4416
-4305
lines changed

15 files changed

+4416
-4305
lines changed

‎.eslintrc.js‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,6 @@ module.exports = {
1515
'@typescript-eslint/no-namespace': 'off',
1616
},
1717
},
18-
{
19-
files: ['**/jest/*', '**/*.stories.mdx'],
20-
rules: {
21-
'import/no-extraneous-dependencies': [
22-
'error',
23-
{ devDependencies: true },
24-
],
25-
},
26-
},
2718
{
2819
// // We need to override them here, because as a result of the `extends` command pulling
2920
// // in additional plugins, the base rules settings of turning this rules off were NOT

‎.github/actions/yarn/action.yml‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,14 @@ runs:
55
using: 'composite'
66
steps:
77
- name: Setup Node.js
8-
uses: actions/setup-node@v3
8+
uses: actions/setup-node@v4
99
with:
1010
node-version-file: .nvmrc
1111
registry-url: 'https://registry.npmjs.org'
12-
- name: Custom Cypress Cache Folder
13-
shell: bash
14-
run: |
15-
mkdir -p $RUNNER_TEMP/cypress
16-
echo "CYPRESS_CACHE_FOLDER=$RUNNER_TEMP/cypress" >> $GITHUB_ENV
17-
- uses: actions/cache@v3
12+
- uses: actions/cache@v4
1813
with:
1914
path: |
2015
**/node_modules
21-
${{ env.CYPRESS_CACHE_FOLDER }}
2216
key: v1-yarn-${{ runner.os }}-${{ hashFiles('.nvmrc') }}-${{ hashFiles('**/yarn.lock') }}
2317

2418
- name: Install Dependencies If Not Cached

‎.github/workflows/publish.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
NPM_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}
5454
NODE_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}
5555
run: |
56-
npx lerna publish --yes --canary --dist-tag=alpha.${GITHUB_SHA:0:6} --preid=alpha.${GITHUB_SHA:0:6}
56+
npx lerna publish --yes --canary --include-merged-tags --dist-tag=alpha.${GITHUB_SHA:0:6} --preid=alpha.${GITHUB_SHA:0:6}
5757
5858
- name: Publish
5959
# Only publish the non-alpha version on main

‎.github/workflows/push.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
name: Push
22

3+
on: push
4+
35
jobs:
46
ci:
57
runs-on: ubuntu-latest
68
steps:
7-
- uses: Codecademy/run-on-yarn@v2
8-
with:
9-
command: ${{ matrix.command }}
9+
- uses: actions/checkout@v4
10+
- uses: ./.github/actions/yarn
11+
- run: yarn ${{ matrix.command }}
1012

1113
strategy:
1214
fail-fast: false
1315
matrix:
14-
command: ['format:verify', 'lint', 'verify']
15-
16-
on: push
16+
command: ['format:verify', 'lint', 'verify', 'syncpack:lint']

‎.nvmrc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v16.17.0
1+
v22.14.0

‎.prettierignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,5 @@ node_modules
22
**/node_modules
33
**/dist
44
**/tmp
5+
6+
/.nx/workspace-data

‎.syncpackrc.js‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
// @ts-check
2+
3+
/**
4+
* Syncpack configuration file
5+
* Controls version management and package.json formatting across the monorepo
6+
* @see https://github.com/JamieMason/syncpack
7+
* @type {import("syncpack").RcFile}
8+
*/
9+
const config = {
10+
/**
11+
* Glob patterns for package.json files to process
12+
* Includes root, apps, libs, and tools directories
13+
*/
14+
source: ['package.json', 'packages/*/package.json'],
15+
16+
/**
17+
* Fields to sort alphabetically in package.json
18+
*/
19+
sortAz: [
20+
'contributors',
21+
'dependencies',
22+
'devDependencies',
23+
'keywords',
24+
'peerDependencies',
25+
'resolutions',
26+
'scripts',
27+
],
28+
29+
/**
30+
* Fields that should appear first in package.json, in this order
31+
*/
32+
sortFirst: ['name', 'description', 'version', 'author'],
33+
34+
/**
35+
* Version management rules for different package groups
36+
*/
37+
versionGroups: [
38+
{
39+
/** Ignore version syncing for peer dependencies */
40+
label: 'ignore peer dependencies',
41+
packages: ['**'],
42+
dependencyTypes: ['peer'],
43+
isIgnored: true,
44+
},
45+
// {
46+
// /** Align all package versions with those defined in @mono/root */
47+
// packages: ['**'],
48+
// dependencies: ['**'],
49+
// dependencyTypes: ['dev', 'prod', 'overrides', 'resolutions'],
50+
// snapTo: ['client-modules'],
51+
// },
52+
],
53+
};
54+
55+
module.exports = config;

‎lerna.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
"version": "independent",
33
"npmClient": "yarn",
4-
"useWorkspaces": true,
54
"packages": ["packages/*"],
65
"command": {
76
"publish": {
@@ -11,5 +10,6 @@
1110
"version": {
1211
"changelogPreset": "conventionalcommits"
1312
}
14-
}
13+
},
14+
"$schema": "node_modules/lerna/schemas/lerna-schema.json"
1515
}

‎package.json‎

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"license": "MIT",
77
"author": "Codecademy Engineers <[email protected]>",
88
"engines": {
9-
"node": "^16.17",
9+
"node": "^22.14.0",
1010
"yarn": "^1.22"
1111
},
1212
"scripts": {
@@ -24,7 +24,8 @@
2424
"clear-modules": "lerna clean -y && rm -rf node_modules",
2525
"build": "turbo run build --concurrency=3",
2626
"build-all": "yarn build",
27-
"prepare": "husky install"
27+
"prepare": "husky install",
28+
"syncpack:lint": "syncpack lint"
2829
},
2930
"lint-staged": {
3031
"**/*.{js,ts,tsx,json}": [
@@ -45,13 +46,13 @@
4546
"conventional-changelog-cli": "^2.0.34",
4647
"conventional-changelog-conventionalcommits": "^4.3.0",
4748
"gh-pages": "^5.0.0",
48-
"lerna": "3.22.1"
49+
"lerna": "8.2.2"
4950
},
5051
"devDependencies": {
5152
"@babel/cli": "7.13.10",
5253
"@babel/core": "7.19.6",
5354
"@babel/preset-typescript": "^7.13.0",
54-
"@codecademy/webpack-config": "^6.0.0",
55+
"@codecademy/webpack-config": "6.4.2",
5556
"@emotion/babel-plugin": "^11.3.0",
5657
"@emotion/jest": "^11.3.0",
5758
"@emotion/react": "^11.4.0",
@@ -69,26 +70,25 @@
6970
"@types/react": "^16.9",
7071
"@types/react-dom": "^16.9",
7172
"@types/stylis": "^4.0.0",
72-
"@typescript-eslint/eslint-plugin": "^5.15.0",
73-
"@typescript-eslint/parser": "^5.15.0",
73+
"@typescript-eslint/eslint-plugin": "^8.31.0",
74+
"@typescript-eslint/parser": "^8.31.0",
7475
"babel-jest": "29.6.4",
7576
"babel-plugin-macros": "3.1.0",
76-
"babel-preset-codecademy": "2.3.0",
77+
"babel-preset-codecademy": "7.0.1",
7778
"component-test-setup": "^0.3.1",
7879
"core-js": "3.32.1",
7980
"enzyme": "3.11.0",
8081
"enzyme-adapter-react-16": "1.15.7",
8182
"enzyme-to-json": "3.6.2",
82-
"eslint": "^8.11.0",
83-
"eslint-plugin-import": "^2.25.2",
84-
"eslint-plugin-jest": "^25.2.4",
83+
"eslint": "^8.57.1",
84+
"eslint-plugin-jest": "^28.11.0",
8585
"eslint-plugin-jest-react": "^0.1.0",
86-
"eslint-plugin-jsx-a11y": "^6.4.1",
87-
"eslint-plugin-no-only-tests": "^2.6.0",
88-
"eslint-plugin-react": "^7.26.1",
89-
"eslint-plugin-react-hooks": "^4.3.0",
90-
"eslint-plugin-simple-import-sort": "^7.0.0",
91-
"eslint-plugin-unused-imports": "^1.1.5",
86+
"eslint-plugin-jsx-a11y": "^6.10.2",
87+
"eslint-plugin-no-only-tests": "^3.3.0",
88+
"eslint-plugin-react": "^7.37.5",
89+
"eslint-plugin-react-hooks": "^5.2.0",
90+
"eslint-plugin-simple-import-sort": "^12.1.1",
91+
"eslint-plugin-unused-imports": "^4.1.4",
9292
"husky": "^8.0.0",
9393
"identity-obj-proxy": "3.0.0",
9494
"jest": "^29.6.4",
@@ -102,8 +102,10 @@
102102
"react-dom": "16.13.1",
103103
"react-helmet": "6.1.0",
104104
"react-test-renderer": "18.2.0",
105+
"semver": "7.7.1",
106+
"syncpack": "^14.0.0-alpha.10",
105107
"turbo": "^1.1.2",
106-
"typescript": "4.4.2"
108+
"typescript": "5.8.3"
107109
},
108110
"packageManager": "[email protected]"
109111
}

‎packages/babel-preset-codecademy/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"babel-plugin-transform-dynamic-import": "^2.1.0"
3939
},
4040
"devDependencies": {
41-
"@babel/cli": "^7.13.10",
42-
"@babel/core": "^7.19.6"
41+
"@babel/cli": "7.13.10",
42+
"@babel/core": "7.19.6"
4343
}
4444
}

0 commit comments

Comments
 (0)