Skip to content

Commit

Permalink
Merge branch 'main' into features/beacon-network
Browse files Browse the repository at this point in the history
  • Loading branch information
gsfk committed Sep 10, 2024
2 parents 64ee366 + 7ea669d commit 48adb35
Show file tree
Hide file tree
Showing 79 changed files with 3,155 additions and 1,218 deletions.
26 changes: 18 additions & 8 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,31 @@ module.exports = {
node: true,
},
plugins: ['react', '@typescript-eslint'],
extends: ['eslint:recommended', 'plugin:react/recommended', 'plugin:@typescript-eslint/recommended', 'plugin:prettier/recommended'],
extends: [
'eslint:recommended',
'plugin:react/recommended',
'plugin:@typescript-eslint/recommended',
'plugin:prettier/recommended',
'plugin:react-hooks/recommended',
],
rules: {
'react/prop-types': 'off', // disable prop-types since we're using TypeScript
'@typescript-eslint/explicit-module-boundary-types': 'off', // allow implicit return types
'@typescript-eslint/no-empty-interface': 'off', // allow empty interfaces
'no-unused-vars': 'off', // disable no-unused-vars since @typescript-eslint/no-unused-vars does the same
'@typescript-eslint/no-unused-vars': ['error', { argsIgnorePattern: '^_' }], // enable @typescript-eslint/no-unused-vars
'@typescript-eslint/no-non-null-assertion': 'off',
'comma-dangle': ['error', {
'arrays': 'always-multiline',
'objects': 'always-multiline',
'imports': 'always-multiline',
'exports': 'always-multiline',
}],
'semi': ['error', 'always'],
'@typescript-eslint/consistent-type-imports': 'error',
'comma-dangle': [
'error',
{
arrays: 'always-multiline',
objects: 'always-multiline',
imports: 'always-multiline',
exports: 'always-multiline',
},
],
semi: ['error', 'always'],
},
settings: {
react: {
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,5 @@ www/

.yalc
yalc.lock

core
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ COPY main.go .
RUN go build -o ./reactapp


FROM ghcr.io/bento-platform/bento_base_image:node-debian-2024.03.01
FROM ghcr.io/bento-platform/bento_base_image:node-debian-2024.07.09

ENV BENTO_PUBLIC_PACKAGE_JSON_PATH=/bento-public/package.json
WORKDIR /bento-public
Expand Down
2 changes: 1 addition & 1 deletion dev.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/bento-platform/bento_base_image:node-debian-2024.03.01
FROM ghcr.io/bento-platform/bento_base_image:node-debian-2024.07.09

RUN apt-get update -y && \
apt-get install -y ca-certificates
Expand Down
Loading

0 comments on commit 48adb35

Please sign in to comment.