wudi 4 lat temu
rodzic
commit
d5139f62ec
3 zmienionych plików z 36 dodań i 2 usunięć
  1. 1 1
      Dockerfile
  2. 5 1
      package.json
  3. 30 0
      yarn.lock

+ 1 - 1
Dockerfile

@@ -4,10 +4,10 @@ ADD package.json yarn.lock /app/
 RUN cd /build && yarn --production=false && cd /app && yarn --production=true
 
 FROM node:lts-slim
+RUN apt-get update && apt-get install -y curl iputils-ping && apt-get clean
 ENV TERM=xterm
 ADD fonts.conf /etc/fonts/
 RUN npm config set registry https://registry.npm.taobao.org && yarn --version
 COPY --from=builder /app /app
 COPY --from=builder /build /build
-RUN apt-get update && apt-get install -y curl iputils-ping && apt-get clean
 WORKDIR /build

+ 5 - 1
package.json

@@ -10,6 +10,7 @@
     "cache-manager-ioredis": "^2.1.0",
     "camelcase": "^6.0.0",
     "cheerio": "^1.0.0-rc.3",
+    "cli-progress": "^3.9.0",
     "config": "^3.3.1",
     "content-disposition": "^0.5.3",
     "cron": "^1.8.2",
@@ -19,6 +20,7 @@
     "dot-prop": "^5.2.0",
     "exceljs": "^4.1.1",
     "form-data": "^3.0.0",
+    "get-stdin": "^9.0.0",
     "got": "^11.5.2",
     "iconv-lite": "^0.6.3",
     "image-size": "^0.9.4",
@@ -50,6 +52,7 @@
     "@types/cache-manager": "^2.10.3",
     "@types/cache-manager-ioredis": "^2.0.1",
     "@types/cheerio": "^0.22.22",
+    "@types/cli-progress": "^3.9.2",
     "@types/config": "^0.0.36",
     "@types/content-disposition": "^0.5.3",
     "@types/cron": "^1.7.2",
@@ -86,6 +89,7 @@
     "typescript": "^4.1.3",
     "webpack": "^5.11.0",
     "webpack-cli": "^4.2.0",
-    "webpack-node-externals": "^2.5.2"
+    "webpack-node-externals": "^2.5.2",
+    "webpack-shell-plugin-next": "^2.2.2"
   }
 }

+ 30 - 0
yarn.lock

@@ -478,6 +478,13 @@
   dependencies:
     "@types/node" "*"
 
+"@types/cli-progress@^3.9.2":
+  version "3.9.2"
+  resolved "https://registry.nlark.com/@types/cli-progress/download/@types/cli-progress-3.9.2.tgz?cache=0&sync_timestamp=1629711886759&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40types%2Fcli-progress%2Fdownload%2F%40types%2Fcli-progress-3.9.2.tgz#6ca355f96268af39bee9f9307f0ac96145639c26"
+  integrity sha1-bKNV+WJorzm+6fkwfwrJYUVjnCY=
+  dependencies:
+    "@types/node" "*"
+
 "@types/color-name@^1.1.1":
   version "1.1.1"
   resolved "https://registry.npm.taobao.org/@types/color-name/download/@types/color-name-1.1.1.tgz?cache=0&sync_timestamp=1596837707987&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Fcolor-name%2Fdownload%2F%40types%2Fcolor-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0"
@@ -1695,6 +1702,14 @@ cli-boxes@^2.2.0:
   resolved "https://registry.npm.taobao.org/cli-boxes/download/cli-boxes-2.2.0.tgz#538ecae8f9c6ca508e3c3c95b453fe93cb4c168d"
   integrity sha1-U47K6PnGylCOPDyVtFP+k8tMFo0=
 
+cli-progress@^3.9.0:
+  version "3.9.0"
+  resolved "https://registry.npm.taobao.org/cli-progress/download/cli-progress-3.9.0.tgz#25db83447deb812e62d05bac1af9aec5387ef3d4"
+  integrity sha1-JduDRH3rgS5i0FusGvmuxTh+89Q=
+  dependencies:
+    colors "^1.1.2"
+    string-width "^4.2.0"
+
 clone-response@^1.0.2:
   version "1.0.2"
   resolved "https://registry.npm.taobao.org/clone-response/download/clone-response-1.0.2.tgz#d1dc973920314df67fbeb94223b4ee350239e96b"
@@ -1756,6 +1771,11 @@ colorette@1.2.1, colorette@^1.2.1:
   resolved "https://registry.npm.taobao.org/colorette/download/colorette-1.2.1.tgz?cache=0&sync_timestamp=1593955762018&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcolorette%2Fdownload%2Fcolorette-1.2.1.tgz#4d0b921325c14faf92633086a536db6e89564b1b"
   integrity sha1-TQuSEyXBT6+SYzCGpTbbbolWSxs=
 
+colors@^1.1.2:
+  version "1.4.0"
+  resolved "https://registry.nlark.com/colors/download/colors-1.4.0.tgz?cache=0&sync_timestamp=1622604546780&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcolors%2Fdownload%2Fcolors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
+  integrity sha1-xQSRR51MG9rtLJztMs98fcI2D3g=
+
 combined-stream@^1.0.8:
   version "1.0.8"
   resolved "https://registry.npm.taobao.org/combined-stream/download/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
@@ -2821,6 +2841,11 @@ get-ready@^1.0.0, get-ready@~1.0.0:
   resolved "https://registry.npm.taobao.org/get-ready/download/get-ready-1.0.0.tgz#f91817f1e9adecfea13a562adfc8de883ab34782"
   integrity sha1-+RgX8emt7P6hOlYq38jeiDqzR4I=
 
+get-stdin@^9.0.0:
+  version "9.0.0"
+  resolved "https://registry.nlark.com/get-stdin/download/get-stdin-9.0.0.tgz#3983ff82e03d56f1b2ea0d3e60325f39d703a575"
+  integrity sha1-OYP/guA9VvGy6g0+YDJfOdcDpXU=
+
 get-stream@^4.1.0:
   version "4.1.0"
   resolved "https://registry.npm.taobao.org/get-stream/download/get-stream-4.1.0.tgz?cache=0&sync_timestamp=1597056455691&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fget-stream%2Fdownload%2Fget-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
@@ -6121,6 +6146,11 @@ webpack-node-externals@^2.5.2:
   resolved "https://registry.npm.taobao.org/webpack-node-externals/download/webpack-node-externals-2.5.2.tgz#178e017a24fec6015bc9e672c77958a6afac861d"
   integrity sha1-F44BeiT+xgFbyeZyx3lYpq+shh0=
 
+webpack-shell-plugin-next@^2.2.2:
+  version "2.2.2"
+  resolved "https://registry.nlark.com/webpack-shell-plugin-next/download/webpack-shell-plugin-next-2.2.2.tgz#35e1bf7fa070b6472be8199cf08012e866f0eea0"
+  integrity sha1-NeG/f6Bwtkcr6Bmc8IAS6Gbw7qA=
+
 webpack-sources@^2.1.1:
   version "2.2.0"
   resolved "https://registry.npm.taobao.org/webpack-sources/download/webpack-sources-2.2.0.tgz?cache=0&sync_timestamp=1603965283437&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fwebpack-sources%2Fdownload%2Fwebpack-sources-2.2.0.tgz#058926f39e3d443193b6c31547229806ffd02bac"