Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: monorepo #616

Merged
merged 60 commits into from
Feb 2, 2024
Merged
Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
04b781e
feat: preparations before moving projects
mikitabut Jan 22, 2024
5ec18f6
feat: use monorepo approach for dial chat
mikitabut Jan 24, 2024
e6ce164
fix: generate overlay lib
mikitabut Jan 24, 2024
d5cad9d
feat: move overlay sandbox to separate place
mikitabut Jan 26, 2024
1c29066
feat: update deps
mikitabut Jan 26, 2024
dcb0f1a
Merge branch 'development' of github.com:epam/ai-dial-chat into feat/…
mikitabut Jan 26, 2024
f814c40
feat: change building for overlay lib
mikitabut Jan 26, 2024
c260dcd
feat: unify targets
mikitabut Jan 26, 2024
34b6ef9
feat: finalize folder structure
mikitabut Jan 27, 2024
2dae759
fix: generate package lock
mikitabut Jan 27, 2024
500338b
fix: fix dependencies
mikitabut Jan 29, 2024
7e4fd29
fix: disabled e2e tests caching
mikitabut Jan 29, 2024
d62963c
fix: disable cache for vite
mikitabut Jan 29, 2024
db369a2
fix: skip test
mikitabut Jan 29, 2024
452d69e
fix: move out docker file back
mikitabut Jan 29, 2024
71f3631
feat: update documentations
mikitabut Jan 29, 2024
512d8e0
Merge branch 'development' of github.com:epam/ai-dial-chat into feat/…
mikitabut Jan 29, 2024
264e81a
fix: fix linting
mikitabut Jan 30, 2024
8446088
feat/chat-monorepo: moved playwright dependencies to optional, update…
irinakartun Jan 30, 2024
5eb21b7
Merge remote-tracking branch 'origin/feat/chat-monorepo' into feat/ch…
irinakartun Jan 30, 2024
652c16f
fix: fix linting
mikitabut Jan 30, 2024
04605c6
Merge branch 'feat/chat-monorepo' of github.com:epam/ai-dial-chat int…
mikitabut Jan 30, 2024
0ac433a
fix: copy package.json implicitly
mikitabut Jan 30, 2024
cb0228e
feat/chat-monorepo: optimized test import; added script for local cha…
irinakartun Jan 30, 2024
dc33be3
fix: fix docker
mikitabut Jan 30, 2024
e58501b
Merge branch 'feat/chat-monorepo' of github.com:epam/ai-dial-chat int…
mikitabut Jan 30, 2024
a11e239
fix: remove script
mikitabut Jan 30, 2024
eb87459
Merge branch 'development' of github.com:epam/ai-dial-chat into feat/…
mikitabut Jan 30, 2024
0bb27c2
fix: skip checks for prs
mikitabut Jan 30, 2024
7c424a3
Merge branch 'development' of github.com:epam/ai-dial-chat into feat/…
mikitabut Jan 30, 2024
0177e2d
fix: updated documentation and add nx as script
mikitabut Jan 30, 2024
ddcd670
fix: get rid of not needed fields
mikitabut Jan 30, 2024
cbcadb0
fix: fix build
mikitabut Jan 31, 2024
064139f
Merge branch 'development' of github.com:epam/ai-dial-chat into feat/…
mikitabut Jan 31, 2024
776020b
fix: return back bypass checks
mikitabut Jan 31, 2024
9b2caca
fix: add exception for rule violation
mikitabut Jan 31, 2024
fd0751f
Merge branch 'development' of github.com:epam/ai-dial-chat into feat/…
mikitabut Jan 31, 2024
dfd5fe5
fix: fix features
mikitabut Jan 31, 2024
b958fa3
fix: fix regexp for ort check
mikitabut Jan 31, 2024
fa2b9b0
fix: fix regexp
mikitabut Jan 31, 2024
390c710
fix: remove not working ort rule violations config
mikitabut Jan 31, 2024
70f5353
fix: add bypass_ort to true to avoid blocking
mikitabut Jan 31, 2024
0238d08
Merge branch 'development' of github.com:epam/ai-dial-chat into feat/…
mikitabut Jan 31, 2024
95b7452
fix: add ort exception again
mikitabut Jan 31, 2024
4a126ce
fix: fix regexp
mikitabut Jan 31, 2024
58a6319
fix: fix versions for overlay lib
mikitabut Jan 31, 2024
eed42ac
feat: update publish workflow
mikitabut Feb 1, 2024
9169eae
fix: update publish script
mikitabut Feb 1, 2024
a7e514e
fix: change bundler
mikitabut Feb 1, 2024
e031a3b
fix: return back logic about overlay
mikitabut Feb 1, 2024
15d8755
fix: update some readme
mikitabut Feb 1, 2024
d737f1a
Merge branch 'development' of github.com:epam/ai-dial-chat into feat/…
mikitabut Feb 1, 2024
3144f44
fix: get rid of chat package json
mikitabut Feb 2, 2024
bf91c33
fix: try to reduce size of docker file
mikitabut Feb 2, 2024
b134cc3
fix: fix npm installing
mikitabut Feb 2, 2024
63bb2ff
fix: fix docker npm i
mikitabut Feb 2, 2024
5d62c82
fix: fix dir
mikitabut Feb 2, 2024
5f8a248
fix: fix pino pretty
mikitabut Feb 2, 2024
7f03d14
fix: fix pino pretty module
mikitabut Feb 2, 2024
fdabb46
fix: fix e2e logging
mikitabut Feb 2, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
13 changes: 13 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Editor configuration, see http://editorconfig.org
root = true

[*]
charset = utf-8
indent_style = space
indent_size = 2
insert_final_newline = true
trim_trailing_whitespace = true

