Skip to content

Commit

Permalink
Merge pull request #552 from marlon360/dependabot/npm_and_yarn/axios-…
Browse files Browse the repository at this point in the history
…1.6.1

Bump axios from 1.6.0 to 1.6.1
also bump all other modules to the newest version except csv-parse
  • Loading branch information
Rubber1Duck authored Nov 21, 2023
2 parents 203cb5c + c81c60a commit a5efffb
Show file tree
Hide file tree
Showing 4 changed files with 49 additions and 155 deletions.
2 changes: 1 addition & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ ARG VIPS_VERSION=8.14.5

# System update, build dependencies, compile vips-x.xx.x and cleanup.
RUN set -x -o pipefail \
&& wget -O- https://github.com/libvips/libvips/releases/download/v${VIPS_VERSION}/vips-${VIPS_VERSION}.tar.xz | tar xJC /tmp \
&& apk update \
&& apk upgrade \
&& apk add \
Expand All @@ -24,6 +23,7 @@ RUN set -x -o pipefail \
zlib-dev libxml2-dev glib-dev gobject-introspection-dev libjpeg-turbo-dev \
lcms2-dev fftw-dev giflib-dev libpng-dev orc-dev tiff-dev poppler-dev \
librsvg-dev libimagequant-dev pango-dev py-gobject3-dev \
&& wget -O- https://github.com/libvips/libvips/releases/download/v${VIPS_VERSION}/vips-${VIPS_VERSION}.tar.xz | tar xJC /tmp \
&& cd /tmp/vips-${VIPS_VERSION} \
&& meson setup build --prefix=/usr --buildtype release \
&& cd build \
Expand Down
182 changes: 39 additions & 143 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 9 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,26 +17,25 @@
"license": "ISC",
"dependencies": {
"@marlon360/express-queue": "^1.0.3",
"axios": "^1.3.2",
"axios": "^1.6.1",
"compression": "^1.7.4",
"cors": "^2.8.5",
"cron": "^1.8.2",
"csv-parse": "^4.16.3",
"express": "^4.17.3",
"express": "^4.18.2",
"express-async-errors": "^3.1.1",
"express-redis-cache-next": "^1.2.0",
"express-redis-cache-next": "^1.2.1",
"lzma-native": "^8.0.6",
"pm2": "^5.1.2",
"pm2": "^5.3.0",
"sharp": "^0.32.6",
"svgson": "^5.2.1",
"xlsx": "^0.17.4"
"svgson": "^5.3.1",
"xlsx": "^0.18.5"
},
"devDependencies": {
"@types/express": "^4.17.13",
"@types/node": "^16.11.6",
"@types/express": "^4.17.21",
"@types/node": "^16.18.62",
"prettier": "2.4.1",
"typescript": "^4.4.4",
"vuepress": "^1.9.5",
"vuepress": "^1.9.10",
"@types/lzma-native": "^4.0.4"
},
"engines": {
Expand Down
1 change: 0 additions & 1 deletion src/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -522,7 +522,6 @@ export async function getMetaData(): Promise<MetaData> {
const oldMetaData: MetaData = JSON.parse(redisEntryMeta[0].body);
const oldModified = oldMetaData.modified;
const newModified = metaData.modified;
newModified > oldModified;
if (newModified > oldModified) {
const validToMs = AddDaysToDate(
new Date(metaData.modified),
Expand Down

0 comments on commit a5efffb

Please sign in to comment.