Merge pull request #625 from MohammedMaaz/feature/68-exclude-dev-depe…

…ndencies-in-prod-build Omit dev dependencies during Next JS build
Agenta-AI · Sep 18, 2023 · b1600da · b1600da
2 parents 0a013b6 + 9a4994d
commit b1600da
Show file tree

Hide file tree

Showing 11 changed files with 16 additions and 63 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
diff --git a/.github/workflows/lint.yml → .github/workflows/lint-and-build.yml b/.github/workflows/lint.yml → .github/workflows/lint-and-build.yml
@@ -1,12 +1,12 @@
-name: Lint and Types
+name: Lint and Build
 
 on:
   pull_request:
     paths:
       - "agenta-web/**"
 
 jobs:
-  lint_and_types:
+  lint_and_build:
     runs-on: ubuntu-latest
     steps:
       - name: Check out code
@@ -18,13 +18,13 @@ jobs:
           node-version: 20
 
       - name: Install dependencies
-        run: npm ci
+        run: npm ci --omit=dev
         working-directory: agenta-web
 
       - name: Run Lint
         run: npm run lint
         working-directory: agenta-web
 
-      - name: Type Check
-        run: npm run types:check
+      - name: Run Build
+        run: npm run build
         working-directory: agenta-web
diff --git a/.github/workflows/prettier.yml b/.github/workflows/prettier.yml
@@ -17,10 +17,6 @@ jobs:
         with:
           node-version: 20
 
-      - name: Install dependencies
-        run: npm ci
-        working-directory: agenta-web
-
       - name: Run Prettier
         run: npx prettier --check .
         working-directory: agenta-web
diff --git a/agenta-web/.eslintrc.json b/agenta-web/.eslintrc.json
@@ -1,7 +1,6 @@
 {
-    "extends": ["next/core-web-vitals", "prettier"],
+    "extends": ["next/core-web-vitals"],
     "rules": {
-        "react/no-unescaped-entities": 0,
-        "react-hooks/rules-of-hooks": 0
+        "react/no-unescaped-entities": 0
     }
 }
diff --git a/agenta-web/package-lock.json b/agenta-web/package-lock.json
diff --git a/agenta-web/package.json b/agenta-web/package.json
@@ -26,6 +26,7 @@
         "@types/js-beautify": "^1.14.0",
         "@types/mdx": "^2.0.6",
         "@types/react-dom": "18.2.1",
+        "@types/react-highlight-words": "^0.16.4",
         "@types/react-syntax-highlighter": "^15.5.7",
         "ag-grid-community": "^30.0.6",
         "ag-grid-react": "^30.0.3",
@@ -55,9 +56,7 @@
         "usehooks-ts": "^2.9.1"
     },
     "devDependencies": {
-        "@types/react-highlight-words": "^0.16.4",
         "cypress": "^12.11.0",
-        "eslint-config-prettier": "^8.8.0",
         "node-mocks-http": "^1.12.2",
         "prettier": "^3.0.0"
     }

diff --git a/agenta-web/prod.Dockerfile b/agenta-web/prod.Dockerfile
@@ -4,7 +4,7 @@ WORKDIR /app
 
 # Install only production dependencies
 COPY package.json package-lock.json* ./
-RUN npm ci
+RUN npm ci --omit=dev
 
 # Copy only necessary files
 COPY src ./src

diff --git a/agenta-web/src/components/AppSelector/AppSelector.tsx b/agenta-web/src/components/AppSelector/AppSelector.tsx
@@ -9,7 +9,7 @@ import {CloseCircleFilled} from "@ant-design/icons"
 import TipsAndFeatures from "./TipsAndFeatures"
 import Welcome from "./Welcome"
 import {isAppNameInputValid} from "@/lib/helpers/utils"
-import {createAndStartTemplate, fetchApps, getTemplates} from "@/lib/services/api"
+import {createAndStartTemplate, useApps, getTemplates} from "@/lib/services/api"
 import AddNewAppModal from "./modals/AddNewAppModal"
 import AddAppFromTemplatedModal from "./modals/AddAppFromTemplateModal"
 import MaxAppModal from "./modals/MaxAppModal"
@@ -274,7 +274,7 @@ const AppSelector: React.FC = () => {
         })
     }
 
-    const {data, error, isLoading} = fetchApps()
+    const {data, error, isLoading} = useApps()
     useEffect(() => {
         setTimeout(() => {
             if (data) {

diff --git a/agenta-web/src/components/TestSetTable/InsertTestsetNameModal.tsx b/agenta-web/src/components/TestSetTable/InsertTestsetNameModal.tsx
@@ -21,7 +21,7 @@ interface Props {
     setIsModalOpen: (value: boolean) => void
 }
 
-const testsetMusHaveNameModal: React.FC<Props> = ({isModalOpen, setIsModalOpen}) => {
+const TestsetMusHaveNameModal: React.FC<Props> = ({isModalOpen, setIsModalOpen}) => {
     const classes = useStyles()
     const handleCloseModal = () => setIsModalOpen(false)
 
@@ -48,4 +48,4 @@ const testsetMusHaveNameModal: React.FC<Props> = ({isModalOpen, setIsModalOpen})
     )
 }
 
-export default testsetMusHaveNameModal
+export default TestsetMusHaveNameModal
diff --git a/agenta-web/src/lib/services/api.ts b/agenta-web/src/lib/services/api.ts
@@ -510,7 +510,7 @@ export const updateEvaluationScenarioScore = async (
     return response
 }
 
-export const fetchApps = () => {
+export const useApps = () => {
     const {data, error, isLoading} = useSWR(
         `${process.env.NEXT_PUBLIC_AGENTA_API_URL}/api/app_variant/list_apps/`,
         fetcher,

diff --git a/agenta-web/src/pages/apps/[app_name]/testsets/index.tsx b/agenta-web/src/pages/apps/[app_name]/testsets/index.tsx
@@ -48,7 +48,7 @@ const fetchData = async (url: string): Promise<any> => {
     return response.data
 }
 
-export default function testsets() {
+export default function Testsets() {
     const classes = useStyles()
     const router = useRouter()
     const {app_name} = router.query