Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions REUSE.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ path = [
"**/tsconfig.json",
"**/package*.json",

# patches folder
"code/patches/**",

# code/ directory licensing
"cleanup-storage/src/whitelist.json",
"code/config/**",
Expand Down
1 change: 1 addition & 0 deletions code/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#
# SPDX-License-Identifier: Apache-2.0

FROM node:20 as base

Check warning on line 5 in code/Dockerfile

View workflow job for this annotation

GitHub Actions / Deploy to Container Apps

The 'as' keyword should match the case of the 'from' keyword

FromAsCasing: 'as' and 'FROM' keywords' casing do not match More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/

# Install dependencies step
FROM base AS deps
Expand All @@ -12,6 +12,7 @@
RUN apt-get install -y build-essential libcairo2-dev libpango1.0-dev libjpeg-dev libgif-dev librsvg2-dev libtool autoconf automake

WORKDIR /app
COPY /patches ./patches
COPY package*.json ./
RUN npm pkg delete scripts.prepare
RUN npm install
Expand All @@ -32,7 +33,7 @@
RUN apt-get install -y build-essential libcairo2-dev libpango1.0-dev libjpeg-dev libgif-dev librsvg2-dev libtool autoconf automake

WORKDIR /app
ENV NODE_ENV production

Check warning on line 36 in code/Dockerfile

View workflow job for this annotation

GitHub Actions / Deploy to Container Apps

Legacy key/value format with whitespace separator should not be used

LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy "ENV key value" format More info: https://docs.docker.com/go/dockerfile/rule/legacy-key-value-format/
RUN addgroup --system --gid 1001 nodejs
RUN adduser --system --uid 1001 service
COPY --from=deps --chown=service:nodejs /app/node_modules ./node_modules
Expand All @@ -45,5 +46,5 @@
ENV XDG_CACHE_HOME=/tmp/fontconfig
USER service
EXPOSE 8080
ENV PORT 8080

Check warning on line 49 in code/Dockerfile

View workflow job for this annotation

GitHub Actions / Deploy to Container Apps

Legacy key/value format with whitespace separator should not be used

LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy "ENV key value" format More info: https://docs.docker.com/go/dockerfile/rule/legacy-key-value-format/
CMD ["node", "--experimental-specifier-resolution=node", "--env-file=.env", "--loader=ts-node/esm", "server.js"]
Binary file added code/fonts/ARIAL.TTF
Binary file not shown.
Binary file added code/fonts/ARIALBD.TTF
Binary file not shown.
Binary file added code/fonts/ARIALBI.TTF
Binary file not shown.
Binary file added code/fonts/ARIALI 1.TTF
Binary file not shown.
Binary file added code/fonts/ARIALI.TTF
Binary file not shown.
Binary file added code/fonts/FuzzyBubbles-Bold.ttf
Binary file not shown.
Binary file added code/fonts/FuzzyBubbles-Regular.ttf
Binary file not shown.
Binary file removed code/fonts/Impact.ttf
Binary file not shown.
Binary file added code/fonts/NotoSansMono-Bold.ttf
Binary file not shown.
Binary file added code/fonts/NotoSansMono-Regular.ttf
Binary file not shown.
Binary file added code/fonts/RobotoMono-Bold.ttf
Binary file not shown.
Binary file added code/fonts/RobotoMono-BoldItalic.ttf
Binary file not shown.
Binary file added code/fonts/RobotoMono-Italic.ttf
Binary file not shown.
Binary file added code/fonts/RobotoMono-Regular.ttf
Binary file not shown.
Binary file added code/fonts/SpecialGothicCondensedOne-Regular.ttf
Binary file not shown.
Binary file removed code/fonts/Verdana-Bold.ttf
Binary file not shown.
Binary file removed code/fonts/Verdana-BoldItalic.ttf
Binary file not shown.
Binary file removed code/fonts/Verdana-Italic.ttf
Binary file not shown.
Binary file removed code/fonts/Verdana.ttf
Binary file not shown.
1,131 changes: 826 additions & 305 deletions code/package-lock.json

Large diffs are not rendered by default.

14 changes: 9 additions & 5 deletions code/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,12 @@
"license": "Apache-2.0",
"type": "module",
"scripts": {
"apply:patches": "patch-package",
"build": "tsc && tsc-alias && mkdir -p ./dist/public && mkdir -p ./dist/temp && cp -r ./public ./dist",
"bump:snapshot": "npm version $npm_package_version.$(date \"+%s\")",
"cleanup": "rm package-lock.json && npkill -D -y",
"copy:assets": "mkdir -p ./public && cp -r node_modules/@imgly/background-removal-node/dist/. public",
"copy:fonts": "cp -r fonts/. dist/fonts",
"copy:fonts": "mkdir -p ./dist && cp -r fonts/. dist/fonts",
"db:generate:migration": "sequelize-cli migration:generate --name migration-definition",
"db:migrate:dev": "cross-env NODE_ENV=development sequelize-cli db:migrate --config ./config/config.cjs",
"db:undo:dev": "cross-env NODE_ENV=development sequelize-cli db:migrate:undo --config ./config/config.cjs",
Expand All @@ -33,7 +34,7 @@
"lint": "eslint src/**/* --no-warn-ignored --ext .ts",
"lint:fix": "eslint src/**/* --no-warn-ignored --ext .ts --fix",
"llm:studio": "mastra dev --dir=./src/mastra/studio --env=.env",
"postinstall": "npm run copy:assets",
"postinstall": "npm run copy:assets && npm run apply:patches",
"prepare": "cd ../ && node code/.husky/install.mjs",
"publish:snapshot": "nx run-many -t publish:snapshot -- --verbose --tag next --registry $NPM_PUBLISHING_REGISTRY --unsafe-perm",
"start": "node --experimental-specifier-resolution=node --env-file=.env --loader ts-node/esm dist/server.js",
Expand All @@ -59,9 +60,11 @@
"@azure/web-pubsub": "^1.2.0",
"@google/genai": "^1.32.0",
"@imgly/background-removal-node": "^1.4.5",
"@inditextech/weave-sdk": "2.23.0",
"@inditextech/weave-store-azure-web-pubsub": "2.23.0",
"@inditextech/weave-store-standalone": "2.23.0",
"@inditextech/weave-renderer-konva-base": "3.1.0",
"@inditextech/weave-renderer-konva-react-reconciler": "3.1.0",
"@inditextech/weave-sdk": "3.1.0",
"@inditextech/weave-store-azure-web-pubsub": "3.1.0",
"@inditextech/weave-store-standalone": "3.1.0",
"@mastra/ai-sdk": "^0.3.1",
"@mastra/core": "^0.24.5",
"@mastra/libsql": "^0.16.2",
Expand Down Expand Up @@ -136,6 +139,7 @@
"husky": "^9.1.7",
"nodemon": "^3.1.9",
"npkill": "^0.12.2",
"patch-package": "^8.0.1",
"prettier": "^3.5.3",
"prettier-eslint": "^16.3.0",
"sequelize-cli": "^6.6.3",
Expand Down
14 changes: 14 additions & 0 deletions code/patches/konva+10.0.2.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
diff --git a/node_modules/konva/lib/shapes/Text.js b/node_modules/konva/lib/shapes/Text.js
index c882d0a..a34a9c9 100644
--- a/node_modules/konva/lib/shapes/Text.js
+++ b/node_modules/konva/lib/shapes/Text.js
@@ -279,8 +279,7 @@ export class Text extends Shape {
_getContextFont() {
return (this.fontStyle() +
SPACE +
- this.fontVariant() +
- SPACE +
+ (this.fontVariant() === "normal" ? "" : this.fontVariant() + SPACE) +
(this.fontSize() + PX_SPACE) +
normalizeFontFamily(this.fontFamily()));
}
Loading
Loading