fix: Support srcDir config

wxt-dev · Jun 25, 2023 · 739d19f · 739d19f
1 parent 1a25f2b
commit 739d19f
Show file tree

Hide file tree

Showing 20 changed files with 16 additions and 4 deletions.
diff --git a/demo/exvite.config.ts b/demo/exvite.config.ts
@@ -1,6 +1,7 @@
 import { defineConfig } from 'exvite';
 
 export default defineConfig({
+  srcDir: 'src',
   storeIds: {
     chrome: '123',
   },

diff --git a/demo/common/style.css → demo/src/common/style.css b/demo/common/style.css → demo/src/common/style.css
diff --git a/demo/entrypoints/background.ts → demo/src/entrypoints/background.ts b/demo/entrypoints/background.ts → demo/src/entrypoints/background.ts
diff --git a/demo/entrypoints/example.sandbox/index.html → ...rc/entrypoints/example.sandbox/index.html b/demo/entrypoints/example.sandbox/index.html → ...rc/entrypoints/example.sandbox/index.html
diff --git a/demo/entrypoints/options/index.html → demo/src/entrypoints/options/index.html b/demo/entrypoints/options/index.html → demo/src/entrypoints/options/index.html
diff --git a/demo/entrypoints/options/main.ts → demo/src/entrypoints/options/main.ts b/demo/entrypoints/options/main.ts → demo/src/entrypoints/options/main.ts
diff --git a/demo/entrypoints/options/style.css → demo/src/entrypoints/options/style.css b/demo/entrypoints/options/style.css → demo/src/entrypoints/options/style.css
diff --git a/demo/entrypoints/overlay.content/index.ts → .../src/entrypoints/overlay.content/index.ts b/demo/entrypoints/overlay.content/index.ts → .../src/entrypoints/overlay.content/index.ts
diff --git a/demo/entrypoints/popup.html → demo/src/entrypoints/popup.html b/demo/entrypoints/popup.html → demo/src/entrypoints/popup.html
diff --git a/demo/entrypoints/sandbox.html → demo/src/entrypoints/sandbox.html b/demo/entrypoints/sandbox.html → demo/src/entrypoints/sandbox.html
diff --git a/demo/public/icon/128.png → demo/src/public/icon/128.png b/demo/public/icon/128.png → demo/src/public/icon/128.png
diff --git a/demo/public/icon/16.png → demo/src/public/icon/16.png b/demo/public/icon/16.png → demo/src/public/icon/16.png
diff --git a/demo/public/icon/32.png → demo/src/public/icon/32.png b/demo/public/icon/32.png → demo/src/public/icon/32.png
diff --git a/demo/public/icon/48.png → demo/src/public/icon/48.png b/demo/public/icon/48.png → demo/src/public/icon/48.png
diff --git a/demo/public/icon/96.png → demo/src/public/icon/96.png b/demo/public/icon/96.png → demo/src/public/icon/96.png
diff --git a/demo/utils/logger.ts → demo/src/utils/logger.ts b/demo/utils/logger.ts → demo/src/utils/logger.ts
diff --git a/demo/tsconfig.json b/demo/tsconfig.json
@@ -1,3 +1,3 @@
 {
-  "extends": ["../tsconfig.base.json", "./.exvite/tsconfig.json"]
+  "extends": ["../tsconfig.base.json", "./src/.exvite/tsconfig.json"]
 }
diff --git a/src/utils/createFsCache.ts b/src/utils/createFsCache.ts
@@ -8,9 +8,9 @@ import { dirname, resolve } from 'path';
  *
  * @param srcDir Absolute path to source directory. See `InternalConfig.srcDir`
  */
-export function createFsCache(srcDir: string): FsCache {
+export function createFsCache(exviteDir: string): FsCache {
   const getPath = (key: string) =>
-    resolve(srcDir, '.exvite/cache', encodeURIComponent(key));
+    resolve(exviteDir, 'cache', encodeURIComponent(key));
 
   return {
     async set(key: string, value: string): Promise<void> {

diff --git a/src/utils/getInternalConfig.ts b/src/utils/getInternalConfig.ts
@@ -52,7 +52,7 @@ export async function getInternalConfig(
     logger,
     vite: config.vite ?? {},
     manifest: config.manifest ?? {},
-    fsCache: createFsCache(srcDir),
+    fsCache: createFsCache(exviteDir),
     imports: config.imports ?? {},
   };
 
@@ -69,6 +69,16 @@ export async function getInternalConfig(
   // Merge inline and user configs
   const merged = vite.mergeConfig(baseConfig, userConfig) as InternalConfig;
 
+  // Ensure user customized directories are absolute
+  merged.srcDir = userConfig.srcDir ? resolve(root, merged.srcDir) : root;
+  merged.entrypointsDir = resolve(
+    merged.srcDir,
+    userConfig.entrypointsDir ?? 'entrypoints',
+  );
+  merged.publicDir = resolve(merged.srcDir, userConfig.publicDir ?? 'public');
+  merged.exviteDir = resolve(merged.srcDir, '.exvite');
+  merged.typesDir = resolve(merged.exviteDir, 'types');
+
   // Customize the default vite config
   merged.vite.root = root;
   merged.vite.configFile = false;

diff --git a/src/utils/manifest.ts b/src/utils/manifest.ts
@@ -26,6 +26,7 @@ export async function writeManifest(
       ? JSON.stringify(manifest)
       : JSON.stringify(manifest, null, 2);
 
+  await fs.ensureDir(config.outDir);
   await fs.writeFile(resolve(config.outDir, 'manifest.json'), str, 'utf-8');
 
   output.unshift({