Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test

2024-03-07 08:16:11 +01:00 · 2024-03-07 08:16:11 +01:00 · 24d1f63003
parent fc3c9332b3 4f68b336bc
commit 24d1f63003
4 changed files with 70 additions and 119 deletions
--- a/package.json
+++ b/package.json
@ -42,7 +42,7 @@
        "mysql": "2.18.1",
        "node-ssh": "^11.0.0",
        "object.pick": "^1.3.0",
-        "puppeteer": "^21.11.0",
+        "puppeteer": "21.11.0",
        "read-chunk": "^3.2.0",
        "require-yaml": "0.0.1",
        "smbhash": "0.0.1",
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@ -93,7 +93,7 @@ dependencies:
    specifier: ^1.3.0
    version: 1.3.0
  puppeteer:
-    specifier: ^21.11.0
+    specifier: 21.11.0
    version: 21.11.0
  read-chunk:
    specifier: ^3.2.0
--- a/print/package.json
+++ b/print/package.json
@ -1,34 +1,34 @@
 {
-  "name": "vn-print",
-  "version": "2.0.0",
-  "description": "Print service",
-  "scripts": {
-    "start": "node server/server.js",
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://git.verdnatura.es/salix"
-  },
-  "license": "GPL-3.0",
-  "packageManager": "pnpm@8.15.1",
-  "dependencies": {
-    "express": "4.14.0",
-    "fs-extra": "^7.0.1",
-    "intl": "^1.2.5",
-    "js-yaml": "^3.13.1",
-    "jsbarcode": "^3.11.5",
-    "juice": "^5.2.0",
-    "log4js": "^6.7.0",
-    "mysql2": "^1.7.0",
-    "nodemailer": "^4.7.0",
-    "puppeteer": "^22.4.0",
-    "puppeteer-cluster": "^0.23.0",
-    "qrcode": "^1.4.2",
-    "strftime": "^0.10.0",
-    "vue": "^2.6.10",
-    "vue-i18n": "^8.15.0",
-    "vue-server-renderer": "^2.6.10",
-    "xmldom": "^0.6.0"
-  }
+    "name": "vn-print",
+    "version": "2.0.0",
+    "description": "Print service",
+    "scripts": {
+        "start": "node server/server.js",
+        "test": "echo \"Error: no test specified\" && exit 1"
+    },
+    "repository": {
+        "type": "git",
+        "url": "https://git.verdnatura.es/salix"
+    },
+    "license": "GPL-3.0",
+    "packageManager": "pnpm@8.15.1",
+    "dependencies": {
+        "express": "4.14.0",
+        "fs-extra": "^7.0.1",
+        "intl": "^1.2.5",
+        "js-yaml": "^3.13.1",
+        "jsbarcode": "^3.11.5",
+        "juice": "^5.2.0",
+        "log4js": "^6.7.0",
+        "mysql2": "^1.7.0",
+        "nodemailer": "^4.7.0",
+        "puppeteer": "21.11.0",
+        "puppeteer-cluster": "0.23.0",
+        "qrcode": "^1.4.2",
+        "strftime": "^0.10.0",
+        "vue": "^2.6.10",
+        "vue-i18n": "^8.15.0",
+        "vue-server-renderer": "^2.6.10",
+        "xmldom": "^0.6.0"
+    }
 }
--- a/print/pnpm-lock.yaml
+++ b/print/pnpm-lock.yaml
@ -33,11 +33,11 @@ dependencies:
    specifier: ^4.7.0
    version: 4.7.0
  puppeteer:
-    specifier: ^22.4.0
-    version: 22.4.0
+    specifier: 21.11.0
+    version: 21.11.0
  puppeteer-cluster:
-    specifier: ^0.23.0
-    version: 0.23.0(puppeteer@22.4.0)
+    specifier: 0.23.0
+    version: 0.23.0(puppeteer@21.11.0)
  qrcode:
    specifier: ^1.4.2
    version: 1.5.3
