diff --git a/.dockerignore b/.dockerignore index d5e2da4..e565d74 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,5 +1,6 @@ * **/* !bundle/ +!dist/ !Caddyfile !nginx.conf diff --git a/.eslintrc.js b/.eslintrc.js index 11f5436..d3ef6c0 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -16,14 +16,40 @@ module.exports = { 'plugin:prettier/recommended', ], plugins: ['@typescript-eslint', 'prettier'], - rules: {}, + rules: { + 'func-names': ['error', 'as-needed'], + 'prefer-destructuring': 'off', + 'object-shorthand': ['error', 'consistent-as-needed'], + 'no-restricted-syntax': ['error', 'ForInStatement', 'LabeledStatement', 'WithStatement'], + + 'import/prefer-default-export': 'off', + 'import/extensions': [ + 'error', + 'ignorePackages', + { + js: 'never', + mjs: 'never', + jsx: 'never', + ts: 'never', + tsx: 'never', + }, + ], + 'no-unused-vars': 'off', + '@typescript-eslint/no-unused-vars': ['error', { varsIgnorePattern: '^_', argsIgnorePattern: '^_' }], + '@typescript-eslint/no-explicit-any': 'off', + + // should be overriden for current project only + 'no-param-reassign': ['error', { props: false }], + 'no-console': 'off', + '@typescript-eslint/explicit-module-boundary-types': 'off', + }, settings: { - // 'import/resolver': { - // browser: { - // extensions: ['.js', '.js', '.ts', '.ts', '.css', '.elm'], - // paths: ['src'], - // }, - // }, - 'import/extensions': ['.js', '.ts'], + 'import/extensions': ['.js', '.ts', '.jsx', '.tsx'], + 'import/resolver': { + typescript: {}, + node: { + paths: ['src'], + }, + }, }, }; diff --git a/.github/workflows/container.yml b/.github/workflows/container.yml index ff0b00f..266862c 100644 --- a/.github/workflows/container.yml +++ b/.github/workflows/container.yml @@ -28,7 +28,7 @@ jobs: node-version: 14 - run: npm install - - run: npm run pack + - run: npm run build env: CI: true diff --git a/caddy.Dockerfile b/caddy.Dockerfile index 10ab4ef..82e730a 100644 --- a/caddy.Dockerfile +++ b/caddy.Dockerfile @@ -1,6 +1,6 @@ FROM caddy WORKDIR / -COPY ./bundle /bundle +COPY ./dist /bundle COPY Caddyfile /Caddyfile #RUN printf '\n\ diff --git a/elm.json b/elm.json index 4f18fba..3eeb3de 100644 --- a/elm.json +++ b/elm.json @@ -1,15 +1,12 @@ { "type": "application", - "source-directories": [ - "src" - ], + "source-directories": ["src"], "elm-version": "0.19.1", "dependencies": { "direct": { "Chadtech/unique-list": "2.1.4", "avh4/elm-color": "1.0.0", "ccapndave/elm-flat-map": "1.2.0", - "damienklinnert/elm-spinner": "3.0.2", "elm/browser": "1.0.2", "elm/core": "1.0.5", "elm/html": "1.0.0", diff --git a/favicon.ico b/favicon.ico new file mode 100644 index 0000000..7b1548e Binary files /dev/null and b/favicon.ico differ diff --git a/index.html b/index.html index 70d0f0b..3b2efd7 100644 --- a/index.html +++ b/index.html @@ -16,7 +16,6 @@