Skip to content

Commit

Permalink
Use pnpm instead of Yarn (#202)
Browse files Browse the repository at this point in the history
* Use pnpm instead of yarn

* Update the action

* Sort commands for pnpm

* Move name to the top

* Move name one step down

* Add extra statements

* Remove wrong json filename

* Remove build non-existent build command

* Update action to install dependencies and build

* Remove unnecesary commands

* Use latest instead of version 7

* Update yaml

* Update step name to be more descriptive

* Fix step name to describe precisely

* Remove unnecesary resolutions

* Remove peer deps for eslint config

* Update lock file

* Remove cypress plugin

* update eslint config

* Update .gitignore

* Remove unnecesary types

---------

Co-authored-by: Karl Horky <[email protected]>
  • Loading branch information
Josehower and karlhorky authored Apr 6, 2023
1 parent 66cb797 commit 931c755
Show file tree
Hide file tree
Showing 8 changed files with 4,619 additions and 4,669 deletions.
5 changes: 4 additions & 1 deletion .eslintrc.cjs
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
module.exports = {
/** @type {import('@typescript-eslint/utils').TSESLint.Linter.Config} */
const config = {
extends: ['@upleveled/upleveled'],
};

module.exports = config;
11 changes: 7 additions & 4 deletions .github/workflows/export-notion-blocks-and-commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,18 @@ jobs:
timeout-minutes: 35
steps:
- uses: actions/checkout@v3
- uses: pnpm/action-setup@v2
with:
version: 'latest'
- uses: actions/setup-node@v3
with:
node-version: '18'

- name: Install deps and build (with cache)
uses: bahmutov/npm-install@v1
cache: 'pnpm'
- name: Install deps (with cache)
run: pnpm install

- name: Run backup script
run: yarn tsx index.ts
run: pnpm tsx index.ts
env:
NOTION_TOKEN: ${{ secrets.NOTION_TOKEN }}

Expand Down
12 changes: 8 additions & 4 deletions .github/workflows/lint-and-check-types.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,14 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: pnpm/action-setup@v2
with:
version: 'latest'
- uses: actions/setup-node@v3
with:
node-version: '18'
- name: Install deps and build (with cache)
uses: bahmutov/npm-install@v1
- run: yarn eslint . --max-warnings 0
- run: yarn tsc
cache: 'pnpm'
- name: Install deps (with cache)
run: pnpm install
- run: pnpm eslint . --max-warnings 0
- run: pnpm tsc
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
node_modules
.eslintcache
*.tsbuildinfo
33 changes: 1 addition & 32 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,38 +16,7 @@
"tsx": "3.12.6"
},
"devDependencies": {
"@babel/eslint-parser": "7.21.3",
"@next/eslint-plugin-next": "13.2.4",
"@types/node": "18.15.11",
"@types/react": "18.0.31",
"@types/react-dom": "18.0.11",
"@typescript-eslint/eslint-plugin": "5.57.0",
"@typescript-eslint/parser": "5.57.0",
"@upleveled/eslint-config-upleveled": "3.20.0",
"@upleveled/eslint-plugin-upleveled": "2.1.6",
"eslint": "8.37.0",
"eslint-config-react-app": "7.0.1",
"eslint-import-resolver-typescript": "3.5.4",
"eslint-plugin-cypress": "2.13.2",
"eslint-plugin-flowtype": "8.0.3",
"eslint-plugin-import": "2.27.5",
"eslint-plugin-jest": "27.2.1",
"eslint-plugin-jsx-a11y": "6.7.1",
"eslint-plugin-jsx-expressions": "1.3.1",
"eslint-plugin-react": "7.32.2",
"eslint-plugin-react-hooks": "4.6.0",
"eslint-plugin-security": "1.7.1",
"eslint-plugin-sonarjs": "0.19.0",
"eslint-plugin-testing-library": "5.10.2",
"eslint-plugin-unicorn": "46.0.0",
"@upleveled/eslint-config-upleveled": "4.0.2",
"typescript": "5.0.3"
},
"resolutions": {
"@typescript-eslint/eslint-plugin": "5.57.0",
"@typescript-eslint/parser": "5.57.0",
"eslint-plugin-import": "2.27.5",
"eslint-plugin-jsx-a11y": "6.7.1",
"eslint-plugin-react": "7.32.2",
"eslint-plugin-react-hooks": "4.6.0"
}
}
Loading

0 comments on commit 931c755

Please sign in to comment.