Merge pull request #1189 from mikecao/dev

v1.32.0

Author: mikecao

Dockerfile

@@ -1,45 +1,52 @@
-# Build image
-FROM node:12.22-alpine AS build
-ARG BASE_PATH
-ARG DATABASE_TYPE
+# Install dependencies only when needed
+FROM node:16-alpine 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 yarn.lock ./
+RUN yarn install --frozen-lockfile
 
+# Rebuild the source code only when needed
+FROM node:16-alpine AS builder
 ENV BASE_PATH=$BASE_PATH
 ENV DATABASE_URL "postgresql://umami:umami@db:5432/umami"
 ENV DATABASE_TYPE=$DATABASE_TYPE
+WORKDIR /app
+COPY --from=deps /app/node_modules ./node_modules
+COPY . .
 
-WORKDIR /build
-
-RUN yarn config set --home enableTelemetry 0
-COPY package.json yarn.lock /build/
-
-# Install only the production dependencies
-RUN yarn install --production --frozen-lockfile
-
-# Cache these modules for production
-RUN cp -R node_modules/ prod_node_modules/
-
-# Install development dependencies
-RUN yarn install --frozen-lockfile
+# 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
 
-COPY . /build
-RUN yarn next telemetry disable
 RUN yarn build
 
-# Production image
-FROM node:12.22-alpine AS production
+# Production image, copy all the files and run next
+FROM node:16-alpine AS runner
 WORKDIR /app
 
-# Copy cached dependencies
-COPY --from=build /build/prod_node_modules ./node_modules
+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 generated Prisma client
-COPY --from=build /build/node_modules/.prisma/ ./node_modules/.prisma/
+# You only need to copy next.config.js if you are NOT using the default configuration
+COPY --from=builder /app/next.config.js ./
+COPY --from=builder /app/public ./public
+COPY --from=builder /app/package.json ./package.json
 
-COPY --from=build /build/yarn.lock /build/package.json ./
-COPY --from=build /build/.next ./.next
-COPY --from=build /build/public ./public
+# 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 node
+USER nextjs
 
 EXPOSE 3000
-CMD ["yarn", "start"]
+
+ENV PORT 3000
+
+CMD ["node", "server.js"]

README.md