@ -103,17 +103,16 @@ packages:
      to-fast-properties: 2.0.0
    dev: false

-  /@puppeteer/browsers@2.1.0:
-    resolution: {integrity: sha512-xloWvocjvryHdUjDam/ZuGMh7zn4Sn3ZAaV4Ah2e2EwEt90N3XphZlSsU3n0VDc1F7kggCjMuH0UuxfPQ5mD9w==}
-    engines: {node: '>=18'}
+  /@puppeteer/browsers@1.9.1:
+    resolution: {integrity: sha512-PuvK6xZzGhKPvlx3fpfdM2kYY3P/hB1URtK8wA7XUJ6prn6pp22zvJHu48th0SGcHL9SutbPHrFuQgfXTFobWA==}
+    engines: {node: '>=16.3.0'}
    hasBin: true
    dependencies:
      debug: 4.3.4
      extract-zip: 2.0.1
      progress: 2.0.3
-      proxy-agent: 6.4.0
-      semver: 7.6.0
-      tar-fs: 3.0.5
+      proxy-agent: 6.3.1
+      tar-fs: 3.0.4
      unbzip2-stream: 1.4.3
      yargs: 17.7.2
    transitivePeerDependencies:
@ -247,37 +246,6 @@ packages:
    resolution: {integrity: sha512-fpWrvyVHEKyeEvbKZTVOeZF3VSKKWtJxFIxX/jaVPf+cLbGUSitjb49pHLqPV2BUNNZ0LcoeEGfE/YCpyDYHIw==}
    dev: false

-  /bare-events@2.2.1:
-    resolution: {integrity: sha512-9GYPpsPFvrWBkelIhOhTWtkeZxVxZOdb3VnFTCzlOo3OjvmTvzLoZFUT8kNFACx0vJej6QPney1Cf9BvzCNE/A==}
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /bare-fs@2.2.1:
-    resolution: {integrity: sha512-+CjmZANQDFZWy4PGbVdmALIwmt33aJg8qTkVjClU6X4WmZkTPBDxRHiBn7fpqEWEfF3AC2io++erpViAIQbSjg==}
-    requiresBuild: true
-    dependencies:
-      bare-events: 2.2.1
-      bare-os: 2.2.0
-      bare-path: 2.1.0
-      streamx: 2.15.6
-    dev: false
-    optional: true
-
-  /bare-os@2.2.0:
-    resolution: {integrity: sha512-hD0rOPfYWOMpVirTACt4/nK8mC55La12K5fY1ij8HAdfQakD62M+H4o4tpfKzVGLgRDTuk3vjA4GqGXXCeFbag==}
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /bare-path@2.1.0:
-    resolution: {integrity: sha512-DIIg7ts8bdRKwJRJrUMy/PICEaQZaPGZ26lsSx9MJSwIhSrcdHn7/C8W+XmnG/rKi6BaRcz+JO00CjZteybDtw==}
-    requiresBuild: true
-    dependencies:
-      bare-os: 2.2.0
-    dev: false
-    optional: true
-
  /base64-js@1.5.1:
    resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==}
    dev: false
@ -361,12 +329,12 @@ packages:
      lodash.some: 4.6.0
    dev: false

-  /chromium-bidi@0.5.12(devtools-protocol@0.0.1249869):
-    resolution: {integrity: sha512-sZMgEBWKbupD0Q7lyFu8AWkrE+rs5ycE12jFkGwIgD/VS8lDPtelPlXM7LYaq4zrkZ/O2L3f4afHUHL0ICdKog==}
+  /chromium-bidi@0.5.8(devtools-protocol@0.0.1232444):
+    resolution: {integrity: sha512-blqh+1cEQbHBKmok3rVJkBlBxt9beKBgOsxbFgs7UJcoVbbeZ+K7+6liAsjgpc8l1Xd55cQUy14fXZdGSb4zIw==}
    peerDependencies:
      devtools-protocol: '*'
    dependencies:
