StarKirby 6 месяцев назад
Родитель
Сommit
c1d051fa7d
6 измененных файлов с 20 добавлено и 15 удалено
  1. 1 0
      .nvmrc
  2. 4 4
      Dockerfile
  3. 4 4
      package-lock.json
  4. 5 2
      package.json
  5. 1 0
      vue.config.js
  6. 5 5
      yarn.lock

+ 1 - 0
.nvmrc

@@ -0,0 +1 @@
+16

+ 4 - 4
Dockerfile

@@ -1,12 +1,12 @@
-FROM node:14 AS base
+FROM node:16 AS base
 WORKDIR /code
 RUN npm config set registry https://registry.npmmirror.com
-ADD package.json /code
-RUN npm install
+ADD package.json yarn.lock /code/
+RUN yarn install --frozen-lockfile
 ADD . /code  
 RUN yarn build
 
 
 FROM nginx:1.19-alpine
 COPY nginx.conf /etc/nginx/conf.d/nginx.conf
-COPY --from=base /code/dist /var/www/html/dist/
+COPY --from=base /code/dist /var/www/html/dist/

+ 4 - 4
package-lock.json

@@ -13312,11 +13312,11 @@
       "integrity": "sha512-W+y2EAI/BxS4Vlcca9scQv8ifeBFck56DRtSwWJ2H4Cw1GLNUYxiZxUHHkuzuI5JPW/cYtL1bPO5xPyEXx4LmQ=="
     },
     "vue-router": {
-      "version": "4.1.6",
-      "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.1.6.tgz",
-      "integrity": "sha512-DYWYwsG6xNPmLq/FmZn8Ip+qrhFEzA14EI12MsMgVxvHFDYvlr4NXpVF5hrRH1wVcDP8fGi5F4rxuJSl8/r+EQ==",
+      "version": "4.0.12",
+      "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.0.12.tgz",
+      "integrity": "sha512-CPXvfqe+mZLB1kBWssssTiWg4EQERyqJZes7USiqfW9B5N2x+nHlnsM1D3b5CaJ6qgCvMmYJnz+G0iWjNCvXrg==",
       "requires": {
-        "@vue/devtools-api": "^6.4.5"
+        "@vue/devtools-api": "^6.0.0-beta.18"
       }
     },
     "vue-style-loader": {

+ 5 - 2
package.json

@@ -27,7 +27,7 @@
     "vue-pdf-embed": "^1.1.5",
     "vue-pdf-preview": "^0.0.3",
     "vue-pdf-signature": "^4.2.7",
-    "vue-router": "^4.0.12",
+    "vue-router": "4.0.12",
     "vue3-pdfjs": "^0.1.6",
     "vuex": "^4.0.2",
     "worker-loader": "^3.0.8",
@@ -78,5 +78,8 @@
     "> 1%",
     "last 2 versions",
     "not dead"
-  ]
+  ],
+  "engines": {
+    "node": ">=16 <19"
+  }
 }

+ 1 - 0
vue.config.js

@@ -3,6 +3,7 @@ const WebpackBar = require("webpackbar");
 module.exports = {
   productionSourceMap: false,
   publicPath: process.env.BASE_URL,
+  transpileDependencies: ["vue-router"],
   chainWebpack: config => {
     config
       .plugin("html")

+ 5 - 5
yarn.lock

@@ -10120,12 +10120,12 @@ vue-resize-sensor@^2.0.0:
   resolved "https://registry.npmjs.org/vue-resize-sensor/-/vue-resize-sensor-2.0.0.tgz"
   integrity sha512-W+y2EAI/BxS4Vlcca9scQv8ifeBFck56DRtSwWJ2H4Cw1GLNUYxiZxUHHkuzuI5JPW/cYtL1bPO5xPyEXx4LmQ==
 
-vue-router@^4.0.12:
-  version "4.1.6"
-  resolved "https://registry.npmjs.org/vue-router/-/vue-router-4.1.6.tgz"
-  integrity sha512-DYWYwsG6xNPmLq/FmZn8Ip+qrhFEzA14EI12MsMgVxvHFDYvlr4NXpVF5hrRH1wVcDP8fGi5F4rxuJSl8/r+EQ==
+vue-router@4.0.12, vue-router@^4.0.12:
+  version "4.0.12"
+  resolved "https://registry.npmjs.org/vue-router/-/vue-router-4.0.12.tgz"
+  integrity sha512-CPXvfqe+mZLB1kBWssssTiWg4EQERyqJZes7USiqfW9B5N2x+nHlnsM1D3b5CaJ6qgCvMmYJnz+G0iWjNCvXrg==
   dependencies:
-    "@vue/devtools-api" "^6.4.5"
+    "@vue/devtools-api" "^6.0.0-beta.18"
 
 vue-style-loader@^4.1.0, vue-style-loader@^4.1.2:
   version "4.1.3"