⬆️ Upgrade config and add Dockerfile (#7)

* ⬆️ Upgrade stuff and add Dockerfile

* 🔧 Add github extension

* 🔧 Dependabot

* 🐛 Fix dockerfile

* 🔧 A bit more act

* 📝 Add badges

* 🔧 pnpm-lock.yaml linguist-generated

.dockerignore

@@ -0,0 +1,5 @@
+node_modules
+.git
+.gitignore
+*.md
+dist

.env

@@ -1 +1,3 @@
-BUILD_BASE=/lmgtfy
+BUILD_ADAPTER=auto
+BUILD_BASE=
+BUILD_IPFS=false

.eslintignore

@@ -9,6 +9,7 @@ vite.config.js.timestamp-*
 vite.config.ts.timestamp-*
 
 # Ignore files for PNPM, NPM and YARN
-pnpm-lock.yaml
+/.pnpm-store
 package-lock.json
+pnpm-lock.yaml
 yarn.lock

.gitattributes

@@ -0,0 +1 @@
+pnpm-lock.yaml linguist-generated

.github/FUNDING.yaml

@@ -0,0 +1,2 @@
+patreon: NatoBoram
+custom: ['https://paypal.me/NatoBoram/5']

.github/dependabot.yaml

@@ -0,0 +1,36 @@
+version: 2
+updates:
+ - package-ecosystem: npm
+ directory: /
+ schedule:
+ interval: monthly
+ timezone: America/Toronto
+ commit-message:
+ prefix: '⬆️ '
+ groups:
+ patch:
+ update-types:
+ - patch
+ eslint:
+ patterns:
+ - '*eslint*'
+ tailwindcss:
+ patterns:
+ - '*heroicons*'
+ - '*tailwindcss*'
+ - autoprefixer
+ - postcss
+ prettier:
+ patterns:
+ - '*prettier*'
+ svelte:
+ patterns:
+ - '*svelte*'
+ vite:
+ patterns:
+ - '*vitejs*'
+ - vite
+ typescript:
+ patterns:
+ - '*typescript*'
+ - tslib

.github/workflows/docker.yaml

@@ -0,0 +1,48 @@
+name: Docker
+
+on:
+ push:
+ branches: main
+ tags: v*
+ pull_request:
+ branches: main
+
+jobs:
+ docker:
+ runs-on: ubuntu-latest
+
+ if: ${{ github.actor != 'nektos/act' }}
+
+ permissions:
+ packages: write
+ contents: read
+
+ steps:
+ - uses: actions/checkout@v3
+
+ - uses: docker/login-action@v2
+ with:
+ registry: ghcr.io
+ username: ${{ github.actor }}
+ password: ${{ secrets.GITHUB_TOKEN }}
+
+ - id: meta
+ uses: docker/metadata-action@v4
+ with:
+ images: |
+ ghcr.io/${{ github.repository }}
+ tags: |
+ type=ref,event=tag
+ type=semver,pattern={{major}}
+ type=semver,pattern={{major}}.{{minor}}
+ type=semver,pattern={{major}}.{{minor}}.{{patch}}
+ type=semver,pattern={{version}}
+
+ - uses: docker/build-push-action@v4
+ with:
+ context: .
+ labels: ${{ steps.meta.outputs.labels }}
+ push: ${{ github.ref_type == 'tag' }}
+ tags: ${{ steps.meta.outputs.tags }}
+ secrets: |
+ BUILD_BASE=

.github/workflows/github-pages.yaml

@@ -2,12 +2,14 @@ name: GitHub Pages
 
 on:
  push:
- branches: [main]
+ branches: main
 
 jobs:
  build:
  runs-on: ubuntu-latest
 
+ if: ${{ github.actor != 'nektos/act' }}
+
  steps:
  - uses: actions/checkout@v3
  - uses: pnpm/action-setup@v2
@@ -16,10 +18,12 @@ jobs:
  - uses: actions/setup-node@v3
  with:
  cache: pnpm
- node-version: 19
- - run: pnpm install
+ node-version: 21
+ - run: pnpm install --frozen-lockfile
  - run: pnpm run build
- - uses: actions/upload-pages-artifact@v1
+ env:
+ BUILD_BASE: /lmgtfy
+ - uses: actions/upload-pages-artifact@v2
  with:
  path: build
 
@@ -38,3 +42,4 @@ jobs:
 
  steps:
  - uses: actions/deploy-pages@v1
+ id: deployment

.github/workflows/node.js.yaml

@@ -2,9 +2,9 @@ name: Node.js CI
 
 on:
  push:
- branches: [main]
+ branches: main
  pull_request:
- branches: [main]
+ branches: main
 
 jobs:
  test:
@@ -18,12 +18,12 @@ jobs:
  - uses: actions/setup-node@v3
  with:
  cache: pnpm
- node-version: 19
+ node-version: 21
  # - uses: actions/cache@v3
  # with:
  # path: ~/.cache/ms-playwright
  # key: ${{ runner.os }}-playwright-${{ hashFiles('**/pnpm-lock.yaml') }}
- - run: pnpm install
+ - run: pnpm install --frozen-lockfile --strict-peer-dependencies
  #- run: npx playwright install
  - run: pnpm run build
  - run: pnpm run check

.prettierignore

@@ -9,6 +9,7 @@ vite.config.js.timestamp-*
 vite.config.ts.timestamp-*
 
 # Ignore files for PNPM, NPM and YARN
-pnpm-lock.yaml
+/.pnpm-store
 package-lock.json
+pnpm-lock.yaml
 yarn.lock

.vscode/extensions.json

@@ -1,8 +1,12 @@
 {
  "recommendations": [
+ "davidanson.vscode-markdownlint",
  "dbaeumer.vscode-eslint",
  "esbenp.prettier-vscode",
+ "github.vscode-github-actions",
+ "github.vscode-pull-request-github",
+ "ms-azuretools.vscode-docker",
  "ms-vscode.live-server",
- "davidanson.vscode-markdownlint"
+ "svelte.svelte-vscode"
  ]
 }

.vscode/settings.json

@@ -4,5 +4,9 @@
  "editor.minimap.maxColumn": 100,
  "editor.rulers": [100]
  },
