🐛 Force alias to be arrays to properly support config merging fix #3

playground/assets/test.txt

@@ -0,0 +1 @@
+Hello world!!!

playground/index.tsx

@@ -3,7 +3,11 @@ import { MetaProvider } from 'solid-meta';
 import { createApp } from 'solid-utils';
 import { Router, Route, RouteDefinition, Link } from 'solid-app-router';
 
-import Home from './pages';
+import test from '@@/test.txt?raw'
+import Home from '@/index';
+
+// This should log Hello World
+console.log(test)
 
 const routes: RouteDefinition[] = [
   {

playground/tsconfig.json

@@ -8,6 +8,11 @@
     "moduleResolution": "node",
     "jsx": "preserve",
     "jsxImportSource": "solid-js",
-    "types": ["vite/client"]
+    "types": ["vite/client"],
+    "baseUrl": ".",
+    "paths": {
+      "@/*": ["./pages/*"],
+      "@@/*": ["./assets/*"]
+    }
   }
 }

playground/vite.config.ts

@@ -1,6 +1,13 @@
 import solid from '../src';
 import { defineConfig } from 'vite';
+import { resolve } from 'path'
 
 export default defineConfig({
   plugins: [solid()],
+  resolve: {
+    alias: {
+      '@': '/pages',
+      '@@': '/assets'
+    }
+  }
 });

src/index.ts

@@ -1,4 +1,4 @@
-import { Plugin, UserConfig } from 'vite';
+import { Plugin, UserConfig, AliasOptions, Alias } from 'vite';
 import { readFileSync } from 'fs';
 import { transformAsync, TransformOptions } from '@babel/core';
 import { mergeAndConcat } from 'merge-anything';
@@ -20,14 +20,20 @@ export default function solidPlugin(options: Partial<Options> = {}): Plugin {
     name: 'solid',
     enforce: 'pre',
 
-    config(userConfig, { command }) {
+    config(userConfig, { command }): UserConfig {
       const replaceDev = options.dev !== false;
 
       const alias =
         command === 'serve' && replaceDev
           ? [{ find: /^solid-js$/, replacement: 'solid-js/dev' }]
           : [];
 
+      // TODO: remove when fully removed from vite
+      userConfig.alias = normalizeAliases(userConfig.alias)
+
+      if (!userConfig.resolve) userConfig.resolve = {}
+      userConfig.resolve.alias = normalizeAliases(userConfig.resolve?.alias)
+
       return mergeAndConcat(userConfig, {
         /**
          * We only need esbuild on .ts or .js files.
@@ -91,3 +97,16 @@ export default function solidPlugin(options: Partial<Options> = {}): Plugin {
     },
   };
 }
+
+/**
+ * This basically normalize all aliases of the config into
+ * the array format of the alias.
+ *
+ * eg: alias: { '@': 'src/' } => [{ find: '@', replacement: 'src/' }]
+ */
+function normalizeAliases(alias: AliasOptions = []): Alias[] {
+  return Array.isArray(alias)
+    ? alias
+    : Object.entries(alias).map(([find, replacement]) => ({ find, replacement }))
+}
+