diff --git a/.vscode/settings.json b/.vscode/settings.json index 2f0e94b4..563f7f15 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -183,7 +183,7 @@ "*.env": "$(capture).env.*", "README.md": "README*,CHANGELOG*,LICENSE,CNAME", "package.json": "pnpm-lock.yaml,pnpm-workspace.yaml,.gitattributes,.gitignore,.gitpod.yml,.npmrc,.browserslistrc,.node-version,.git*,.tazerc.json", - "Dockerfile": "Dockerfile,.docker*,docker-entrypoint.sh,build-local-docker*", + "Dockerfile": "Dockerfile,.docker*,docker-entrypoint.sh,build-local-docker*,nginx.conf", "eslint.config.mjs": ".eslintignore,.prettierignore,.stylelintignore,.commitlintrc.*,.prettierrc.*,stylelint.config.*,.lintstagedrc.mjs,.ls-lint*,cspell.json", "tailwind.config.mjs": "postcss.*" }, diff --git a/Dockerfile b/Dockerfile index a7dd4ae4..4b76d886 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,7 +23,7 @@ FROM nginx:stable-alpine as production RUN echo "types { application/javascript js mjs; }" > /etc/nginx/conf.d/mjs.conf COPY --from=builder /app/apps/web-antd/dist /usr/share/nginx/html -COPY ./deploy/nginx.conf /etc/nginx/nginx.conf +COPY ./nginx.conf /etc/nginx/nginx.conf EXPOSE 8080 diff --git a/internal/lint-configs/eslint-config/src/custom-config.ts b/internal/lint-configs/eslint-config/src/custom-config.ts index 13526bcc..4cdf8d60 100644 --- a/internal/lint-configs/eslint-config/src/custom-config.ts +++ b/internal/lint-configs/eslint-config/src/custom-config.ts @@ -14,6 +14,13 @@ const customConfig: Linter.Config[] = [ 'vue/require-default-prop': 'off', }, }, + { + files: ['packages/effects/**/**', 'packages/types/**/**'], + ignores: restrictedImportIgnores, + rules: { + 'perfectionist/sort-interfaces': 'off', + }, + }, { // apps内部的一些基础规则 files: ['apps/**/**'], @@ -46,6 +53,7 @@ const customConfig: Linter.Config[] = [ ], }, ], + 'perfectionist/sort-interfaces': 'off', }, }, { diff --git a/deploy/nginx.conf b/nginx.conf similarity index 84% rename from deploy/nginx.conf rename to nginx.conf index a36247d0..8e6ab101 100644 --- a/deploy/nginx.conf +++ b/nginx.conf @@ -73,15 +73,3 @@ http { } } } - -# stream { # stream 模块配置和 http 模块在相同级别 -# upstream redis { -# server 127.0.0.1:6379 max_fails=3 fail_timeout=30s; -# } -# server { -# listen 16379; -# proxy_connect_timeout 1s; -# proxy_timeout 3s; -# proxy_pass redis; -# } -# }