+ "files.associations": {
+ "*.eslintignore": "ignore",
+ "*.prettierignore": "ignore"
+ },
  "typescript.tsdk": "node_modules/typescript/lib"
 }

Dockerfile

@@ -0,0 +1,19 @@
+FROM node:21-slim AS base
+ENV PNPM_HOME="/pnpm"
+ENV PATH="$PNPM_HOME:$PATH"
+RUN corepack enable
+COPY . /app
+WORKDIR /app
+
+FROM base AS prod-deps
+RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm install --prod --frozen-lockfile
+
+FROM base AS build
+RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm install --frozen-lockfile
+RUN --mount=type=secret,id=BUILD_BASE BUILD_BASE="$(cat /run/secrets/BUILD_BASE)" BUILD_ADAPTER='node' pnpm run build
+
+FROM base
+COPY --from=prod-deps /app/node_modules /app/node_modules
+COPY --from=build /app/build /app/build
+EXPOSE 3000
+CMD [ "node", "./build/index.js" ]

README.md

@@ -1,6 +1,6 @@
 # LMGTFY
 
-[![Node.js CI](https://github.com/NatoBoram/lmgtfy/actions/workflows/node.js.yaml/badge.svg)](https://github.com/NatoBoram/lmgtfy/actions/workflows/node.js.yaml)
+[![Docker](https://github.com/NatoBoram/lmgtfy/actions/workflows/docker.yaml/badge.svg)](https://github.com/NatoBoram/lmgtfy/actions/workflows/docker.yaml) [![GitHub Pages](https://github.com/NatoBoram/lmgtfy/actions/workflows/github-pages.yaml/badge.svg)](https://github.com/NatoBoram/lmgtfy/actions/workflows/github-pages.yaml) [![Node.js CI](https://github.com/NatoBoram/lmgtfy/actions/workflows/node.js.yaml/badge.svg)](https://github.com/NatoBoram/lmgtfy/actions/workflows/node.js.yaml)
 
 A _Let Me Google That For You_ clone that's open source and doesn't track you when you share it.
 

package.json

@@ -21,12 +21,16 @@
  "check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch",
  "test:unit": "vitest",
  "lint": "prettier --plugin-search-dir . --check . && eslint .",
- "format": "prettier --plugin-search-dir . --write ."
+ "format": "prettier --plugin-search-dir . --write .",
+ "docker:build": "docker build --secret id=BUILD_BASE --tag lmgtfy .",
+ "docker:run": "docker run --publish 127.0.0.1:3000:3000 lmgtfy",
+ "docker:kill": "docker ps --format '{{.Image}} {{.ID}}' | grep lmgtfy | awk '{print $2}' | xargs docker kill"
  },
  "devDependencies": {
  "@natoboram/heroicons.svelte": "^1.0.1",
  "@playwright/test": "^1.31.2",
  "@sveltejs/adapter-auto": "^2.0.0",
+ "@sveltejs/adapter-node": "^1.3.1",
  "@sveltejs/adapter-static": "^2.0.1",
  "@sveltejs/kit": "^1.15.2",
  "@typescript-eslint/eslint-plugin": "^5.56.0",