Skip to content

Commit

Permalink
Merge pull request #4 from Chimera-Studio/development
Browse files Browse the repository at this point in the history
v2.1.0 - upgraded all deps, removed CMS (all local now) & small bug fixes
  • Loading branch information
dariodumlijan authored Feb 4, 2024
2 parents d139a2f + b829a58 commit a417401
Show file tree
Hide file tree
Showing 135 changed files with 6,494 additions and 6,439 deletions.
6 changes: 0 additions & 6 deletions .buckconfig

This file was deleted.

158 changes: 139 additions & 19 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,11 @@
"requireConfigFile": false,
"ecmaVersion": 8
},
"extends": ["plugin:react/recommended", "airbnb", "airbnb/hooks"],
"extends": [
"plugin:react/recommended",
"airbnb",
"airbnb/hooks"
],
"rules": {
"arrow-parens": 0,
"class-methods-use-this": 0,
Expand All @@ -17,19 +21,30 @@
"import/no-extraneous-dependencies": 0,
"import/no-named-as-default": 0,
"import/no-named-as-default-member": 0,
"import/no-unresolved": [2],
"import/no-unresolved": [
2
],
"import/prefer-default-export": 0,
"jsx-a11y/anchor-is-valid": 0,
"jsx-a11y/click-events-have-key-events": 0,
"jsx-a11y/control-has-associated-label": 0,
"jsx-a11y/label-has-associated-control": [1, {
"required": {
"some": [ "nesting", "id" ]
"jsx-a11y/label-has-associated-control": [
1,
{
"required": {
"some": [
"nesting",
"id"
]
}
}
}],
],
"jsx-a11y/label-has-for": 0,
"jsx-a11y/no-static-element-interactions": 0,
"jsx-quotes": 0,
"jsx-quotes": [
"error",
"prefer-double"
],
"linebreak-style": 0,
"max-len": 0,
"no-case-declarations": 0,
Expand All @@ -41,7 +56,10 @@
"no-multi-spaces": 1,
"no-param-reassign": 0,
"no-plusplus": 0,
"no-restricted-syntax": [0, "ForInStatement"],
"no-restricted-syntax": [
0,
"ForInStatement"
],
"no-sparse-arrays": 1,
"no-undef": 1,
"no-underscore-dangle": 0,
Expand All @@ -51,15 +69,27 @@
"prefer-template": 0,
"padding-line-between-statements": [
"error",
{ "blankLine": "always", "prev": "*", "next": "return" }
{
"blankLine": "always",
"prev": "*",
"next": "return"
}
],
"react/button-has-type": 0,
"react/default-props-match-prop-types": 0,
"react/destructuring-assignment": 0,
"react/forbid-prop-types": 0,
"react/jsx-filename-extension": [1, {
"extensions": [".js", ".jsx", ".ts", ".tsx"]
}],
"react/jsx-filename-extension": [
1,
{
"extensions": [
".js",
".jsx",
".ts",
".tsx"
]
}
],
"react/jsx-curly-newline": 0,
"react/jsx-no-bind": 0,
"react/jsx-no-target-blank": 0,
Expand All @@ -72,16 +102,106 @@
"react/state-in-constructor": 0,
"react/static-property-placement": 0,
"react/prefer-exact-props": 0,
"react-hooks/rules-of-hooks": 2,
"react-hooks/exhaustive-deps": 1,
"space-before-function-paren": 0,
"semi": 1,
"require-await": "error"
"require-await": "error",
"@typescript-eslint/consistent-type-imports": [
"error",
{
"prefer": "type-imports"
}
],
"import/order": [
"error",
{
"groups": [
"builtin",
"external",
"internal",
[
"index",
"parent",
"sibling",
"object"
],
"type",
"unknown"
],
"pathGroups": [
{
"pattern": "react",
"group": "builtin",
"position": "before"
},
{
"pattern": "react*",
"group": "external",
"position": "before"
},
{
"pattern": "*react*",
"group": "external",
"position": "before"
}
],
"pathGroupsExcludedImportTypes": [
"react"
],
"newlines-between": "never",
"alphabetize": {
"order": "asc",
"caseInsensitive": true
}
}
],
"sort-imports": [
"error",
{
"ignoreCase": false,
"ignoreDeclarationSort": true,
"ignoreMemberSort": false,
"memberSyntaxSortOrder": [
"single",
"multiple",
"all",
"none"
],
"allowSeparatedGroups": false
}
]
},
"overrides": [{
"files": ["*.test.js"],
"env": {
"jest": true
"overrides": [
{
"files": [
"*.ts",
"*.tsx"
],
"extends": [
"eslint-config-airbnb-typescript"
],
"parserOptions": {
"project": [
"./tsconfig.json"
]
}
},
{
"files": [
"*.test.js",
"*.test.jsx",
"*.test.ts",
"*.test.tsx"
],
"env": {
"jest": true
},
"rules": {
"react/react-in-jsx-scope": "off"
}
}
}],
],
"globals": {
"window": true,
"document": true,
Expand All @@ -90,4 +210,4 @@
"sessionStorage": true,
"assert": true
}
}
}
63 changes: 0 additions & 63 deletions .flowconfig

This file was deleted.

15 changes: 11 additions & 4 deletions .github/workflows/test-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,19 @@ on:
types: [opened, synchronize, reopened]
branches:
- main
workflow_call:
secrets:
access-token:
required: false

env:
NODE_VERSION: 16.10.0
NODE_VERSION: 18.0

jobs:
run_tests:
if: github.event_name == 'push' || (github.event_name == 'pull_request')
name: Run Tests
runs-on: ubuntu-latest
timeout-minutes: 5

steps:
- uses: actions/checkout@v3
Expand All @@ -31,7 +35,10 @@ jobs:
if: steps.yarn-cache.outputs.cache-hit != true
run: yarn install --frozen-lockfile

- name: Create mock ENV
run: cp __mocks__/env.json env.json

# Run tests
- run: yarn test
- run: yarn tsc
- run: yarn lint
- run: yarn flow
# - run: yarn test
14 changes: 8 additions & 6 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -30,19 +30,16 @@ build/
local.properties
*.iml
*.hprof
.cxx/
*.keystore
!debug.keystore

# node.js
#
node_modules/
npm-debug.log
yarn-error.log

# BUCK
buck-out/
\.buckd/
*.keystore
!debug.keystore

# fastlane
#
# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
Expand All @@ -62,6 +59,11 @@ buck-out/
/ios/Pods/
/vendor/bundle/

# Temporary files created by Metro to check the health of the file watcher
.metro-health-check*
# testing
/coverage

# Secrets
env.json
!/__mocks__/env.json
Expand Down
6 changes: 0 additions & 6 deletions .vscode/settings.json

This file was deleted.

Loading

0 comments on commit a417401

Please sign in to comment.