Skip to content

Commit

Permalink
feat(management): drop lerna and restructure a bit the monorepo
Browse files Browse the repository at this point in the history
  • Loading branch information
aldbr committed Nov 4, 2024
1 parent bce5f04 commit 6541d3c
Show file tree
Hide file tree
Showing 99 changed files with 11,594 additions and 12,475 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/basic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
run: npm ci

- name: Build Library
run: npm run build-lib
run: npm run build:diracx-web-components

- name: Check formatting rules
run: npx prettier . --check
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ jobs:
cache: 'npm'

- name: Build documentation
run: npm ci && npm run build-storybook -w @dirac-grid/diracx-web-components
run: npm ci && npm --prefix packages/diracx-web-components run build-storybook

- name: Upload artifact
uses: actions/upload-pages-artifact@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ jobs:
run: npm ci

- name: Trigger tests
run: npm run test
run: npm --prefix packages/diracx-web-components run test
4 changes: 3 additions & 1 deletion .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

npx lerna exec -- npx lint-staged
npm --prefix packages/diracx-web-components run lint-staged
npm --prefix packages/diracx-web run lint-staged
npm --prefix packages/extensions run lint-staged
6 changes: 4 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
FROM node:alpine AS build
WORKDIR /app
# Copy the application to the working directory
COPY . .
COPY package*.json ./
COPY packages/diracx-web ./packages/diracx-web
COPY packages/diracx-web-components ./packages/diracx-web-components
# Install the project dependencies
RUN npm ci
# Build the static export with telemetry disabled (https://nextjs.org/telemetry)
Expand All @@ -14,5 +16,5 @@ RUN NEXT_TELEMETRY_DISABLED=1 npm run build
# Stage 2: Copy the website from the previous container to a Nginx container
FROM nginxinc/nginx-unprivileged:alpine
EXPOSE 8080
COPY --from=build /app/out /usr/share/nginx/html
COPY --from=build /app/packages/diracx-web/out /usr/share/nginx/html
COPY ./config/nginx/default.conf /etc/nginx/conf.d/default.conf
4 changes: 0 additions & 4 deletions lerna.json

This file was deleted.

Loading

0 comments on commit 6541d3c

Please sign in to comment.