Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated project to pnpm, updated all dependencies #88

Merged
merged 1 commit into from
Jul 28, 2023
Merged
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
5 changes: 2 additions & 3 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
module.exports = {
root: true,
extends: [
'airbnb-base',
'airbnb-typescript/base',
'plugin:@typescript-eslint/recommended',
'plugin:prettier/recommended',
'prettier',
'prettier/@typescript-eslint',
'plugin:import/typescript',
],
plugins: ['@typescript-eslint', 'import', 'prettier'],
plugins: [],
ignorePatterns: ['dist/*', '/noReact.js'],
parser: '@typescript-eslint/parser',
parserOptions: {
Expand Down
30 changes: 10 additions & 20 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,34 +11,24 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout branch
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Setup Node.js for use with actions
uses: actions/setup-node@v1
- uses: pnpm/action-setup@v2
with:
node-version: 12.x

- name: Setup caching
id: yarn-cache-dir-path
run: echo "::set-output name=dir::$(yarn cache dir)"
- uses: actions/cache@v2
with:
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
${{ runner.os }}-yarn-
- uses: actions/cache@v2
version: 8.x.x
- name: Use Node.js 18
uses: actions/setup-node@v3
with:
path: ${{ github.workspace }}/.next/cache
key: ${{ runner.os }}-nextjs-${{ hashFiles('**/yarn.lock') }}
node-version: 18.x
cache: 'pnpm'
- name: Install dependencies
run: yarn install --frozen-lockfile --prefer-offline
run: pnpm install --frozen-lockfile --prefer-offline
env:
CI: true
- name: Build dist
run: yarn build
run: pnpm build
- name: Cleanup folder structure
run: rm -rf src prettier.config.js tsconfig.eslint.json tsconfig.json prettier.config.js yarn.lock .eslintrc.js .prettierignore .gitignore .github
run: rm -rf src prettier.config.js tsconfig.eslint.json tsconfig.json prettier.config.js pnpm-lock.yaml .eslintrc.js .prettierignore .gitignore .github
- name: Run deploy script
run: |
git config user.name "PiJa Deploy" && git config user.email "[email protected]"
Expand Down
34 changes: 34 additions & 0 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: Node.js CI

on:
pull_request:
branches:
- develop
- main

jobs:
build:
name: Build and test
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: pnpm/action-setup@v2
with:
version: 8.x.x
- name: Use Node.js 18
uses: actions/setup-node@v3
with:
node-version: 18.x
cache: 'pnpm'
- name: Install dependencies
run: pnpm install --prefer-offline --frozen-lockfile
env:
CI: true
- run: pnpm run lint
env:
CI: true
- run: pnpm run build
env:
CI: true
timeout-minutes: 20
42 changes: 21 additions & 21 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "quiztador-common",
"version": "1.2.37",
"version": "1.3.0",
"private": true,
"main": "dist/index.js",
"license": "UNLICENSED",
Expand All @@ -20,30 +20,30 @@
"src"
]
},
"dependencies": {},
"devDependencies": {
"@types/child-process-promise": "^2.2.1",
"@types/node": "^15.0.1",
"@types/react": "^17.0.34",
"@types/tough-cookie": "^4.0.0",
"@typescript-eslint/eslint-plugin": "^5.51.0",
"@typescript-eslint/parser": "^5.51.0",
"@types/child-process-promise": "^2.2.2",
"@types/node": "^20.4.5",
"@types/react": "^18.2.17",
"@types/tough-cookie": "^4.0.2",
"@typescript-eslint/eslint-plugin": "^6.2.0",
"@typescript-eslint/parser": "^6.2.0",
"copyfiles": "^2.4.1",
"eslint": "^8.33.0",
"eslint-config-airbnb-typescript": "^12.3.1",
"eslint-config-prettier": "^7.2.0",
"eslint-plugin-import": "2.26.0",
"eslint-plugin-prettier": "^3.3.1",
"execa": "^5.1.1",
"nodemon": "^2.0.15",
"eslint": "^8.45.0",
"eslint-config-airbnb-base": "^15.0.0",
"eslint-config-airbnb-typescript": "^17.1.0",
"eslint-config-prettier": "^8.9.0",
"eslint-plugin-import": "2.28.0",
"eslint-plugin-prettier": "^5.0.0",
"execa": "^7.2.0",
"nodemon": "^3.0.1",
"npm-run-all": "^4.1.5",
"prettier": "^2.2.1",
"react": "^17.0.2",
"rimraf": "^3.0.2",
"typescript": "^4.9.5",
"zod": "^3.20.0"
"prettier": "^3.0.0",
"react": "^18.2.0",
"rimraf": "^5.0.1",
"typescript": "^5.1.6",
"zod": "^3.21.4"
},
"peerDependencies": {
"zod": "^3.20.0"
"zod": "^3.21.4"
}
}
Loading