-      devtools-protocol: 0.0.1249869
+      devtools-protocol: 0.0.1232444
      mitt: 3.0.1
      urlpattern-polyfill: 10.0.0
    dev: false
@ -580,8 +548,8 @@ packages:
    resolution: {integrity: sha512-3NdhDuEXnfun/z7x9GOElY49LoqVHoGScmOKwmxhsS8N5Y+Z8KyPPDnaSzqWgYt/ji4mqwfTS34Htrk0zPIXVg==}
    dev: false

-  /devtools-protocol@0.0.1249869:
-    resolution: {integrity: sha512-Ctp4hInA0BEavlUoRy9mhGq0i+JSo/AwVyX2EFgZmV1kYB+Zq+EMBAn52QWu6FbRr10hRb6pBl420upbp4++vg==}
+  /devtools-protocol@0.0.1232444:
+    resolution: {integrity: sha512-pM27vqEfxSxRkTMnF+XCmxSEb6duO5R+t8A9DEEJgy4Wz2RVanje2mmj99B6A3zv2r/qGfYlOvYznUhuokizmg==}
    dev: false

  /dijkstrajs@1.0.3:
@ -1293,13 +1261,6 @@ packages:
      yallist: 3.1.1
    dev: false

-  /lru-cache@6.0.0:
-    resolution: {integrity: sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==}
-    engines: {node: '>=10'}
-    dependencies:
-      yallist: 4.0.0
-    dev: false
-
  /lru-cache@7.18.3:
    resolution: {integrity: sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==}
    engines: {node: '>=12'}
@ -1350,6 +1311,10 @@ packages:
    resolution: {integrity: sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw==}
    dev: false

+  /mkdirp-classic@0.5.3:
+    resolution: {integrity: sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==}
+    dev: false
+
  /ms@0.7.1:
    resolution: {integrity: sha512-lRLiIR9fSNpnP6TC4v8+4OU7oStC01esuNowdQ34L+Gk8e5Puoc88IqJ+XAY/B3Mn2ZKis8l8HX90oU8ivzUHg==}
    dev: false
@ -1574,8 +1539,8 @@ packages:
      ipaddr.js: 1.4.0
    dev: false

-  /proxy-agent@6.4.0:
-    resolution: {integrity: sha512-u0piLU+nCOHMgGjRbimiXmA9kM/L9EHh3zL81xCdp7m+Y2pHIsnmbdDoEDoAz5geaonNR6q6+yOPQs6n4T6sBQ==}
+  /proxy-agent@6.3.1:
+    resolution: {integrity: sha512-Rb5RVBy1iyqOtNl15Cw/llpeLH8bsb37gM1FUfKQ+Wck6xHlbAhWGUFiTRHtkjqGTA5pSHz6+0hrPW/oECihPQ==}
    engines: {node: '>= 14'}
    dependencies:
      agent-base: 7.1.0
@ -1610,26 +1575,26 @@ packages:
    engines: {node: '>=6'}
    dev: false

-  /puppeteer-cluster@0.23.0(puppeteer@22.4.0):
+  /puppeteer-cluster@0.23.0(puppeteer@21.11.0):
    resolution: {integrity: sha512-108terIWDzPrQopmoYSPd5yDoy3FGJ2dNnoGMkGYPs6xtkdhgaECwpfZkzaRToMQPZibUOz0/dSSGgPEdXEhkQ==}
    peerDependencies:
      puppeteer: '>=1.5.0'
    dependencies:
      debug: 4.3.4
-      puppeteer: 22.4.0
+      puppeteer: 21.11.0
    transitivePeerDependencies:
      - supports-color
    dev: false

