chore: Обновил зависимости nuxt, обновил файлы докера nuxt для сборки…

…, обновил umami
wokalek · Nov 27, 2023 · d286a8f · d286a8f
1 parent ccd74b4
commit d286a8f
Show file tree

Hide file tree

Showing 8 changed files with 3,836 additions and 2,044 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -21,5 +21,6 @@ jobs:
           password: ${{ secrets.DEPLOY_SERVER_PASSWORD }}
           script: |
             cd ${{ secrets.DEPLOY_SERVER_WORK_DIR }}
-            git pull
+            git fetch origin main
+            git reset origin/main --hard
             docker compose -f docker-compose.prod.yml up -d --build
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
@@ -11,7 +11,8 @@ services:
       fonts:
         condition: service_completed_successfully
     ports:
-      - 24678:24678 #Для работы HMR
+      - 4000:4000 # Для работы HMR
+      - 24678:24678 # Для работы HMR
     volumes:
       - nuxt-devfolder:/nuxt/.nuxt
       - ./nuxt/nuxt.config.ts:/nuxt/nuxt.config.ts

diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
@@ -65,7 +65,7 @@ services:
 
   umami:
     container_name: wokalek-umami
-    image: ghcr.io/umami-software/umami:postgresql-v2.7.0
+    image: ghcr.io/umami-software/umami:postgresql-v2.8.0
     restart: always
     env_file: env/umami/.env
     depends_on:

diff --git a/docker/nuxt/dev.Dockerfile b/docker/nuxt/dev.Dockerfile
@@ -1,4 +1,4 @@
-FROM node:20.2.0-alpine
+FROM node:21.2.0-alpine
 
 WORKDIR /nuxt
 
@@ -7,7 +7,6 @@ RUN apk update && apk upgrade
 RUN npm i -g pnpm
 
 COPY ./nuxt/package.json ./nuxt/pnpm-lock.yaml ./nuxt/.npmrc ./
-RUN pnpm fetch
-RUN pnpm install -r --offline
+RUN pnpm install --frozen-lockfile
 
 ENTRYPOINT [ "pnpm", "run", "dev", "--host" ]
diff --git a/docker/nuxt/prod.Dockerfile b/docker/nuxt/prod.Dockerfile
@@ -1,4 +1,4 @@
-FROM node:20.2.0-alpine
+FROM node:21.2.0-alpine
 
 WORKDIR /nuxt
 
@@ -7,8 +7,7 @@ RUN apk update && apk upgrade
 RUN npm i -g pnpm
 
 COPY ./nuxt/package.json ./nuxt/pnpm-lock.yaml ./nuxt/.npmrc ./
-RUN pnpm fetch --prod
-RUN pnpm install -r --offline --prod
+RUN pnpm install --prod --frozen-lockfile
 
 COPY ./nuxt/nuxt.config.ts ./nuxt/tsconfig.json ./env/nuxt/.env ./
 COPY ./nuxt/src ./src

diff --git a/nuxt/nuxt.config.ts b/nuxt/nuxt.config.ts
@@ -116,10 +116,6 @@ const config: ReturnType<typeof defineNuxtConfig> = {
   site: {
     url: `https://${process.env.DOMAIN}`,
   },
-  schemaOrg: {
-    inLanguage: 'ru',
-    currency: 'RUB',
-  },
 }
 
 export default defineNuxtConfig(config)
diff --git a/nuxt/package.json b/nuxt/package.json
@@ -11,42 +11,42 @@
   },
   "dependencies": {
     "@nuxt/content": "^2.8.2",
-    "@nuxt/image": "1.0.0-rc.1",
-    "@nuxtjs/color-mode": "^3.3.0",
+    "@nuxt/image": "1.1.0",
+    "@nuxtjs/color-mode": "^3.3.2",
     "@nuxtjs/device": "^3.1.1",
     "@nuxtjs/fontaine": "^0.4.1",
     "@nuxtjs/robots": "^3.0.0",
     "@sass-collective/strip-unit": "^3.1.2",
-    "@vite-pwa/nuxt": "^0.1.1",
-    "@vueuse/core": "^10.5.0",
-    "@vueuse/nuxt": "^10.5.0",
+    "@vite-pwa/nuxt": "^0.3.2",
+    "@vueuse/core": "^10.6.1",
+    "@vueuse/nuxt": "^10.6.1",
     "dayjs": "^1.11.10",
     "image-size": "^1.0.2",
     "kaokun": "^1.1.10",
-    "lightningcss": "^1.22.0",
-    "nanoid": "^5.0.2",
+    "lightningcss": "^1.22.1",
+    "nanoid": "^5.0.3",
     "normalize.css": "^8.0.1",
-    "nuxt": "^3.7.4",
-    "nuxt-lodash": "^2.5.0",
-    "nuxt-schema-org": "^3.0.1",
-    "nuxt-simple-sitemap": "^3.4.0",
-    "nuxt-svgo": "^3.5.5",
-    "nuxt-typed-router": "^3.3.1",
-    "nuxt-umami": "^2.5.4",
+    "nuxt": "^3.8.2",
+    "nuxt-lodash": "^2.5.3",
+    "nuxt-schema-org": "^3.2.1",
+    "nuxt-simple-sitemap": "^4.1.6",
+    "nuxt-svgo": "^3.6.0",
+    "nuxt-typed-router": "^3.3.3",
+    "nuxt-umami": "^2.5.5",
     "oh-vue-icons": "1.0.0-rc3",
     "photoswipe": "^5.4.2",
     "postcss": "^8.4.31",
     "postcss-easings": "^4.0.0",
     "rehype-katex": "^6.0.3",
     "remark-math": "^5.1.1",
-    "sass": "^1.69.3",
+    "sass": "^1.69.5",
     "timeago.js": "^4.0.2",
     "vanilla-lazyload": "^17.8.5"
   },
   "devDependencies": {
     "@nuxtjs/eslint-config-typescript": "^12.1.0",
-    "@types/node": "^20.8.6",
-    "eslint": "^8.51.0"
+    "@types/node": "^20.10.0",
+    "eslint": "^8.54.0"
   },
   "overrides": {
     "vue": "latest"