chore: release v3.1.3

.dockerignore

@@ -13,7 +13,7 @@ storage
 
 # Additional good to have ignores for dockerignore
 Dockerfile*
-docker-compose*
+compose*
 .dockerignore
 *.md
 .git

.editorconfig

@@ -10,12 +10,5 @@ charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
 
-[*.json]
-insert_final_newline = unset
-
 [**.min.js]
 indent_style = unset
-insert_final_newline = unset
-
-[*.md]
-trim_trailing_whitespace = false

.release-it.json

@@ -1,9 +1,6 @@
 {
   "hooks": {
-    "before:init": [
-      "pnpm format",
-      "pnpm lint"
-    ]
+    "before:init": ["pnpm lint", "pnpm run typecheck"]
   },
   "git": {
     "commitMessage": "chore: release v${version}",
@@ -17,4 +14,4 @@
   "npm": {
     "publish": false
   }
-}
+}

.vscode/extensions.json

@@ -1,3 +0,0 @@
-{
-	"recommendations": ["vunguyentuan.vscode-css-variables"]
-}

.vscode/settings.json

@@ -7,7 +7,7 @@
 	"explorer.fileNesting.enabled": true,
 	"explorer.fileNesting.patterns": {
 		"*.js": "${capture}.js.map, ${capture}.min.js, ${capture}.d.ts",
-		"package.json": "pnpm-lock.yaml, tsconfig.json, eslint.config.js, .babelrc, vite.config.ts, .editorconfig",
+		"package.json": "pnpm-lock.yaml, pnpm-workspace.yaml, tsconfig.json, eslint.config.js, .babelrc, vite.config.ts, .editorconfig",
 		"Makefile": "*compose.yml, Dockerfile, servers_pgadmin.json, .dockerignore"
 	},
 	"cssVariables.lookupFiles": [
@@ -17,4 +17,4 @@
 		"**/*.less",
 		"node_modules/@mantine/core/styles.css"
 	]
-}
+}

Dockerfile

@@ -1,6 +1,6 @@
 # Source : https://github.com/adonisjs-community/adonis-packages/blob/main/Dockerfile
 
-FROM node:22.11-alpine3.20 AS base
+FROM node:24.1-alpine3.20 AS base
 
 RUN apk --no-cache add curl
 RUN corepack enable

Makefile

@@ -1,21 +1,28 @@
 dev:
 	@docker compose down
 	@docker compose -f dev.compose.yml pull
-	@docker compose -f dev.compose.yml up -d --wait
+	@docker compose -f dev.compose.yml up -d --wait --remove-orphans
 	@node ace migration:fresh
 	@pnpm run dev
 
 prod:
 	@docker compose -f dev.compose.yml down
 	@docker compose pull
-	@docker compose up -d --build --wait
+	@docker compose up -d --build --wait --remove-orphans
 
 seed:
 	@node ace db:seed
 
+fresh:
+	@node ace migration:fresh
+
 down:
 	@-docker compose down
 	@-docker compose -f dev.compose.yml down
 
 release:
 	@pnpm run release
+
+docker-weight:
+	@DOCKER_IMAGE_WEIGHT=$$(docker save axekin-axekin:latest | wc -c | awk '{printf "%.3f", $$1/1024/1024}'); \
+	echo "Docker image weight: $${DOCKER_IMAGE_WEIGHT} Mo"

adonisrc.ts

@@ -103,7 +103,7 @@ export default defineConfig({
 	],
 
 	assetsBundler: false,
-	unstable_assembler: {
+	hooks: {
 		onBuildStarting: [() => import('@adonisjs/vite/build_hook')],
 		onDevServerStarted: [() => import('@izzyjs/route/dev_hook')],
 	},

app/collections/models/collection.ts

@@ -15,9 +15,6 @@ export default class Collection extends AppBaseModel {
 	@column()
 	declare visibility: Visibility;
 
-	@column()
-	declare nextId: number;
-
 	@column()
 	declare authorId: number;
 

app/collections/validators/create_collection_validator.ts

@@ -6,7 +6,6 @@ export const createCollectionValidator = vine.compile(
 		name: vine.string().trim().minLength(1).maxLength(254),
 		description: vine.string().trim().maxLength(254).nullable(),
 		visibility: vine.enum(Visibility),
-		nextId: vine.number().optional(),
 	})
 );
 

app/collections/validators/update_collection_validator.ts

@@ -7,7 +7,6 @@ export const updateCollectionValidator = vine.compile(
 		name: vine.string().trim().minLength(1).maxLength(254),
 		description: vine.string().trim().maxLength(254).nullable(),
 		visibility: vine.enum(Visibility),
-		nextId: vine.number().optional(),
 
 		params,
 	})

