feat!: Update to recent Adonis.

KararTY · Aug 9, 2021 · 7cec6a7 · 7cec6a7
1 parent ddf9cec
commit 7cec6a7
Show file tree

Hide file tree

Showing 25 changed files with 16,341 additions and 11,440 deletions.
diff --git a/.gitignore b/.gitignore
@@ -40,6 +40,13 @@ typings/
 
 # Yarn Integrity file
 .yarn-integrity
+.yarn/*
+!.yarn/patches
+!.yarn/releases
+!.yarn/plugins
+!.yarn/sdks
+!.yarn/versions
+.pnp.*
 
 # dotenv environment variables file
 .env

diff --git a/.yarn/releases/yarn-3.0.0.cjs b/.yarn/releases/yarn-3.0.0.cjs
diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -0,0 +1,3 @@
+nodeLinker: node-modules
+
+yarnPath: .yarn/releases/yarn-3.0.0.cjs
diff --git a/ace-manifest.json b/ace-manifest.json
@@ -1 +1,267 @@
-{"dump:rcfile":{"settings":{},"commandPath":"@adonisjs/core/build/commands/DumpRc","commandName":"dump:rcfile","description":"Dump contents of .adonisrc.json file along with defaults","args":[],"flags":[]},"list:routes":{"settings":{"loadApp":true},"commandPath":"@adonisjs/core/build/commands/ListRoutes","commandName":"list:routes","description":"List application routes","args":[],"flags":[{"name":"json","propertyName":"json","type":"boolean","description":"Output as JSON"}]},"generate:key":{"settings":{},"commandPath":"@adonisjs/core/build/commands/GenerateKey","commandName":"generate:key","description":"Generate a new APP_KEY secret","args":[],"flags":[]},"db:seed":{"settings":{"loadApp":true},"commandPath":"@adonisjs/lucid/build/commands/DbSeed","commandName":"db:seed","description":"Execute database seeder files","args":[],"flags":[{"name":"connection","propertyName":"connection","type":"string","description":"Define a custom database connection for the seeders","alias":"c"},{"name":"interactive","propertyName":"interactive","type":"boolean","description":"Run seeders in interactive mode","alias":"i"},{"name":"files","propertyName":"files","type":"array","description":"Define a custom set of seeders files names to run","alias":"f"}]},"make:model":{"settings":{},"commandPath":"@adonisjs/lucid/build/commands/MakeModel","commandName":"make:model","description":"Make a new Lucid model","args":[{"type":"string","propertyName":"name","name":"name","required":true,"description":"Name of the model class"}],"flags":[{"name":"migration","propertyName":"migration","type":"boolean","alias":"m","description":"Generate the migration for the model"},{"name":"controller","propertyName":"controller","type":"boolean","alias":"c","description":"Generate the controller for the model"}]},"make:migration":{"settings":{"loadApp":true},"commandPath":"@adonisjs/lucid/build/commands/MakeMigration","commandName":"make:migration","description":"Make a new migration file","args":[{"type":"string","propertyName":"name","name":"name","required":true,"description":"Name of the migration file"}],"flags":[{"name":"connection","propertyName":"connection","type":"string","description":"Define a custom database connection for the migration"},{"name":"folder","propertyName":"folder","type":"string","description":"Pre-select a migration directory"},{"name":"create","propertyName":"create","type":"string","description":"Define the table name for creating a new table"},{"name":"table","propertyName":"table","type":"string","description":"Define the table name for altering an existing table"}]},"make:seeder":{"settings":{},"commandPath":"@adonisjs/lucid/build/commands/MakeSeeder","commandName":"make:seeder","description":"Make a new Seeder file","args":[{"type":"string","propertyName":"name","name":"name","required":true,"description":"Name of the seeder class"}],"flags":[]},"migration:run":{"settings":{"loadApp":true},"commandPath":"@adonisjs/lucid/build/commands/Migration/Run","commandName":"migration:run","description":"Run pending migrations","args":[],"flags":[{"name":"connection","propertyName":"connection","type":"string","description":"Define a custom database connection","alias":"c"},{"name":"force","propertyName":"force","type":"boolean","description":"Explicitly force to run migrations in production"},{"name":"dry-run","propertyName":"dryRun","type":"boolean","description":"Print SQL queries, instead of running the migrations"}]},"migration:rollback":{"settings":{"loadApp":true},"commandPath":"@adonisjs/lucid/build/commands/Migration/Rollback","commandName":"migration:rollback","description":"Rollback migrations to a given batch number","args":[],"flags":[{"name":"connection","propertyName":"connection","type":"string","description":"Define a custom database connection","alias":"c"},{"name":"force","propertyName":"force","type":"boolean","description":"Explictly force to run migrations in production"},{"name":"dry-run","propertyName":"dryRun","type":"boolean","description":"Print SQL queries, instead of running the migrations"},{"name":"batch","propertyName":"batch","type":"number","description":"Define custom batch number for rollback. Use 0 to rollback to initial state"}]},"migration:status":{"settings":{"loadApp":true},"commandPath":"@adonisjs/lucid/build/commands/Migration/Status","commandName":"migration:status","description":"Check migrations current status.","args":[],"flags":[{"name":"connection","propertyName":"connection","type":"string","description":"Define a custom database connection","alias":"c"}]},"repl":{"settings":{"loadApp":true,"environment":"repl","stayAlive":true},"commandPath":"@adonisjs/repl/build/commands/AdonisRepl","commandName":"repl","description":"Start a new REPL session","args":[],"flags":[]}}
+{
+  "commands": {
+    "dump:rcfile": {
+      "settings": {},
+      "commandPath": "@adonisjs/core/commands/DumpRc",
+      "commandName": "dump:rcfile",
+      "description": "Dump contents of .adonisrc.json file along with defaults",
+      "args": [],
+      "aliases": [],
+      "flags": []
+    },
+    "list:routes": {
+      "settings": {
+        "loadApp": true
+      },
+      "commandPath": "@adonisjs/core/commands/ListRoutes",
+      "commandName": "list:routes",
+      "description": "List application routes",
+      "args": [],
+      "aliases": [],
+      "flags": [
+        {
+          "name": "json",
+          "propertyName": "json",
+          "type": "boolean",
+          "description": "Output as JSON"
+        }
+      ]
+    },
+    "generate:key": {
+      "settings": {},
+      "commandPath": "@adonisjs/core/commands/GenerateKey",
+      "commandName": "generate:key",
+      "description": "Generate a new APP_KEY secret",
+      "args": [],
+      "aliases": [],
+      "flags": []
+    },
+    "db:seed": {
+      "settings": {
+        "loadApp": true
+      },
+      "commandPath": "@adonisjs/lucid/build/commands/DbSeed",
+      "commandName": "db:seed",
+      "description": "Execute database seeder files",
+      "args": [],
+      "aliases": [],
+      "flags": [
+        {
+          "name": "connection",
+          "propertyName": "connection",
+          "type": "string",
+          "description": "Define a custom database connection for the seeders",
+          "alias": "c"
+        },
+        {
+          "name": "interactive",
+          "propertyName": "interactive",
+          "type": "boolean",
+          "description": "Run seeders in interactive mode",
+          "alias": "i"
+        },
+        {
+          "name": "files",
+          "propertyName": "files",
+          "type": "array",
+          "description": "Define a custom set of seeders files names to run",
+          "alias": "f"
+        }
+      ]
+    },
+    "make:model": {
+      "settings": {},
+      "commandPath": "@adonisjs/lucid/build/commands/MakeModel",
+      "commandName": "make:model",
+      "description": "Make a new Lucid model",
+      "args": [
+        {
+          "type": "string",
+          "propertyName": "name",
+          "name": "name",
+          "required": true,
+          "description": "Name of the model class"
+        }
+      ],
+      "aliases": [],
+      "flags": [
+        {
+          "name": "migration",
+          "propertyName": "migration",
+          "type": "boolean",
+          "alias": "m",
+          "description": "Generate the migration for the model"
+        },
+        {
+          "name": "controller",
+          "propertyName": "controller",
+          "type": "boolean",
+          "alias": "c",
+          "description": "Generate the controller for the model"
+        }
+      ]
+    },
+    "make:migration": {
+      "settings": {
+        "loadApp": true
+      },
+      "commandPath": "@adonisjs/lucid/build/commands/MakeMigration",
+      "commandName": "make:migration",
+      "description": "Make a new migration file",
+      "args": [
+        {
+          "type": "string",
+          "propertyName": "name",
+          "name": "name",
+          "required": true,
+          "description": "Name of the migration file"
+        }
+      ],
+      "aliases": [],
+      "flags": [
+        {
+          "name": "connection",
+          "propertyName": "connection",
+          "type": "string",
+          "description": "The connection flag is used to lookup the directory for the migration file"
+        },
+        {
+          "name": "folder",
+          "propertyName": "folder",
+          "type": "string",
+          "description": "Pre-select a migration directory"
+        },
+        {
+          "name": "create",
+          "propertyName": "create",
+          "type": "string",
+          "description": "Define the table name for creating a new table"
+        },
+        {
+          "name": "table",
+          "propertyName": "table",
+          "type": "string",
+          "description": "Define the table name for altering an existing table"
+        }
+      ]
+    },
+    "make:seeder": {
+      "settings": {},
+      "commandPath": "@adonisjs/lucid/build/commands/MakeSeeder",
+      "commandName": "make:seeder",
+      "description": "Make a new Seeder file",
+      "args": [
+        {
+          "type": "string",
+          "propertyName": "name",
+          "name": "name",
+          "required": true,
+          "description": "Name of the seeder class"
+        }
+      ],
+      "aliases": [],
+      "flags": []
+    },
+    "migration:run": {
+      "settings": {
+        "loadApp": true
+      },
+      "commandPath": "@adonisjs/lucid/build/commands/Migration/Run",
+      "commandName": "migration:run",
+      "description": "Run pending migrations",
+      "args": [],
+      "aliases": [],
+      "flags": [
+        {
+          "name": "connection",
+          "propertyName": "connection",
+          "type": "string",
+          "description": "Define a custom database connection",
+          "alias": "c"
+        },
+        {
+          "name": "force",
+          "propertyName": "force",
+          "type": "boolean",
+          "description": "Explicitly force to run migrations in production"
+        },
+        {
+          "name": "dry-run",
+          "propertyName": "dryRun",
+          "type": "boolean",
+          "description": "Print SQL queries, instead of running the migrations"
+        }
+      ]
+    },
+    "migration:rollback": {
+      "settings": {
+        "loadApp": true
+      },
+      "commandPath": "@adonisjs/lucid/build/commands/Migration/Rollback",
+      "commandName": "migration:rollback",
+      "description": "Rollback migrations to a given batch number",
+      "args": [],
+      "aliases": [],
+      "flags": [
+        {
+          "name": "connection",
+          "propertyName": "connection",
+          "type": "string",
+          "description": "Define a custom database connection",
+          "alias": "c"
+        },
+        {
+          "name": "force",
+          "propertyName": "force",
+          "type": "boolean",
+          "description": "Explictly force to run migrations in production"
+        },
+        {
+          "name": "dry-run",
+          "propertyName": "dryRun",
+          "type": "boolean",
+          "description": "Print SQL queries, instead of running the migrations"
+        },
+        {
+          "name": "batch",
+          "propertyName": "batch",
+          "type": "number",
+          "description": "Define custom batch number for rollback. Use 0 to rollback to initial state"
+        }
+      ]
+    },
+    "migration:status": {
+      "settings": {
+        "loadApp": true
+      },
+      "commandPath": "@adonisjs/lucid/build/commands/Migration/Status",
+      "commandName": "migration:status",
+      "description": "Check migrations current status.",
+      "args": [],
+      "aliases": [],
+      "flags": [
+        {
+          "name": "connection",
+          "propertyName": "connection",
+          "type": "string",
+          "description": "Define a custom database connection",
+          "alias": "c"
+        }
+      ]
+    },
+    "repl": {
+      "settings": {
+        "loadApp": true,
+        "environment": "repl",
+        "stayAlive": true
+      },
+      "commandPath": "@adonisjs/repl/build/commands/AdonisRepl",
+      "commandName": "repl",
+      "description": "Start a new REPL session",
+      "args": [],
+      "aliases": [],
+      "flags": []
+    }
+  },
+  "aliases": {}
+}
diff --git a/app/Controllers/Http/AuthController.ts b/app/Controllers/Http/AuthController.ts
@@ -58,7 +58,7 @@ export default class AuthController {
         let flashMessage = 'Welcome back!'
 
         // Check if not actually registered, and only just cached. For "favorite streamers" purposes.
-        await userExists.preload('profile')
+        await userExists.load('profile')
         if (userExists.profile.length === 0) {
           await userExists.related('profile').create({
             enabled: false,

diff --git a/app/Controllers/Http/EmotesController.ts b/app/Controllers/Http/EmotesController.ts
@@ -8,7 +8,7 @@ export default class EmotesController {
 
     const totalEmotes = auth.user.emotes.reduce((acc, cur) => acc + (cur.amount || 0), 0)
 
-    return view.render('core', {
+    return await view.render('core', {
       user: auth.user.toJSON(),
       totalEmotes,
       web: {

diff --git a/app/Controllers/Http/ProfilesController.ts b/app/Controllers/Http/ProfilesController.ts
@@ -17,7 +17,7 @@ export default class ProfilesController {
       // Show all user's profiles.
       const profiles = await this.getAllProfilesForUser(auth.user)
 
-      return view.render('core', {
+      return await view.render('core', {
         user: auth.user.toJSON(),
         profiles,
         web: {
@@ -55,7 +55,7 @@ export default class ProfilesController {
         }
       }
 
-      await auth.user.preload('favoriteStreamers')
+      await auth.user.load('favoriteStreamers')
 
       const userJSON = auth.user.toJSON()
       const profileJSON = profile.toJSON()
@@ -64,7 +64,7 @@ export default class ProfilesController {
 
       if (ownProfile) {
         // If own, allow access.
-        return view.render('core', {
+        return await view.render('core', {
           user: userJSON,
           profile: profileJSON,
           profileUser: userJSON,
@@ -107,9 +107,9 @@ export default class ProfilesController {
           return response.redirect('/profile')
         }
 
-        await userOfProfile.preload('favoriteStreamers')
+        await userOfProfile.load('favoriteStreamers')
 
-        return view.render('core', {
+        return await view.render('core', {
           user: userJSON,
           profile: profileJSON,
           profileUser: userOfProfile.toJSON(),
@@ -192,7 +192,7 @@ export default class ProfilesController {
       return response.redirect('/profile/')
     }
 
-    await auth.user.preload('profile')
+    await auth.user.load('profile')
 
     const profile = auth.user.profile.find(profile => profile.id === idNumber)
     if (profile !== undefined) {
@@ -317,7 +317,7 @@ export default class ProfilesController {
   private async getAllProfilesForUser (user: User) {
     const profiles: any[] = []
 
-    await user.preload('profile')
+    await user.load('profile')
 
     for (let index = 0; index < user.profile.length; index++) {
       const profile = user.profile[index]
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		nodeLinker: node-modules

		yarnPath: .yarn/releases/yarn-3.0.0.cjs