Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into feat/settings_stamp
Browse files Browse the repository at this point in the history
  • Loading branch information
mehm8128 committed Jul 24, 2024
2 parents d15c500 + 43f1d5d commit 6d6d515
Show file tree
Hide file tree
Showing 28 changed files with 303 additions and 190 deletions.
15 changes: 15 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,28 @@ updates:
schedule:
interval: monthly
open-pull-requests-limit: 10
groups:
non-majors:
update-types:
- 'patch'
- 'minor'
- package-ecosystem: docker
directory: '/'
schedule:
interval: monthly
open-pull-requests-limit: 10
groups:
non-majors:
update-types:
- 'patch'
- 'minor'
- package-ecosystem: github-actions
directory: '/'
schedule:
interval: monthly
open-pull-requests-limit: 10
groups:
non-majors:
update-types:
- 'patch'
- 'minor'
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ jobs:
with:
node-version-file: ./.node-version
cache: npm
- uses: actions/cache@v3
- uses: actions/cache@v4
with:
path: ./public/fonts
key: font-build-${{ runner.os }}
Expand Down Expand Up @@ -145,7 +145,7 @@ jobs:
with:
node-version-file: ./.node-version
cache: npm
- uses: actions/cache@v3
- uses: actions/cache@v4
with:
path: ./public/fonts
key: font-build-${{ runner.os }}
Expand Down
2 changes: 1 addition & 1 deletion .node-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
21.1.0
20.15.0
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM --platform=$BUILDPLATFORM node:21.1.0-alpine as build
FROM --platform=$BUILDPLATFORM node:20.15.0-alpine as build
WORKDIR /app

ENV CYPRESS_INSTALL_BINARY=0
Expand All @@ -10,7 +10,7 @@ COPY . .
RUN NODE_ENV=production npm run build:with-font


FROM caddy:2.7.6-alpine
FROM caddy:2.8.4-alpine
EXPOSE 80

COPY build/docker/Caddyfile /etc/caddy/Caddyfile
Expand Down
13 changes: 12 additions & 1 deletion build/gen-unicode_emojis.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,18 @@ categoryMap['regional'] = {
}

const unicodeTable = {}
const altNameTable = {}
const altNameTable = {
0: 'zero',
1: 'one',
2: 'two',
3: 'three',
4: 'four',
5: 'five',
6: 'six',
7: 'seven',
8: 'eight',
9: 'nine'
}
Object.entries(emojis).forEach(([key, e]) => {
if (e.category === 'modifier') return
if (e.name.endsWith('skin tone')) return
Expand Down
129 changes: 72 additions & 57 deletions package-lock.json

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

Loading

0 comments on commit 6d6d515

Please sign in to comment.