compose.yml

@@ -15,33 +15,6 @@ services:
     ports:
       - '${DB_PORT}:5432'
 
-  pgadmin:
-    container_name: pgadmin
-    image: dpage/pgadmin4:8
-    restart: always
-    entrypoint: /bin/sh -c "chmod 0600 /pgpass; /entrypoint.sh;"
-    healthcheck:
-      test: ['CMD', 'wget', '-O', '-', 'http://localhost:80/misc/ping']
-      interval: 2s
-      timeout: 10s
-      retries: 30
-    env_file: .env
-    environment:
-      - PGADMIN_DEFAULT_EMAIL=myemail@gmail.com
-      - PGADMIN_DEFAULT_PASSWORD=a12345678
-      - PGADMIN_CONFIG_SERVER_MODE=False
-      - PGADMIN_CONFIG_MASTER_PASSWORD_REQUIRED=False
-    depends_on:
-      - postgres
-    ports:
-      - '5050:80'
-    user: root
-    configs:
-      - source: servers.json
-        target: /pgadmin4/servers.json
-      - source: pgpass
-        target: /pgpass
-
   my-links:
     container_name: my-links
     restart: always
@@ -61,19 +34,3 @@ services:
 
 volumes:
   postgres-volume:
-
-configs:
-  pgpass:
-    content: postgres:${DB_PORT}:*:${DB_USER}:${DB_PASSWORD}
-  servers.json:
-    content: |
-      {"Servers": {"1": {
-        "Group": "Servers",
-        "Name": "project",
-        "Host": "postgres",
-        "Port": ${DB_PORT},
-        "MaintenanceDB": "${DB_DATABASE}",
-        "Username": "${DB_USER}",
-        "PassFile": "/pgpass",
-        "SSLMode": "prefer"
-      }}}

database/migrations/1737478982886_drop_next_id_collections_table.ts

@@ -0,0 +1,21 @@
+import { BaseSchema } from '@adonisjs/lucid/schema';
+
+export default class extends BaseSchema {
+	protected tableName = 'collections';
+
+	async up() {
+		this.schema.alterTable('collections', (table) => {
+			table.dropColumn('next_id');
+		});
+	}
+
+	async down() {
+		this.schema.alterTable('collections', (table) => {
+			table
+				.integer('next_id')
+				.references('id')
+				.inTable('collections')
+				.defaultTo(null);
+		});
+	}
+}

database/seeders/collection_seeder.ts

@@ -4,6 +4,8 @@ import User from '#user/models/user';
 import { BaseSeeder } from '@adonisjs/lucid/seeders';
 import { faker } from '@faker-js/faker';
 
