CLI (#84)

* move to packages

* update deps

* update deps

* actions maintenance

* don't use blob

* cli

* fix default import

* use synthetic default imports

* remove comment

* cli packaging

* node 18 guard

* packages

* build system

* testing

* test pipeline

* pipelines

* changelog

* version bump

* update locales

* update deps

* update deps

* update dependecies

Author: cupcakearmy

.dockerignore

@@ -1,15 +1,15 @@
 *
 
-!/packages/backend/src
-!/packages/backend/Cargo.lock
-!/packages/backend/Cargo.toml
+!/packages
+!/package.json
+!/pnpm-lock.yaml
+!/pnpm-workspace.yaml
 
-!/packages/frontend/locales
-!/packages/frontend/src
-!/packages/frontend/static
-!/packages/frontend/.npmrc
-!/packages/frontend/package.json
-!/packages/frontend/pnpm-lock.yaml
-!/packages/frontend/svelte.config.js
-!/packages/frontend/tsconfig.json
-!/packages/frontend/vite.config.js
+**/target
+**/node_modules
+**/dist
+**/bin
+**/*.tsbuildinfo
+**/build
+**/.svelte
+**/.svelte-kit

.github/workflows/docker.yml renamed to .github/workflows/release.yml

@@ -4,34 +4,47 @@ on:
   workflow_dispatch:
   push:
     tags:
-      - "v*.*.*"
+      - 'v*.*.*'
 
 jobs:
+  cli:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: actions/setup-node@v3
+        with:
+          node-version-file: '.nvmrc'
+      - uses: pnpm/action-setup@v2
+
+      - run: |
+          pnpm install --frozen-lockfile
+          pnpm run build
+
   docker:
     runs-on: ubuntu-latest
     steps:
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+      - uses: actions/checkout@v3
+      - uses: docker/setup-qemu-action@v2
+      - uses: docker/setup-buildx-action@v2
         with:
           install: true
       - name: Docker Labels
         id: meta
-        uses: crazy-max/ghaction-docker-meta@v2
+        uses: docker/metadata-action@v4
         with:
           images: cupcakearmy/cryptgeon
           tags: |
             type=semver,pattern={{version}}
             type=semver,pattern={{major}}.{{minor}}
             type=semver,pattern={{major}}
       - name: Login to DockerHub
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Build and push
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v4
         with:
           platforms: linux/amd64,linux/arm64
           push: true

.github/workflows/test.yaml

@@ -10,27 +10,29 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v3
+
+      # Node
+      - uses: actions/setup-node@v3
         with:
-          node-version: "16"
+          node-version-file: '.nvmrc'
+      - uses: pnpm/action-setup@v2
 
-      - uses: docker/setup-qemu-action@v1
-      - uses: docker/setup-buildx-action@v1
+      # Docker
+      - uses: docker/setup-qemu-action@v2
+      - uses: docker/setup-buildx-action@v2
         with:
           install: true
-      - name: Build docker image
-        run: npm run test:prepare
 
       - name: Prepare
         run: |
-          npm install playwright
-          npx playwright install --with-deps
+          pnpm install --frozen-lockfile
+          pnpm exec playwright install --with-deps
+          pnpm run test:prepare
 
       - name: Run your tests
-        run: npm test
-      - uses: actions/upload-artifact@v2
-        if: always()
+        run: pnpm test
+      - uses: actions/upload-artifact@v3
         with:
           name: test-results
           path: test-results

.gitignore

@@ -1,14 +1,10 @@
+.env
+*.tsbuildinfo
+node_modules
+dist
+bin
 
-# Backend
 target
 
-# Client
-.DS_Store
-node_modules
-/.svelte
-/build
-/functions
-.env
-
-General
+# Testing
 test-results

.nvmrc

@@ -0,0 +1 @@
+v18.16

CHANGELOG.md

@@ -5,6 +5,17 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.3.0] - 2023-05-XX
+
+### Added
+
+- New CLI 🎉
+- Russian language
+
+### Changed
+
+- Moved to monorepo
+
 ## [2.2.0] - 2023-01-14
 
 ### Changed

