selfhosted
/
jackson
mirror of https://github.com/boxyhq/jackson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Bump next-i18next from 12.1.0 to 13.0.2 (#753) 

* Bump next-i18next from 12.1.0 to 13.0.2

Bumps [next-i18next](https://github.com/i18next/next-i18next) from 12.1.0 to 13.0.2.
- [Release notes](https://github.com/i18next/next-i18next/releases)
- [Changelog](https://github.com/i18next/next-i18next/blob/master/CHANGELOG.md)
- [Commits](https://github.com/i18next/next-i18next/compare/v12.1.0...v13.0.2)

---
updated-dependencies:
- dependency-name: next-i18next
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

* fixed warning about i18next instance

* base Uffizzi image on original Dockerfile

* trying again

* fixed syntax error

* install i18next and react-i18next

* Fixed build error - https://www.i18next.com/overview/typescript#argument-of-type-defaulttfuncreturn-is-not-assignable-to-parameter-of-type-xyz

* adjust permissions

* updated template

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Deepak Prabhakara <deepak@boxyhq.com>
This commit is contained in:
dependabot[bot] 2022-12-20 20:11:27 +00:00 committed by GitHub
parent 8519216a85
commit 1e0d5ceec3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 151 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.github/workflows/uffizzi-build.yaml vendored
View File

@ -14,6 +14,12 @@ jobs:
- name: checkout
uses: actions/checkout@v3
- name: Generate Dockerfile
id: generate-dockerfile
run: |
cd uffizzi
./create-dockerfile.sh
- name: Generate UUID image name
id: uuid
run: echo "UUID_TAG=$(uuidgen)" >> $GITHUB_ENV
@ -41,7 +47,7 @@ jobs:
cache-from: type=gha
cache-to: type=gha,mode=max
- name: Push Image to TTL.SH
- name: Push Image to Uffizzi
run: docker push registry.uffizzi.com/${{ env.UUID_TAG }}:60h
render-compose-file:

8
i18next.d.ts vendored Normal file
View File

@ -0,0 +1,8 @@
// i18next.d.ts
import 'i18next';
declare module 'i18next' {
interface CustomTypeOptions {
returnNull: false;
}
}

116
package-lock.json generated
View File

@ -24,7 +24,7 @@
"micromatch": "4.0.5",
"next": "13.0.7",
"next-auth": "4.18.6",
"next-i18next": "12.1.0",
"next-i18next": "13.0.2",
"next-mdx-remote": "4.2.0",
"node-fetch": "3.3.0",
"nodemailer": "6.8.0",
@ -1597,10 +1597,11 @@
}
},
"node_modules/@babel/runtime": {
"version": "7.18.9",
"license": "MIT",
"version": "7.20.6",
"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.6.tgz",
"integrity": "sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==",
"dependencies": {
"regenerator-runtime": "^0.13.4"
"regenerator-runtime": "^0.13.11"
},
"engines": {
"node": ">=6.9.0"
@ -5501,7 +5502,9 @@
},
"node_modules/html-parse-stringify": {
"version": "3.0.1",
"license": "MIT",
"resolved": "https://registry.npmjs.org/html-parse-stringify/-/html-parse-stringify-3.0.1.tgz",
"integrity": "sha512-KknJ50kTInJ7qIScF3jeaFRpMpE8/lfiTdzf/twXyPBLAGrLRTmkz3AdTnKeh40X8k9L2fdYwEp/42WGXIRGcg==",
"peer": true,
"dependencies": {
"void-elements": "3.1.0"
}
@ -5543,7 +5546,9 @@
}
},
"node_modules/i18next": {
"version": "21.9.2",
"version": "22.4.6",
"resolved": "https://registry.npmjs.org/i18next/-/i18next-22.4.6.tgz",
"integrity": "sha512-9Tm1ezxWyzV+306CIDMBbYBitC1jedQyYuuLtIv7oxjp2ohh8eyxP9xytIf+2bbQfhH784IQKPSYp+Zq9+YSbw==",
"funding": [
{
"type": "individual",
@ -5558,14 +5563,15 @@
"url": "https://www.i18next.com/how-to/faq#i18next-is-awesome.-how-can-i-support-the-project"
}
],
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/runtime": "^7.17.2"
"@babel/runtime": "^7.20.6"
}
},
"node_modules/i18next-fs-backend": {
"version": "1.1.5",
"license": "MIT"
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/i18next-fs-backend/-/i18next-fs-backend-2.1.0.tgz",
"integrity": "sha512-gur0HAEkVDeUgZ9WNUcACYYl2N5FUt0C6bQCWsFPc+IYMXYWfiFQa8QQ930QAVYf71I75Ptl4XqQo5sl/u6/mA=="
},
"node_modules/iconv-lite": {
"version": "0.4.24",
@ -7395,12 +7401,10 @@
}
},
"node_modules/next-i18next": {
"version": "12.1.0",
"version": "13.0.2",
"resolved": "https://registry.npmjs.org/next-i18next/-/next-i18next-13.0.2.tgz",
"integrity": "sha512-aUHyKT2kztMgEP44zDB5KoW8XZUQawIdOYWXcrMH6lxAcS0kBsKX0uKMzGS5XlgLW88gvOVc3D7NdfCznLgyyg==",
"funding": [
{
"type": "individual",
"url": "https://locize.com"
},
{
"type": "individual",
"url": "https://locize.com/i18next.html"
@ -7408,24 +7412,31 @@
{
"type": "individual",
"url": "https://www.i18next.com/how-to/faq#i18next-is-awesome.-how-can-i-support-the-project"
},
{
"type": "individual",
"url": "https://locize.com"
},
{
"type": "individual",
"url": "https://github.com/belgattitude"
}
],
"license": "MIT",
"dependencies": {
"@babel/runtime": "^7.18.9",
"@babel/runtime": "^7.20.6",
"@types/hoist-non-react-statics": "^3.3.1",
"core-js": "^3",
"hoist-non-react-statics": "^3.3.2",
"i18next": "^21.9.1",
"i18next-fs-backend": "^1.1.5",
"react-i18next": "^11.18.4"
"i18next-fs-backend": "^2.1.0"
},
"engines": {
"node": ">=12"
"node": ">=14"
},
"peerDependencies": {
"next": ">= 10.0.0",
"react": ">= 16.8.0"
"i18next": "^22.0.6",
"next": ">= 12.0.0",
"react": ">= 17.0.2",
"react-i18next": "^12.1.1"
}
},
"node_modules/next-mdx-remote": {
@ -8379,8 +8390,10 @@
}
},
"node_modules/react-i18next": {
"version": "11.18.6",
"license": "MIT",
"version": "12.1.1",
"resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-12.1.1.tgz",
"integrity": "sha512-mFdieOI0LDy84q3JuZU6Aou1DoWW2fhapcTGeBS8+vWSJuViuoCLQAMYSb0QoHhXS8B0WKUOPpx4cffAP7r/aA==",
"peer": true,
"dependencies": {
"@babel/runtime": "^7.14.5",
"html-parse-stringify": "^3.0.1"
@ -8547,8 +8560,9 @@
}
},
"node_modules/regenerator-runtime": {
"version": "0.13.9",
"license": "MIT"
"version": "0.13.11",
"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
"integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg=="
},
"node_modules/regexp.prototype.flags": {
"version": "1.4.3",
@ -10270,7 +10284,9 @@
},
"node_modules/void-elements": {
"version": "3.1.0",
"license": "MIT",
"resolved": "https://registry.npmjs.org/void-elements/-/void-elements-3.1.0.tgz",
"integrity": "sha512-Dhxzh5HZuiHQhbvTW9AMetFfBHDMYpo23Uo9btPXgdYP+3T5S+p+jgNy7spra+veYhBP2dCSgxR/i2Y02h5/6w==",
"peer": true,
"engines": {
"node": ">=0.10.0"
}
@ -15667,9 +15683,11 @@
}
},
"@babel/runtime": {
"version": "7.18.9",
"version": "7.20.6",
"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.6.tgz",
"integrity": "sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==",
"requires": {
"regenerator-runtime": "^0.13.4"
"regenerator-runtime": "^0.13.11"
}
},
"@babel/runtime-corejs3": {
@ -20703,6 +20721,9 @@
},
"html-parse-stringify": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/html-parse-stringify/-/html-parse-stringify-3.0.1.tgz",
"integrity": "sha512-KknJ50kTInJ7qIScF3jeaFRpMpE8/lfiTdzf/twXyPBLAGrLRTmkz3AdTnKeh40X8k9L2fdYwEp/42WGXIRGcg==",
"peer": true,
"requires": {
"void-elements": "3.1.0"
}
@ -20726,13 +20747,18 @@
"dev": true
},
"i18next": {
"version": "21.9.2",
"version": "22.4.6",
"resolved": "https://registry.npmjs.org/i18next/-/i18next-22.4.6.tgz",
"integrity": "sha512-9Tm1ezxWyzV+306CIDMBbYBitC1jedQyYuuLtIv7oxjp2ohh8eyxP9xytIf+2bbQfhH784IQKPSYp+Zq9+YSbw==",
"peer": true,
"requires": {
"@babel/runtime": "^7.17.2"
"@babel/runtime": "^7.20.6"
}
},
"i18next-fs-backend": {
"version": "1.1.5"
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/i18next-fs-backend/-/i18next-fs-backend-2.1.0.tgz",
"integrity": "sha512-gur0HAEkVDeUgZ9WNUcACYYl2N5FUt0C6bQCWsFPc+IYMXYWfiFQa8QQ930QAVYf71I75Ptl4XqQo5sl/u6/mA=="
},
"iconv-lite": {
"version": "0.4.24",
@ -21771,15 +21797,15 @@
}
},
"next-i18next": {
"version": "12.1.0",
"version": "13.0.2",
"resolved": "https://registry.npmjs.org/next-i18next/-/next-i18next-13.0.2.tgz",
"integrity": "sha512-aUHyKT2kztMgEP44zDB5KoW8XZUQawIdOYWXcrMH6lxAcS0kBsKX0uKMzGS5XlgLW88gvOVc3D7NdfCznLgyyg==",
"requires": {
"@babel/runtime": "^7.18.9",
"@babel/runtime": "^7.20.6",
"@types/hoist-non-react-statics": "^3.3.1",
"core-js": "^3",
"hoist-non-react-statics": "^3.3.2",
"i18next": "^21.9.1",
"i18next-fs-backend": "^1.1.5",
"react-i18next": "^11.18.4"
"i18next-fs-backend": "^2.1.0"
}
},
"next-mdx-remote": {
@ -22344,7 +22370,10 @@
}
},
"react-i18next": {
"version": "11.18.6",
"version": "12.1.1",
"resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-12.1.1.tgz",
"integrity": "sha512-mFdieOI0LDy84q3JuZU6Aou1DoWW2fhapcTGeBS8+vWSJuViuoCLQAMYSb0QoHhXS8B0WKUOPpx4cffAP7r/aA==",
"peer": true,
"requires": {
"@babel/runtime": "^7.14.5",
"html-parse-stringify": "^3.0.1"
@ -22438,7 +22467,9 @@
}
},
"regenerator-runtime": {
"version": "0.13.9"
"version": "0.13.11",
"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
"integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg=="
},
"regexp.prototype.flags": {
"version": "1.4.3",
@ -23456,7 +23487,10 @@
}
},
"void-elements": {
"version": "3.1.0"
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/void-elements/-/void-elements-3.1.0.tgz",
"integrity": "sha512-Dhxzh5HZuiHQhbvTW9AMetFfBHDMYpo23Uo9btPXgdYP+3T5S+p+jgNy7spra+veYhBP2dCSgxR/i2Y02h5/6w==",
"peer": true
},
"web-streams-polyfill": {
"version": "3.2.1"

2
package.json
View File

@ -59,7 +59,7 @@
"micromatch": "4.0.5",
"next": "13.0.7",
"next-auth": "4.18.6",
"next-i18next": "12.1.0",
"next-i18next": "13.0.2",
"next-mdx-remote": "4.2.0",
"node-fetch": "3.3.0",
"nodemailer": "6.8.0",

3
pages/_app.tsx
View File

@ -7,6 +7,7 @@ import { Toaster } from '@components/Toaster';
import { appWithTranslation } from 'next-i18next';
import { ReactElement, ReactNode } from 'react';
import micromatch from 'micromatch';
import nextI18NextConfig from '../next-i18next.config.js';
import { AccountLayout, SetupLayout } from '@components/layouts';
@ -66,7 +67,7 @@ function MyApp({ Component, pageProps }: AppPropsWithLayout) {
);
}
export default appWithTranslation<never>(MyApp);
export default appWithTranslation<never>(MyApp, nextI18NextConfig);
export type AppPropsWithLayout = AppProps & {
Component: NextPageWithLayout;

68
uffizzi/Dockerfile
View File

@ -1,37 +1,70 @@
FROM node:16.18.0-alpine3.16 AS base
ARG NODEJS_IMAGE=node:16.18.1-alpine3.16
FROM --platform=$BUILDPLATFORM $NODEJS_IMAGE AS base
# Install dependencies only when needed
FROM base AS deps
# Check https://github.com/nodejs/docker-node/tree/b4117f9333da4138b03a546ec926ef50a31506c3#nodealpine to understand why libc6-compat might be needed.
RUN apk add --no-cache libc6-compat
WORKDIR /app
COPY package.json package-lock.json ./
# Install dependencies based on the preferred package manager
COPY package.json package-lock.json ./
COPY npm npm
RUN npm install --legacy-peer-deps
RUN npm ci
# Rebuild the source code only when needed
FROM base AS builder
WORKDIR /app
COPY . .
COPY --from=deps /app/npm ./npm
COPY --from=deps /app/node_modules ./node_modules
RUN npm run build && npm install --legacy-peer-deps --production --ignore-scripts --prefer-offline
COPY . .
# Next.js collects completely anonymous telemetry data about general usage.
# Learn more here: https://nextjs.org/telemetry
# Uncomment the following line in case you want to disable telemetry during the build.
ENV NEXT_TELEMETRY_DISABLED 1
RUN npm run build
# Production image, copy all the files and run next
FROM base AS runner
FROM $NODEJS_IMAGE AS runner
WORKDIR /app
ENV NODE_OPTIONS="--max-http-header-size=81920"
ENV NODE_ENV production
RUN addgroup -g 1001 -S nodejs
RUN adduser -S nextjs -u 1001
ENV NODE_ENV production
# Uncomment the following line in case you want to disable telemetry during runtime.
ENV NEXT_TELEMETRY_DISABLED 1
RUN addgroup --system --gid 1001 nodejs
RUN adduser --system --uid 1001 nextjs
COPY --from=builder /app/public ./public
COPY --from=builder --chown=nextjs:nodejs /app/.next ./.next
COPY --from=builder /app/npm ./npm
COPY --from=builder /app/node_modules ./node_modules
COPY --from=builder /app/package.json ./package.json
# Automatically leverage output traces to reduce image size
# https://nextjs.org/docs/advanced-features/output-file-tracing
COPY --from=builder --chown=nextjs:nodejs /app/.next/standalone ./
COPY --from=builder --chown=nextjs:nodejs /app/.next/static ./.next/static
USER nextjs
EXPOSE 5225
ENV PORT 5225
CMD ["node", "server.js"]
FROM runner AS uffizzi
USER root
COPY --from=builder /app/uffizzi/saml_config ./uffizzi/saml_config
COPY ./uffizzi/docker-entrypoint.sh .
@ -39,11 +72,4 @@ RUN chmod +x docker-entrypoint.sh
USER nextjs
EXPOSE 5225
# Next.js collects completely anonymous telemetry data about general usage.
# Learn more here: https://nextjs.org/telemetry
# Uncomment the following line in case you want to disable telemetry.
ENV NEXT_TELEMETRY_DISABLED 1
CMD ["./docker-entrypoint.sh"]
CMD ["./docker-entrypoint.sh"]

10
uffizzi/Dockerfile.tmpl Normal file
View File

@ -0,0 +1,10 @@
FROM runner AS uffizzi
USER root
COPY --from=builder /app/uffizzi/saml_config ./uffizzi/saml_config
COPY ./uffizzi/docker-entrypoint.sh .
RUN chmod +x docker-entrypoint.sh
USER nextjs
CMD ["./docker-entrypoint.sh"]

1
uffizzi/create-dockerfile.sh Executable file
View File

@ -0,0 +1 @@
cat ../Dockerfile Dockerfile.tmpl > Dockerfile