Merge branch '21.x' into feat/unique

.github/workflows/checks.yml

@@ -2,6 +2,7 @@ name: test
 on:
   - push
   - pull_request
+  - workflow_call
 
 jobs:
   lint:

.github/workflows/labels.yml

@@ -0,0 +1,15 @@
+name: Sync labels
+on:
+  workflow_dispatch:
+permissions:
+  issues: write
+jobs:
+  labels:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: EndBug/label-sync@v2
+        with:
+          config-file: 'https://raw.githubusercontent.com/thetutlage/static/main/labels.yml'
+          delete-other-labels: true
+          token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release.yml

@@ -0,0 +1,32 @@
+name: release
+on: workflow_dispatch
+permissions:
+  contents: write
+  id-token: write
+jobs:
+  checks:
+    uses: ./.github/workflows/checks.yml
+  release:
+    needs: checks
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20
+      - name: git config
+        run: |
+          git config user.name "${GITHUB_ACTOR}"
+          git config user.email "${GITHUB_ACTOR}@users.noreply.github.com"
+      - name: Init npm config
+        run: npm config set //registry.npmjs.org/:_authToken $NPM_TOKEN
+        env:
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+      - run: npm install
+      - run: npm run release -- --ci
+        env:
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

README.md

@@ -19,7 +19,7 @@ We encourage you to read the [contribution guide](https://github.com/adonisjs/.g
 Easiest way to run tests is to launch the redis cluster using docker-compose and `docker-compose.yml` file.
 
 ```sh
-docker-compose up
+docker-compose up -d
 npm run test
 ```
 

commands/db_seed.ts

@@ -23,7 +23,7 @@ export default class DbSeed extends BaseCommand {
     startApp: true,
   }
 
-  private declare seeder: SeedsRunner
+  declare private seeder: SeedsRunner
 
   /**
    * Track if one or more seeders have failed

commands/db_truncate.ts

@@ -43,7 +43,7 @@ export default class DbTruncate extends BaseCommand {
   /**
    * Prompts to take consent when truncating the database in production
    */
-  private async takeProductionConstent(): Promise<boolean> {
+  private async takeProductionConsent(): Promise<boolean> {
     const question = 'You are in production environment. Want to continue truncating the database?'
     try {
       return await this.prompt.confirm(question)
@@ -78,7 +78,7 @@ export default class DbTruncate extends BaseCommand {
      */
     let continueTruncate = !this.app.inProduction || this.force
     if (!continueTruncate) {
-      continueTruncate = await this.takeProductionConstent()
+      continueTruncate = await this.takeProductionConsent()
     }
 
     /**

commands/db_wipe.ts

@@ -61,7 +61,7 @@ export default class DbWipe extends BaseCommand {
   /**
    * Prompts to take consent when wiping the database in production
    */
-  private async takeProductionConstent(): Promise<boolean> {
+  private async takeProductionConsent(): Promise<boolean> {
     const question = 'You are in production environment. Want to continue wiping the database?'
     try {
       return await this.prompt.confirm(question)
@@ -141,7 +141,7 @@ export default class DbWipe extends BaseCommand {
      */
     let continueWipe = !this.app.inProduction || this.force
     if (!continueWipe) {
-      continueWipe = await this.takeProductionConstent()
+      continueWipe = await this.takeProductionConsent()
     }
 
     /**

commands/migration/_base.ts

@@ -36,7 +36,7 @@ export default abstract class MigrationsBase extends BaseCommand {
   /**
    * Prompts to take consent for running migrations in production
    */
-  protected async takeProductionConstent(): Promise<boolean> {
+  protected async takeProductionConsent(): Promise<boolean> {
     const question = 'You are in production environment. Want to continue running migrations?'
     try {
       return await this.prompt.confirm(question)

commands/migration/refresh.ts

@@ -45,6 +45,12 @@ export default class Refresh extends BaseCommand {
   @flags.boolean({ description: 'Run seeders' })
   declare seed: boolean
 
+  /**
+   * Display migrations result in one compact single-line output
+   */
+  @flags.boolean({ description: 'A compact single-line output' })
+  declare compactOutput: boolean
+
   /**
    * Disable advisory locks
    */
@@ -60,6 +66,10 @@ export default class Refresh extends BaseCommand {
       args.push('--force')
     }
 
+    if (this.compactOutput) {
+      args.push('--compact-output')
+    }
+
     if (this.connection) {
       args.push(`--connection=${this.connection}`)
     }

commands/migration/reset.ts

@@ -39,6 +39,12 @@ export default class Reset extends BaseCommand {
   @flags.boolean({ description: 'Do not run actual queries. Instead view the SQL output' })
   declare dryRun: boolean
 
+  /**
+   * Display migrations result in one compact single-line output
+   */
+  @flags.boolean({ description: 'A compact single-line output' })
+  declare compactOutput: boolean
+
   /**
    * Disable advisory locks
    */
@@ -54,6 +60,10 @@ export default class Reset extends BaseCommand {
       args.push('--force')
     }
 
+    if (this.compactOutput) {
+      args.push('--compact-output')
+    }
+
     if (this.connection) {
       args.push(`--connection=${this.connection}`)
     }

commands/migration/rollback.ts

@@ -35,7 +35,7 @@ export default class Rollback extends MigrationsBase {
   /**
    * Force run migrations in production
    */
-  @flags.boolean({ description: 'Explictly force to run migrations in production' })
+  @flags.boolean({ description: 'Explicitly force to run migrations in production' })
   declare force: boolean
 
   /**
@@ -52,6 +52,14 @@ export default class Rollback extends MigrationsBase {
   })
   declare batch: number
 
+  /**
+   * Define custom step, instead of rolling back to the latest batch
+   */
+  @flags.number({
+    description: 'The number of migrations to be reverted',
+  })
+  declare step: number
+
   /**
    * Display migrations result in one compact single-line output
    */
@@ -74,6 +82,7 @@ export default class Rollback extends MigrationsBase {
       direction: 'down',
       connectionName: this.connection,
       batch: this.batch,
+      step: this.step,
       dryRun: this.dryRun,
       disableLocks: this.disableLocks,
     })
@@ -93,7 +102,7 @@ export default class Rollback extends MigrationsBase {
      */
     let continueMigrations = !this.app.inProduction || this.force
     if (!continueMigrations) {
-      continueMigrations = await this.takeProductionConstent()
+      continueMigrations = await this.takeProductionConsent()
     }
 
     /**

commands/migration/run.ts

@@ -83,7 +83,7 @@ export default class Migrate extends MigrationsBase {
      */
     let continueMigrations = !this.app.inProduction || this.force
     if (!continueMigrations) {
-      continueMigrations = await this.takeProductionConstent()
+      continueMigrations = await this.takeProductionConsent()
     }
 
     /**

docker-compose.yml → compose.yml

@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
   legacy_mysql:
     platform: linux/x86_64
@@ -48,7 +46,7 @@ services:
       - $LEGACY_MYSQL_READ_REPLICA_PORT
 
   pg:
-    image: postgres:11
+    image: postgres:16
     container_name: pg
     env_file: ./.env
     environment:
@@ -61,7 +59,7 @@ services:
       - $PG_PORT
 
   pg_read_replica:
-    image: postgres:11
+    image: postgres:16
     container_name: pg_read_replica
     env_file: ./.env
     environment:

configure.ts

@@ -25,7 +25,12 @@ export async function configure(command: Configure) {
   if (dialect === undefined) {
     dialect = await command.prompt.choice(
       'Select the database you want to use',
-      Object.keys(DIALECTS),
+      Object.keys(DIALECTS).map((dialectKey) => {
+        return {
+          name: dialectKey,
+          message: DIALECTS[dialectKey as keyof typeof DIALECTS].name,
+        }
+      }),
       {
         validate(value) {
           return !!value

eslint.config.js

@@ -0,0 +1,2 @@
+import { configPkg } from '@adonisjs/eslint-config'
+export default configPkg()