[*.md]
max_line_length = off
trim_trailing_whitespace = false
2 changes: 1 addition & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ dist

.github
helm
__tests__
apps/chat-e2e/html-report
96 changes: 46 additions & 50 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,61 +1,57 @@
{
"extends": [
"eslint:recommended",
"plugin:@typescript-eslint/recommended",
"plugin:@typescript-eslint/stylistic",
"prettier",
"plugin:tailwindcss/recommended",
"next/core-web-vitals"
],
"parser": "@typescript-eslint/parser",
"plugins": ["@typescript-eslint", "tailwindcss"],
"extends": ["eslint:recommended", "prettier"],
"plugins": ["@nx"],
"root": true,
"settings": {
"tailwindcss": {
"config": "./tailwind.config.js",
"callees": ["classnames", "classNames"]
}
},
"rules": {
"react/jsx-boolean-value": ["error", "never"],
"no-empty": "warn",
"@typescript-eslint/no-explicit-any": "warn",
"no-console": ["error", { "allow": ["warn", "error"] }],
"no-constant-condition": "off",
"@typescript-eslint/no-unused-vars": [
"error",
{ "argsIgnorePattern": "^_" }
],
"no-restricted-imports": ["error", { "paths": ["react-i18next"] }],
"tailwindcss/no-custom-classname": "error",
"tailwindcss/no-contradicting-classname": "error",
"no-restricted-globals": [
"error",
{
"name": "localStorage",
"message": "Use DataService instead."
},
{
"name": "sessionStorage",
"message": "Use DataService instead."
}
],
"no-multiple-empty-lines": ["warn", { "max": 1, "maxBOF": 0 }]
"parser": "@typescript-eslint/parser",
"env": {
"node": true
},
"overrides": [
{
"plugins": ["testing-library"],
"files": [
"**/__tests__/**/*.[jt]s?(x)",
"**/?(*.)+(spec|test).[jt]s?(x)"
"files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
"rules": {
"@nx/enforce-module-boundaries": [
"error",
{
"enforceBuildableLibDependency": true,
"allow": [],
"depConstraints": [
{
"sourceTag": "*",
"onlyDependOnLibsWithTags": ["*"]
}
]
}
],
"no-empty": "warn",
"no-console": ["error", { "allow": ["warn", "error", "info"] }],
"no-constant-condition": "off",
"no-multiple-empty-lines": ["warn", { "max": 1, "maxBOF": 0 }]
}
},
{
"files": ["*.ts", "*.tsx"],
"parserOptions": {
"project": ["tsconfig.*?.json"]
},
"extends": [
"plugin:@nx/typescript",
"plugin:@typescript-eslint/recommended",
"plugin:@typescript-eslint/stylistic"
],
"extends": ["plugin:testing-library/react"],
"rules": {
"testing-library/await-async-queries": "error",
"testing-library/no-await-sync-queries": "error",
"testing-library/no-debugging-utils": "warn",
"testing-library/no-dom-import": "off"
// TODO: Check all typescript rules work
mikitabut marked this conversation as resolved.
Show resolved Hide resolved
"@typescript-eslint/no-unused-vars": [
"error",
{ "argsIgnorePattern": "^_" }
],
"@typescript-eslint/no-explicit-any": "warn"
}
},
{
"files": ["*.js", "*.jsx"],
"extends": ["plugin:@nx/javascript"],
"rules": {}
}
]
}
17 changes: 11 additions & 6 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
/test-results

# next.js
/.next/
.next
/out/
/dist

Expand Down Expand Up @@ -46,11 +46,16 @@ pnpm-lock.yaml
.vscode

# e2e
/e2e/test-results/
/e2e/allure-results/
/e2e/auth/
/e2e/html-report/
/e2e/src/testData/export/
/apps/chat-e2e/test-results/
/apps/chat-e2e/allure-results/
e2e
/apps/chat-e2e/auth/
/apps/chat-e2e/html-report/
/apps/chat-e2e/src/testData/export/

# coverage
*/coverage

# NX
.nx/cache
tmp
14 changes: 7 additions & 7 deletions .ort.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
---
excludes:
paths:
- pattern: "package-lock.json"
reason: "BUILD_TOOL_OF"
- pattern: 'package-lock.json'
reason: 'BUILD_TOOL_OF'
scopes:
- pattern: "devDependencies"
reason: "DEV_DEPENDENCY_OF"
comment: "Packages for development only."
- pattern: 'devDependencies'
reason: 'DEV_DEPENDENCY_OF'
comment: 'Packages for development only.'
license_choices:
repository_license_choices:
- given: "GPL-2.0-only OR MIT"
choice: "MIT"
- given: 'GPL-2.0-only OR MIT'
choice: 'MIT'
7 changes: 5 additions & 2 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
**/.hg
**/node_modules

.next
.next/
next.config.js
next-i18next.config.js
public
Expand All @@ -12,4 +12,7 @@ dist

.github
helm
__tests__

/coverage

/.nx/cache
8 changes: 2 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,9 @@ RUN npm run build
FROM node:20-alpine AS production
RUN apk update && apk upgrade --no-cache libcrypto3 libssl3
WORKDIR /app
COPY --from=dependencies /app/node_modules ./node_modules
COPY --from=build /app/.next ./.next
COPY --from=build /app/public ./public
COPY --from=build /app/package*.json ./
COPY --from=build /app/next.config.js ./next.config.js
COPY --from=build /app/next-i18next.config.js ./next-i18next.config.js
COPY --from=build /app ./dist/apps/chat
COPY --from=build /app/startup.sh ./startup.sh
COPY --from=dependencies /app/node_modules ./node_modules

ENV NODE_ENV production
ENV NEXT_TELEMETRY_DISABLED 1
Expand Down
Loading
Loading