From 19c0948d9554daa86121c3cde4bedaafe8dd89a4 Mon Sep 17 00:00:00 2001
From: Aaron Klinker <aklinker1@users.noreply.github.com>
Date: Thu, 20 Jul 2023 15:47:38 -0500
Subject: [PATCH] feat!: Change default `publicDir` to `<rootDir>/public`

BREAKING CHANGE: `config.publicDir`'s default changed from `<srcDir>/public` to `rootDir/<public>` to align with other frameworks and standards
---
 demo/{src => }/public/icon/128.png  | Bin
 demo/{src => }/public/icon/16.png   | Bin
 demo/{src => }/public/icon/32.png   | Bin
 demo/{src => }/public/icon/48.png   | Bin
 demo/{src => }/public/icon/96.png   | Bin
 src/core/types/external.ts          |   4 ++--
 src/core/utils/getInternalConfig.ts |   2 +-
 7 files changed, 3 insertions(+), 3 deletions(-)
 rename demo/{src => }/public/icon/128.png (100%)
 rename demo/{src => }/public/icon/16.png (100%)
 rename demo/{src => }/public/icon/32.png (100%)
 rename demo/{src => }/public/icon/48.png (100%)
 rename demo/{src => }/public/icon/96.png (100%)

diff --git a/demo/src/public/icon/128.png b/demo/public/icon/128.png
similarity index 100%
rename from demo/src/public/icon/128.png
rename to demo/public/icon/128.png
diff --git a/demo/src/public/icon/16.png b/demo/public/icon/16.png
similarity index 100%
rename from demo/src/public/icon/16.png
rename to demo/public/icon/16.png
diff --git a/demo/src/public/icon/32.png b/demo/public/icon/32.png
similarity index 100%
rename from demo/src/public/icon/32.png
rename to demo/public/icon/32.png
diff --git a/demo/src/public/icon/48.png b/demo/public/icon/48.png
similarity index 100%
rename from demo/src/public/icon/48.png
rename to demo/public/icon/48.png
diff --git a/demo/src/public/icon/96.png b/demo/public/icon/96.png
similarity index 100%
rename from demo/src/public/icon/96.png
rename to demo/public/icon/96.png
diff --git a/src/core/types/external.ts b/src/core/types/external.ts
index 11b644f0..d3aa57e9 100644
--- a/src/core/types/external.ts
+++ b/src/core/types/external.ts
@@ -16,14 +16,14 @@ export interface InlineConfig {
    * directory.
    *
    * @default
-   * "<root>"
+   * "<rootDir>"
    */
   srcDir?: string;
   /**
    * Directory containing files that will be copied to the output directory as-is.
    *
    * @default
-   * "<srcDir>/publicDir"
+   * "<rootDir>/publicDir"
    */
   publicDir?: string;
   /**
diff --git a/src/core/utils/getInternalConfig.ts b/src/core/utils/getInternalConfig.ts
index fbaacb62..5ee638d4 100644
--- a/src/core/utils/getInternalConfig.ts
+++ b/src/core/utils/getInternalConfig.ts
@@ -80,7 +80,7 @@ export async function getInternalConfig(
     srcDir,
     userConfig.entrypointsDir ?? 'entrypoints',
   );
-  const publicDir = resolve(srcDir, userConfig.publicDir ?? 'public');
+  const publicDir = resolve(root, userConfig.publicDir ?? 'public');
   const wxtDir = resolve(srcDir, '.wxt');
   const typesDir = resolve(wxtDir, 'types');