-  /puppeteer-core@22.4.0:
-    resolution: {integrity: sha512-MZttAbttrxi6O/B//rY6zQihjFe/vXeCLb5YvKH2xG6yrcVESo0Hc5/Cv49omwZyZzAJ1BK8BnDeatDsj+3hMw==}
-    engines: {node: '>=18'}
+  /puppeteer-core@21.11.0:
+    resolution: {integrity: sha512-ArbnyA3U5SGHokEvkfWjW+O8hOxV1RSJxOgriX/3A4xZRqixt9ZFHD0yPgZQF05Qj0oAqi8H/7stDorjoHY90Q==}
+    engines: {node: '>=16.13.2'}
    dependencies:
-      '@puppeteer/browsers': 2.1.0
-      chromium-bidi: 0.5.12(devtools-protocol@0.0.1249869)
+      '@puppeteer/browsers': 1.9.1
+      chromium-bidi: 0.5.8(devtools-protocol@0.0.1232444)
      cross-fetch: 4.0.0
      debug: 4.3.4
-      devtools-protocol: 0.0.1249869
+      devtools-protocol: 0.0.1232444
      ws: 8.16.0
    transitivePeerDependencies:
      - bufferutil
@ -1638,15 +1603,15 @@ packages:
      - utf-8-validate
    dev: false

-  /puppeteer@22.4.0:
-    resolution: {integrity: sha512-tR+JsDbA2qD1DqRX4F9k9SxQhk6UzcaCN+Qux7+WrDceS7wcR7tlFmMNB8+g8zE4Fmr/iRTOtf5wNnTW9cGUFQ==}
-    engines: {node: '>=18'}
+  /puppeteer@21.11.0:
+    resolution: {integrity: sha512-9jTHuYe22TD3sNxy0nEIzC7ZrlRnDgeX3xPkbS7PnbdwYjl2o/z/YuCrRBwezdKpbTDTJ4VqIggzNyeRcKq3cg==}
+    engines: {node: '>=16.13.2'}
    hasBin: true
    requiresBuild: true
    dependencies:
-      '@puppeteer/browsers': 2.1.0
+      '@puppeteer/browsers': 1.9.1
      cosmiconfig: 9.0.0
-      puppeteer-core: 22.4.0
+      puppeteer-core: 21.11.0
    transitivePeerDependencies:
      - bufferutil
      - encoding
@ -1768,14 +1733,6 @@ packages:
    hasBin: true
    dev: false

-  /semver@7.6.0:
-    resolution: {integrity: sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==}
-    engines: {node: '>=10'}
-    hasBin: true
-    dependencies:
-      lru-cache: 6.0.0
-    dev: false
-
  /send@0.14.1:
    resolution: {integrity: sha512-1Ru269QpUVUgD32Y9jdyBXiX+pHYuYnTzR17w+DhyOWvGMPjJILrnLhl9c4LQjtIy2BSAa6Ykq0ZdGcAjaXlwQ==}
    engines: {node: '>= 0.8.0'}
@ -1997,14 +1954,12 @@ packages:
    engines: {node: '>= 0.4'}
    dev: false

-  /tar-fs@3.0.5:
-    resolution: {integrity: sha512-JOgGAmZyMgbqpLwct7ZV8VzkEB6pxXFBVErLtb+XCOqzc6w1xiWKI9GVd6bwk68EX7eJ4DWmfXVmq8K2ziZTGg==}
+  /tar-fs@3.0.4:
+    resolution: {integrity: sha512-5AFQU8b9qLfZCX9zp2duONhPmZv0hGYiBPJsyUdqMjzq/mqVpy/rEUSeHk1+YitmxugaptgBh5oDGU3VsAJq4w==}
    dependencies:
+      mkdirp-classic: 0.5.3
      pump: 3.0.0
      tar-stream: 3.1.7
-    optionalDependencies:
-      bare-fs: 2.2.1
-      bare-path: 2.1.0
    dev: false

  /tar-stream@3.1.7:
@ -2249,10 +2204,6 @@ packages:
    resolution: {integrity: sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==}
    dev: false

-  /yallist@4.0.0:
-    resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==}
-    dev: false
-
  /yargs-parser@18.1.3:
    resolution: {integrity: sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==}
    engines: {node: '>=6'}