refactor: use aliases from the rcFile, since autoloads have been removed

adonisjs · Dec 18, 2019 · 2d29d64 · 2d29d64
1 parent 9089cf1
commit 2d29d64
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 18 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -87,7 +87,7 @@
     }
   },
   "dependencies": {
-    "@adonisjs/application": "^1.3.0",
+    "@adonisjs/application": "^1.3.1",
     "@adonisjs/config": "^1.0.10",
     "@adonisjs/encryption": "^1.0.2",
     "@adonisjs/env": "^1.0.10",

diff --git a/src/Ignitor/Ace/AppCommands.ts b/src/Ignitor/Ace/AppCommands.ts
@@ -132,7 +132,7 @@ export class AppCommands {
      * Do not change sequence
      */
     this._bootstrapper.registerProviders(true)
-    this._bootstrapper.registerAutoloads()
+    this._bootstrapper.registerAliases()
     await this._bootstrapper.bootProviders()
     this._bootstrapper.registerPreloads()
   }

diff --git a/src/Ignitor/Ace/GenerateManifest.ts b/src/Ignitor/Ace/GenerateManifest.ts
@@ -75,7 +75,7 @@ export class GenerateManifest {
      * the manifest file
      */
     this._bootstrapper.registerProviders(true)
-    this._bootstrapper.registerAutoloads()
+    this._bootstrapper.registerAliases()
 
     /**
      * Generate file

diff --git a/src/Ignitor/Bootstrapper/index.ts b/src/Ignitor/Bootstrapper/index.ts
@@ -131,8 +131,8 @@ export class Bootstrapper {
   /**
    * Registers autoloading directories
    */
-  public registerAutoloads () {
-    this.application.autoloadsMap.forEach((toPath, alias) => {
+  public registerAliases () {
+    this.application.aliasesMap.forEach((toPath, alias) => {
       if (this._logger) {
         this._logger.trace(`registering %s under %s alias`, toPath, alias)
       }

diff --git a/src/Ignitor/HttpServer/index.ts b/src/Ignitor/HttpServer/index.ts
@@ -83,7 +83,7 @@ export class HttpServer {
     /**
      * Registering directories to be autoloaded
      */
-    this._bootstrapper.registerAutoloads()
+    this._bootstrapper.registerAliases()
 
     /**
      * Booting providers

diff --git a/test/ignitor-boostrapper.spec.ts b/test/ignitor-boostrapper.spec.ts
@@ -87,16 +87,16 @@ test.group('Ignitor | Setup', (group) => {
     assert.equal(env.get('APP_KEY'), SECRET)
   })
 
-  test('register autoloads defined in adonisrc.json file', async (assert) => {
+  test('register aliases defined in adonisrc.json file', async (assert) => {
     await fs.add('.adonisrc.json', JSON.stringify({
-      autoloads: {
+      aliases: {
         'App': './app',
       },
     }))
 
     const bootstrapper = new Bootstrapper(fs.basePath)
     const application = bootstrapper.setup()
-    bootstrapper.registerAutoloads()
+    bootstrapper.registerAliases()
 
     assert.deepEqual(application.container.autoloads, { App: join(fs.basePath, './app') })
   })

diff --git a/test/ignitor-http-server.spec.ts b/test/ignitor-http-server.spec.ts
@@ -69,7 +69,7 @@ test.group('Ignitor | Http', (group) => {
     const httpServer = ignitor.httpServer()
     const application = boostrapper.setup()
 
-    boostrapper.registerAutoloads()
+    boostrapper.registerAliases()
     boostrapper.registerProviders(false)
     await boostrapper.bootProviders()