Skip to content

Commit

Permalink
chore: revert previous commits
Browse files Browse the repository at this point in the history
  • Loading branch information
BallardRobinett committed Feb 8, 2024
1 parent 767568f commit 54898f8
Show file tree
Hide file tree
Showing 8 changed files with 142 additions and 642 deletions.
14 changes: 7 additions & 7 deletions .github/actions/dev-env-setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ runs:
using: composite
steps:
- name: asdf setup
uses: asdf-vm/actions/setup@v1
- uses: actions/cache@v3
uses: asdf-vm/actions/setup@v3
- uses: actions/cache@v4
id: asdf-cache-client
with:
path: |
Expand All @@ -17,7 +17,7 @@ runs:
with:
path: |
~/.asdf
./bc_obps/.tool-versions
./server/.tool-versions
key: ${{ runner.os }}-asdf-cache-backend-${{ hashFiles('bc_obps/.tool-versions') }}
- uses: actions/cache@v3
id: yarn-cache
Expand All @@ -28,9 +28,9 @@ runs:
key: ${{ runner.os }}-yarn-cache-${{ hashFiles('client/yarn.lock') }}-v2
- name: Set up python
id: setup-python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: "3.9.16"
python-version: "3.9"
- name: Install Poetry
uses: snok/install-poetry@v1
- name: Load cached venv
Expand All @@ -45,10 +45,10 @@ runs:
- name: Install dependencies
if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true'
run: poetry install --no-interaction --no-root
working-directory: ./bc_obps
working-directory: ./server
shell: bash
- name: Install server dev tools
working-directory: ./bc_obps
working-directory: ./server
shell: bash
run: |
make install_backend_asdf_tools
Expand Down
10 changes: 7 additions & 3 deletions .github/workflows/eslint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: ESLint

on:
push:
branches: [main, develop, 127-fix-precommit-conditions]
branches: [main, develop]
pull_request:
branches: [main, develop]

Expand All @@ -12,12 +12,16 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Change working directory
run: cd /client/

- name: Setup Node.js
uses: actions/setup-node@v2
uses: actions/setup-node@v4
with:
node-version: 20

- name: Install dependencies
run: yarn install

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/precommit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Precommit tests

on:
push:
branches: [main, develop, 127-fix-precommit-conditions]
branches: [main, develop]
pull_request:
branches: [main, develop]

Expand All @@ -11,5 +11,5 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v3
- uses: actions/setup-python@v5
- uses: pre-commit/action@v3.0.0
45 changes: 19 additions & 26 deletions client/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,32 +1,25 @@
module.exports = {
extends: ["airbnb-typescript", "next", "prettier"],
env: { es6: true, browser: true, node: true },
parser: "@typescript-eslint/parser",
parserOptions: {
project: "tsconfig.json",
tsconfigRootDir: __dirname,
env: {
browser: true,
es2021: true,
},
rules: {
"import/no-extraneous-dependencies": [
"error",
{
devDependencies: [
"test.{ts,tsx,js,jsx}",
"test-*.{ts,tsx,js,jsx}",
"**/*{.,_}{test,spec}.{ts,tsx,js,jsx}",
"**/jest.config.{ts,js}",
"**/playwright.config.{ts,js}",
],
extends: "plugin:react/recommended",
overrides: [
{
env: {
node: true,
},
],
"import/extensions": [
"error",
"never",
{
json: "always",
files: [".eslintrc.{js,cjs}"],
parserOptions: {
sourceType: "script",
},
],
"no-console": 1,
"no-var": 2,
},
],
parser: "@typescript-eslint/parser",
parserOptions: {
ecmaVersion: "latest",
sourceType: "module",
},
plugins: ["@typescript-eslint", "react"],
rules: {},
};
7 changes: 4 additions & 3 deletions client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"autoprefixer": "^10.4.16",
"classnames": "^2.3.2",
"dotenv": "^16.3.1",
"eslint": "8.48.0",
"eslint": "^8.56.0",
"eslint-config-airbnb-typescript": "^17.1.0",
"eslint-config-next": "^14.0.1",
"eslint-plugin-import": "^2.25.3",
Expand All @@ -61,10 +61,11 @@
"@testing-library/react": "^14.0.0",
"@types/jest": "^29.5.5",
"@types/lodash.debounce": "^4.0.9",
"@typescript-eslint/eslint-plugin": "^6.5.0",
"@typescript-eslint/parser": "^6.5.0",
"@typescript-eslint/eslint-plugin": "^6.21.0",
"@typescript-eslint/parser": "^6.21.0",
"babel-jest": "^29.6.4",
"eslint-config-prettier": "^9.0.0",
"eslint-plugin-react": "^7.33.2",
"improved-yarn-audit": "^3.0.0",
"jest": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
Expand Down
Loading

0 comments on commit 54898f8

Please sign in to comment.