Skip to content

Commit

Permalink
feat: add new updates
Browse files Browse the repository at this point in the history
fix tsconfig paths, add catalog versioning, update pnpm version
  • Loading branch information
FilipPyrek committed Aug 19, 2024
1 parent 5a8dc83 commit 6500777
Show file tree
Hide file tree
Showing 18 changed files with 348 additions and 414 deletions.
13 changes: 2 additions & 11 deletions .eslintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,11 @@ module.exports = {
version: '18.2'
}
},
plugins: [
'prettier',
'simple-import-sort',
'react-hooks',
'@microsoft/eslint-plugin-sdl'
],
plugins: ['prettier', 'simple-import-sort', '@microsoft/eslint-plugin-sdl'],
rules: {
'prettier/prettier': 'error',
'react-hooks/exhaustive-deps': 'warn',
'react-hooks/rules-of-hooks': 'error',
'react/prop-types': ['off'],
'simple-import-sort/exports': 'error',
'simple-import-sort/imports': 'error',
'react/react-in-jsx-scope': 'off'
'simple-import-sort/imports': 'error'
},
overrides: [
{
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ jobs:
run: pnpm sst build

- name: Type check
run: pnpm run typecheck:all
run: pnpm run typecheck:all && cat pnpm-exec-summary.json

- name: Test
run: pnpm run test
2 changes: 2 additions & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@purple-technology:registry=https://npm.pkg.github.com
use-node-version=20.11.0
node-version=20.11.0
engine-strict=true
manage-package-manager-versions=true
1 change: 0 additions & 1 deletion .vscode/extensions.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"eamodio.gitlens",
"editorconfig.editorconfig",
"esbenp.prettier-vscode",
"styled-components.vscode-styled-components",
"vivaxy.vscode-conventional-commits",
"SebastianBille.iam-legend",
"bradlc.vscode-tailwindcss"
Expand Down
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@
"[typescript]": {
"editor.defaultFormatter": "dbaeumer.vscode-eslint"
},
"[css]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"files.associations": {
"*.env": "ini"
},
Expand Down
4 changes: 4 additions & 0 deletions lint-staged.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
export default {
'*.{ts,tsx,js,jsx,cjs,mjs}': 'eslint --fix',
'*.{html,json}': 'prettier --write'
}
23 changes: 10 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
"type": "module",
"engines": {
"node": "20.x",
"pnpm": "9.x"
"pnpm": ">=9.6 <10"
},
"scripts": {
"env": "env-cmd -f ./.env bash -c \"ssocreds -p \\$AWS_PROFILE\" && env-cmd -f ./.env",
"env:vscode": "pnpm run env echo 1",
"prepare": "husky install",
"lint": "eslint 'services' 'packages' 'constructs' --ext .ts,.tsx,.js,.jsx,.cjs,.mjs && prettier -c \"**/*.{json,graphql,gql,html}\"",
"lint:fix": "eslint 'services' 'packages' 'constructs' --ext .ts,.tsx,.js,.jsx,.cjs,.mjs --fix && prettier --write \"**/*.{json,graphql,gql,html}\"",
"lint": "eslint 'services' 'packages' 'constructs' --ext .ts,.tsx,.js,.jsx,.cjs,.mjs && prettier -c \"**/*.{json,html}\"",
"lint:fix": "eslint 'services' 'packages' 'constructs' --ext .ts,.tsx,.js,.jsx,.cjs,.mjs --fix && prettier --write \"**/*.{json,html}\"",
"dev": "pnpm run env -- sst dev",
"build": "pnpm run env -- sst build",
"deploy": "pnpm run env -- sst deploy",
Expand All @@ -23,23 +23,19 @@
"test": "vitest run",
"test:watch": "vitest",
"typecheck": "tsc --noEmit",
"typecheck:all": "time pnpm run typecheck && time pnpm run -r --report-summary typecheck && cat pnpm-exec-summary.json"
},
"lint-staged": {
"*.{ts,tsx,js,jsx}": "eslint --fix",
"*.{graphql,gql,html,json}": "prettier --write"
"typecheck:all": "time pnpm run typecheck && time pnpm run -r --report-summary typecheck"
},
"devDependencies": {
"@commitlint/cli": "^18.6.1",
"@commitlint/config-conventional": "^18.6.3",
"@microsoft/eslint-plugin-sdl": "^0.2.2",
"@purple/serverless-git-branch-stage-plugin": "^1.3.2",
"@tsconfig/node20": "^20.1.4",
"@types/node": "^20.12.7",
"@types/node": "catalog:",
"@typescript-eslint/eslint-plugin": "^6.21.0",
"@typescript-eslint/parser": "^6.21.0",
"@vitest/coverage-v8": "^1.5.0",
"aws-cdk-lib": "2.110.1",
"aws-cdk-lib": "2.124.0",
"aws-sso-creds-helper": "^1.12.0",
"constructs": "10.3.0",
"env-cmd": "^10.1.0",
Expand All @@ -56,8 +52,9 @@
"prettier": "^3.2.5",
"prettier-plugin-tailwindcss": "^0.5.14",
"semantic-release": "^23.0.8",
"sst": "^2.41.4",
"typescript": "^5.4.5",
"vitest": "^1.5.0"
"sst": "2.40.6",
"typescript": "catalog:",
"vite-tsconfig-paths": "^4.3.2",
"vitest": "^1.6.0"
}
}
4 changes: 3 additions & 1 deletion packages/timestamp/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
{
"extends": "../../tsconfig.base.json",
"compilerOptions": {
"baseUrl": "."
"paths": {
"@package/*": ["../*"]
}
}
}
Loading

0 comments on commit 6500777

Please sign in to comment.