Dockerfile

@@ -1,31 +1,27 @@
 # FRONTEND
-FROM node:16-alpine as client 
+FROM node:18-alpine as client 
 WORKDIR /tmp
-RUN npm install -g pnpm@7
-COPY ./packages/frontend ./
-RUN pnpm install
-RUN pnpm exec svelte-kit sync
+RUN npm install -g pnpm@8
+COPY . .
+RUN pnpm install --frozen-lockfile
 RUN pnpm run build
 
 
 # BACKEND
-FROM rust:1.64-alpine as backend
+FROM rust:1.69-alpine as backend
 WORKDIR /tmp
 RUN apk add libc-dev openssl-dev alpine-sdk
 COPY ./packages/backend/Cargo.* ./
-# https://blog.rust-lang.org/2022/06/22/sparse-registry-testing.html
-RUN rustup update nightly
-ENV CARGO_UNSTABLE_SPARSE_REGISTRY=true
-RUN cargo +nightly fetch
+RUN cargo fetch
 COPY ./packages/backend ./
-RUN cargo +nightly build --release
+RUN cargo build --release
 
 
 # RUNNER
 FROM alpine
 WORKDIR /app
 COPY --from=backend /tmp/target/release/cryptgeon .
-COPY --from=client /tmp/build ./frontend
+COPY --from=client /tmp/packages/frontend/build ./frontend
 ENV FRONTEND_PATH="./frontend"
 ENV REDIS="redis://redis/"
 EXPOSE 8000

cryptgeon.code-workspace

@@ -5,12 +5,19 @@
     },
     {
       "path": "packages/backend"
+    },
+    {
+      "path": "packages/frontend"
+    },
+    {
+      "path": "packages/cli"
+    },
+    {
+      "path": "packages/shared"
     }
   ],
   "settings": {
-    "cSpell.words": ["ciphertext", "cryptgeon"],
-    "i18n-ally.enabledFrameworks": ["svelte"],
-    "i18n-ally.keystyle": "nested",
-    "i18n-ally.localesPaths": ["packages/frontend/locales"]
+    "i18n-ally.localesPaths": ["packages/frontend/locales"],
+    "cSpell.words": ["cryptgeon"]
   }
 }

docker-compose.dev.yaml

@@ -10,7 +10,6 @@ services:
       - 6379:6379
 
   app:
-    image: cupcakearmy/cryptgeon:test
     build: .
     env_file: .dev.env
     depends_on:

package.json

@@ -1,18 +1,21 @@
 {
+  "packageManager": "[email protected]",
   "scripts": {
     "dev:docker": "docker-compose -f docker-compose.dev.yaml up redis",
     "dev:packages": "pnpm --parallel run dev",
-    "dev:proxy": "node proxy.mjs",
     "dev": "run-p dev:*",
+    "docker:up": "docker compose -f docker-compose.dev.yaml up",
+    "docker:build": "docker compose -f docker-compose.dev.yaml build",
     "test": "playwright test --project chrome firefox safari",
     "test:local": "playwright test --project local",
-    "test:server": "docker compose -f docker-compose.dev.yaml up",
-    "test:prepare": "docker compose -f docker-compose.dev.yaml build"
+    "test:server": "run-s docker:up",
+    "test:prepare": "run-p build docker:build",
+    "build": "pnpm run --recursive --filter=!@cryptgeon/backend build"
   },
   "devDependencies": {
-    "@playwright/test": "^1.29.2",
-    "@types/node": "^16.18.11",
-    "http-proxy": "^1.18.1",
-    "npm-run-all": "^4.1.5"
+    "@playwright/test": "^1.33.0",
+    "@types/node": "^20.1.3",
+    "npm-run-all": "^4.1.5",
+    "shelljs": "^0.8.5"
   }
 }