diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index c600ae2..dda2507 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -14,13 +14,10 @@ "version": "latest", "pnpmVersion": "none", "nvmVersion": "latest" - }, - "ghcr.io/devcontainers-extra/features/corepack:1": { - "version": "latest" } }, - "postCreateCommand": "corepack enable && yarn install", + "postCreateCommand": "npm install", // Configure tool-specific properties. "customizations": { diff --git a/.github/workflows/audit.yml b/.github/workflows/audit.yml index 75322ce..1d88088 100644 --- a/.github/workflows/audit.yml +++ b/.github/workflows/audit.yml @@ -35,9 +35,8 @@ jobs: steps: - uses: actions/checkout@v5 - - run: corepack enable - - run: yarn install - - run: yarn npm audit + - run: npm install + - run: npm audit build: runs-on: ubuntu-latest diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 63d4712..3ae8d46 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -9,7 +9,7 @@ "isDefault": true }, "problemMatcher": [], - "label": "yarn: build", + "label": "npm: build", "detail": "Build project" }, { @@ -17,7 +17,7 @@ "script": "install", "group": "build", "problemMatcher": [], - "label": "yarn: install", + "label": "npm: install", "detail": "Restore dependencies" }, { @@ -28,7 +28,7 @@ "isDefault": true }, "problemMatcher": [], - "label": "yarn: dev", + "label": "npm: dev", "detail": "Start development server" }, { @@ -36,7 +36,7 @@ "script": "lint", "group": "test", "problemMatcher": [], - "label": "yarn: lint", + "label": "npm: lint", "detail": "Run ESLint" }, { diff --git a/.yarnrc.yml b/.yarnrc.yml deleted file mode 100644 index d72e49f..0000000 --- a/.yarnrc.yml +++ /dev/null @@ -1,5 +0,0 @@ -nodeLinker: node-modules - -logFilters: - - level: discard - pattern: "react is listed by your project with version * (*), which doesn't satisfy what @fluentui/react-icons and other dependencies request*" diff --git a/Dockerfile b/Dockerfile index d165c75..f555139 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,9 +7,8 @@ RUN apk add --no-cache libc6-compat WORKDIR /app # Install dependencies -COPY package.json yarn.lock .yarnrc.yml ./ -RUN corepack enable -RUN yarn install +COPY package.json package-lock.json ./ +RUN npm install # Rebuild the source code only when needed FROM base AS builder @@ -17,15 +16,13 @@ WORKDIR /app COPY --from=deps /app/node_modules ./node_modules COPY . . -RUN corepack enable - # Next.js collects completely anonymous telemetry data about general usage. # Learn more here: https://nextjs.org/telemetry # Uncomment the following line in case you want to disable telemetry during the build. # ENV NEXT_TELEMETRY_DISABLED 1 -RUN yarn lint -RUN yarn build +RUN npm run lint +RUN npm run build # Production image, copy all the files and run next FROM base AS runner diff --git a/README.md b/README.md index ff352ac..64c4881 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,6 @@ This repository contains the source code for my personal website, built using Ne For development you can use [Dev Containers](https://devcontainers.io/) or [GitHub Codespaces](https://github.com/features/codespaces). Otherwise you will need to install following tools: - [Node.js](https://nodejs.org/en/) -- [Yarn](https://yarnpkg.com/) - [Docker](https://www.docker.com/) @@ -41,10 +40,10 @@ For development you can use [Dev Containers](https://devcontainers.io/) or [GitH Here're some commonly used commands: ```bash -yarn install # Install dependencies -yarn dev # Start the development server at http://localhost:3000 -yarn lint # Lint the project with ESLint -yarn build # Build the project for production +npm install # Install dependencies +npm run dev # Start the development server at http://localhost:3000 +npm run lint # Lint the project with ESLint +npm run build # Build the project for production ``` To build a Docker image, run: diff --git a/app/_data/experience.tsx b/app/_data/experience.tsx index 8d4ff8a..fe84785 100644 --- a/app/_data/experience.tsx +++ b/app/_data/experience.tsx @@ -66,7 +66,7 @@ const experience: WorkplaceEntry[] = year: "2025", description: <>

Designing and implementing large-scale distributed WLAN controller system

-

Stack: ASP.NET (RESTFul API), MongoDB, Postges (EF Core), RabbitMQ (MassTransit), MQTT, Docker.

+

Stack: React, ASP.NET (RESTFul API), MongoDB, Postges (EF Core), RabbitMQ (MassTransit), MQTT, Docker.