Skip to content

Commit

Permalink
Merge branch 'main' into changeset-release/main
Browse files Browse the repository at this point in the history
  • Loading branch information
kodiakhq[bot] authored May 11, 2024
2 parents a4aaf66 + 7b4cba9 commit 71cc03e
Show file tree
Hide file tree
Showing 10 changed files with 3,540 additions and 3,095 deletions.
2 changes: 2 additions & 0 deletions .changeset/polite-dolphins-brake.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
---
2 changes: 1 addition & 1 deletion .github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- name: Setup PNPM
uses: pnpm/action-setup@v2
with:
version: 7
version: 9

- name: Setup Node
uses: actions/setup-node@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
- name: Setup PNPM
uses: pnpm/action-setup@v2
with:
version: 7
version: 9

- name: Setup Node
uses: actions/setup-node@v4
Expand Down
18 changes: 9 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@
"clean": "turbo run clean",
"clean:root": "rm -rf .turbo && rm -rf node_modules",
"format": "prettier --write \"**/*.{cjs,js,mjs,ts,json,md,mdx,yaml,yml}\"",
"lint": "turbo run lint",
"lint": "ESLINT_USE_FLAT_CONFIG=false turbo run lint",
"prepare": "husky",
"release": "changeset publish",
"sort-package-json": "pnpm dlx sort-package-json && turbo run sort-package-json",
"version-packages": "changeset version && pnpm run format"
},
"lint-staged": {
"*.{cjs,js,jsx,ts,tsx}": "eslint --fix",
"*.{cjs,js,jsx,ts,tsx}": "ESLINT_USE_FLAT_CONFIG=false eslint --fix",
"!(pnpm-)*.{cjs,js,mjs,jsx,ts,tsx,json,md,mdx,yaml,yml}": "pnpm exec prettier --write",
"package.json": "pnpm dlx sort-package-json"
},
Expand All @@ -27,21 +27,21 @@
},
"devDependencies": {
"@changesets/cli": "^2.27.1",
"@commitlint/cli": "^19.2.1",
"@commitlint/cli": "^19.3.0",
"@mheob/changeset-changelog": "^3.0.1",
"@mheob/commitlint-config": "workspace:*",
"@mheob/eslint-config": "workspace:*",
"@mheob/prettier-config": "workspace:*",
"@types/node": "^20.11.30",
"@types/node": "^20.12.11",
"commitizen": "^4.3.0",
"cz-git": "^1.9.0",
"eslint": "^8.57.0",
"cz-git": "^1.9.1",
"eslint": "^9.2.0",
"husky": "^9.0.11",
"lint-staged": "^15.2.2",
"prettier": "^3.2.5",
"ts-node": "^10.9.2",
"turbo": "^1.13.0",
"typescript": "^5.4.3"
"turbo": "^1.13.3",
"typescript": "^5.4.5"
},
"packageManager": "pnpm@8.15.5+sha256.4b4efa12490e5055d59b9b9fc9438b7d581a6b7af3b5675eb5c5f447cee1a589"
"packageManager": "pnpm@9.1.0+sha512.67f5879916a9293e5cf059c23853d571beaf4f753c707f40cb22bed5fb1578c6aad3b6c4107ccb3ba0b35be003eb621a16471ac836c87beb53f9d54bb4612724"
}
8 changes: 4 additions & 4 deletions packages/commitlint-config/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@
"sort-package-json": "pnpm dlx sort-package-json"
},
"devDependencies": {
"@commitlint/cli": "^19.2.1",
"@commitlint/cli": "^19.3.0",
"@mheob/eslint-config": "workspace:*",
"@mheob/tsconfig": "workspace:*",
"commitizen": "^4.3.0",
"cz-git": "^1.9.0",
"eslint": "^8.57.0",
"typescript": "^5.4.3"
"cz-git": "^1.9.1",
"eslint": "^9.2.0",
"typescript": "^5.4.5"
},
"peerDependencies": {
"@commitlint/cli": "^18.6.0 || ^19.0.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/commitlint-config/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { execSync } from 'node:child_process';
import { existsSync, readdirSync } from 'node:fs';
import { resolve } from 'node:path';
import nodePath from 'node:path';

import type { UserConfig } from 'cz-git';

Expand All @@ -14,7 +14,7 @@ function getPackagesFromPath(...directoryPaths: string[]) {
const packages: string[] = [];

for (const directoryPath of directoryPaths) {
const path = resolve(process.cwd(), directoryPath);
const path = nodePath.resolve(process.cwd(), directoryPath);
if (!existsSync(path)) continue;
const packages = readdirSync(path);
packages.push(...packages);
Expand Down
18 changes: 9 additions & 9 deletions packages/eslint-config/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,24 +49,24 @@
"sort-package-json": "pnpm dlx sort-package-json"
},
"dependencies": {
"@typescript-eslint/eslint-plugin": "^7.3.1",
"@typescript-eslint/parser": "^7.3.1",
"eslint-config-next": "^14.1.4",
"@typescript-eslint/eslint-plugin": "^7.8.0",
"@typescript-eslint/parser": "^7.8.0",
"eslint-config-next": "^14.2.3",
"eslint-config-prettier": "^9.1.0",
"eslint-import-resolver-typescript": "^3.6.1",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-react": "^7.34.1",
"eslint-plugin-simple-import-sort": "^12.0.0",
"eslint-plugin-unicorn": "^51.0.0",
"eslint-plugin-unused-imports": "^3.1.0"
"eslint-plugin-simple-import-sort": "^12.1.0",
"eslint-plugin-unicorn": "^53.0.0",
"eslint-plugin-unused-imports": "^3.2.0"
},
"devDependencies": {
"@mheob/tsconfig": "workspace:*",
"@types/eslint": "^8.56.6",
"eslint": "^8.57.0",
"@types/eslint": "^8.56.10",
"eslint": "^9.2.0",
"prettier": "^3.2.5",
"typescript": "^5.4.3"
"typescript": "^5.4.5"
},
"peerDependencies": {
"eslint": "^8.56.0",
Expand Down
10 changes: 5 additions & 5 deletions packages/eslint-config/src/base.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,19 +24,19 @@ const config: Linter.Config = {
{
groups: [
// Side effect imports
['^\\u0000'],
[String.raw`^\u0000`],
// Node.js builtins
['^node:'],
// Packages
['^@?\\w'],
[String.raw`^@?\w`],
// Internal packages
['^@/?\\w'],
[String.raw`^@/?\w`],
// Absolute imports
['^'],
// Relative imports
['^\\.'],
[String.raw`^\.`],
// Style imports
['^.+\\.s?css$'],
[String.raw`^.+\.s?css$`],
],
},
],
Expand Down
4 changes: 2 additions & 2 deletions packages/prettier-config/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@
"devDependencies": {
"@mheob/eslint-config": "workspace:*",
"@mheob/tsconfig": "workspace:*",
"eslint": "^8.57.0",
"eslint": "^9.2.0",
"prettier": "^3.2.5",
"typescript": "^5.4.3"
"typescript": "^5.4.5"
},
"peerDependencies": {
"prettier": "^3.2.5"
Expand Down
Loading

0 comments on commit 71cc03e

Please sign in to comment.