fix: aliases not flattened

adonisjs · Jun 2, 2024 · 60aafa7 · 60aafa7
1 parent c48b294
commit 60aafa7
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/src/client/config.ts b/src/client/config.ts
@@ -25,7 +25,7 @@ export function resolveAlias(config: UserConfig): AliasOptions {
   if (Array.isArray(config.resolve?.alias)) {
     return [
       ...(config.resolve?.alias ?? []),
-      Object.entries(defaultAlias).map(([find, replacement]) => ({ find, replacement })),
+      ...Object.entries(defaultAlias).map(([find, replacement]) => ({ find, replacement })),
     ]
   }
 

diff --git a/tests/client/config.spec.ts b/tests/client/config.spec.ts
@@ -53,6 +53,21 @@ test.group('Vite plugin', () => {
     })
   })
 
+  test('flatten existing aliases', async ({ assert }) => {
+    const plugin = adonisjs({ entrypoints: ['./resources/js/app.ts'] })[1] as Plugin
+
+    // @ts-ignore
+    const config = plugin!.config!(
+      { resolve: { alias: [{ find: '@test/', replacement: '/test/' }] } },
+      { command: 'build' }
+    )
+
+    assert.deepEqual(config.resolve.alias, [
+      { find: '@test/', replacement: '/test/' },
+      { find: '@/', replacement: '/resources/js/' },
+    ])
+  })
+
   test('user should be able to override the default alias', async ({ assert }) => {
     const plugin = adonisjs({ entrypoints: ['./resources/js/app.ts'] })[1] as Plugin