diff --git a/.dockerignore b/.dockerignore index 3f38488..2b9daea 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,3 +1,4 @@ **/node_modules .git -**/dist \ No newline at end of file +**/dist +**/tsconfig.tsbuildinfo \ No newline at end of file diff --git a/app/Dockerfile b/app/Dockerfile index e5e4888..aa511c6 100644 --- a/app/Dockerfile +++ b/app/Dockerfile @@ -6,8 +6,9 @@ COPY package.json yarn.lock tsconfig.json ./ COPY packages/file-graph/package.json ./packages/file-graph/package.json COPY packages/utils/package.json ./packages/utils/package.json COPY packages/constants/package.json ./packages/constants/package.json +COPY packages/models/package.json ./packages/models/package.json COPY app/package.json ./app/package.json -RUN yarn install +RUN yarn install --frozen-lockfile # Dev stage FROM base as dev @@ -19,8 +20,8 @@ FROM base as build COPY packages/file-graph ./packages/file-graph COPY packages/utils ./packages/utils COPY packages/constants ./packages/constants +COPY packages/models ./packages/models COPY app ./app -RUN yarn workspace app build:refs RUN yarn workspace app build # Production stage diff --git a/app/package.json b/app/package.json index cce0b82..f571179 100644 --- a/app/package.json +++ b/app/package.json @@ -5,8 +5,7 @@ "scripts": { "dev": "vite", "dev:docker": "API_TARGET=http://backend:3000 vite", - "build": "vite build", - "build:refs": "tsc --build", + "build": "vue-tsc -b && vite build", "preview": "vite preview" }, "dependencies": { @@ -18,6 +17,7 @@ "@linux-odyssey/constants": "*", "@linux-odyssey/file-graph": "*", "@linux-odyssey/utils": "*", + "@linux-odyssey/models": "*", "@types/dompurify": "^3.0.5", "axios": "^1.6.0", "dompurify": "^3.0.6", @@ -42,6 +42,6 @@ "tailwindcss": "^3.3.3", "typescript": "^5.3.3", "vite": "^4.5.3", - "vue-tsc": "^1.8.25" + "vue-tsc": "^2.0.10" } } diff --git a/app/src/components/ContactButton.vue b/app/src/components/ContactButton.vue index c264443..77237ab 100644 --- a/app/src/components/ContactButton.vue +++ b/app/src/components/ContactButton.vue @@ -1,4 +1,4 @@ -