1145 Upgrade yarn to v3 (podkrepi-bg#1189)

* Upgrade yarn and update dockerfile

* Auto format

* Added curl to the container

* Change cmd to get cache folder

* Ignore yarn folder when searching with vscode

* Switch workflows to node 18 and add yarn cache

* Remove yarn cache from unit tests workflow

* Remove yarn ache expectation from api repo

.gitattributes

@@ -0,0 +1,2 @@
+/.yarn/releases/** binary
+/.yarn/plugins/** binary

.github/workflows/build-nextjs.yml

@@ -14,7 +14,7 @@ jobs:
 
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
-        run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
+        run: echo "dir=$(yarn config get cacheFolder)" >> $GITHUB_OUTPUT
 
       - uses: actions/cache@v3
         with:

.github/workflows/check-pr.yml

@@ -22,7 +22,7 @@ jobs:
           GHOST_CONTENT_KEY: ${{ secrets.GHOST_CONTENT_KEY }}
         with:
           push: false
-          target: production
+          target: runner
           build-args: |
             SENTRY_AUTH_TOKEN=${{ env.SENTRY_AUTH_TOKEN }}
             GHOST_API_URL=${{ env.GHOST_API_URL }}

.github/workflows/playwright.yml

@@ -21,7 +21,7 @@ jobs:
 
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
-        run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
+        run: echo "dir=$(yarn config get cacheFolder)" >> $GITHUB_OUTPUT
 
       - uses: actions/cache@v3
         with:
@@ -37,7 +37,7 @@ jobs:
         run: docker compose up -d pg-db
       - uses: actions/setup-node@v3
         with:
-          node-version: '16.x'
+          node-version: '18'
 
       - name: Install backend dependencies and seed database
         working-directory: ./api

.github/workflows/release.yml

@@ -72,7 +72,7 @@ jobs:
           GHOST_CONTENT_KEY: ${{ secrets.GHOST_CONTENT_KEY }}
         with:
           push: true
-          target: production
+          target: runner
           build-args: |
             SENTRY_AUTH_TOKEN=${{ env.SENTRY_AUTH_TOKEN }}
             GHOST_API_URL=${{ env.GHOST_API_URL }}

.github/workflows/test.yml → .github/workflows/unit-tests.yml

@@ -1,4 +1,4 @@
-name: Test
+name: Component Tests
 
 on:
   workflow_dispatch:
@@ -12,7 +12,7 @@ jobs:
     strategy:
       max-parallel: 1
       matrix:
-        node-version: [14.x]
+        node-version: [18.x]
 
     steps:
       - uses: actions/checkout@v3
@@ -24,7 +24,7 @@ jobs:
 
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
-        run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
+        run: echo "dir=$(yarn config get cacheFolder)" >> $GITHUB_OUTPUT
 
       - uses: actions/cache@v3
         with:

.gitignore

@@ -26,6 +26,10 @@ coverage
 .settings/
 *.sublime-workspace
 .vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
 .vs
 
 .env
@@ -50,3 +54,12 @@ bld/
 /test-results/
 /playwright-report/
 /playwright/.cache/
+
+# https://yarnpkg.com/getting-started/qa/#which-files-should-be-gitignored
+.pnp.*
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions

.prettierignore

@@ -5,3 +5,6 @@ package-lock.json
 public/fonts
 public/img
 manifests
+.github
+!.github/workflows
+.yarn

.vscode/settings.json

@@ -0,0 +1,11 @@
+{
+  "files.exclude": {
+    "**/.yarn": true
+  },
+  "search.exclude": {
+    "**/.yarn": true
+  },
+  "files.watcherExclude": {
+    "**/.yarn": true
+  }
+}

.yarnrc.yml

@@ -0,0 +1,11 @@
+nodeLinker: node-modules
+
+plugins:
+  - path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
+    spec: '@yarnpkg/plugin-workspace-tools'
+  - path: .yarn/plugins/@yarnpkg/plugin-version.cjs
+    spec: '@yarnpkg/plugin-version'
+  - path: .yarn/plugins/@yarnpkg/plugin-typescript.cjs
+    spec: '@yarnpkg/plugin-typescript'
+
+yarnPath: .yarn/releases/yarn-3.3.0.cjs

Dockerfile

@@ -5,62 +5,61 @@ WORKDIR /app
 ARG NODE_ENV=production
 ENV PATH=/app/node_modules/.bin:$PATH \
   NODE_ENV="$NODE_ENV"