@@ -19,12 +19,18 @@ See [Running on Railway](https://umami.is/docs/running-on-railway) to get starte
 - A server with Node.js 12 or newer
 - A database (MySQL or Postgresql)
 
+### Install Yarn (if needed)
+
+```
+npm install -g yarn
+```
+
 ### Get the source code and install packages
 
 ```
 git clone https://github.com/mikecao/umami.git
 cd umami
-npm install
+yarn install
 ```
 
 ### Create database tables
@@ -67,13 +73,13 @@ The `HASH_SALT` is used to generate unique values for your installation.
 ### Build the application
 
 ```bash
-npm run build
+yarn build
 ```
 
 ### Start the application
 
 ```bash
-npm start
+yarn start
 ```
 
 By default this will launch the application on `http://localhost:3000`. You will need to either 
@@ -104,8 +110,8 @@ To get the latest features, simply do a pull, install any new dependencies, and
 
 ```bash
 git pull
-npm install
-npm run build
+yarn install
+yarn build
 ```
 
 To update the Docker image, simply pull the new images and rebuild:

components/pages/Dashboard.js

@@ -32,7 +32,9 @@ export default function Dashboard() {
   return (
     <Page>
       <PageHeader>
-        <div>Dashboard</div>
+        <div>
+          <FormattedMessage id="label.dashboard" defaultMessage="Dashboard" />
+        </div>
         <DashboardSettingsButton />
       </PageHeader>
       <WebsiteList websites={data} showCharts={showCharts} limit={max} />

hooks/useFetch.js

@@ -5,14 +5,14 @@ import useApi from './useApi';
 export default function useFetch(url, options = {}, update = []) {
   const [response, setResponse] = useState();
   const [error, setError] = useState();
-  const [loading, setLoadiing] = useState(false);
+  const [loading, setLoading] = useState(false);
   const [count, setCount] = useState(0);
   const { get } = useApi();
   const { params = {}, headers = {}, disabled, delay = 0, interval, onDataLoad } = options;
 
   async function loadData(params) {
     try {
-      setLoadiing(true);
+      setLoading(true);
       setError(null);
       const time = performance.now();
 
@@ -32,7 +32,7 @@ export default function useFetch(url, options = {}, update = []) {
       console.error(e);
       setError(e);
     } finally {
-      setLoadiing(false);
+      setLoading(false);
     }
   }
 

lang/de-DE.json

@@ -51,7 +51,7 @@
   "label.settings": "Einstellungen",
   "label.share-url": "Freigabe-URL",
   "label.single-day": "Ein Tag",
-  "label.theme": "Theme",
+  "label.theme": "Thema",
   "label.this-month": "Diesen Monat",
   "label.this-week": "Diese Woche",
   "label.this-year": "Dieses Jahr",
@@ -92,7 +92,7 @@
   "metrics.countries": "Länder",
   "metrics.device.desktop": "Desktop",
   "metrics.device.laptop": "Laptop",
-  "metrics.device.mobile": "Mobiltelefon",
+  "metrics.device.mobile": "Handy",
   "metrics.device.tablet": "Tablet",
   "metrics.devices": "Geräte",
   "metrics.events": "Ereignisse",

next.config.js

@@ -6,6 +6,9 @@ module.exports = {
     VERSION: pkg.version,
   },
   basePath: process.env.BASE_PATH,
+  experimental: {
+    outputStandalone: true,
+  },
   eslint: {
     ignoreDuringBuilds: true,
   },

package.json

@@ -1,6 +1,6 @@
 {
   "name": "umami",
-  "version": "1.31.0",
+  "version": "1.32.0",
   "description": "A simple, fast, privacy-focused alternative to Google Analytics.",
   "author": "Mike Cao <mike@mikecao.com>",
   "license": "MIT",
@@ -54,7 +54,7 @@
   },
   "dependencies": {
     "@fontsource/inter": "4.5.7",
-    "@prisma/client": "3.12.0",
+    "@prisma/client": "3.14.0",
     "bcryptjs": "^2.4.3",
     "chalk": "^4.1.1",
     "chart.js": "^2.9.4",
@@ -112,10 +112,10 @@
     "postcss": "^8.4.12",
     "postcss-flexbugs-fixes": "^5.0.2",
     "postcss-import": "^14.0.2",
-    "postcss-preset-env": "^7.4.2",
+    "postcss-preset-env": "7.4.3",
     "postcss-rtlcss": "^3.6.1",
     "prettier": "^2.6.2",
-    "prisma": "3.12.0",
+    "prisma": "3.14.0",
     "prompts": "2.4.2",
     "rollup": "^2.70.1",
     "rollup-plugin-terser": "^7.0.2",

pages/_app.js

@@ -24,7 +24,6 @@ const Intl = ({ children }) => {
 export default function App({ Component, pageProps }) {
   const { basePath } = useRouter();
   const { dir } = useLocale();
-  const version = process.env.VERSION;
 
   return (
     <Intl>
@@ -35,12 +34,6 @@ export default function App({ Component, pageProps }) {
         <link rel="icon" type="image/png" sizes="16x16" href={`${basePath}/favicon-16x16.png`} />
         <link rel="manifest" href={`${basePath}/site.webmanifest`} />
         <link rel="mask-icon" href={`${basePath}/safari-pinned-tab.svg`} color="#5bbad5" />
-        <link
-          rel="preload"
-          href={`https://i.umami.is/icon.png?v=${version}`}
-          as="image"
-          type="image/png"
-        />
         <meta name="msapplication-TileColor" content="#da532c" />
         <meta name="theme-color" content="#fafafa" media="(prefers-color-scheme: light)" />
         <meta name="theme-color" content="#2f2f2f" media="(prefers-color-scheme: dark)" />

pages/_middleware.js

@@ -17,7 +17,7 @@ function customScriptName(req) {
 
 function disableLogin(req) {
   if (process.env.DISABLE_LOGIN && req.nextUrl.pathname.endsWith('/login')) {
-    return new Response('403 Forbidden', { status: 403 });
+    return new Response('Login is disabled', { status: 403 });
   }
 }
 

public/intl/messages/de-DE.json

@@ -334,7 +334,7 @@
   "label.theme": [
     {
       "type": 0,
-      "value": "Theme"
+      "value": "Thema"
     }
   ],
   "label.this-month": [
@@ -704,7 +704,7 @@
   "metrics.device.mobile": [
     {
       "type": 0,
-      "value": "Mobiltelefon"
+      "value": "Handy"
     }
   ],
   "metrics.device.tablet": [