+const ID_OFFSET = 100;
+
 export default class extends BaseSeeder {
 	static environment = ['development', 'testing'];
 
@@ -11,7 +13,7 @@ export default class extends BaseSeeder {
 		const users = await getUserIds();
 
 		const collections = faker.helpers.multiple(
-			() => createRandomCollection(users),
+			(_, index) => createRandomCollection(users, ID_OFFSET + index),
 			{
 				count: 50,
 			}
@@ -25,16 +27,13 @@ export async function getUserIds() {
 	return users.map(({ id }) => id);
 }
 
-let collectionId = 0;
-function createRandomCollection(userIds: User['id'][]) {
+function createRandomCollection(userIds: User['id'][], id: number) {
 	const authorId = faker.helpers.arrayElements(userIds, 1).at(0);
-	collectionId++;
 	return {
-		id: collectionId,
+		id,
 		name: faker.string.alphanumeric({ length: { min: 5, max: 25 } }),
 		description: faker.string.alphanumeric({ length: { min: 0, max: 254 } }),
 		visibility: Visibility.PRIVATE,
-		nextId: collectionId + 1,
 		authorId,
 	};
 }

database/seeders/link_seeder.ts

@@ -5,6 +5,8 @@ import User from '#user/models/user';
 import { BaseSeeder } from '@adonisjs/lucid/seeders';
 import { faker } from '@faker-js/faker';
 
+const ID_OFFSET = 100;
+
 export default class extends BaseSeeder {
 	static environment = ['development', 'testing'];
 
@@ -12,9 +14,12 @@ export default class extends BaseSeeder {
 		const users = await getUserIds();
 
 		const links = await Promise.all(
-			faker.helpers.multiple(async () => createRandomLink(users), {
-				count: 500,
-			})
+			faker.helpers.multiple(
+				async (_, index) => createRandomLink(users, ID_OFFSET + index),
+				{
+					count: 500,
+				}
+			)
 		);
 		await Link.createMany(links.filter((a) => typeof a !== 'undefined') as any);
 	}
@@ -25,7 +30,7 @@ async function getCollectionIds(authorId: User['id']) {
 	return collection.map(({ id }) => id);
 }
 
-async function createRandomLink(userIds: User['id'][]) {
+async function createRandomLink(userIds: User['id'][], id: number) {
 	const authorId = faker.helpers.arrayElements(userIds, 1).at(0)!;
 	const collections = await getCollectionIds(authorId);
 
@@ -35,7 +40,7 @@ async function createRandomLink(userIds: User['id'][]) {
 	}
 
 	return {
-		id: faker.string.uuid(),
+		id,
 		name: faker.string.alphanumeric({ length: { min: 5, max: 25 } }),
 		description: faker.string.alphanumeric({ length: { min: 0, max: 254 } }),
 		url: faker.internet.url(),

database/seeders/user_seeder.ts

@@ -3,22 +3,27 @@ import { GoogleToken } from '@adonisjs/ally/types';
 import { BaseSeeder } from '@adonisjs/lucid/seeders';
 import { faker } from '@faker-js/faker';
 
+const ID_OFFSET = 100;
+
 export default class extends BaseSeeder {
 	static environment = ['development', 'testing'];
 
 	async run() {
-		const users = faker.helpers.multiple(createRandomUser, {
-			count: 25,
-		});
+		const users = faker.helpers.multiple(
+			(_, index) => createRandomUser(ID_OFFSET + index),
+			{
+				count: 25,
+			}
+		);
 		await User.createMany(users);
 	}
 }
 
-export function createRandomUser() {
+export function createRandomUser(index: number) {
 	return {
-		id: faker.number.int(),
+		id: index,
 		email: faker.internet.email(),
-		name: faker.internet.userName(),
+		name: faker.internet.username(),
 		nickName: faker.internet.displayName(),
 		avatarUrl: faker.image.avatar(),
 		isAdmin: false,

dev.compose.yml

@@ -15,48 +15,5 @@ services:
     ports:
       - "${DB_PORT}:5432"
 
-  pgadmin:
-    container_name: pgadmin
-    image: dpage/pgadmin4:8
-    restart: always
-    entrypoint: /bin/sh -c "chmod 0600 /pgpass; /entrypoint.sh;"
-    healthcheck:
-      test: ["CMD", "wget", "-O", "-", "http://localhost:80/misc/ping"]
-      interval: 2s
-      timeout: 10s
-      retries: 30
-    env_file: .env
-    environment:
-      - PGADMIN_DEFAULT_EMAIL=myemail@gmail.com
-      - PGADMIN_DEFAULT_PASSWORD=a12345678
-      - PGADMIN_CONFIG_SERVER_MODE=False
-      - PGADMIN_CONFIG_MASTER_PASSWORD_REQUIRED=False
-    depends_on:
-      - postgres
-    ports:
-      - "5050:80"
-    user: root
-    configs:
-      - source: servers.json
-        target: /pgadmin4/servers.json
-      - source: pgpass
-        target: /pgpass
-
 volumes:
   postgres-volume:
-
-configs:
-  pgpass:
-    content: postgres:${DB_PORT}:*:${DB_USER}:${DB_PASSWORD}
-  servers.json:
-    content: |
-      {"Servers": {"1": {
-        "Group": "Servers",
-        "Name": "project",
-        "Host": "postgres",
-        "Port": ${DB_PORT},
-        "MaintenanceDB": "${DB_DATABASE}",
-        "Username": "${DB_USER}",
-        "PassFile": "/pgpass",
-        "SSLMode": "prefer"
-      }}}

eslint.config.js

@@ -1,4 +1,7 @@
 import { configApp } from '@adonisjs/eslint-config';
 export default configApp({
   files: ['**/*.ts', '**/*.tsx', '**/*.js', '**/*.jsx'],
+  rules: {
+    'unicorn/filename-case': 'off',
+  },
 });

inertia/components/dashboard/collection/item/collection_item.module.css

@@ -6,7 +6,7 @@
 	text-decoration: none;
 	font-size: var(--mantine-font-size-sm);
 	color: light-dark(var(--mantine-color-gray-7), var(--mantine-color-dark-1));
-	padding: var(--mantine-spacing-xs) var(--mantine-spacing-sm);
+	padding: rem(8px) rem(12px);
 	border-radius: var(--mantine-radius-sm);
 	font-weight: 500;
 

inertia/components/dashboard/collection/item/collection_item.tsx

@@ -24,8 +24,6 @@ export default function CollectionItem({
 		}
 	}, [collection.id, activeCollection?.id]);
 
-	const linksCount = collection?.links.length ?? 0;
-	const showLinks = linksCount > 0;
 	return (
 		<Link
 			className={classes.link}
@@ -39,11 +37,6 @@ export default function CollectionItem({
 			<Text lineClamp={1} maw={'200px'} style={{ wordBreak: 'break-all' }}>
 				{collection.name}
 			</Text>
-			{showLinks && (
-				<Text style={{ whiteSpace: 'nowrap' }} c="dimmed" ml="sm">
-					— {linksCount}
-				</Text>
-			)}
 		</Link>
 	);
 }

inertia/components/form/form_collection.tsx

@@ -3,13 +3,12 @@ import { FormEvent } from 'react';
 import { useTranslation } from 'react-i18next';
 import BackToDashboard from '~/components/common/navigation/back_to_dashboard';
 import { FormLayout, FormLayoutProps } from '~/layouts/form_layout';
-import { Collection, Visibility } from '~/types/app';
+import { Visibility } from '~/types/app';
 
 export type FormCollectionData = {
 	name: string;
 	description: string | null;
 	visibility: Visibility;
-	nextId?: Collection['id'];
 };
 
 interface FormCollectionProps extends FormLayoutProps {

inertia/layouts/_base_layout.tsx

@@ -1,22 +1,17 @@
-import { router, usePage } from '@inertiajs/react';
-import { ColorSchemeScript, createTheme, MantineProvider } from '@mantine/core';
+import { router } from '@inertiajs/react';
+import { ColorSchemeScript, MantineProvider } from '@mantine/core';
+import '@mantine/core/styles.css';
+import '@mantine/spotlight/styles.css';
 import dayjs from 'dayjs';
 import { ReactNode, useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
-import { InertiaPage } from '~/types/inertia';
-
-import '@mantine/core/styles.css';
-import '@mantine/spotlight/styles.css';
 import '../styles/index.css';
 
-const theme = createTheme({});
 const TRANSITION_IN_CLASS = '__transition_fadeIn';
 const TRANSITION_OUT_CLASS = '__transition_fadeOut';
 
 export default function BaseLayout({ children }: { children: ReactNode }) {
 	const { i18n } = useTranslation();
-	const { language } = usePage<InertiaPage>().props;
-	i18n.changeLanguage(language);
 	dayjs.locale(i18n.language);
 
 	const findAppElement = () => document.getElementById('app');
@@ -34,7 +29,6 @@ export default function BaseLayout({ children }: { children: ReactNode }) {
 
 	useEffect(() => {
 		const currentLocation = new URL(window.location.href);
-		flipClass(TRANSITION_IN_CLASS, TRANSITION_OUT_CLASS);
 
 		const removeStartEventListener = router.on(
 			'start',
@@ -58,7 +52,7 @@ export default function BaseLayout({ children }: { children: ReactNode }) {
 	return (
 		<>
 			<ColorSchemeScript />
-			<MantineProvider theme={theme}>{children}</MantineProvider>
+			<MantineProvider>{children}</MantineProvider>
 		</>
 	);
 }

inertia/pages/collections/edit.tsx

@@ -18,7 +18,6 @@ export default function EditCollectionPage({
 			name: collection.name,
 			description: collection.description,
 			visibility: collection.visibility,
-			nextId: collection.nextId,
 		});
 	const canSubmit = useMemo<boolean>(() => {
 		const trimmedName = data.name.trim();

inertia/stores/collection_store.ts

@@ -74,6 +74,7 @@ export const useFavorites = () =>
 	);
 
 export function useCollectionsSetter() {
+	// eslint-disable-next-line @typescript-eslint/naming-convention
 	const { _setCollections, setActiveCollection } = useCollectionStore();
 	return { _setCollections, setActiveCollection };
 }

inertia/types/app.ts

@@ -49,7 +49,6 @@ export type Collection = CommonBase & {
 	name: string;
 	description: string | null;
 	visibility: Visibility;
-	nextId: number;
 	authorId: number;
 };
 

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "my-links",
-	"version": "3.1.0",
+	"version": "3.1.3",
 	"type": "module",
 	"license": "GPL-3.0-only",
 	"scripts": {
@@ -11,6 +11,7 @@
 		"lint": "eslint . --report-unused-disable-directives --max-warnings 0",
 		"format": "prettier --write --parser typescript '**/*.{ts,tsx}'",
 		"typecheck": "tsc --noEmit",
+		"check": "pnpm run lint && pnpm run typecheck",
 		"prepare": "husky",
 		"release": "release-it",
 		"generate-icons": "pwa-assets-generator"
@@ -35,68 +36,68 @@
 	},
 	"devDependencies": {
 		"@adonisjs/assembler": "^7.8.2",
-		"@adonisjs/eslint-config": "2.0.0-beta.6",
-		"@adonisjs/prettier-config": "^1.4.0",
-		"@adonisjs/tsconfig": "^1.4.0",
-		"@faker-js/faker": "^9.3.0",
-		"@japa/assert": "^4.0.0",
-		"@japa/plugin-adonisjs": "^3.0.1",
-		"@japa/runner": "^3.1.4",
-		"@swc/core": "^1.10.4",
-		"@types/luxon": "^3.4.2",
-		"@types/node": "^22.10.4",
-		"@types/react": "^19.0.2",
-		"@types/react-dom": "^19.0.2",
-		"@typescript-eslint/eslint-plugin": "^8.19.0",
-		"@vite-pwa/assets-generator": "^0.2.6",
-		"@vitejs/plugin-react": "^4.3.4",
-		"eslint": "^9.17.0",
+		"@adonisjs/eslint-config": "2.1.0",
+		"@adonisjs/prettier-config": "^1.4.5",
+		"@adonisjs/tsconfig": "^1.4.1",
+		"@faker-js/faker": "^9.9.0",
+		"@japa/assert": "^4.1.1",
+		"@japa/plugin-adonisjs": "^4.0.0",
+		"@japa/runner": "^4.3.0",
+		"@swc/core": "^1.13.3",
+		"@types/luxon": "^3.7.1",
+		"@types/node": "^22.14.0",
+		"@types/react": "^19.1.9",
+		"@types/react-dom": "^19.1.7",
+		"@typescript-eslint/eslint-plugin": "^8.39.0",
+		"@vite-pwa/assets-generator": "^1.0.0",
+		"@vitejs/plugin-react": "^4.7.0",
+		"eslint": "^9.32.0",
 		"hot-hook": "^0.4.0",
 		"husky": "^9.1.7",
-		"lint-staged": "^15.3.0",
-		"pino-pretty": "^13.0.0",
-		"postcss": "^8.4.49",
-		"postcss-preset-mantine": "^1.17.0",
+		"lint-staged": "^15.5.0",
+		"pino-pretty": "^13.1.1",
+		"postcss": "^8.5.6",
+		"postcss-preset-mantine": "^1.18.0",
 		"postcss-simple-vars": "^7.0.1",
-		"prettier": "^3.4.2",
-		"release-it": "^17.11.0",
-		"ts-node-maintained": "^10.9.4",
-		"typescript": "~5.7.2",
-		"vite": "^6.0.6"
+		"prettier": "^3.6.2",
+		"release-it": "^18.1.2",
+		"ts-node-maintained": "^10.9.6",
+		"typescript": "~5.9.2",
+		"vite": "^6.2.5"
 	},
 	"dependencies": {
-		"@adonisjs/ally": "^5.0.2",
-		"@adonisjs/auth": "^9.3.0",
-		"@adonisjs/core": "^6.17.0",
+		"@adonisjs/ally": "^5.1.0",
+		"@adonisjs/auth": "^9.4.2",
+		"@adonisjs/core": "^6.19.0",
 		"@adonisjs/cors": "^2.2.1",
-		"@adonisjs/inertia": "^2.1.2",
-		"@adonisjs/lucid": "^21.6.0",
-		"@adonisjs/session": "^7.5.0",
-		"@adonisjs/shield": "^8.1.1",
+		"@adonisjs/inertia": "^3.1.1",
+		"@adonisjs/lucid": "^21.8.0",
+		"@adonisjs/session": "^7.5.1",
+		"@adonisjs/shield": "^8.2.0",
 		"@adonisjs/static": "^1.1.1",
 		"@adonisjs/vite": "^4.0.0",
-		"@inertiajs/react": "^2.0.0",
+		"@inertiajs/react": "^2.0.17",
 		"@izzyjs/route": "^1.2.0",
-		"@mantine/core": "^7.15.2",
-		"@mantine/hooks": "^7.15.2",
-		"@mantine/spotlight": "^7.15.2",
-		"@vinejs/vine": "^3.0.0",
-		"bentocache": "^1.0.0-beta.9",
+		"@mantine/core": "^7.17.3",
+		"@mantine/hooks": "^7.17.3",
+		"@mantine/spotlight": "^7.17.3",
+		"@vinejs/vine": "^3.0.1",
+		"bentocache": "^1.5.0",
 		"dayjs": "^1.11.13",
-		"edge.js": "^6.2.0",
-		"i18next": "^24.2.0",
+		"edge.js": "^6.3.0",
+		"i18next": "^24.2.3",
 		"knex": "^3.1.0",
-		"luxon": "^3.5.0",
+		"luxon": "^3.7.1",
 		"node-html-parser": "^7.0.1",
-		"pg": "^8.13.1",
-		"react": "^19.0.0",
-		"react-dom": "^19.0.0",
+		"pg": "^8.16.3",
+		"react": "^19.1.1",
+		"react-dom": "^19.1.1",
 		"react-hotkeys-hook": "^4.6.1",
-		"react-i18next": "^15.4.0",
-		"react-icons": "^5.4.0",
+		"react-i18next": "^15.6.1",
+		"react-icons": "^5.5.0",
 		"reflect-metadata": "^0.2.2",
-		"vite-plugin-pwa": "^0.21.1",
-		"zustand": "^5.0.2"
+		"vite-plugin-pwa": "^1.0.2",
+		"zustand": "^5.0.7"
 	},
 	"hotHook": {
 		"boundaries": [
@@ -118,6 +119,6 @@
 		"*.js,*.ts,*.jsx,*.tsx": "eslint --cache --fix"
 	},
 	"volta": {
-		"node": "22.11.0"
+		"node": "24.1.0"
 	}
 }

pnpm-workspace.yaml

@@ -0,0 +1,4 @@
+onlyBuiltDependencies:
+  - '@swc/core'
+  - esbuild
+  - sharp

pwa-assets.config.ts

@@ -1,3 +1,4 @@
+/* eslint-disable @unicorn/filename-case */
 import {
 	defineConfig,
 	minimal2023Preset as preset,

vite.config.ts

@@ -101,7 +101,7 @@ export default defineConfig({
 		inertia({ ssr: { enabled: true, entrypoint: 'inertia/app/ssr.tsx' } }),
 		react(),
 		adonisjs({
-			entrypoints: ['inertia/app/app.tsx'],
+			entrypoints: [`${getDirname(import.meta.url)}/inertia/app/app.tsx`],
 			reload: ['resources/views/**/*.edge'],
 		}),
 	],