8000 feat: extract node ui code by frdomovic · Pull Request #1252 · calimero-network/core · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

feat: extract node ui code #1252

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

Merged
merged 29 commits into from
May 19, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
dff69f0
feat: extract node ui code
frdomovic May 8, 2025
232b969
feat: update server build file
frdomovic May 8, 2025
c541eef
fix: lint
frdomovic May 8, 2025
2f77e34
fix: remove nove ui
frdomovic May 8, 2025
d51f65e
fix: output path
frdomovic May 8, 2025
1f06474
feat: add default folder
frdomovic May 8, 2025
76af549
feat: update build for server
frdomovic May 9, 2025
f60003a
fix: lint
frdomovic May 9, 2025
f43aa7b
fix: rebuild on node run
frdomovic May 9, 2025
df5dcd8
fix: lint
frdomovic May 12, 2025
d2f84f0
fix: optimization 1
frdomovic May 12, 2025
b957a0b
fix: optimization 2
frdomovic May 12, 2025
54b6625
feat: update build logic + remove node ui
frdomovic May 12, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 0 additions & 21 deletions .github/actions/style/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,24 +46,3 @@ runs:
exit 1 # Exit with a non-zero status code if formatting fails
fi
fi

# Check for changes in the 'node-ui' directory and run formatting/linting
- name: Check for changes in node-ui
shell: bash
env:
ALL_CHANGED_FILES: ${{ steps.changed-files.outputs.all_changed_files }}
run: |
echo "Checking for changes in node-ui files"
if echo "$ALL_CHANGED_FILES" | grep -q '^node-ui/'; then
echo "Running checks for the node-ui..."
cd node-ui
if ! pnpm prettier:check .; then
echo "Prettier found unformatted files in node-ui."
exit 1 # Fail if Prettier detects issues
fi
# TODO: Uncomment after fixing linting issues
# if ! pnpm lint; then
# echo "Linting issues found in node-ui."
# exit 1 # Fail if linter detects issues
# fi
fi
130 changes: 0 additions & 130 deletions .github/workflows/build_node_ui.yml

This file was deleted.

26 changes: 0 additions & 26 deletions .github/workflows/ci-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,29 +55,3 @@ jobs:
uses: EmbarkStudios/cargo-deny-action@v2
with:
command: check licenses sources

nodejs:
name: NodeJS
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v4

- name: Set up Node.js
uses: actions/setup-node@v2
with:
node-version: '20'

- name: Install pnpm
run: npm install -g pnpm

- name: Install node-ui dependencies with pnpm
run: pnpm install --prefix ./node-ui

- name: Build node-ui
run: pnpm --filter ./node-ui run build

- name: Prettier check
run: |
cd node-ui
pnpm prettier:check .
6 changes: 0 additions & 6 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,3 @@ if git diff --cached --name-only | grep -qE '\.rs$'; then
echo "Running checks for the Rust code..."
cargo +nightly fmt
fi

# Check for changes in the 'node-ui' directory (Next.js app)
if git diff --cached --name-only | grep -q '^node-ui/'; then
echo "Running checks for the node-ui (Next.js app)..."
(cd node-ui && pnpm prettier && pnpm lint:fix)
fi
18 changes: 0 additions & 18 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,6 @@
# Want to help us make this template better? Share your feedback here: https://forms.gle/ybq9Krt8jtBL3iCk7

ARG RUST_VERSION=1.81.0
ARG NODE_VERSION=20

################################################################################
# Create a stage for building the node-ui application
FROM node:${NODE_VERSION}-slim AS builder-nodejs
WORKDIR /app

# Copy node-ui directory
COPY node-ui ./node-ui
WORKDIR /app/node-ui

# Install pnpm and build the UI
RUN npm install -g pnpm && \
pnpm install --no-frozen-lockfile && \
pnpm run build

################################################################################
# Create a stage for building the Rust application
Expand Down Expand Up @@ -50,9 +35,6 @@ COPY contracts ./contracts
COPY apps ./apps
COPY e2e-tests ./e2e-tests

# Copy the built node-ui from the nodejs stage
COPY --from=builder-nodejs /app/node-ui ./node-ui

# Build merod and meroctl together with caching and copy to persistent locations
RUN --mount=type=cache,target=/app/target/ \
--mount=type=cache,target=/usr/local/cargo/git/db \
Expand Down
2 changes: 0 additions & 2 deletions node-ui/.env

This file was deleted.

40 changes: 0 additions & 40 deletions node-ui/.eslint.config.mjs

This file was deleted.

4 changes: 0 additions & 4 deletions node-ui/.eslintignore

This file was deleted.

24 changes: 0 additions & 24 deletions node-ui/.gitignore

This file was deleted.

4 changes: 0 additions & 4 deletions node-ui/.prettierignore

This file was deleted.

50 changes: 0 additions & 50 deletions node-ui/build/404.html

This file was deleted.

Loading
Loading
0