-COPY package.json yarn.lock /app/
-EXPOSE 3040
-
-# Build target dependencies #
-###########################
-FROM base AS dependencies
+# Yarn
+RUN yarn set version berry
+COPY package.json yarn.lock* .yarnrc.yml ./
 
-RUN apk --no-cache add curl g++ make python3
 
-# Install prod dependencies
-RUN yarn install --production && \
-  # Cache prod dependencies
-  cp -R node_modules /prod_node_modules && \
-  # Install dev dependencies
-  yarn install --production=false
+FROM base AS deps
 
-# Build target development #
-############################
-FROM dependencies AS development
-COPY . /app
-CMD [ "yarn", "dev" ]
+COPY .yarn .yarn
+RUN yarn workspaces focus --all --production
 
 # Build target builder #
 ########################
 FROM base AS builder
+
+# Setup build env
 ARG VERSION=unversioned
 ARG SENTRY_AUTH_TOKEN
 ENV SENTRY_AUTH_TOKEN="$SENTRY_AUTH_TOKEN"
 ARG GHOST_API_URL
 ENV GHOST_API_URL="$GHOST_API_URL"
 ARG GHOST_CONTENT_KEY
 ENV GHOST_CONTENT_KEY="$GHOST_CONTENT_KEY"
-COPY --from=dependencies /app/node_modules /app/node_modules
-COPY . /app
 
 RUN apk add --no-cache jq && \
   mv package.json package.json.bak && \
   jq --arg version "$VERSION" '.version=$version' package.json.bak > package.json && \
   rm package.json.bak && \
   apk del jq
 
+# Add dev deps
+COPY --from=deps /app/node_modules ./node_modules
+COPY . .
+
 RUN yarn build && \
-  yarn sitemap && \
-  rm -rf node_modules
+  yarn sitemap
 
 # Build target production #
 ###########################
-FROM base AS production
+FROM base AS runner
 
-COPY --from=builder /app/.next /app/.next
-COPY --from=builder /app/public /app/public
-COPY --from=dependencies /prod_node_modules /app/node_modules
-COPY next.config.js next-i18next.config.js /app/
+RUN apk --no-cache add curl
 
-USER 1000:1001
+RUN addgroup --system --gid 1001 nodejs
+RUN adduser --system --uid 1001 nextjs
+
+COPY --from=builder /app/public ./public
+COPY --from=builder --chown=nextjs:nodejs /app/.next/standalone ./
+COPY --from=builder --chown=nextjs:nodejs /app/.next/static ./.next/static
+
+USER nextjs
+
+ENV PORT 3040
+
+EXPOSE 3040
 
-CMD [ "yarn", "start" ]
+CMD [ "node", "server.js" ]
 
 HEALTHCHECK --interval=5s --timeout=3s --retries=3 CMD curl --fail http://localhost:3040 || exit 1

README.md

@@ -70,7 +70,9 @@ Read more at [End-2-End Testing](https://github.com/podkrepi-bg/frontend/blob/ma
 ## Contributors ✨
 
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
+
 [![All Contributors](https://img.shields.io/badge/all_contributors-60-orange.svg?style=flat-square)](#contributors-)
+
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 
 Please check [contributors guide](https://github.com/podkrepi-bg/frontend/blob/master/CONTRIBUTING.md) for:

docker-compose.yml

@@ -0,0 +1,16 @@
+version: '3.7'
+services:
+  frontend:
+    image: frontend
+    container_name: frontend
+    build:
+      context: ./
+      dockerfile: ./Dockerfile
+      # args:
+      #   SENTRY_AUTH_TOKEN: ${SENTRY_AUTH_TOKEN}
+      #   GHOST_API_URL: ${GHOST_API_URL}
+      #   GHOST_CONTENT_KEY: ${GHOST_CONTENT_KEY}
+    env_file:
+      - .env.local
+    ports:
+      - '3040:3040'

next.config.js

@@ -16,6 +16,7 @@ const moduleExports = {
     includePaths: [path.join(__dirname, 'src/styles')],
   },
   swcMinify: true,
+  output: 'standalone',
   env: {
     APP_ENV: process.env.APP_ENV,
     APP_VERSION: version,

package.json

@@ -3,6 +3,7 @@
   "version": "0.9.13",
   "license": "MIT",
   "repository": "https://github.com/orgs/podkrepi-bg",
+  "packageManager": "[email protected]",
   "scripts": {
     "predev": "shx test -e .env.local && exit 0 || shx echo 'You need to create .env.local file. Please check README.md!' && exit 1",
     "dev": "yarn && next dev -p 3040",